This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch 5.2 in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit b159a90b3c491e35ee2e7f137bd09ec8b3f60dd1 Author: Istvan Toth <[email protected]> AuthorDate: Fri Sep 27 10:44:27 2024 +0200 PHOENIX-7180 Use phoenix-client-lite in sqlline script (#1982) --- bin/phoenix_utils.py | 11 +++++++++++ bin/sqlline.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/bin/phoenix_utils.py b/bin/phoenix_utils.py index 6f8469b74b..48e7a42d5a 100755 --- a/bin/phoenix_utils.py +++ b/bin/phoenix_utils.py @@ -79,6 +79,7 @@ def findClasspath(command_name): def setPath(): PHOENIX_CLIENT_EMBEDDED_JAR_PATTERN = "phoenix-client-embedded-hbase-*[!s].jar" + PHOENIX_CLIENT_LITE_JAR_PATTERN = "phoenix-client-lite-hbase-*[!s].jar" PHOENIX_TRACESERVER_JAR_PATTERN = "phoenix-tracing-webapp-*-runnable.jar" PHOENIX_TESTS_JAR_PATTERN = "phoenix-core-*-tests*.jar" PHOENIX_PHERF_JAR_PATTERN = "phoenix-pherf-*[!s].jar" @@ -132,6 +133,16 @@ def setPath(): if phoenix_client_embedded_jar == "": phoenix_client_embedded_jar = find(PHOENIX_CLIENT_EMBEDDED_JAR_PATTERN, phoenix_class_path) + global phoenix_lite_jar_path + phoenix_lite_jar_path = os.path.join(current_dir, "..", "phoenix-client-parent" , "phoenix-client-lite", "target","*") + + global phoenix_client_lite_jar + phoenix_client_lite_jar = find(PHOENIX_CLIENT_LITE_JAR_PATTERN, phoenix_lite_jar_path) + if phoenix_client_lite_jar == "": + phoenix_client_lite_jar = findFileInPathWithoutRecursion(PHOENIX_CLIENT_LITE_JAR_PATTERN, os.path.join(current_dir, "..")) + if phoenix_client_lite_jar == "": + phoenix_client_lite_jar = find(PHOENIX_CLIENT_LITE_JAR_PATTERN, phoenix_class_path) + global phoenix_test_jar_path phoenix_test_jar_path = os.path.join(current_dir, "..", "phoenix-core", "target","*") diff --git a/bin/sqlline.py b/bin/sqlline.py index 0a15265dfc..b927c94df4 100755 --- a/bin/sqlline.py +++ b/bin/sqlline.py @@ -96,7 +96,7 @@ java_cmd = phoenix_utils.java + ' ' + phoenix_utils.jvm_module_flags + ' $PHOENI phoenix_utils.sqlline_with_deps_jar + os.pathsep + \ phoenix_utils.slf4j_backend_jar + os.pathsep + \ phoenix_utils.logging_jar + os.pathsep + \ - phoenix_utils.phoenix_client_embedded_jar + \ + phoenix_utils.phoenix_client_lite_jar + \ '" -Dlog4j2.configurationFile=file:' + os.path.join(phoenix_utils.current_dir, "log4j2.properties") + \ disable_jna + \ " sqlline.SqlLine -d org.apache.phoenix.jdbc.PhoenixDriver" + \
