Fix udfs path in tests runner (#11821)

Author: lll-phill-lll

ydb/library/benchmarks/runner/run-tests.sh

@@ -9,7 +9,7 @@ if [ "X$1" = "X--help" ]; then
     echo '  $script_path  default is deduced from argv0'
     echo '  $ydb_path     default is $script_path/../../../..'
     echo '  $rebuild      0 [default] or build type (relwithdebinfo [default if empty]|release|profile); requires clean git repository and presence of {current branch name}-base tag'
-    echo 'When $rebuild is 0, requires pre-built $ydb_path/ydb/library/yql/udfs, $ydb_path/ydb/library/yql/tools/dqrun/dqrun-unspilled and $ydb_path/ydb/library/yql/tools/dqrun/dqrun'
+    echo 'When $rebuild is 0, requires pre-built $ydb_path/yql/essentials/udfs, $ydb_path/ydb/library/yql/tools/dqrun/dqrun-unspilled and $ydb_path/ydb/library/yql/tools/dqrun/dqrun'
     echo '  $decimal      setting to empty string disables DECIMAL support requirement'
     echo '  $cbo          setting to empty string disables CostBasedOptimizer support requirement'
     echo '  $runner_opts  extra options passed to runner'
@@ -52,7 +52,7 @@ if [ "X${rebuild-0}" != X0 ]; then
     (cd ${dq_path} && $ya_path/ya make --build ${rebuild:-relwithdebinfo} && git describe --always --dirty >$dq_path/dqrun-unspilled.commit && cp -L $dq_path/dqrun $dq_path/dqrun-unspilled)
     git checkout @{-1}
     (cd ${dq_path} && $ya_path/ya make --build ${rebuild:-relwithdebinfo})
-    (cd ${ydb_path}/ydb/library/yql/udfs/common && $ya_path/ya make --build ${rebuild:-relwithdebinfo} datetime datetime2 string re2 set math unicode_base)
+    (cd ${ydb_path}/yql/essentials/udfs/common && $ya_path/ya make --build ${rebuild:-relwithdebinfo} datetime datetime2 string re2 set math unicode_base)
     (cd ${ydb_path}/ydb/library/benchmarks/gen_queries && $ya_path/ya make --build ${rebuild:-relwithdebinfo})
     )
     (cd ${script_path} && ${script_path}/../../../../ya make --build ${rebuild:-relwithdebinfo})
@@ -114,33 +114,33 @@ outdir=results-`date -u +%Y%m%dT%H%M%S`-${variant}-${datasize}-$tasks
 if false; then
 start="`cd ${dq_path} && git describe --always --dirty`"
 echo LLVM && \
-command time ${script_path}/runner/runner $perf $runner_opts --query-dir ${ql}-${datasize}-$tasks/${variant} --bindings ${ql}-${datasize}-$tasks/bindings.json --result-dir $outdir ${dq_path}/dqrun-unspilled -s --fs-cfg ${dq_path}/examples/fs.conf --gateways-cfg $script_path/runner/test-gateways.conf --udfs-dir ${ydb_path}/ydb/library/yql/udfs/common/ $dqrun_opts
+command time ${script_path}/runner/runner $perf $runner_opts --query-dir ${ql}-${datasize}-$tasks/${variant} --bindings ${ql}-${datasize}-$tasks/bindings.json --result-dir $outdir ${dq_path}/dqrun-unspilled -s --fs-cfg ${dq_path}/examples/fs.conf --gateways-cfg $script_path/runner/test-gateways.conf --udfs-dir ${ydb_path}/yql/essentials/udfs/common/ $dqrun_opts
 (echo $start; cd ${dq_path} && git describe --always --dirty) > $outdir/${ql}-${datasize}-$tasks/${variant}/commit
 fi
 if false; then
 echo main NO LLVM && \
-command time ${script_path}/runner/runner $perf $runner_opts --query-dir ${qX}-${datasize}-$tasks/${variant} --bindings ${qX}-${datasize}-$tasks/${variant}/bindings.json --result-dir $outdir ${dq_path}/dqrun-unspilled ${enable_spilling} -s --fs-cfg ${dq_path}/examples/fs.conf --gateways-cfg $script_path/runner/test-gateways.conf --udfs-dir ${ydb_path}/ydb/library/yql/udfs/common/ $dqrun_opts
+command time ${script_path}/runner/runner $perf $runner_opts --query-dir ${qX}-${datasize}-$tasks/${variant} --bindings ${qX}-${datasize}-$tasks/${variant}/bindings.json --result-dir $outdir ${dq_path}/dqrun-unspilled ${enable_spilling} -s --fs-cfg ${dq_path}/examples/fs.conf --gateways-cfg $script_path/runner/test-gateways.conf --udfs-dir ${ydb_path}/yql/essentials/udfs/common/ $dqrun_opts
 (cd ${dq_path}; cat dqrun-unspilled.commit) > $outdir/${qX}-${datasize}-$tasks/${variant}/commit
 fi
 if [ -z "${skipllvm+set}" ]; then
 start="`cd ${dq_path} && git describe --always --dirty`"
 echo Spilling+LLVM && \
-command time ${script_path}/runner/runner $perf $runner_opts --query-dir ${qsL}-${datasize}-$tasks/${variant} --bindings ${qsL}-${datasize}-$tasks/${variant}/bindings.json --result-dir $outdir ${dq_path}/dqrun$dqsuffix -s ${enable_spilling} --fs-cfg ${dq_path}/examples/fs.conf --gateways-cfg $script_path/runner/test-gateways.conf --udfs-dir ${ydb_path}/ydb/library/yql/udfs/common/ $dqrun_opts
+command time ${script_path}/runner/runner $perf $runner_opts --query-dir ${qsL}-${datasize}-$tasks/${variant} --bindings ${qsL}-${datasize}-$tasks/${variant}/bindings.json --result-dir $outdir ${dq_path}/dqrun$dqsuffix -s ${enable_spilling} --fs-cfg ${dq_path}/examples/fs.conf --gateways-cfg $script_path/runner/test-gateways.conf --udfs-dir ${ydb_path}/yql/essentials/udfs/common/ $dqrun_opts
 (echo $start; cd ${dq_path} && git describe --always --dirty) > $outdir/${qsL}-${datasize}-$tasks/${variant}/commit
 if [ -z "${skipmain+set}" ]; then
 echo main+LLVM no enable spilling && \
-command time ${script_path}/runner/runner $perf $runner_opts --query-dir ${qL}-${datasize}-$tasks/${variant} --bindings ${qL}-${datasize}-$tasks/${variant}/bindings.json --result-dir $outdir ${dq_path}/dqrun-unspilled -s --fs-cfg ${dq_path}/examples/fs.conf --gateways-cfg $script_path/runner/test-gateways.conf --udfs-dir ${ydb_path}/ydb/library/yql/udfs/common/ $dqrun_opts
+command time ${script_path}/runner/runner $perf $runner_opts --query-dir ${qL}-${datasize}-$tasks/${variant} --bindings ${qL}-${datasize}-$tasks/${variant}/bindings.json --result-dir $outdir ${dq_path}/dqrun-unspilled -s --fs-cfg ${dq_path}/examples/fs.conf --gateways-cfg $script_path/runner/test-gateways.conf --udfs-dir ${ydb_path}/yql/essentials/udfs/common/ $dqrun_opts
 (cd ${dq_path}; cat dqrun-unspilled.commit) > $outdir/${qL}-${datasize}-$tasks/${variant}/commit
 fi
 fi
 if [ -z "${skipnollvm+set}" ]; then
 start="`cd ${dq_path} && git describe --always --dirty`"
 echo Spilling NO LLVM && \
-command time ${script_path}/runner/runner $perf $runner_opts --query-dir ${qs}-${datasize}-$tasks/${variant} --bindings ${qs}-${datasize}-$tasks/${variant}/bindings.json --result-dir $outdir ${dq_path}/dqrun$dqsuffix -s ${enable_spilling} --fs-cfg ${dq_path}/examples/fs.conf --gateways-cfg $script_path/runner/test-gateways.conf --udfs-dir ${ydb_path}/ydb/library/yql/udfs/common/ $dqrun_opts
+command time ${script_path}/runner/runner $perf $runner_opts --query-dir ${qs}-${datasize}-$tasks/${variant} --bindings ${qs}-${datasize}-$tasks/${variant}/bindings.json --result-dir $outdir ${dq_path}/dqrun$dqsuffix -s ${enable_spilling} --fs-cfg ${dq_path}/examples/fs.conf --gateways-cfg $script_path/runner/test-gateways.conf --udfs-dir ${ydb_path}/yql/essentials/udfs/common/ $dqrun_opts
 (echo $start; cd ${dq_path} && git describe --always --dirty) > $outdir/${qs}-${datasize}-$tasks/${variant}/commit
 if [ -z "${skipmain+set}" ]; then
 echo main NO LLVM no enable spilling && \
-command time ${script_path}/runner/runner $perf $runner_opts --query-dir ${q}-${datasize}-$tasks/${variant} --bindings ${q}-${datasize}-$tasks/${variant}/bindings.json --result-dir $outdir ${dq_path}/dqrun-unspilled -s --fs-cfg ${dq_path}/examples/fs.conf --gateways-cfg $script_path/runner/test-gateways.conf --udfs-dir ${ydb_path}/ydb/library/yql/udfs/common/ $dqrun_opts
+command time ${script_path}/runner/runner $perf $runner_opts --query-dir ${q}-${datasize}-$tasks/${variant} --bindings ${q}-${datasize}-$tasks/${variant}/bindings.json --result-dir $outdir ${dq_path}/dqrun-unspilled -s --fs-cfg ${dq_path}/examples/fs.conf --gateways-cfg $script_path/runner/test-gateways.conf --udfs-dir ${ydb_path}/yql/essentials/udfs/common/ $dqrun_opts
 (cd ${dq_path}; cat dqrun-unspilled.commit) > $outdir/${q}-${datasize}-$tasks/${variant}/commit
 fi
 fi

ydb/library/benchmarks/runner/run_tests/run_tests.py

@@ -69,7 +69,7 @@ def parse_args():
 
         args = override_parser.parse_args(argv, namespace=args)
 
-        udfs_prefix = args.ydb_root / "ydb" / "library" / "yql" / "udfs" / "common"
+        udfs_prefix = args.ydb_root / "yql" / "essentials" / "udfs" / "common"
         args.udfs_dir = [udfs_prefix / name for name in ["set", "url_base", "datetime2", "re2", "math", "unicode_base"]]
 
         return args