phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s..@apache.org
Subject [1/3] phoenix git commit: Make sqlline refer to bin/hbase-site.xml by default (Junegunn Choi)
Date Fri, 20 May 2016 03:56:03 GMT
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 341d846ca -> 9359e1374
  refs/heads/4.x-HBase-1.0 50c03bcac -> 74a7fc61d
  refs/heads/master 7d3ae7168 -> 1d3c92881


Make sqlline refer to bin/hbase-site.xml by default (Junegunn Choi)


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

Branch: refs/heads/master
Commit: 1d3c92881de3f2555d30f04195aad13d67065037
Parents: 7d3ae71
Author: Sergey Soldatov <ssa@apache.org>
Authored: Thu May 19 20:51:38 2016 -0700
Committer: Sergey Soldatov <ssa@apache.org>
Committed: Thu May 19 20:51:38 2016 -0700

----------------------------------------------------------------------
 bin/sqlline.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/1d3c9288/bin/sqlline.py
----------------------------------------------------------------------
diff --git a/bin/sqlline.py b/bin/sqlline.py
index f14cfc7..6d537e3 100755
--- a/bin/sqlline.py
+++ b/bin/sqlline.py
@@ -88,7 +88,7 @@ if os.name == 'nt':
     colorSetting = "false"
 
 java_cmd = java + ' $PHOENIX_OPTS ' + \
-    ' -cp "' + phoenix_utils.hbase_conf_dir + os.pathsep + phoenix_utils.phoenix_client_jar
+ os.pathsep + phoenix_utils.hadoop_common_jar + os.pathsep + phoenix_utils.hadoop_hdfs_jar
+ \
+    ' -cp "' + hbase_config_path + os.pathsep + phoenix_utils.hbase_conf_dir + os.pathsep
+ phoenix_utils.phoenix_client_jar + os.pathsep + phoenix_utils.hadoop_common_jar + os.pathsep
+ phoenix_utils.hadoop_hdfs_jar + \
     os.pathsep + phoenix_utils.hadoop_conf + os.pathsep + phoenix_utils.hadoop_classpath
+ '" -Dlog4j.configuration=file:' + \
     os.path.join(phoenix_utils.current_dir, "log4j.properties") + \
     " sqlline.SqlLine -d org.apache.phoenix.jdbc.PhoenixDriver \


Mime
View raw message