phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [4/7] phoenix git commit: PHOENIX-3223 Add `hadoop classpath` to PQS classpath when available
Date Tue, 30 Aug 2016 22:49:32 GMT
PHOENIX-3223 Add `hadoop classpath` to PQS classpath when available


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

Branch: refs/heads/4.8-HBase-1.1
Commit: 990bb9d4f1517b819236720bd51477dc4ee3465d
Parents: 317780b
Author: Josh Elser <elserj@apache.org>
Authored: Tue Aug 30 15:58:50 2016 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Tue Aug 30 18:48:17 2016 -0400

----------------------------------------------------------------------
 bin/queryserver.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/990bb9d4/bin/queryserver.py
----------------------------------------------------------------------
diff --git a/bin/queryserver.py b/bin/queryserver.py
index 1048adb..1ad8b86 100755
--- a/bin/queryserver.py
+++ b/bin/queryserver.py
@@ -73,6 +73,7 @@ else:
 # HBase/Phoenix client side property override
 hbase_config_path = phoenix_utils.hbase_conf_dir
 hadoop_config_path = phoenix_utils.hadoop_conf
+hadoop_classpath = phoenix_utils.hadoop_classpath
 
 # TODO: add windows support
 phoenix_file_basename = '%s-queryserver' % getpass.getuser()
@@ -119,7 +120,8 @@ out_file_path = os.path.join(log_dir, phoenix_out_file)
 
 # The command is run through subprocess so environment variables are automatically inherited
 java_cmd = '%(java)s -cp ' + hbase_config_path + os.pathsep + hadoop_config_path + os.pathsep
+ \
-    phoenix_utils.phoenix_client_jar + os.pathsep + phoenix_utils.phoenix_queryserver_jar
 + \
+    phoenix_utils.phoenix_client_jar + os.pathsep + phoenix_utils.phoenix_queryserver_jar
+ \
+    os.pathsep + hadoop_classpath + \
     " -Dproc_phoenixserver" + \
     " -Dlog4j.configuration=file:" + os.path.join(phoenix_utils.current_dir, "log4j.properties")
+ \
     " -Dpsql.root.logger=%(root_logger)s" + \


Mime
View raw message