Skip to content

Commit 916b0dd

Browse files
committed
Revert "PHOENIX-7180 Use phoenix-client-lite in sqlline script (#1982)"
This reverts commit b159a90.
1 parent b74734b commit 916b0dd

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-12
lines changed

bin/phoenix_utils.py

-11
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ def findClasspath(command_name):
7979

8080
def setPath():
8181
PHOENIX_CLIENT_EMBEDDED_JAR_PATTERN = "phoenix-client-embedded-hbase-*[!s].jar"
82-
PHOENIX_CLIENT_LITE_JAR_PATTERN = "phoenix-client-lite-hbase-*[!s].jar"
8382
PHOENIX_TRACESERVER_JAR_PATTERN = "phoenix-tracing-webapp-*-runnable.jar"
8483
PHOENIX_TESTS_JAR_PATTERN = "phoenix-core-*-tests*.jar"
8584
PHOENIX_PHERF_JAR_PATTERN = "phoenix-pherf-*[!s].jar"
@@ -133,16 +132,6 @@ def setPath():
133132
if phoenix_client_embedded_jar == "":
134133
phoenix_client_embedded_jar = find(PHOENIX_CLIENT_EMBEDDED_JAR_PATTERN, phoenix_class_path)
135134

136-
global phoenix_lite_jar_path
137-
phoenix_lite_jar_path = os.path.join(current_dir, "..", "phoenix-client-parent" , "phoenix-client-lite", "target","*")
138-
139-
global phoenix_client_lite_jar
140-
phoenix_client_lite_jar = find(PHOENIX_CLIENT_LITE_JAR_PATTERN, phoenix_lite_jar_path)
141-
if phoenix_client_lite_jar == "":
142-
phoenix_client_lite_jar = findFileInPathWithoutRecursion(PHOENIX_CLIENT_LITE_JAR_PATTERN, os.path.join(current_dir, ".."))
143-
if phoenix_client_lite_jar == "":
144-
phoenix_client_lite_jar = find(PHOENIX_CLIENT_LITE_JAR_PATTERN, phoenix_class_path)
145-
146135
global phoenix_test_jar_path
147136
phoenix_test_jar_path = os.path.join(current_dir, "..", "phoenix-core", "target","*")
148137

bin/sqlline.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def kill_child():
9696
phoenix_utils.sqlline_with_deps_jar + os.pathsep + \
9797
phoenix_utils.slf4j_backend_jar + os.pathsep + \
9898
phoenix_utils.logging_jar + os.pathsep + \
99-
phoenix_utils.phoenix_client_lite_jar + \
99+
phoenix_utils.phoenix_client_embedded_jar + \
100100
'" -Dlog4j2.configurationFile=file:' + os.path.join(phoenix_utils.current_dir, "log4j2.properties") + \
101101
disable_jna + \
102102
" sqlline.SqlLine -d org.apache.phoenix.jdbc.PhoenixDriver" + \

0 commit comments

Comments
 (0)