diff options
author | udovichenko-r <udovichenko-r@yandex-team.com> | 2024-11-18 16:10:37 +0300 |
---|---|---|
committer | udovichenko-r <udovichenko-r@yandex-team.com> | 2024-11-18 17:01:41 +0300 |
commit | f355ebbe8420eca558dd6e98846cf31f09df9890 (patch) | |
tree | ca6ea7441a4694161865bd38d4ce0580ef60761d | |
parent | cf82f2051358f5c26f05b423a0ee11f4098135b3 (diff) | |
download | ydb-f355ebbe8420eca558dd6e98846cf31f09df9890.tar.gz |
YQL-19206 Move contrib/ydb/library/yql/cfg -> yql/essentials/cfg
commit_hash:22adeac140825b580d7674c61994c0404ccf2762
-rw-r--r-- | build/conf/project_specific/yql_udf.conf | 10 | ||||
-rw-r--r-- | yql/essentials/cfg/tests/fs.conf | 6 | ||||
-rw-r--r-- | yql/essentials/cfg/tests/fs_arc.conf | 1 | ||||
-rw-r--r-- | yql/essentials/cfg/tests/gateways-experimental.conf | 26 | ||||
-rw-r--r-- | yql/essentials/cfg/tests/gateways-forceblocks.conf | 5 | ||||
-rw-r--r-- | yql/essentials/cfg/tests/gateways.conf | 245 | ||||
-rw-r--r-- | yql/essentials/cfg/udf_test/fs.conf | 6 | ||||
-rw-r--r-- | yql/essentials/cfg/udf_test/gateways-forceblocks.conf | 13 | ||||
-rw-r--r-- | yql/essentials/cfg/udf_test/gateways.conf | 10 | ||||
-rw-r--r-- | yql/essentials/core/ut/ya.make | 2 | ||||
-rw-r--r-- | yql/essentials/parser/pg_wrapper/test/test_doc.py | 2 | ||||
-rw-r--r-- | yql/essentials/parser/pg_wrapper/test/ya.make | 2 |
12 files changed, 320 insertions, 8 deletions
diff --git a/build/conf/project_specific/yql_udf.conf b/build/conf/project_specific/yql_udf.conf index 68de630833..df2ec98480 100644 --- a/build/conf/project_specific/yql_udf.conf +++ b/build/conf/project_specific/yql_udf.conf @@ -42,9 +42,9 @@ module YQL_UDF_TEST: PY3TEST_BIN { DEPENDS($YQL_BASE_TEST_DIR/tools/yqlrun) DEPENDS(yql/essentials/tools/udf_resolver) DATA(arcadia/yql/essentials/mount) - DATA(arcadia/$YQL_BASE_TEST_DIR/cfg/udf_test) + DATA(arcadia/yql/essentials/cfg/udf_test) ENV(YQL_ASTDIFF_PATH="yql/essentials/tools/astdiff/astdiff") - ENV(YQL_CONFIG_DIR="$YQL_BASE_TEST_DIR/cfg/udf_test") + ENV(YQL_CONFIG_DIR="yql/essentials/cfg/udf_test") ENV(YQL_YQLRUN_PATH="$YQL_BASE_TEST_DIR/tools/yqlrun/yqlrun") ENV(YQL_SQL2YQL_PATH="yql/essentials/tools/sql2yql/sql2yql") ENV(YQL_UDFRESOLVER_PATH="yql/essentials/tools/udf_resolver/udf_resolver") @@ -59,7 +59,7 @@ module YQL_UDF_YDB_TEST: PY3TEST_BIN { DEPENDS($YQL_BASE_TEST_DIR/tools/yqlrun) DEPENDS(yql/essentials/tools/udf_resolver) DATA(arcadia/yql/essentials/mount) - DATA(arcadia/$YQL_BASE_TEST_DIR/cfg/udf_test) + DATA(arcadia/yql/essentials/cfg/udf_test) } module YQL_UDF_TEST_CONTRIB: PY3TEST_BIN { @@ -71,9 +71,9 @@ module YQL_UDF_TEST_CONTRIB: PY3TEST_BIN { DEPENDS($YQL_BASE_TEST_DIR/tools/yqlrun) DEPENDS(yql/essentials/tools/udf_resolver) DATA(arcadia/yql/essentials/mount) - DATA(arcadia/$YQL_BASE_TEST_DIR/cfg/udf_test) + DATA(arcadia/yql/essentials/cfg/udf_test) ENV(YQL_ASTDIFF_PATH="yql/essentials/tools/astdiff/astdiff") - ENV(YQL_CONFIG_DIR="$YQL_BASE_TEST_DIR/cfg/udf_test") + ENV(YQL_CONFIG_DIR="yql/essentials/cfg/udf_test") ENV(YQL_YQLRUN_PATH="$YQL_BASE_TEST_DIR/tools/yqlrun/yqlrun") ENV(YQL_SQL2YQL_PATH="yql/essentials/tools/sql2yql/sql2yql") ENV(YQL_UDFRESOLVER_PATH="yql/essentials/tools/udf_resolver/udf_resolver") diff --git a/yql/essentials/cfg/tests/fs.conf b/yql/essentials/cfg/tests/fs.conf new file mode 100644 index 0000000000..e3bfbe5a5e --- /dev/null +++ b/yql/essentials/cfg/tests/fs.conf @@ -0,0 +1,6 @@ +# Use temp directory +#Path: "" +MaxFiles: 1000 +MaxSizeMb: 512 +Threads: 2 +RetryCount: 3 diff --git a/yql/essentials/cfg/tests/fs_arc.conf b/yql/essentials/cfg/tests/fs_arc.conf new file mode 100644 index 0000000000..b91ff121ad --- /dev/null +++ b/yql/essentials/cfg/tests/fs_arc.conf @@ -0,0 +1 @@ +ArcTokenPath: "~/.arc/token" diff --git a/yql/essentials/cfg/tests/gateways-experimental.conf b/yql/essentials/cfg/tests/gateways-experimental.conf new file mode 100644 index 0000000000..c173168fd8 --- /dev/null +++ b/yql/essentials/cfg/tests/gateways-experimental.conf @@ -0,0 +1,26 @@ +Yt { + DefaultSettings { + Name: "InferSchemaMode" + Value: "rpc" + } + + DefaultSettings { + Name: "DQRPCReaderInflight" + Value: "10" + } + + DefaultSettings { + Name: "TableContentLocalExecution" + Value: "true" + } +} + +Dq { +} + +YqlCore { + Flags { + Name: "OptimizerFlags" + Args: ["FieldSubsetEnableMultiusage", "EarlyExpandSkipNull"] + } +} diff --git a/yql/essentials/cfg/tests/gateways-forceblocks.conf b/yql/essentials/cfg/tests/gateways-forceblocks.conf new file mode 100644 index 0000000000..53540ce3aa --- /dev/null +++ b/yql/essentials/cfg/tests/gateways-forceblocks.conf @@ -0,0 +1,5 @@ +YqlCore { + Flags { + Name: "UseBlocks" + } +} diff --git a/yql/essentials/cfg/tests/gateways.conf b/yql/essentials/cfg/tests/gateways.conf new file mode 100644 index 0000000000..cf82a39ae0 --- /dev/null +++ b/yql/essentials/cfg/tests/gateways.conf @@ -0,0 +1,245 @@ +Yt { + GatewayThreads: 0 + YtLogLevel: YL_INFO + + DefaultSettings { + Name: "DefaultMaxJobFails" + Value: "1" + } + + DefaultSettings { + Name: "LocalCalcLimit" + Value: "16" + } + + DefaultSettings { + Name: "ReleaseTempData" + Value: "immediate" + } + + DefaultSettings { + Name: "NativeYtTypeCompatibility" + Value: "all" + } + + DefaultSettings { + Name: "UseYqlRowSpecCompactForm" + Value: "true" + } + + DefaultSettings { + Name: "UseNewPredicateExtraction" + Value: "true" + } + + DefaultSettings { + Name: "PruneKeyFilterLambda" + Value: "true" + } + + DefaultSettings { + Name: "_UseKeyBoundApi" + Value: "true" + } + + DefaultSettings { + Name: "JoinCommonUseMapMultiOut" + Value: "true" + } + + DefaultSettings { + Name: "UseAggPhases" + Value: "true" + } + + DefaultSettings { + Name: "_EnableWriteReorder" + Value: "true" + } + + DefaultSettings { + Name: "_EnableYtPartitioning" + Value: "true" + } + + DefaultSettings { + Name: "UseRPCReaderInDq" + Value: "true" + } + + DefaultSettings { + Name: "PartitionByConstantKeysViaMap" + Value: "true" + } + + RemoteFilePatterns { + Pattern: "yt://([a-zA-Z0-9\\-_]+)/([^&@?]+)$" + Cluster: "$1" + Path: "$2" + } + + RemoteFilePatterns { + Pattern: "https?://yt\\.yandex(\\.net|-team\\.ru)/([a-zA-Z0-9\\-_]+)/#page=navigation&path=//([^&]+)$" + Cluster: "$2" + Path: "$3" + } + + RemoteFilePatterns { + Pattern: "https?://yt\\.yandex(\\.net|-team\\.ru)/([a-zA-Z0-9\\-_]+)/navigation\\?path=//([^&]+)$" + Cluster: "$2" + Path: "$3" + } + + RemoteFilePatterns { + Pattern: "https?://([a-zA-Z0-9\\-_]+)\\.yt\\.yandex(\\.net|-team\\.ru)/api/v(2/download|3/read_file)\\?(|.+&)path=//([^&]+)($|&.*)" + Cluster: "$1" + Path: "$5" + } +} + +SqlCore { + TranslationFlags: ["FlexibleTypes", "DisableAnsiOptionalAs", "EmitAggApply", "UnorderedResult"] +} + +YqlCore { + Flags { + Name: "DisableYsonCastToString" + } + Flags { + Name: "_EnableMatchRecognize" + } + Flags { + Name: "_EnableStreamLookupJoin" + } + Flags { + Name: "OptimizerFlags" + Args: ["FieldSubsetEnableMultiusage"] + } +} + +Dq { + DefaultSettings { + Name: "EnableLLVM" + Value: "true" + } + + DefaultSettings { + Name: "EnableInsert" + Value: "true" + } + + DefaultSettings { + Name: "EnableFullResultWrite" + Value: "true" + } + + DefaultSettings { + Name: "_EnablePrecompute" + Value: "true" + } + + DefaultSettings { + Name: "_LiteralTimeout" + Value: "3600000" + } + + DefaultSettings { + Name: "_TableTimeout" + Value: "3600000" + } + DefaultSettings { + Name: "EnableComputeActor" + Value: "1" + } + DefaultSettings { + Name: "ComputeActorType" + Value: "async" + } + + DefaultSettings { + Name: "UseAggPhases" + Value: "true" + } + + DefaultSettings { + Name: "HashJoinMode" + Value: "grace" + } + + DefaultSettings { + Name: "UseFinalizeByKey" + Value: "true" + } + + DefaultSettings { + Name: "EnableDqReplicate" + Value: "true" + } + + DefaultSettings { + Name: "UseWideChannels" + Value: "true" + } + + DefaultSettings { + Name: "UseFastPickleTransport" + Value: "true" + } + + DefaultSettings { + Name: "UseOOBTransport" + Value: "true" + } + + DefaultSettings { + Name: "SplitStageOnDqReplicate" + Value: "false" + } +} + +Fs { + CustomSchemes { + Pattern: "sbr:(?://)?(\\d+)" + TargetUrl: "https://proxy.sandbox.yandex-team.ru/$1" + } + CustomSchemes { + # backward compatibility rule + Pattern: "yt://([a-zA-Z0-9\\-_]+)/(.+)@t=([^&=]+)" + TargetUrl: "yt://$1/$2?transaction_id=$3" + } + CustomSchemes { + Pattern: "https?://yt\\.yandex(?:\\.net|-team\\.ru)/([a-zA-Z0-9\\-_]+)/#page=navigation&(.+)" + TargetUrl: "yt://$1/?$2" + } + CustomSchemes { + Pattern: "https?://yt\\.yandex(?:\\.net|-team\\.ru)/([a-zA-Z0-9\\-_]+)/navigation\\?(.+)" + TargetUrl: "yt://$1/?$2" + } + CustomSchemes { + Pattern: "https?://([a-zA-Z0-9\\-_]+)\\.yt\\.yandex(?:\\.net|-team\\.ru)/api/v3/read_file\\?(.+)" + TargetUrl: "yt://$1/?$2" + } + CustomSchemes { + Pattern: "https?://a\\.yandex-team\\.ru/(?:arc|svn)/(.+)/arcadia/(.+)\\?rev=r?(\\d+)" + TargetUrl: "arc:/$2?rev=$3&branch=$1" + } + CustomSchemes { + Pattern: "https?://a(?:rcanum)?\\.yandex-team\\.ru/arcadia/(.+)\\?rev=r(\\d+)" + TargetUrl: "arc:/$1?rev=$2" + } + CustomSchemes { + Pattern: "https?://a(?:rcanum)?\\.yandex-team\\.ru/arcadia/(.+)\\?rev=([^r].*)" + TargetUrl: "arc:/$1?hash=$2" + } + CustomSchemes { + Pattern: "arc://(.*)" + TargetUrl: "arc:/$1" + } +} + +Solomon { + DefaultSettings { + Name: "_EnableReading" + Value: "1" + } +} diff --git a/yql/essentials/cfg/udf_test/fs.conf b/yql/essentials/cfg/udf_test/fs.conf new file mode 100644 index 0000000000..e3bfbe5a5e --- /dev/null +++ b/yql/essentials/cfg/udf_test/fs.conf @@ -0,0 +1,6 @@ +# Use temp directory +#Path: "" +MaxFiles: 1000 +MaxSizeMb: 512 +Threads: 2 +RetryCount: 3 diff --git a/yql/essentials/cfg/udf_test/gateways-forceblocks.conf b/yql/essentials/cfg/udf_test/gateways-forceblocks.conf new file mode 100644 index 0000000000..927f4f5c87 --- /dev/null +++ b/yql/essentials/cfg/udf_test/gateways-forceblocks.conf @@ -0,0 +1,13 @@ +SqlCore { + TranslationFlags: ["FlexibleTypes", "DisableAnsiOptionalAs", "EmitAggApply"] +} + +YqlCore { + Flags { + Name: "DisableYsonCastToString" + } + Flags { + Name: "UseBlocks" + } +} + diff --git a/yql/essentials/cfg/udf_test/gateways.conf b/yql/essentials/cfg/udf_test/gateways.conf new file mode 100644 index 0000000000..110ea04afc --- /dev/null +++ b/yql/essentials/cfg/udf_test/gateways.conf @@ -0,0 +1,10 @@ +SqlCore { + TranslationFlags: ["FlexibleTypes", "DisableAnsiOptionalAs", "EmitAggApply", "DisableUnorderedResult"] +} + +YqlCore { + Flags { + Name: "DisableYsonCastToString" + } +} + diff --git a/yql/essentials/core/ut/ya.make b/yql/essentials/core/ut/ya.make index 8b7c2d7b60..1813a0032f 100644 --- a/yql/essentials/core/ut/ya.make +++ b/yql/essentials/core/ut/ya.make @@ -46,7 +46,7 @@ PEERDIR( ) RESOURCE( - contrib/ydb/library/yql/cfg/tests/fs.conf fs.conf + yql/essentials/cfg/tests/fs.conf fs.conf ) IF (SANITIZER_TYPE == "thread" OR WITH_VALGRIND) diff --git a/yql/essentials/parser/pg_wrapper/test/test_doc.py b/yql/essentials/parser/pg_wrapper/test/test_doc.py index 01e5b646e4..52214190e4 100644 --- a/yql/essentials/parser/pg_wrapper/test/test_doc.py +++ b/yql/essentials/parser/pg_wrapper/test/test_doc.py @@ -17,7 +17,7 @@ def run_one(item): support_udfs = True yqlrun_res = YQLRun(prov='yt', use_sql2yql=False, - cfg_dir='contrib/ydb/library/yql/cfg/udf_test', + cfg_dir='yql/essentials/cfg/udf_test', support_udfs=support_udfs).yql_exec( program="--!syntax_pg\n" + input, run_sql=True, diff --git a/yql/essentials/parser/pg_wrapper/test/ya.make b/yql/essentials/parser/pg_wrapper/test/ya.make index 4ee6684cf7..da4cb9a291 100644 --- a/yql/essentials/parser/pg_wrapper/test/ya.make +++ b/yql/essentials/parser/pg_wrapper/test/ya.make @@ -23,7 +23,7 @@ REQUIREMENTS( DATA( arcadia/contrib/ydb/docs/ru/core/postgresql/_includes/functions.md - arcadia/contrib/ydb/library/yql/cfg/udf_test + arcadia/yql/essentials/cfg/udf_test arcadia/yql/essentials/mount ) |