summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormaxim-yurchuk <[email protected]>2025-02-07 18:08:17 +0300
committermaxim-yurchuk <[email protected]>2025-02-07 19:17:45 +0300
commit394521439e11faf0ee166cbb82d3ec7ab09ce882 (patch)
treea73f6cf53aa21bd652edbc6c404be96c019e4b6f
parent4cbcfb91d354b9407f6fb563d75fa90b4c12ed82 (diff)
Revert commit rXXXXXX, Use yt/yql/providers for allow list (github ydb sync)
Более правильный фикс был сделан здесь: <HIDDEN_URL> commit_hash:2e8c0b099852b8a1aac4f3f43d7e3f1a8791b1a8
-rw-r--r--yt/yql/providers/ytflow/expr_nodes/ya.make33
-rw-r--r--yt/yql/providers/ytflow/expr_nodes/yql_ytflow_expr_nodes.cpp51
-rw-r--r--yt/yql/providers/ytflow/expr_nodes/yql_ytflow_expr_nodes.h31
-rw-r--r--yt/yql/providers/ytflow/expr_nodes/yql_ytflow_expr_nodes.json128
-rw-r--r--yt/yql/providers/ytflow/integration/interface/ya.make12
-rw-r--r--yt/yql/providers/ytflow/integration/interface/yql_ytflow_integration.cpp1
-rw-r--r--yt/yql/providers/ytflow/integration/interface/yql_ytflow_integration.h43
-rw-r--r--yt/yql/providers/ytflow/integration/interface/yql_ytflow_optimization.cpp1
-rw-r--r--yt/yql/providers/ytflow/integration/interface/yql_ytflow_optimization.h54
-rw-r--r--yt/yql/providers/ytflow/integration/proto/ya.make9
-rw-r--r--yt/yql/providers/ytflow/integration/proto/yt.proto14
11 files changed, 0 insertions, 377 deletions
diff --git a/yt/yql/providers/ytflow/expr_nodes/ya.make b/yt/yql/providers/ytflow/expr_nodes/ya.make
deleted file mode 100644
index 04d6ce6f538..00000000000
--- a/yt/yql/providers/ytflow/expr_nodes/ya.make
+++ /dev/null
@@ -1,33 +0,0 @@
-LIBRARY()
-
-PEERDIR(
- yql/essentials/core/expr_nodes
- yql/essentials/providers/common/provider
-)
-
-SRCS(
- yql_ytflow_expr_nodes.cpp
-)
-
-SRCDIR(
- yql/essentials/core/expr_nodes_gen
-)
-
-RUN_PROGRAM(
- yql/essentials/core/expr_nodes_gen/gen
- yql_expr_nodes_gen.jnj
- yql_ytflow_expr_nodes.json
- yql_ytflow_expr_nodes.gen.h
- yql_ytflow_expr_nodes.decl.inl.h
- yql_ytflow_expr_nodes.defs.inl.h
- IN yql_expr_nodes_gen.jnj
- IN yql_ytflow_expr_nodes.json
- OUT yql_ytflow_expr_nodes.gen.h
- OUT yql_ytflow_expr_nodes.decl.inl.h
- OUT yql_ytflow_expr_nodes.defs.inl.h
- OUTPUT_INCLUDES
- ${ARCADIA_ROOT}/yql/essentials/core/expr_nodes_gen/yql_expr_nodes_gen.h
- ${ARCADIA_ROOT}/util/generic/hash_set.h
-)
-
-END()
diff --git a/yt/yql/providers/ytflow/expr_nodes/yql_ytflow_expr_nodes.cpp b/yt/yql/providers/ytflow/expr_nodes/yql_ytflow_expr_nodes.cpp
deleted file mode 100644
index 3598e4b76e6..00000000000
--- a/yt/yql/providers/ytflow/expr_nodes/yql_ytflow_expr_nodes.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#include "yql_ytflow_expr_nodes.h"
-
-
-namespace NYql::NNodes {
-
-TYtflowDSource::TYtflowDSource(const TExprNode* node)
- : TYtflowDSourceStub(node)
-{
-}
-
-TYtflowDSource::TYtflowDSource(const TExprNode::TPtr& node)
- : TYtflowDSourceStub(node)
-{
-}
-
-bool TYtflowDSource::Match(const TExprNode* node) {
- if (!TYtflowDSourceStub::Match(node)) {
- return false;
- }
-
- if (node->Child(TYtflowDSource::idx_Category)->Content() != YtflowProviderName) {
- return false;
- }
-
- return true;
-}
-
-
-TYtflowDSink::TYtflowDSink(const TExprNode* node)
- : TYtflowDSinkStub(node)
-{
-}
-
-TYtflowDSink::TYtflowDSink(const TExprNode::TPtr& node)
- : TYtflowDSinkStub(node)
-{
-}
-
-bool TYtflowDSink::Match(const TExprNode* node) {
- if (!TYtflowDSinkStub::Match(node)) {
- return false;
- }
-
- if (node->Child(TYtflowDSink::idx_Category)->Content() != YtflowProviderName) {
- return false;
- }
-
- return true;
-}
-
-} // namespace NYql::NNodes
diff --git a/yt/yql/providers/ytflow/expr_nodes/yql_ytflow_expr_nodes.h b/yt/yql/providers/ytflow/expr_nodes/yql_ytflow_expr_nodes.h
deleted file mode 100644
index 12ec7791099..00000000000
--- a/yt/yql/providers/ytflow/expr_nodes/yql_ytflow_expr_nodes.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-
-#include <yql/essentials/core/expr_nodes/yql_expr_nodes.h>
-#include <yql/essentials/providers/common/provider/yql_provider_names.h>
-#include <yt/yql/providers/ytflow/expr_nodes/yql_ytflow_expr_nodes.gen.h>
-
-
-namespace NYql::NNodes {
-
-#include <yt/yql/providers/ytflow/expr_nodes/yql_ytflow_expr_nodes.decl.inl.h>
-
-class TYtflowDSource: public NGenerated::TYtflowDSourceStub<TExprBase, TCallable, TCoAtom> {
-public:
- explicit TYtflowDSource(const TExprNode* node);
- explicit TYtflowDSource(const TExprNode::TPtr& node);
-
- static bool Match(const TExprNode* node);
-};
-
-
-class TYtflowDSink: public NGenerated::TYtflowDSinkStub<TExprBase, TCallable, TCoAtom> {
-public:
- explicit TYtflowDSink(const TExprNode* node);
- explicit TYtflowDSink(const TExprNode::TPtr& node);
-
- static bool Match(const TExprNode* node);
-};
-
-#include <yt/yql/providers/ytflow/expr_nodes/yql_ytflow_expr_nodes.defs.inl.h>
-
-} // namespace NYql::NNodes
diff --git a/yt/yql/providers/ytflow/expr_nodes/yql_ytflow_expr_nodes.json b/yt/yql/providers/ytflow/expr_nodes/yql_ytflow_expr_nodes.json
deleted file mode 100644
index 02943510157..00000000000
--- a/yt/yql/providers/ytflow/expr_nodes/yql_ytflow_expr_nodes.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
- "NodeRootType": "TExprBase",
- "NodeBuilderBase": "TNodeBuilderBase",
- "ListBuilderBase": "TListBuilderBase",
- "FreeArgCallableBase": "TFreeArgCallable",
- "FreeArgBuilderBase": "TFreeArgCallableBuilderBase",
- "Nodes": [
- {
- "Name": "TYtflowDSource",
- "Base": "TCallable",
- "Definition": "Custom",
- "Builder": {"Generate": "None"},
- "Match": {"Type": "Callable", "Name": "DataSource"},
- "Children": [
- {"Index": 0, "Name": "Category", "Type": "TCoAtom"},
- {"Index": 1, "Name": "Cluster", "Type": "TCoAtom"}
- ]
- },
- {
- "Name": "TYtflowDSink",
- "Base": "TCallable",
- "Definition": "Custom",
- "Builder": {"Generate": "None"},
- "Match": {"Type": "Callable", "Name": "DataSink"},
- "Children": [
- {"Index": 0, "Name": "Category", "Type": "TCoAtom"},
- {"Index": 1, "Name": "Cluster", "Type": "TCoAtom"}
- ]
- },
- {
- "Name": "TYtflowReadWrap",
- "Base": "TCallable",
- "Match": {"Type": "Callable", "Name": "YtflowReadWrap"},
- "Children": [
- {"Index": 0, "Name": "Input", "Type": "TExprBase"}
- ]
- },
- {
- "Name": "TYtflowWriteWrap",
- "Base": "TCallable",
- "Match": {"Type": "Callable", "Name": "YtflowWriteWrap"},
- "Children": [
- {"Index": 0, "Name": "Input", "Type": "TExprBase"}
- ]
- },
- {
- "Name": "TYtflowReadStub",
- "Base": "TCallable",
- "Match": {"Type": "Callable", "Name": "YtflowReadStub!"},
- "Children": [
- {"Index": 0, "Name": "World", "Type": "TExprBase"},
- {"Index": 1, "Name": "ItemType", "Type": "TExprBase"}
- ]
- },
- {
- "Name": "TYtflowPersistentSource",
- "Base": "TCallable",
- "Match": {"Type": "Callable", "Name": "YtflowPersistentSource"},
- "Children": [
- {"Index": 0, "Name": "Name", "Type": "TCoAtom"},
- {"Index": 1, "Name": "Input", "Type": "TYtflowReadWrap"}
- ]
- },
- {
- "Name": "TYtflowSinkBase",
- "Base": "TCallable",
- "Match": {"Type": "CallableBase"},
- "Builder": {"Generate": "None"},
- "Children": [
- {"Index": 0, "Name": "Name", "Type": "TCoAtom"}
- ]
- },
- {
- "Name": "TYtflowIntermediateSink",
- "Base": "TYtflowSinkBase",
- "Match": {"Type": "Callable", "Name": "YtflowIntermediateSink"},
- "Children": [
- {"Index": 1, "Name": "RowType", "Type": "TExprBase"}
- ]
- },
- {
- "Name": "TYtflowPersistentSink",
- "Base": "TYtflowSinkBase",
- "Match": {"Type": "Callable", "Name": "YtflowPersistentSink"},
- "Children": [
- {"Index": 1, "Name": "Input", "Type": "TYtflowWriteWrap"}
- ]
- },
- {
- "Name": "TYtflowOpBase",
- "Base": "TCallable",
- "Match": {"Type": "CallableBase"},
- "Builder": {"Generate": "None"},
- "Children": [
- {"Index": 0, "Name": "World", "Type": "TExprBase"},
- {"Index": 1, "Name": "Sources", "Type": "TExprList"},
- {"Index": 2, "Name": "Sinks", "Type": "TExprList"},
- {"Index": 3, "Name": "Settings", "Type": "TCoNameValueTupleList"}
- ]
- },
- {
- "Name": "TYtflowMap",
- "Base": "TYtflowOpBase",
- "Match": {"Type": "Callable", "Name": "YtflowMap!"},
- "Children": [
- {"Index": 4, "Name": "Lambda", "Type": "TCoLambda"}
- ]
- },
- {
- "Name": "TYtflowOutput",
- "Base": "TCallable",
- "Match": {"Type": "Callable", "Name": "YtflowOutput"},
- "Children": [
- {"Index": 0, "Name": "Operation", "Type": "TYtflowOpBase"},
- {"Index": 1, "Name": "OutputIndex", "Type": "TCoAtom"}
- ]
- },
- {
- "Name": "TYtflowPublish",
- "Base": "TCallable",
- "Match": {"Type": "Callable", "Name": "YtflowPublish!"},
- "Children": [
- {"Index": 0, "Name": "World", "Type": "TExprBase"},
- {"Index": 1, "Name": "Settings", "Type": "TCoNameValueTupleList"}
- ]
- }
- ]
-}
diff --git a/yt/yql/providers/ytflow/integration/interface/ya.make b/yt/yql/providers/ytflow/integration/interface/ya.make
deleted file mode 100644
index 0bdacd34e19..00000000000
--- a/yt/yql/providers/ytflow/integration/interface/ya.make
+++ /dev/null
@@ -1,12 +0,0 @@
-LIBRARY()
-
-PEERDIR(
- yql/essentials/ast
-)
-
-SRCS(
- yql_ytflow_integration.cpp
- yql_ytflow_optimization.cpp
-)
-
-END()
diff --git a/yt/yql/providers/ytflow/integration/interface/yql_ytflow_integration.cpp b/yt/yql/providers/ytflow/integration/interface/yql_ytflow_integration.cpp
deleted file mode 100644
index cfe0dbb8a31..00000000000
--- a/yt/yql/providers/ytflow/integration/interface/yql_ytflow_integration.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "yql_ytflow_integration.h"
diff --git a/yt/yql/providers/ytflow/integration/interface/yql_ytflow_integration.h b/yt/yql/providers/ytflow/integration/interface/yql_ytflow_integration.h
deleted file mode 100644
index 1564be87f97..00000000000
--- a/yt/yql/providers/ytflow/integration/interface/yql_ytflow_integration.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#pragma once
-
-#include <yql/essentials/ast/yql_expr.h>
-
-#include <util/generic/maybe.h>
-
-
-namespace google::protobuf {
- class Any;
-} // namespace google::protobuf
-
-
-namespace NYql {
-
-class IYtflowIntegration {
-public:
- virtual ~IYtflowIntegration() = default;
-
- // Nothing if callable is not for reading,
- // false if callable is for reading and there are some errors (they are added to ctx),
- // true if callable is for reading and no issues occured.
- virtual TMaybe<bool> CanRead(const TExprNode& read, TExprContext& ctx) = 0;
- virtual TExprNode::TPtr WrapRead(const TExprNode::TPtr& read, TExprContext& ctx) = 0;
-
- // Nothing if callable is not for writing,
- // false if callable is for writing and there are some errors (they are added to ctx),
- // true if callable is for writing and no issues occured.
- virtual TMaybe<bool> CanWrite(const TExprNode& write, TExprContext& ctx) = 0;
- virtual TExprNode::TPtr WrapWrite(const TExprNode::TPtr& write, TExprContext& ctx) = 0;
-
- virtual TExprNode::TPtr GetReadWorld(const TExprNode& read, TExprContext& ctx) = 0;
- virtual TExprNode::TPtr GetWriteWorld(const TExprNode& write, TExprContext& ctx) = 0;
-
- virtual TExprNode::TPtr GetWriteContent(const TExprNode& write, TExprContext& ctx) = 0;
-
- virtual void FillSourceSettings(
- const TExprNode& source, ::google::protobuf::Any& settings, TExprContext& ctx) = 0;
-
- virtual void FillSinkSettings(
- const TExprNode& sink, ::google::protobuf::Any& settings, TExprContext& ctx) = 0;
-};
-
-} // namespace NYql
diff --git a/yt/yql/providers/ytflow/integration/interface/yql_ytflow_optimization.cpp b/yt/yql/providers/ytflow/integration/interface/yql_ytflow_optimization.cpp
deleted file mode 100644
index 78e67047a92..00000000000
--- a/yt/yql/providers/ytflow/integration/interface/yql_ytflow_optimization.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "yql_ytflow_optimization.h"
diff --git a/yt/yql/providers/ytflow/integration/interface/yql_ytflow_optimization.h b/yt/yql/providers/ytflow/integration/interface/yql_ytflow_optimization.h
deleted file mode 100644
index 48fcbcf167d..00000000000
--- a/yt/yql/providers/ytflow/integration/interface/yql_ytflow_optimization.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#pragma once
-
-#include <yql/essentials/ast/yql_expr.h>
-
-
-namespace NYql {
-
-class IYtflowOptimization {
-public:
- virtual ~IYtflowOptimization() = default;
-
- /**
- Apply new members subset for YtflowReadWrap's underlying provider specific read callable
- Args:
- * read - provider specific read callable
- * members - expr list of atoms with new members
- * ctx - expr context
- Returns one of:
- * empty TPtr on error
- * original `read`, if no changes
- * new read with applied new members
- */
- virtual TExprNode::TPtr ApplyExtractMembers(
- const TExprNode::TPtr& read, const TExprNode::TPtr& members,
- TExprContext& ctx) = 0;
-
- /**
- Apply `unordered` setting for YtflowReadWrap's underlying provider specific read callable
- Args:
- * read - provider specific read callable
- * ctx - expr context
- Returns one of:
- * empty TPtr on error
- * original `read`, if no changes
- * new read with applied setting
- */
- virtual TExprNode::TPtr ApplyUnordered(
- const TExprNode::TPtr& read, TExprContext& ctx) = 0;
-
- /**
- Rewrite YtflowWriteWrap's underlying provider specific write callable
- Args:
- * write - provider specific write callable
- * ctx - expr context
- Returns one of:
- * empty TPtr on error
- * original `write`, if no changes
- * new write with trimmed content
- */
- virtual TExprNode::TPtr TrimWriteContent(
- const TExprNode::TPtr& write, TExprContext& ctx) = 0;
-};
-
-} // namespace NYql
diff --git a/yt/yql/providers/ytflow/integration/proto/ya.make b/yt/yql/providers/ytflow/integration/proto/ya.make
deleted file mode 100644
index 317d796ff17..00000000000
--- a/yt/yql/providers/ytflow/integration/proto/ya.make
+++ /dev/null
@@ -1,9 +0,0 @@
-PROTO_LIBRARY()
-
-SRCS(
- yt.proto
-)
-
-EXCLUDE_TAGS(GO_PROTO)
-
-END()
diff --git a/yt/yql/providers/ytflow/integration/proto/yt.proto b/yt/yql/providers/ytflow/integration/proto/yt.proto
deleted file mode 100644
index 3de6f6b985c..00000000000
--- a/yt/yql/providers/ytflow/integration/proto/yt.proto
+++ /dev/null
@@ -1,14 +0,0 @@
-package NYql.NYtflow.NProto;
-
-
-message TQYTSourceMessage {
- optional string Cluster = 1;
- optional string Path = 2;
- optional bytes RowType = 3;
-}
-
-message TQYTSinkMessage {
- optional string Cluster = 1;
- optional string Path = 2;
- optional bytes RowType = 3;
-}