From fad18a0472208918200608fd1ec3be2b2b33a03a Mon Sep 17 00:00:00 2001 From: Andrey Neporada Date: Wed, 20 Dec 2023 23:41:24 +0300 Subject: [PATCH 1/2] Fix ui.sh, add missing mounts.txt --- ydb/library/yql/tools/yqlrun/mounts.txt | 5 +++++ ydb/library/yql/tools/yqlrun/ui.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 ydb/library/yql/tools/yqlrun/mounts.txt diff --git a/ydb/library/yql/tools/yqlrun/mounts.txt b/ydb/library/yql/tools/yqlrun/mounts.txt new file mode 100644 index 000000000000..455bf007ee5f --- /dev/null +++ b/ydb/library/yql/tools/yqlrun/mounts.txt @@ -0,0 +1,5 @@ +MountPoints { + MountPoint: "../../mount/lib" + RootAlias: "/lib" + Library: true +} diff --git a/ydb/library/yql/tools/yqlrun/ui.sh b/ydb/library/yql/tools/yqlrun/ui.sh index a050b7b32c9a..2eafdb1ee7a0 100755 --- a/ydb/library/yql/tools/yqlrun/ui.sh +++ b/ydb/library/yql/tools/yqlrun/ui.sh @@ -8,7 +8,7 @@ # SCRIPT_DIR="$(dirname $(readlink -f "$0"))" -UDFS_DIR="${SCRIPT_DIR}/../../udfs;${SCRIPT_DIR}/../../../../../yql/udfs" +UDFS_DIR="${SCRIPT_DIR}/../../udfs;${SCRIPT_DIR}/../../../../../../yql/udfs" ASSETS_DIR=${SCRIPT_DIR}/http/www MOUNTS_CFG=${SCRIPT_DIR}/mounts.txt GATEWAYS_CFG=${SCRIPT_DIR}/../../cfg/tests/gateways.conf From 089406494539d6016ba07926698e7fdeaffa7d59 Mon Sep 17 00:00:00 2001 From: Andrey Neporada Date: Thu, 21 Dec 2023 00:01:31 +0300 Subject: [PATCH 2/2] mounts.txt for uig.sh, drop no longe needed LD_LIBRARY_PATH --- ydb/library/yql/tools/yqlrun/uig.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ydb/library/yql/tools/yqlrun/uig.sh b/ydb/library/yql/tools/yqlrun/uig.sh index f8fc121a753e..84382db3c8d3 100755 --- a/ydb/library/yql/tools/yqlrun/uig.sh +++ b/ydb/library/yql/tools/yqlrun/uig.sh @@ -10,6 +10,7 @@ SCRIPT_DIR="$(dirname $(readlink -f "$0"))" UDFS_DIR="${SCRIPT_DIR}/../../udfs" ASSETS_DIR=${SCRIPT_DIR}/http/www +MOUNTS_CFG=${SCRIPT_DIR}/mounts.txt GATEWAYS_CFG=${SCRIPT_DIR}/../../cfg/tests/gateways.conf PORT=${1:-3000} @@ -18,8 +19,8 @@ if [ "$2" = "--gdb" ]; then GDB="yag tool gdb --args" fi -export LD_LIBRARY_PATH=. ${GDB} ${SCRIPT_DIR}/yqlrun ui \ + --mounts ${MOUNTS_CFG} \ --udfs-dir ${UDFS_DIR} \ --assets ${ASSETS_DIR} \ --gateways-cfg ${GATEWAYS_CFG} \