Revert commit rXXXXXX

ydb-platform · May 31, 2023 · a627cca · a627cca
1 parent 13cbc28
commit a627cca
Show file tree

Hide file tree

Showing 80 changed files with 4 additions and 3,446 deletions.
diff --git a/CMakeLists.darwin-x86_64.txt b/CMakeLists.darwin-x86_64.txt
@@ -12,4 +12,3 @@ add_subdirectory(util)
 add_subdirectory(library)
 add_subdirectory(ydb)
 add_subdirectory(certs)
-add_subdirectory(yql)
diff --git a/CMakeLists.linux-aarch64.txt b/CMakeLists.linux-aarch64.txt
@@ -12,4 +12,3 @@ add_subdirectory(util)
 add_subdirectory(library)
 add_subdirectory(ydb)
 add_subdirectory(certs)
-add_subdirectory(yql)
diff --git a/CMakeLists.linux-x86_64.txt b/CMakeLists.linux-x86_64.txt
@@ -12,4 +12,3 @@ add_subdirectory(util)
 add_subdirectory(library)
 add_subdirectory(ydb)
 add_subdirectory(certs)
-add_subdirectory(yql)
diff --git a/CMakeLists.windows-x86_64.txt b/CMakeLists.windows-x86_64.txt
@@ -12,4 +12,3 @@ add_subdirectory(util)
 add_subdirectory(library)
 add_subdirectory(ydb)
 add_subdirectory(certs)
-add_subdirectory(yql)
diff --git a/ydb/library/yql/ast/yql_expr.h b/ydb/library/yql/ast/yql_expr.h
@@ -555,20 +555,6 @@ class TStructExprType : public TTypeAnnotationNode {
         return true;
     }
 
-
-    TString ToString() const {
-        TStringBuilder sb;
-
-        for (std::size_t i = 0; i < Items.size(); i++) {
-            sb << i << ": " << Items[i]->GetName() << "(" << FormatType(Items[i]->GetItemType()) << ")";
-            if (i != Items.size() - 1) {
-                sb << ", ";
-            }
-        }
-
-        return sb;
-    }
-
 private:
     TVector<const TItemExprType*> Items;
 };

diff --git a/ydb/library/yql/providers/CMakeLists.txt b/ydb/library/yql/providers/CMakeLists.txt
@@ -11,7 +11,6 @@ add_subdirectory(common)
 add_subdirectory(config)
 add_subdirectory(dq)
 add_subdirectory(function)
-add_subdirectory(generic)
 add_subdirectory(pq)
 add_subdirectory(result)
 add_subdirectory(s3)

diff --git a/ydb/library/yql/providers/common/db_id_async_resolver/db_async_resolver.h b/ydb/library/yql/providers/common/db_id_async_resolver/db_async_resolver.h
@@ -9,8 +9,7 @@ enum class DatabaseType {
     Ydb,
     ClickHouse,
     DataStreams,
-    ObjectStorage,
-    Generic
+    ObjectStorage
 };
 
 struct TDatabaseAuth {

diff --git a/ydb/library/yql/providers/common/mkql/parser.cpp b/ydb/library/yql/providers/common/mkql/parser.cpp
@@ -137,7 +137,6 @@ TRuntimeNode WrapWithDecompress(
 }
 } // namespace
 
-
 TRuntimeNode BuildParseCall(
     TPosition pos,
     TRuntimeNode input,
@@ -391,7 +390,6 @@ TMaybe<TRuntimeNode> TryWrapWithParser(const TDqSourceWrapBase& wrapper, NCommon
 
     const auto& settings = GetSettings(wrapper.Settings().Cast().Ref());
     TPosition pos = ctx.ExprCtx.GetPosition(wrapper.Pos());
-
     return BuildParseCall(
         pos,
         input,
@@ -407,30 +405,4 @@ TMaybe<TRuntimeNode> TryWrapWithParser(const TDqSourceWrapBase& wrapper, NCommon
         useBlocks);
 }
 
-TMaybe<TRuntimeNode> TryWrapWithParserForArrowIPCStreaming(const TDqSourceWrapBase& wrapper, NCommon::TMkqlBuildContext& ctx) {
-    const auto input = MkqlBuildExpr(wrapper.Input().Ref(), ctx);
-    const TStructExprType* rowType = wrapper.RowType().Ref().GetTypeAnn()->Cast<TTypeExprType>()->GetType()->Cast<TStructExprType>();
-
-    const auto finalItemType = NCommon::BuildType(
-        wrapper.RowType().Ref(),
-        *rowType,
-        ctx.ProgramBuilder);
-
-    const auto* finalItemStructType = static_cast<TStructType*>(finalItemType);
-
-    return ctx.ProgramBuilder.ExpandMap(ctx.ProgramBuilder.ToFlow(input), [&](TRuntimeNode item) {
-        // MKQL_ENSURE(!extraColumnsByPathIndex && metadataColumns.empty(), "TODO");
-
-        TRuntimeNode::TList fields;
-
-        for (ui32 i = 0; i < finalItemStructType->GetMembersCount(); ++i) {
-            TStringBuf name = finalItemStructType->GetMemberName(i);
-            fields.push_back(ctx.ProgramBuilder.Member(item, name));
-        }
-
-        fields.push_back(ctx.ProgramBuilder.Member(item, BlockLengthColumnName));
-        return fields;
-    });
-}
-
 }
diff --git a/ydb/library/yql/providers/common/mkql/parser.h b/ydb/library/yql/providers/common/mkql/parser.h
@@ -28,6 +28,5 @@ NKikimr::NMiniKQL::TRuntimeNode BuildParseCall(
     bool useBlocks = false);
 
 TMaybe<NKikimr::NMiniKQL::TRuntimeNode> TryWrapWithParser(const NYql::NNodes::TDqSourceWrapBase& wrapper, NCommon::TMkqlBuildContext& ctx, bool useBlocks = false);
-TMaybe<NKikimr::NMiniKQL::TRuntimeNode> TryWrapWithParserForArrowIPCStreaming(const NYql::NNodes::TDqSourceWrapBase& wrapper, NCommon::TMkqlBuildContext& ctx);
 
 }
diff --git a/ydb/library/yql/providers/common/proto/gateways_config.proto b/ydb/library/yql/providers/common/proto/gateways_config.proto
@@ -530,15 +530,6 @@ message TDbToolConfig {
 }
 
 
-/////////// Generic gateway for the external data sources ////////////
-
-message TGenericGatewayConfig {
-    required string Endpoint = 1;
-
-    // external data sources that can be accessed via connector
-    optional TClickHouseGatewayConfig ClickHouse = 2;
-}
-
 /////////////////////////////// Root ///////////////////////////////
 
 message TGatewaysConfig {
@@ -562,5 +553,4 @@ message TGatewaysConfig {
     optional THttpGatewayConfig HttpGateway = 18;
     optional TYtOrmGatewayConfig YtOrm = 19;
     optional TDbToolConfig DbTool = 20;
-    optional TGenericGatewayConfig Generic = 21;
 }
diff --git a/ydb/library/yql/providers/common/provider/yql_provider_names.h b/ydb/library/yql/providers/common/provider/yql_provider_names.h
@@ -18,12 +18,11 @@ constexpr TStringBuf YdbProviderName = "ydb";
 constexpr TStringBuf PqProviderName = "pq";
 constexpr TStringBuf S3ProviderName = "s3";
 constexpr TStringBuf FunctionProviderName = "function";
-constexpr TStringBuf GenericProviderName = "generic";
 
-constexpr std::array<const TStringBuf, 13> Providers = {
+constexpr std::array<const TStringBuf, 12> Providers = {
     {ConfigProviderName, YtProviderName, KikimrProviderName, RtmrProviderName, S3ProviderName,
      StatProviderName, SolomonProviderName, DqProviderName, ClickHouseProviderName, YdbProviderName,
-     PqProviderName, FunctionProviderName, GenericProviderName}
+     PqProviderName, FunctionProviderName}
 };
 
 } // namespace NYql
diff --git a/ydb/library/yql/providers/generic/CMakeLists.txt b/ydb/library/yql/providers/generic/CMakeLists.txt
diff --git a/ydb/library/yql/providers/generic/actors/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/providers/generic/actors/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/generic/actors/CMakeLists.linux-aarch64.txt b/ydb/library/yql/providers/generic/actors/CMakeLists.linux-aarch64.txt
diff --git a/ydb/library/yql/providers/generic/actors/CMakeLists.linux-x86_64.txt b/ydb/library/yql/providers/generic/actors/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/generic/actors/CMakeLists.txt b/ydb/library/yql/providers/generic/actors/CMakeLists.txt
diff --git a/ydb/library/yql/providers/generic/actors/CMakeLists.windows-x86_64.txt b/ydb/library/yql/providers/generic/actors/CMakeLists.windows-x86_64.txt