phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndimi...@apache.org
Subject phoenix git commit: PHOENIX-1904 bin scripts use incorrect variable for locating hbase conf
Date Thu, 23 Apr 2015 20:15:24 GMT
Repository: phoenix
Updated Branches:
  refs/heads/master e18378b6f -> 136f7eea0


PHOENIX-1904 bin scripts use incorrect variable for locating hbase conf


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/136f7eea
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/136f7eea
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/136f7eea

Branch: refs/heads/master
Commit: 136f7eea0f0ecc9a3bb514a514c02bbae27771dd
Parents: e18378b
Author: Nick Dimiduk <ndimiduk@apache.org>
Authored: Wed Apr 22 15:51:31 2015 -0700
Committer: Nick Dimiduk <ndimiduk@apache.org>
Committed: Thu Apr 23 13:14:56 2015 -0700

----------------------------------------------------------------------
 bin/end2endTest.py   | 5 ++---
 bin/phoenix_utils.py | 6 ++++--
 bin/psql.py          | 2 +-
 bin/queryserver.py   | 2 +-
 bin/sqlline-thin.py  | 2 +-
 bin/sqlline.py       | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/136f7eea/bin/end2endTest.py
----------------------------------------------------------------------
diff --git a/bin/end2endTest.py b/bin/end2endTest.py
index a5993dc..2e4b68e 100755
--- a/bin/end2endTest.py
+++ b/bin/end2endTest.py
@@ -34,13 +34,12 @@ phoenix_jar_path = os.getenv(phoenix_utils.phoenix_class_path, phoenix_utils.pho
 
 # HBase configuration folder path (where hbase-site.xml reside) for
 # HBase/Phoenix client side property override
-hbase_config_path = os.getenv('HBASE_CONF_DIR', phoenix_utils.hbase_conf_path)
 hbase_library_path = os.getenv('HBASE_LIBRARY_DIR', '')
 
-print "Current ClassPath=%s:%s:%s" % (hbase_config_path, phoenix_jar_path,
+print "Current ClassPath=%s:%s:%s" % (phoenix_utils.hbase_conf_dir, phoenix_jar_path,
                                       hbase_library_path)
 
-java_cmd = "java -cp " + hbase_config_path + os.pathsep + phoenix_jar_path + os.pathsep +
\
+java_cmd = "java -cp " + phoenix_utils.hbase_conf_dir + os.pathsep + phoenix_jar_path + os.pathsep
+ \
     hbase_library_path + " org.apache.phoenix.end2end.End2EndTestDriver " + \
     ' '.join(sys.argv[1:])
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/136f7eea/bin/phoenix_utils.py
----------------------------------------------------------------------
diff --git a/bin/phoenix_utils.py b/bin/phoenix_utils.py
index 554b21b..36c7b82 100755
--- a/bin/phoenix_utils.py
+++ b/bin/phoenix_utils.py
@@ -64,8 +64,10 @@ def setPath():
  phoenix_client_jar = find("phoenix-*-client.jar", phoenix_jar_path)
  global phoenix_test_jar_path
  phoenix_test_jar_path = os.path.join(current_dir, "..", "phoenix-core", "target","*")
- global hbase_conf_path
- hbase_conf_path = os.getenv('HBASE_CONF_PATH','.')
+ global hbase_conf_dir
+ hbase_conf_dir = os.getenv('HBASE_CONF_DIR', os.getenv('HBASE_CONF_PATH', '.'))
+ global hbase_conf_path # keep conf_path around for backward compatibility
+ hbase_conf_path = hbase_conf_dir
  global testjar
  testjar = find(PHOENIX_TESTS_JAR_PATTERN, phoenix_test_jar_path)
  global phoenix_queryserver_jar

http://git-wip-us.apache.org/repos/asf/phoenix/blob/136f7eea/bin/psql.py
----------------------------------------------------------------------
diff --git a/bin/psql.py b/bin/psql.py
index 5b26dcd..3c60dfa 100755
--- a/bin/psql.py
+++ b/bin/psql.py
@@ -30,7 +30,7 @@ args = phoenix_utils.shell_quote(sys.argv[1:])
 
 # HBase configuration folder path (where hbase-site.xml reside) for
 # HBase/Phoenix client side property override
-java_cmd = 'java -cp "' + phoenix_utils.hbase_conf_path + os.pathsep + phoenix_utils.phoenix_client_jar
+ \
+java_cmd = 'java -cp "' + phoenix_utils.hbase_conf_dir + os.pathsep + phoenix_utils.phoenix_client_jar
+ \
     '" -Dlog4j.configuration=file:' + \
     os.path.join(phoenix_utils.current_dir, "log4j.properties") + \
     " org.apache.phoenix.util.PhoenixRuntime " + args 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/136f7eea/bin/queryserver.py
----------------------------------------------------------------------
diff --git a/bin/queryserver.py b/bin/queryserver.py
index 0bd4e08..5553567 100755
--- a/bin/queryserver.py
+++ b/bin/queryserver.py
@@ -58,7 +58,7 @@ else:
 
 # HBase configuration folder path (where hbase-site.xml reside) for
 # HBase/Phoenix client side property override
-hbase_config_path = os.getenv('HBASE_CONF_DIR', phoenix_utils.hbase_conf_path)
+hbase_config_path = phoenix_utils.hbase_conf_dir
 
 # default paths ## TODO: add windows support
 java_home = os.getenv('JAVA_HOME')

http://git-wip-us.apache.org/repos/asf/phoenix/blob/136f7eea/bin/sqlline-thin.py
----------------------------------------------------------------------
diff --git a/bin/sqlline-thin.py b/bin/sqlline-thin.py
index 2afbb0c..44e5352 100755
--- a/bin/sqlline-thin.py
+++ b/bin/sqlline-thin.py
@@ -77,7 +77,7 @@ colorSetting = "true"
 if os.name == 'nt':
     colorSetting = "false"
 
-java_cmd = 'java -cp "' + phoenix_utils.hbase_conf_path + os.pathsep + phoenix_utils.phoenix_thin_client_jar
+ \
+java_cmd = 'java -cp "' + phoenix_utils.hbase_conf_dir + os.pathsep + phoenix_utils.phoenix_thin_client_jar
+ \
     '" -Dlog4j.configuration=file:' + \
     os.path.join(phoenix_utils.current_dir, "log4j.properties") + \
     " sqlline.SqlLine -d org.apache.phoenix.queryserver.client.Driver " + \

http://git-wip-us.apache.org/repos/asf/phoenix/blob/136f7eea/bin/sqlline.py
----------------------------------------------------------------------
diff --git a/bin/sqlline.py b/bin/sqlline.py
index 2b2750a..6e5b5fa 100755
--- a/bin/sqlline.py
+++ b/bin/sqlline.py
@@ -53,7 +53,7 @@ colorSetting = "true"
 if os.name == 'nt':
     colorSetting = "false"
 
-java_cmd = 'java -cp "' + phoenix_utils.hbase_conf_path + os.pathsep + phoenix_utils.phoenix_client_jar
+ \
+java_cmd = 'java -cp "' + phoenix_utils.hbase_conf_dir + os.pathsep + phoenix_utils.phoenix_client_jar
+ \
     '" -Dlog4j.configuration=file:' + \
     os.path.join(phoenix_utils.current_dir, "log4j.properties") + \
     " sqlline.SqlLine -d org.apache.phoenix.jdbc.PhoenixDriver \


Mime
View raw message