Merge pull request #11465 from vitstn/mergelibs-yql-fix2

Yql fixes

Author: maximyurchuk

build/conf/project_specific/yql_udf.conf

@@ -55,26 +55,26 @@ module YQL_UDF_YDB_TEST: PY3TEST_BIN {
 
     PEERDIR(ydb/library/yql/tests/common/udf_test)
 
-    DEPENDS(ydb/library/yql/tools/astdiff)
+    DEPENDS(yql/essentials/tools/astdiff)
     DEPENDS(ydb/library/yql/tools/yqlrun)
-    DEPENDS(ydb/library/yql/tools/udf_resolver)
+    DEPENDS(yql/essentials/tools/udf_resolver)
     DATA(arcadia/yql/essentials/mount)
     DATA(arcadia/ydb/library/yql/cfg/udf_test)
 }
 
 module YQL_UDF_TEST_CONTRIB: PY3TEST_BIN {
     SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)
 
-    PEERDIR(contrib/ydb/library/yql/tests/common/udf_test)
+    PEERDIR(ydb/library/yql/tests/common/udf_test)
 
     DEPENDS(yql/essentials/tools/astdiff)
-    DEPENDS(contrib/ydb/library/yql/tools/yqlrun)
+    DEPENDS(ydb/library/yql/tools/yqlrun)
     DEPENDS(yql/essentials/tools/udf_resolver)
     DATA(arcadia/yql/essentials/mount)
-    DATA(arcadia/contrib/ydb/library/yql/cfg/udf_test)
+    DATA(arcadia/ydb/library/yql/cfg/udf_test)
     ENV(YQL_ASTDIFF_PATH="yql/essentials/tools/astdiff/astdiff")
-    ENV(YQL_CONFIG_DIR="contrib/ydb/library/yql/cfg/udf_test")
-    ENV(YQL_YQLRUN_PATH="contrib/ydb/library/yql/tools/yqlrun/yqlrun")
+    ENV(YQL_CONFIG_DIR="ydb/library/yql/cfg/udf_test")
+    ENV(YQL_YQLRUN_PATH="ydb/library/yql/tools/yqlrun/yqlrun")
     ENV(YQL_SQL2YQL_PATH="yql/essentials/tools/sql2yql/sql2yql")
     ENV(YQL_UDFRESOLVER_PATH="yql/essentials/tools/udf_resolver/udf_resolver")
 }

ydb/core/kqp/provider/ut/ya.make

@@ -8,9 +8,9 @@ SRCS(
 
 PEERDIR(
     ydb/core/kqp/ut/common
-    ydb/library/yql/ast
+    yql/essentials/ast
     yql/essentials/sql/pg_dummy
-    ydb/library/yql/sql/v1
+    yql/essentials/sql/v1
     library/cpp/testing/gmock_in_unittest
 )
 

ydb/core/kqp/provider/yql_kikimr_provider_ut.cpp

@@ -1,7 +1,7 @@
 #include <ydb/core/kqp/provider/yql_kikimr_provider_impl.h>
-#include <ydb/library/yql/ast/yql_expr.h>
-#include <ydb/library/yql/sql/v1/source.h>
-#include <ydb/library/yql/sql/v1/context.h>
+#include <yql/essentials/ast/yql_expr.h>
+#include <yql/essentials/sql/v1/source.h>
+#include <yql/essentials/sql/v1/context.h>
 
 #include <library/cpp/testing/unittest/registar.h>
 

ydb/core/testlib/basics/pg/ya.make

@@ -2,8 +2,8 @@ LIBRARY()
 
 PEERDIR(
     ydb/core/testlib/basics
-    ydb/library/yql/sql/pg
-    ydb/library/yql/parser/pg_wrapper
+    yql/essentials/sql/pg
+    yql/essentials/parser/pg_wrapper
 )
 
 END()

ydb/core/tx/replication/service/ut_json_change_record/ya.make

@@ -8,7 +8,7 @@ TIMEOUT(60)
 
 PEERDIR(
     ydb/core/testlib/pg
-    ydb/library/yql/public/udf/service/exception_policy
+    yql/essentials/public/udf/service/exception_policy
     library/cpp/testing/unittest
 )
 

ydb/library/yql/providers/yt/gateway/native/ut/ya.make

@@ -1,3 +1,5 @@
+IF (NOT OPENSOURCE)
+
 UNITTEST()
 
 SRCS(
@@ -21,3 +23,6 @@ PEERDIR(
 YQL_LAST_ABI_VERSION()
 
 END()
+
+ENDIF()
+

ydb/library/yql/tests/postgresql/ya.make

@@ -1,3 +1,5 @@
+IF (NOT OPENSOURCE)
+
 PY3TEST()
 
 IF(ORIGINAL)
@@ -42,3 +44,6 @@ DEPENDS(
 )
 
 END()
+
+ENDIF()
+