You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by el...@apache.org on 2016/08/30 22:49:29 UTC

[1/7] phoenix git commit: PHOENIX-3223 Add `hadoop classpath` to PQS classpath when available

Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-0.98 add1de676 -> 68988a84e
  refs/heads/4.8-HBase-1.0 8c2642c43 -> b1d3933a5
  refs/heads/4.8-HBase-1.1 317780bb4 -> 990bb9d4f
  refs/heads/4.8-HBase-1.2 6655d5714 -> 008883a58
  refs/heads/4.x-HBase-0.98 6ae65471d -> 68552306c
  refs/heads/4.x-HBase-1.1 5212931c5 -> 7a82c62ec
  refs/heads/master ede483cf2 -> 93a9c9187


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/7a82c62e
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/7a82c62e
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/7a82c62e

Branch: refs/heads/4.x-HBase-1.1
Commit: 7a82c62ec264b03de85a73f61d0db1530249520b
Parents: 5212931
Author: Josh Elser <el...@apache.org>
Authored: Tue Aug 30 15:58:50 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Aug 30 18:47:05 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/phoenix/blob/7a82c62e/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" + \


[7/7] phoenix git commit: PHOENIX-3223 Add `hadoop classpath` to PQS classpath when available

Posted by el...@apache.org.
PHOENIX-3223 Add `hadoop classpath` to PQS classpath when available

Closes apache/phoenix#205


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

Branch: refs/heads/master
Commit: 93a9c9187f63578b9da9864e06c0df3231c9f61c
Parents: ede483c
Author: Josh Elser <el...@apache.org>
Authored: Tue Aug 30 15:58:50 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Aug 30 18:49:08 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/phoenix/blob/93a9c918/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" + \


[2/7] phoenix git commit: PHOENIX-3223 Add `hadoop classpath` to PQS classpath when available

Posted by el...@apache.org.
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/68552306
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/68552306
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/68552306

Branch: refs/heads/4.x-HBase-0.98
Commit: 68552306cafe5449f55c464c1745253e864fdda6
Parents: 6ae6547
Author: Josh Elser <el...@apache.org>
Authored: Tue Aug 30 15:58:50 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Aug 30 18:47:23 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/phoenix/blob/68552306/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" + \


[5/7] phoenix git commit: PHOENIX-3223 Add `hadoop classpath` to PQS classpath when available

Posted by el...@apache.org.
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/b1d3933a
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/b1d3933a
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/b1d3933a

Branch: refs/heads/4.8-HBase-1.0
Commit: b1d3933a595299504af28bbf0bd2cf13896b5b45
Parents: 8c2642c
Author: Josh Elser <el...@apache.org>
Authored: Tue Aug 30 15:58:50 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Aug 30 18:48:23 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b1d3933a/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" + \


[4/7] phoenix git commit: PHOENIX-3223 Add `hadoop classpath` to PQS classpath when available

Posted by el...@apache.org.
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 <el...@apache.org>
Authored: Tue Aug 30 15:58:50 2016 -0400
Committer: Josh Elser <el...@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" + \


[3/7] phoenix git commit: PHOENIX-3223 Add `hadoop classpath` to PQS classpath when available

Posted by el...@apache.org.
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/008883a5
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/008883a5
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/008883a5

Branch: refs/heads/4.8-HBase-1.2
Commit: 008883a5805c117fbd2209d911b336b44109eb9c
Parents: 6655d57
Author: Josh Elser <el...@apache.org>
Authored: Tue Aug 30 15:58:50 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Aug 30 18:47:37 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/phoenix/blob/008883a5/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" + \


[6/7] phoenix git commit: PHOENIX-3223 Add `hadoop classpath` to PQS classpath when available

Posted by el...@apache.org.
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/68988a84
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/68988a84
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/68988a84

Branch: refs/heads/4.8-HBase-0.98
Commit: 68988a84e6b3cbed5b0d8e550aee8b47f9e0abd2
Parents: add1de6
Author: Josh Elser <el...@apache.org>
Authored: Tue Aug 30 15:58:50 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Aug 30 18:48:30 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/phoenix/blob/68988a84/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" + \