Return-Path: X-Original-To: apmail-phoenix-commits-archive@minotaur.apache.org Delivered-To: apmail-phoenix-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 73C4118D0F for ; Wed, 24 Jun 2015 20:23:57 +0000 (UTC) Received: (qmail 84748 invoked by uid 500); 24 Jun 2015 20:23:57 -0000 Delivered-To: apmail-phoenix-commits-archive@phoenix.apache.org Received: (qmail 84703 invoked by uid 500); 24 Jun 2015 20:23:57 -0000 Mailing-List: contact commits-help@phoenix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@phoenix.apache.org Delivered-To: mailing list commits@phoenix.apache.org Received: (qmail 84678 invoked by uid 99); 24 Jun 2015 20:23:57 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Jun 2015 20:23:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 16FC7E08EA; Wed, 24 Jun 2015 20:23:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tdsilva@apache.org To: commits@phoenix.apache.org Date: Wed, 24 Jun 2015 20:23:57 -0000 Message-Id: <5312c7b805ef46998125644800c0460e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/49] phoenix git commit: PHOENIX-1948 bin scripts run under make_rc.sh packaging Repository: phoenix Updated Branches: refs/heads/json b47dcb660 -> 03a6ac002 PHOENIX-1948 bin scripts run under make_rc.sh packaging Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/45a919f3 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/45a919f3 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/45a919f3 Branch: refs/heads/json Commit: 45a919f380a2743bdcf3838da2cd9873c3f518c0 Parents: b47dcb6 Author: Nick Dimiduk Authored: Wed May 6 09:58:35 2015 -0700 Committer: Nick Dimiduk Committed: Wed May 6 09:58:35 2015 -0700 ---------------------------------------------------------------------- bin/phoenix_utils.py | 142 +++++++++++++++++++++++++++------------------- 1 file changed, 84 insertions(+), 58 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/45a919f3/bin/phoenix_utils.py ---------------------------------------------------------------------- diff --git a/bin/phoenix_utils.py b/bin/phoenix_utils.py index 2cf7db7..383e0e1 100755 --- a/bin/phoenix_utils.py +++ b/bin/phoenix_utils.py @@ -41,7 +41,8 @@ def find(pattern, classPaths): return "" def findFileInPathWithoutRecursion(pattern, path): - + if not os.path.exists(path): + return "" files = [f for f in os.listdir(path) if os.path.isfile(os.path.join(path,f))] # sort the file names so *-client always precedes *-thin-client files.sort() @@ -52,63 +53,71 @@ def findFileInPathWithoutRecursion(pattern, path): return "" def setPath(): - PHOENIX_CLIENT_JAR_PATTERN = "phoenix-*-client.jar" - PHOENIX_THIN_CLIENT_JAR_PATTERN = "phoenix-*-thin-client.jar" - PHOENIX_QUERYSERVER_JAR_PATTERN = "phoenix-server-*-runnable.jar" - PHOENIX_TESTS_JAR_PATTERN = "phoenix-core-*-tests*.jar" - global current_dir - current_dir = os.path.dirname(os.path.abspath(__file__)) - global phoenix_jar_path - phoenix_jar_path = os.path.join(current_dir, "..", "phoenix-assembly", "target","*") - global phoenix_client_jar - 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 hadoop_common_jar_path - hadoop_common_jar_path = os.path.join(current_dir, "..", "phoenix-assembly", "target","*") - global hadoop_common_jar - hadoop_common_jar = find("hadoop-common*.jar", hadoop_common_jar_path) - global hadoop_hdfs_jar_path - hadoop_hdfs_jar_path = os.path.join(current_dir, "..", "phoenix-assembly", "target","*") - global hadoop_hdfs_jar - hadoop_hdfs_jar = find("hadoop-hdfs*.jar", hadoop_hdfs_jar_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 - phoenix_queryserver_jar = find(PHOENIX_QUERYSERVER_JAR_PATTERN, os.path.join(current_dir, "..", "phoenix-server", "target", "*")) - global phoenix_thin_client_jar - phoenix_thin_client_jar = find(PHOENIX_THIN_CLIENT_JAR_PATTERN, os.path.join(current_dir, "..", "phoenix-server-client", "target", "*")) - - if phoenix_client_jar == "": - phoenix_client_jar = findFileInPathWithoutRecursion(PHOENIX_CLIENT_JAR_PATTERN, os.path.join(current_dir, "..")) - - if phoenix_thin_client_jar == "": - phoenix_thin_client_jar = findFileInPathWithoutRecursion(PHOENIX_THIN_CLIENT_JAR_PATTERN, os.path.join(current_dir, "..")) - - if phoenix_queryserver_jar == "": - phoenix_queryserver_jar = findFileInPathWithoutRecursion(PHOENIX_QUERYSERVER_JAR_PATTERN, os.path.join(current_dir, "..", "lib")) - - if testjar == "": - testjar = findFileInPathWithoutRecursion(PHOENIX_TESTS_JAR_PATTERN, os.path.join(current_dir, "..")) - - # Backward support old env variable PHOENIX_LIB_DIR replaced by PHOENIX_CLASS_PATH - global phoenix_class_path - phoenix_class_path = os.getenv('PHOENIX_LIB_DIR','') - if phoenix_class_path == "": - phoenix_class_path = os.getenv('PHOENIX_CLASS_PATH','') - - if phoenix_client_jar == "": - phoenix_client_jar = find(PHOENIX_CLIENT_JAR_PATTERN, phoenix_class_path) - - if testjar == "": - testjar = find(PHOENIX_TESTS_JAR_PATTERN, phoenix_class_path) - - return "" + PHOENIX_CLIENT_JAR_PATTERN = "phoenix-*-client.jar" + PHOENIX_THIN_CLIENT_JAR_PATTERN = "phoenix-*-thin-client.jar" + PHOENIX_QUERYSERVER_JAR_PATTERN = "phoenix-server-*-runnable.jar" + PHOENIX_TESTS_JAR_PATTERN = "phoenix-core-*-tests*.jar" + + # Backward support old env variable PHOENIX_LIB_DIR replaced by PHOENIX_CLASS_PATH + global phoenix_class_path + phoenix_class_path = os.getenv('PHOENIX_LIB_DIR','') + if phoenix_class_path == "": + phoenix_class_path = os.getenv('PHOENIX_CLASS_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 current_dir + current_dir = os.path.dirname(os.path.abspath(__file__)) + + global phoenix_jar_path + phoenix_jar_path = os.path.join(current_dir, "..", "phoenix-assembly", "target","*") + + global phoenix_client_jar + phoenix_client_jar = find("phoenix-*-client.jar", phoenix_jar_path) + if phoenix_client_jar == "": + phoenix_client_jar = findFileInPathWithoutRecursion(PHOENIX_CLIENT_JAR_PATTERN, os.path.join(current_dir, "..")) + if phoenix_client_jar == "": + phoenix_client_jar = find(PHOENIX_CLIENT_JAR_PATTERN, phoenix_class_path) + + global phoenix_test_jar_path + phoenix_test_jar_path = os.path.join(current_dir, "..", "phoenix-core", "target","*") + + global hadoop_common_jar_path + hadoop_common_jar_path = os.path.join(current_dir, "..", "phoenix-assembly", "target","*") + + global hadoop_common_jar + hadoop_common_jar = find("hadoop-common*.jar", hadoop_common_jar_path) + + global hadoop_hdfs_jar_path + hadoop_hdfs_jar_path = os.path.join(current_dir, "..", "phoenix-assembly", "target","*") + + global hadoop_hdfs_jar + hadoop_hdfs_jar = find("hadoop-hdfs*.jar", hadoop_hdfs_jar_path) + + global testjar + testjar = find(PHOENIX_TESTS_JAR_PATTERN, phoenix_test_jar_path) + if testjar == "": + testjar = findFileInPathWithoutRecursion(PHOENIX_TESTS_JAR_PATTERN, os.path.join(current_dir, "..")) + if testjar == "": + testjar = find(PHOENIX_TESTS_JAR_PATTERN, phoenix_class_path) + + global phoenix_queryserver_jar + phoenix_queryserver_jar = find(PHOENIX_QUERYSERVER_JAR_PATTERN, os.path.join(current_dir, "..", "phoenix-server", "target", "*")) + if phoenix_queryserver_jar == "": + phoenix_queryserver_jar = findFileInPathWithoutRecursion(PHOENIX_QUERYSERVER_JAR_PATTERN, os.path.join(current_dir, "..", "lib")) + if phoenix_queryserver_jar == "": + phoenix_queryserver_jar = findFileInPathWithoutRecursion(PHOENIX_QUERYSERVER_JAR_PATTERN, os.path.join(current_dir, "..")) + + + global phoenix_thin_client_jar + phoenix_thin_client_jar = find(PHOENIX_THIN_CLIENT_JAR_PATTERN, os.path.join(current_dir, "..", "phoenix-server-client", "target", "*")) + if phoenix_thin_client_jar == "": + phoenix_thin_client_jar = findFileInPathWithoutRecursion(PHOENIX_THIN_CLIENT_JAR_PATTERN, os.path.join(current_dir, "..")) + + return "" def shell_quote(args): """ @@ -124,3 +133,20 @@ def shell_quote(args): # pipes module isn't available on Windows import pipes return " ".join([pipes.quote(v) for v in args]) + +if __name__ == "__main__": + setPath() + print "phoenix_class_path:", phoenix_class_path + print "hbase_conf_dir:", hbase_conf_dir + print "hbase_conf_path:", hbase_conf_path + print "current_dir:", current_dir + print "phoenix_jar_path:", phoenix_jar_path + print "phoenix_client_jar:", phoenix_client_jar + print "phoenix_test_jar_path:", phoenix_test_jar_path + print "hadoop_common_jar_path:", hadoop_common_jar_path + print "hadoop_common_jar:", hadoop_common_jar + print "hadoop_hdfs_jar_path:", hadoop_hdfs_jar_path + print "hadoop_hdfs_jar:", hadoop_hdfs_jar + print "testjar:", testjar + print "phoenix_queryserver_jar:", phoenix_queryserver_jar + print "phoenix_thin_client_jar:", phoenix_thin_client_jar