Yq 3724 Move no_pg_wrapper to fq (#10360)

kardymonds · web-flow · commit 6e67eb55d929 · 2024-10-14T22:10:27.000+03:00
diff --git a/ydb/core/engine/ut/ya.make b/ydb/core/engine/ut/ya.make
@@ -21,6 +21,7 @@ PEERDIR(
     ydb/core/tablet_flat/test/libs/table
     ydb/library/mkql_proto/ut/helpers
     ydb/library/yql/public/udf/service/exception_policy
+    ydb/library/yql/sql/pg_dummy
 )
 
 YQL_LAST_ABI_VERSION()
diff --git a/ydb/core/external_sources/hive_metastore/ut/ya.make b/ydb/core/external_sources/hive_metastore/ut/ya.make
@@ -66,6 +66,7 @@ PEERDIR(
     ydb/core/testlib/basics
     ydb/library/yql/minikql/comp_nodes
     ydb/library/yql/minikql/comp_nodes/llvm14
+    ydb/library/yql/sql/pg_dummy
 )
 
 DEPENDS(
diff --git a/ydb/core/fq/libs/common/ut/ya.make b/ydb/core/fq/libs/common/ut/ya.make
@@ -14,6 +14,7 @@ SRCS(
 )
 
 PEERDIR(
+    ydb/library/yql/sql/pg_dummy
     ydb/core/testlib
 )
 
diff --git a/ydb/core/fq/libs/result_formatter/ut/ya.make b/ydb/core/fq/libs/result_formatter/ut/ya.make
@@ -11,6 +11,7 @@ SRCS(
 )
 
 PEERDIR(
+    ydb/library/yql/sql/pg_dummy
     ydb/core/testlib
 )
 
diff --git a/ydb/core/fq/libs/row_dispatcher/purecalc_no_pg_wrapper/ya.make b/ydb/core/fq/libs/row_dispatcher/purecalc_no_pg_wrapper/ya.make
@@ -0,0 +1,5 @@
+LIBRARY()
+
+INCLUDE(../../../../../library/yql/public/purecalc/common/ya.make.inc)
+
+END()
diff --git a/ydb/core/fq/libs/row_dispatcher/ut/ya.make b/ydb/core/fq/libs/row_dispatcher/ut/ya.make
@@ -19,6 +19,8 @@ PEERDIR(
     ydb/library/yql/udfs/common/json2
     ydb/library/yql/udfs/common/yson2
     ydb/tests/fq/pq_async_io
+    ydb/library/yql/sql/pg_dummy
+    ydb/library/yql/udfs/common/clickhouse/client
 )
 
 SIZE(MEDIUM)
diff --git a/ydb/core/fq/libs/row_dispatcher/ya.make b/ydb/core/fq/libs/row_dispatcher/ya.make
@@ -26,7 +26,7 @@ PEERDIR(
     ydb/library/yql/dq/actors/compute
     ydb/library/yql/dq/proto
     ydb/library/yql/providers/pq/provider
-    ydb/library/yql/public/purecalc/common
+    ydb/core/fq/libs/row_dispatcher/purecalc_no_pg_wrapper
     ydb/public/sdk/cpp/client/ydb_scheme
     ydb/public/sdk/cpp/client/ydb_table
 )
diff --git a/ydb/core/http_proxy/ut/ya.make b/ydb/core/http_proxy/ut/ya.make
@@ -18,6 +18,7 @@ PEERDIR(
     ydb/library/persqueue/tests
     ydb/library/testlib/service_mocks
     ydb/library/yql/public/udf/service/exception_policy
+    ydb/library/yql/sql/pg_dummy
     ydb/public/sdk/cpp/client/ydb_discovery
     ydb/public/sdk/cpp/client/ydb_types
     ydb/services/datastreams
diff --git a/ydb/core/kqp/executer_actor/ut/ya.make b/ydb/core/kqp/executer_actor/ut/ya.make
@@ -17,6 +17,7 @@ PEERDIR(
     ydb/core/kqp/ut/common
     ydb/public/sdk/cpp/client/ydb_proto
     ydb/library/yql/providers/common/http_gateway
+    ydb/library/yql/sql/pg_dummy
 )
 
 YQL_LAST_ABI_VERSION()
diff --git a/ydb/core/kqp/provider/ut/ya.make b/ydb/core/kqp/provider/ut/ya.make
@@ -9,6 +9,7 @@ SRCS(
 PEERDIR(
     ydb/core/client/minikql_result_lib
     ydb/core/kqp/ut/common
+    ydb/library/yql/sql/pg_dummy
     library/cpp/testing/gmock_in_unittest
 )
 
diff --git a/ydb/core/kqp/proxy_service/ut/ya.make b/ydb/core/kqp/proxy_service/ut/ya.make
@@ -14,6 +14,7 @@ PEERDIR(
     ydb/core/kqp/proxy_service
     ydb/core/kqp/ut/common
     ydb/core/kqp/workload_service/ut/common
+    ydb/library/yql/sql/pg_dummy
     ydb/public/sdk/cpp/client/ydb_query
     ydb/public/sdk/cpp/client/ydb_driver
     ydb/services/ydb
diff --git a/ydb/core/kqp/rm_service/ut/ya.make b/ydb/core/kqp/rm_service/ut/ya.make
@@ -12,6 +12,7 @@ SRCS(
 
 PEERDIR(
     ydb/core/kqp/ut/common
+    ydb/library/yql/sql/pg_dummy
 )
 
 YQL_LAST_ABI_VERSION()
diff --git a/ydb/core/kqp/ut/arrow/ya.make b/ydb/core/kqp/ut/arrow/ya.make
@@ -13,6 +13,7 @@ SRCS(
 PEERDIR(
     ydb/core/kqp
     ydb/core/kqp/ut/common
+    ydb/library/yql/sql/pg_dummy
 )
 
 YQL_LAST_ABI_VERSION()
diff --git a/ydb/core/kqp/ut/cost/ya.make b/ydb/core/kqp/ut/cost/ya.make
@@ -19,6 +19,7 @@ SRCS(
 PEERDIR(
     ydb/core/kqp
     ydb/core/kqp/ut/common
+    ydb/library/yql/sql/pg_dummy
 )
 
 YQL_LAST_ABI_VERSION()
diff --git a/ydb/core/kqp/ut/data_integrity/ya.make b/ydb/core/kqp/ut/data_integrity/ya.make
@@ -11,6 +11,7 @@ SRCS(
 
 PEERDIR(
     ydb/core/kqp/ut/common
+    ydb/library/yql/sql/pg_dummy
 )
 
 YQL_LAST_ABI_VERSION()
diff --git a/ydb/core/kqp/ut/federated_query/generic_ut/ya.make b/ydb/core/kqp/ut/federated_query/generic_ut/ya.make
@@ -13,6 +13,7 @@ PEERDIR(
     ydb/core/kqp/ut/federated_query/common
     ydb/library/yql/providers/generic/connector/libcpp/ut_helpers
     ydb/library/yql/providers/s3/actors
+    ydb/library/yql/sql/pg_dummy
 )
 
 YQL_LAST_ABI_VERSION()
diff --git a/ydb/core/kqp/ut/federated_query/s3/ya.make b/ydb/core/kqp/ut/federated_query/s3/ya.make
@@ -21,6 +21,7 @@ PEERDIR(
     ydb/core/kqp/ut/common
     ydb/core/kqp/ut/federated_query/common
     ydb/library/yql/providers/s3/actors
+    ydb/library/yql/sql/pg_dummy
     ydb/library/testlib/s3_recipe_helper
     ydb/public/sdk/cpp/client/ydb_types/operation
 )
diff --git a/ydb/core/kqp/ut/idx_test/ya.make b/ydb/core/kqp/ut/idx_test/ya.make
@@ -26,6 +26,7 @@ PEERDIR(
     ydb/public/lib/yson_value
     ydb/public/sdk/cpp/client/ydb_scheme
     ydb/public/sdk/cpp/client/ydb_table
+    ydb/library/yql/sql/pg_dummy
 )
 
 YQL_LAST_ABI_VERSION()
diff --git a/ydb/core/kqp/ut/indexes/ya.make b/ydb/core/kqp/ut/indexes/ya.make
@@ -22,6 +22,7 @@ PEERDIR(
     ydb/core/kqp
     ydb/core/kqp/ut/common
     ydb/library/yql/providers/common/http_gateway
+    ydb/library/yql/sql/pg_dummy
 )
 
 YQL_LAST_ABI_VERSION()
diff --git a/ydb/core/kqp/ut/join/ya.make b/ydb/core/kqp/ut/join/ya.make
@@ -22,6 +22,7 @@ SRCS(
 PEERDIR(
     ydb/core/kqp
     ydb/core/kqp/ut/common
+    ydb/library/yql/sql/pg_dummy
     ydb/library/yql/udfs/common/digest
 )
 
diff --git a/ydb/core/kqp/ut/olap/ya.make b/ydb/core/kqp/ut/olap/ya.make
@@ -33,6 +33,7 @@ SRCS(
 PEERDIR(
     ydb/core/kqp
     ydb/core/kqp/ut/common
+    ydb/library/yql/sql/pg_dummy
     ydb/core/tx/columnshard/hooks/testing
     ydb/core/tx/columnshard/test_helper
     ydb/core/tx/columnshard
diff --git a/ydb/core/kqp/ut/perf/ya.make b/ydb/core/kqp/ut/perf/ya.make
@@ -21,6 +21,7 @@ PEERDIR(
     library/cpp/threading/local_executor
     ydb/core/kqp
     ydb/core/kqp/ut/common
+    ydb/library/yql/sql/pg_dummy
 )
 
 YQL_LAST_ABI_VERSION()
diff --git a/ydb/core/kqp/ut/query/ya.make b/ydb/core/kqp/ut/query/ya.make
@@ -27,6 +27,7 @@ PEERDIR(
     ydb/public/sdk/cpp/client/ydb_proto
     ydb/core/kqp
     ydb/core/kqp/ut/common
+    ydb/library/yql/sql/pg_dummy
 )
 
 YQL_LAST_ABI_VERSION()
diff --git a/ydb/core/kqp/ut/scan/ya.make b/ydb/core/kqp/ut/scan/ya.make
@@ -21,6 +21,7 @@ SRCS(
 PEERDIR(
     ydb/core/kqp
     ydb/core/kqp/ut/common
+    ydb/library/yql/sql/pg_dummy
 )
 
 YQL_LAST_ABI_VERSION()
diff --git a/ydb/core/kqp/ut/spilling/ya.make b/ydb/core/kqp/ut/spilling/ya.make
@@ -16,6 +16,7 @@ PEERDIR(
     ydb/core/kqp/host
     ydb/core/kqp/provider
     ydb/core/kqp/ut/common
+    ydb/library/yql/sql/pg_dummy
 )
 
 YQL_LAST_ABI_VERSION()
diff --git a/ydb/core/kqp/ut/sysview/ya.make b/ydb/core/kqp/ut/sysview/ya.make
@@ -20,6 +20,7 @@ SRCS(
 PEERDIR(
     ydb/core/kqp
     ydb/core/kqp/ut/common
+    ydb/library/yql/sql/pg_dummy
 )
 
 YQL_LAST_ABI_VERSION()
diff --git a/ydb/core/kqp/ut/tx/ya.make b/ydb/core/kqp/ut/tx/ya.make
@@ -26,6 +26,7 @@ PEERDIR(
     ydb/core/kqp
     ydb/core/kqp/ut/common
     ydb/core/tx/columnshard/hooks/testing
+    ydb/library/yql/sql/pg_dummy
 )
 
 YQL_LAST_ABI_VERSION()
diff --git a/ydb/core/kqp/workload_service/ut/ya.make b/ydb/core/kqp/workload_service/ut/ya.make
@@ -12,6 +12,8 @@ SRCS(
 
 PEERDIR(
     ydb/core/kqp/workload_service/ut/common
+
+    ydb/library/yql/sql/pg_dummy
 )
 
 YQL_LAST_ABI_VERSION()
diff --git a/ydb/core/memory_controller/ut/ya.make b/ydb/core/memory_controller/ut/ya.make
@@ -14,6 +14,7 @@ ELSE()
 ENDIF()
 
 PEERDIR(
+    ydb/library/yql/sql/pg_dummy
     ydb/core/testlib
     ydb/core/tx/datashard/ut_common
     ydb/core/tablet_flat
diff --git a/ydb/core/testlib/basics/default/ya.make b/ydb/core/testlib/basics/default/ya.make
@@ -2,8 +2,7 @@ LIBRARY()
 
 PEERDIR(
     ydb/core/testlib/basics
-    ydb/library/yql/parser/pg_wrapper
-    ydb/library/yql/sql/pg
+    ydb/library/yql/sql/pg_dummy
 )
 
 END()
diff --git a/ydb/core/testlib/default/ya.make b/ydb/core/testlib/default/ya.make
@@ -2,8 +2,7 @@ LIBRARY()
 
 PEERDIR(
     ydb/core/testlib
-    ydb/library/yql/sql/pg
-    ydb/library/yql/parser/pg_wrapper
+    ydb/library/yql/sql/pg_dummy
 )
 
 END()
diff --git a/ydb/core/tx/columnshard/engines/ut/ya.make b/ydb/core/tx/columnshard/engines/ut/ya.make
@@ -20,6 +20,7 @@ PEERDIR(
     ydb/core/tablet
     ydb/core/tablet_flat
     ydb/core/tx/columnshard/counters
+    ydb/library/yql/sql/pg_dummy
     ydb/library/yql/core/arrow_kernels/request
     ydb/core/testlib/default
     ydb/core/tx/columnshard/test_helper
diff --git a/ydb/core/tx/datashard/ut_erase_rows/ya.make b/ydb/core/tx/datashard/ut_erase_rows/ya.make
@@ -19,9 +19,11 @@ PEERDIR(
     library/cpp/regex/pcre
     library/cpp/svnversion
     ydb/core/kqp/ut/common
-    ydb/core/testlib/default
+    ydb/core/testlib
     ydb/core/tx
+    ydb/library/yql/parser/pg_wrapper
     ydb/library/yql/public/udf/service/exception_policy
+    ydb/library/yql/sql/pg
     ydb/public/lib/yson_value
     ydb/public/sdk/cpp/client/ydb_result
 )
diff --git a/ydb/core/tx/schemeshard/ut_backup_collection/ya.make b/ydb/core/tx/schemeshard/ut_backup_collection/ya.make
@@ -16,6 +16,7 @@ ENDIF()
 PEERDIR(
     ydb/core/protos
     ydb/core/tx/schemeshard/ut_helpers
+    ydb/library/yql/sql/pg_dummy
 )
 
 SRCS(
diff --git a/ydb/core/tx/schemeshard/ut_backup_collection_reboots/ya.make b/ydb/core/tx/schemeshard/ut_backup_collection_reboots/ya.make
@@ -15,6 +15,7 @@ ENDIF()
 
 PEERDIR(
     ydb/core/tx/schemeshard/ut_helpers
+    ydb/library/yql/sql/pg_dummy
 )
 
 SRCS(
diff --git a/ydb/core/tx/schemeshard/ut_cdc_stream_reboots/ya.make b/ydb/core/tx/schemeshard/ut_cdc_stream_reboots/ya.make
@@ -16,6 +16,7 @@ ENDIF()
 PEERDIR(
     ydb/core/tx/schemeshard/ut_helpers
     ydb/core/persqueue/writer
+    ydb/library/yql/sql/pg_dummy
 )
 
 SRCS(
diff --git a/ydb/core/tx/schemeshard/ut_replication/ya.make b/ydb/core/tx/schemeshard/ut_replication/ya.make
@@ -16,6 +16,7 @@ ENDIF()
 PEERDIR(
     ydb/core/protos
     ydb/core/tx/schemeshard/ut_helpers
+    ydb/library/yql/sql/pg_dummy
 )
 
 SRCS(
diff --git a/ydb/core/tx/schemeshard/ut_replication_reboots/ya.make b/ydb/core/tx/schemeshard/ut_replication_reboots/ya.make
@@ -15,6 +15,7 @@ ENDIF()
 
 PEERDIR(
     ydb/core/tx/schemeshard/ut_helpers
+    ydb/library/yql/sql/pg_dummy
 )
 
 SRCS(
diff --git a/ydb/core/tx/schemeshard/ut_ttl/ya.make b/ydb/core/tx/schemeshard/ut_ttl/ya.make
@@ -16,6 +16,8 @@ ENDIF()
 PEERDIR(
     ydb/core/kqp/ut/common
     ydb/core/tx/schemeshard/ut_helpers
+    ydb/library/yql/parser/pg_wrapper
+    ydb/library/yql/sql/pg
 )
 
 SRCS(
diff --git a/ydb/library/ncloud/impl/ut/ya.make b/ydb/library/ncloud/impl/ut/ya.make
@@ -10,6 +10,7 @@ PEERDIR(
     ydb/core/base
     ydb/core/testlib
     ydb/core/testlib/actors
+    ydb/library/yql/sql/pg_dummy
 )
 
 YQL_LAST_ABI_VERSION()
diff --git a/ydb/library/query_actor/ut/ya.make b/ydb/library/query_actor/ut/ya.make
@@ -2,6 +2,7 @@ UNITTEST_FOR(ydb/library/query_actor)
 
 PEERDIR(
     ydb/core/testlib
+    ydb/library/yql/sql/pg_dummy
 )
 
 SRCS(
diff --git a/ydb/library/table_creator/ut/ya.make b/ydb/library/table_creator/ut/ya.make
@@ -12,6 +12,7 @@ PEERDIR(
     library/cpp/testing/unittest
     ydb/core/testlib/default
     ydb/library/yql/public/udf/service/exception_policy
+    ydb/library/yql/sql/pg_dummy
     ydb/public/sdk/cpp/client/ydb_driver
 )
 
diff --git a/ydb/library/yql/providers/generic/actors/ut/ya.make b/ydb/library/yql/providers/generic/actors/ut/ya.make
@@ -1,6 +1,7 @@
 UNITTEST_FOR(ydb/library/yql/providers/generic/actors)
 
 PEERDIR(
+    ydb/library/yql/sql/pg_dummy
     ydb/library/yql/providers/generic/connector/libcpp/ut_helpers
     ydb/library/actors/testlib
     library/cpp/testing/unittest
diff --git a/ydb/library/yql/providers/pq/provider/ut/ya.make b/ydb/library/yql/providers/pq/provider/ut/ya.make
@@ -24,6 +24,7 @@ PEERDIR(
     ydb/library/yql/providers/solomon/gateway
     ydb/library/yql/providers/solomon/provider
     ydb/library/yql/public/udf/service/exception_policy
+    ydb/library/yql/sql/pg_dummy
     ydb/public/sdk/cpp/client/ydb_params
     ydb/public/sdk/cpp/client/ydb_persqueue_public/codecs
 )
diff --git a/ydb/tools/query_replay/common_deps.inc b/ydb/tools/query_replay/common_deps.inc
@@ -81,4 +81,5 @@ SET(YDB_REPLAY_PEERDIRS
     ydb/library/yql/udfs/common/topfreq
     ydb/library/yql/udfs/common/yson2
     ydb/library/yql/udfs/logs/dsv
+    ydb/library/yql/sql/pg_dummy
 )
diff --git a/ydb/tools/query_replay_yt/common_deps.inc b/ydb/tools/query_replay_yt/common_deps.inc
@@ -80,4 +80,5 @@ SET(YDB_REPLAY_PEERDIRS
     ydb/library/yql/udfs/common/topfreq
     ydb/library/yql/udfs/common/yson2
     ydb/library/yql/udfs/logs/dsv
+    ydb/library/yql/sql/pg_dummy
 )

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ PEERDIR(`
`21`	`21`	`ydb/core/tablet_flat/test/libs/table`
`22`	`22`	`ydb/library/mkql_proto/ut/helpers`
`23`	`23`	`ydb/library/yql/public/udf/service/exception_policy`
	`24`	`+ ydb/library/yql/sql/pg_dummy`
`24`	`25`	`)`
`25`	`26`
`26`	`27`	`YQL_LAST_ABI_VERSION()`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ PEERDIR(`
`66`	`66`	`ydb/core/testlib/basics`
`67`	`67`	`ydb/library/yql/minikql/comp_nodes`
`68`	`68`	`ydb/library/yql/minikql/comp_nodes/llvm14`
	`69`	`+ ydb/library/yql/sql/pg_dummy`
`69`	`70`	`)`
`70`	`71`
`71`	`72`	`DEPENDS(`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ SRCS(`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`PEERDIR(`
	`17`	`+ ydb/library/yql/sql/pg_dummy`
`17`	`18`	`ydb/core/testlib`
`18`	`19`	`)`
`19`	`20`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ SRCS(`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`PEERDIR(`
	`14`	`+ ydb/library/yql/sql/pg_dummy`
`14`	`15`	`ydb/core/testlib`
`15`	`16`	`)`
`16`	`17`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +LIBRARY()
++
 +INCLUDE(../../../../../library/yql/public/purecalc/common/ya.make.inc)
++
 +END()
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@ PEERDIR(`
`19`	`19`	`ydb/library/yql/udfs/common/json2`
`20`	`20`	`ydb/library/yql/udfs/common/yson2`
`21`	`21`	`ydb/tests/fq/pq_async_io`
	`22`	`+ ydb/library/yql/sql/pg_dummy`
	`23`	`+ ydb/library/yql/udfs/common/clickhouse/client`
`22`	`24`	`)`
`23`	`25`
`24`	`26`	`SIZE(MEDIUM)`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ PEERDIR(`
`26`	`26`	`ydb/library/yql/dq/actors/compute`
`27`	`27`	`ydb/library/yql/dq/proto`
`28`	`28`	`ydb/library/yql/providers/pq/provider`
`29`		`- ydb/library/yql/public/purecalc/common`
	`29`	`+ ydb/core/fq/libs/row_dispatcher/purecalc_no_pg_wrapper`
`30`	`30`	`ydb/public/sdk/cpp/client/ydb_scheme`
`31`	`31`	`ydb/public/sdk/cpp/client/ydb_table`
`32`	`32`	`)`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ PEERDIR(`
`17`	`17`	`ydb/core/kqp/ut/common`
`18`	`18`	`ydb/public/sdk/cpp/client/ydb_proto`
`19`	`19`	`ydb/library/yql/providers/common/http_gateway`
	`20`	`+ ydb/library/yql/sql/pg_dummy`
`20`	`21`	`)`
`21`	`22`
`22`	`23`	`YQL_LAST_ABI_VERSION()`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ SRCS(`
`9`	`9`	`PEERDIR(`
`10`	`10`	`ydb/core/client/minikql_result_lib`
`11`	`11`	`ydb/core/kqp/ut/common`
	`12`	`+ ydb/library/yql/sql/pg_dummy`
`12`	`13`	`library/cpp/testing/gmock_in_unittest`
`13`	`14`	`)`
`14`	`15`