Uh oh!
There was an error while loading. Please reload this page.
PHOENIX-6378 Unbundle sqlline from phoenix-client - #1239
Merged
Conversation
stoty
suggested changes
May 25, 2021
Uh oh!
There was an error while loading. Please reload this page.
| <!-- Unpack all the dependencies to class files, since java doesn't support | ||
| jar of jars for running --> | ||
| <unpack>false</unpack> | ||
| <!-- save these dependencies to the top-level --> |
| <!-- Components that we don't want in jars that are used with other libraries, but we want for a standalone client --> | ||
| <dependencySets> | ||
| <dependencySet> | ||
| <!-- Unpack all the dependencies to class files, since java doesn't support |
Contributor
There was a problem hiding this comment.
I don't think this comment is relevant to anything anymore.
| <artifactId>log4j</artifactId> | ||
| <scope>runtime</scope> | ||
| </dependency> | ||
| <dependency> |
Contributor
There was a problem hiding this comment.
I think that we'd best keep the old client unchanged for backwards compatibility reasons.
| <artifactId>hamcrest-core</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> |
Contributor
There was a problem hiding this comment.
Why is this needed ?
Ideally Phoenix-core doesn't have anything to do with sqlline.
| <artifactId>phoenix-hbase-compat-${hbase.compat.version}</artifactId> | ||
| <optional>false</optional> | ||
| </dependency> | ||
| <dependency> |
Contributor
There was a problem hiding this comment.
I thought that we are already not adding sqlline here.
Just noting that we change sqlline-embedded too.
Uh oh!
There was an error while loading. Please reload this page.
stoty
commented
May 25, 2021
Contributor
💔 -1 overall
This message was automatically generated. |
stoty
commented
May 26, 2021
Contributor
💔 -1 overall
This message was automatically generated. |
stoty
commented
May 27, 2021
Contributor
💔 -1 overall
This message was automatically generated. |
stoty
commented
May 27, 2021
Contributor
Could you update the ticket title and commit message ? |
stoty
reviewed
May 31, 2021
| 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" | ||
| SLF4J_JAR_PATTERN = "slf4j-log4j12-*[!s].jar" |
Contributor
There was a problem hiding this comment.
Please change the slf4j* variable names to slf4j_log4j12_* for clarity.
stoty
suggested changes
May 31, 2021
| java_cmd = java + ' $PHOENIX_OPTS ' + \ | ||
| ' -cp "' + hbase_config_path + os.pathsep + phoenix_utils.hbase_conf_dir + os.pathsep + phoenix_utils.phoenix_client_jar + \ | ||
| ' -cp "' + phoenix_utils.sqlline_with_deps_jar + os.pathsep + hbase_config_path + os.pathsep + \ | ||
| phoenix_utils.slf4j_jar + os.pathsep + \ |
Contributor
There was a problem hiding this comment.
this variable name hasn't been updated.
| if sqlline_with_deps_jar is None or sqlline_with_deps_jar == "": | ||
| sqlline_with_deps_jar = findFileInPathWithoutRecursion(SQLLINE_WITH_DEPS_PATTERN, os.path.join(current_dir, "..","lib")) | ||
| global slf4j_jar |
Contributor
There was a problem hiding this comment.
this variable name hasn't been updated
| print("phoenix_loadbalancer_jar:", phoenix_loadbalancer_jar) | ||
| print("phoenix_thin_client_jar:", phoenix_thin_client_jar) | ||
| print("hadoop_classpath:", hadoop_classpath) | ||
| print("sqlline_with_deps_jar", sqlline_with_deps_jar) |
Contributor
There was a problem hiding this comment.
We should log the slf4j_log4j12 jar name too.
stoty
reviewed
May 31, 2021
| SQLLINE_WITH_DEPS_PATTERN = "sqlline-*-jar-with-dependencies.jar" | ||
| OVERRIDE_SLF4J = "OVERRIDE_SLF4J_JAR_LOCATION" |
Contributor
There was a problem hiding this comment.
On second thought, we should call it SLF4J_BACKEND_JAR instead of SLF4J_LOG4J12_JAR.
and apply it everywhere, including the name of the OVERRIDE system property.
…it in sqlline.py Change-Id: Ifd31e25b303ab3d2872b53f4a503219539777544
richardantal
commented
May 31, 2021
ContributorAuthor
Thanks @stoty for the review. I squashed the commits to 1, before merging. |
stoty
commented
May 31, 2021
Contributor
💔 -1 overall
This message was automatically generated. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Change-Id: I443593c18d412c4ccd2e137c6b2809863bc71bc8