[12/49] phoenix git commit: PHOENIX-1990 bin/queryserver makeWinServiceDesc doesn't actually work in Windows

2015-06-24 Thread tdsilva 
PHOENIX-1990 bin/queryserver makeWinServiceDesc doesn't actually work in Windows


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

Branch: refs/heads/json
Commit: c83ab9edba7b417a001fb702de5d893cbda95f29
Parents: 6fc53b5
Author: Nick Dimiduk ndimi...@apache.org
Authored: Mon May 18 16:00:31 2015 -0700
Committer: Nick Dimiduk ndimi...@apache.org
Committed: Mon May 18 16:00:31 2015 -0700

--
 bin/queryserver.py | 17 ++---
 1 file changed, 14 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c83ab9ed/bin/queryserver.py
--
diff --git a/bin/queryserver.py b/bin/queryserver.py
index 6a18741..7666246 100755
--- a/bin/queryserver.py
+++ b/bin/queryserver.py
@@ -78,11 +78,22 @@ phoenix_out_file = '%s.out' % phoenix_file_basename
 phoenix_pid_file = '%s.pid' % phoenix_file_basename
 opts = os.getenv('PHOENIX_QUERYSERVER_OPTS', '')
 
-# load hbase-env.sh to extract JAVA_HOME, HBASE_PID_DIR, HBASE_LOG_DIR
-hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.sh')
+# load hbase-env.??? to extract JAVA_HOME, HBASE_PID_DIR, HBASE_LOG_DIR
+hbase_env_path = None
+hbase_env_cmd  = None
+if os.name == 'posix':
+hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.sh')
+hbase_env_cmd = ['bash', '-c', 'source %s  env' % hbase_env_path]
+elif os.name == 'nt':
+hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.cmd')
+hbase_env_cmd = ['cmd.exe', '/c', 'call %s  set' % hbase_env_path]
+if not hbase_env_path or not hbase_env_cmd:
+print  sys.stderr, hbase-env file unknown on platform %s % os.name
+sys.exit(-1)
+
 hbase_env = {}
 if os.path.isfile(hbase_env_path):
-p = subprocess.Popen(['bash', '-c', 'source %s  env' % hbase_env_path], 
stdout = subprocess.PIPE)
+p = subprocess.Popen(hbase_env_cmd, stdout = subprocess.PIPE)
 for x in p.stdout:
 (k, _, v) = x.partition('=')
 hbase_env[k.strip()] = v.strip()

phoenix git commit: PHOENIX-1990 bin/queryserver makeWinServiceDesc doesn't actually work in Windows

2015-06-01 Thread ndimiduk 
Repository: phoenix
Updated Branches:
  refs/heads/4.4-HBase-1.0 68e297022 - 5ccfa54c7


PHOENIX-1990 bin/queryserver makeWinServiceDesc doesn't actually work in Windows


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

Branch: refs/heads/4.4-HBase-1.0
Commit: 5ccfa54c71f77d660d46175a0f212c8d3988df1c
Parents: 68e2970
Author: Nick Dimiduk ndimi...@apache.org
Authored: Mon May 18 16:00:31 2015 -0700
Committer: Nick Dimiduk ndimi...@apache.org
Committed: Mon Jun 1 11:52:07 2015 -0700

--
 bin/queryserver.py | 17 ++---
 1 file changed, 14 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/5ccfa54c/bin/queryserver.py
--
diff --git a/bin/queryserver.py b/bin/queryserver.py
index 6a18741..7666246 100755
--- a/bin/queryserver.py
+++ b/bin/queryserver.py
@@ -78,11 +78,22 @@ phoenix_out_file = '%s.out' % phoenix_file_basename
 phoenix_pid_file = '%s.pid' % phoenix_file_basename
 opts = os.getenv('PHOENIX_QUERYSERVER_OPTS', '')
 
-# load hbase-env.sh to extract JAVA_HOME, HBASE_PID_DIR, HBASE_LOG_DIR
-hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.sh')
+# load hbase-env.??? to extract JAVA_HOME, HBASE_PID_DIR, HBASE_LOG_DIR
+hbase_env_path = None
+hbase_env_cmd  = None
+if os.name == 'posix':
+hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.sh')
+hbase_env_cmd = ['bash', '-c', 'source %s  env' % hbase_env_path]
+elif os.name == 'nt':
+hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.cmd')
+hbase_env_cmd = ['cmd.exe', '/c', 'call %s  set' % hbase_env_path]
+if not hbase_env_path or not hbase_env_cmd:
+print  sys.stderr, hbase-env file unknown on platform %s % os.name
+sys.exit(-1)
+
 hbase_env = {}
 if os.path.isfile(hbase_env_path):
-p = subprocess.Popen(['bash', '-c', 'source %s  env' % hbase_env_path], 
stdout = subprocess.PIPE)
+p = subprocess.Popen(hbase_env_cmd, stdout = subprocess.PIPE)
 for x in p.stdout:
 (k, _, v) = x.partition('=')
 hbase_env[k.strip()] = v.strip()

phoenix git commit: PHOENIX-1990 bin/queryserver makeWinServiceDesc doesn't actually work in Windows

2015-06-01 Thread ndimiduk 
Repository: phoenix
Updated Branches:
  refs/heads/4.4-HBase-0.98 96cb2c728 - 44c512116


PHOENIX-1990 bin/queryserver makeWinServiceDesc doesn't actually work in Windows


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

Branch: refs/heads/4.4-HBase-0.98
Commit: 44c51211677bc793fa5df64c1638c2606723a82c
Parents: 96cb2c7
Author: Nick Dimiduk ndimi...@apache.org
Authored: Mon May 18 16:00:31 2015 -0700
Committer: Nick Dimiduk ndimi...@apache.org
Committed: Mon Jun 1 11:52:17 2015 -0700

--
 bin/queryserver.py | 17 ++---
 1 file changed, 14 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/44c51211/bin/queryserver.py
--
diff --git a/bin/queryserver.py b/bin/queryserver.py
index 6a18741..7666246 100755
--- a/bin/queryserver.py
+++ b/bin/queryserver.py
@@ -78,11 +78,22 @@ phoenix_out_file = '%s.out' % phoenix_file_basename
 phoenix_pid_file = '%s.pid' % phoenix_file_basename
 opts = os.getenv('PHOENIX_QUERYSERVER_OPTS', '')
 
-# load hbase-env.sh to extract JAVA_HOME, HBASE_PID_DIR, HBASE_LOG_DIR
-hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.sh')
+# load hbase-env.??? to extract JAVA_HOME, HBASE_PID_DIR, HBASE_LOG_DIR
+hbase_env_path = None
+hbase_env_cmd  = None
+if os.name == 'posix':
+hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.sh')
+hbase_env_cmd = ['bash', '-c', 'source %s  env' % hbase_env_path]
+elif os.name == 'nt':
+hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.cmd')
+hbase_env_cmd = ['cmd.exe', '/c', 'call %s  set' % hbase_env_path]
+if not hbase_env_path or not hbase_env_cmd:
+print  sys.stderr, hbase-env file unknown on platform %s % os.name
+sys.exit(-1)
+
 hbase_env = {}
 if os.path.isfile(hbase_env_path):
-p = subprocess.Popen(['bash', '-c', 'source %s  env' % hbase_env_path], 
stdout = subprocess.PIPE)
+p = subprocess.Popen(hbase_env_cmd, stdout = subprocess.PIPE)
 for x in p.stdout:
 (k, _, v) = x.partition('=')
 hbase_env[k.strip()] = v.strip()

phoenix git commit: PHOENIX-1990 bin/queryserver makeWinServiceDesc doesn't actually work in Windows

2015-05-18 Thread ndimiduk 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 fc19c0e7b - 1b943dbf2


PHOENIX-1990 bin/queryserver makeWinServiceDesc doesn't actually work in Windows


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 1b943dbf21d1bda56b21289218f6a2feb6903f59
Parents: fc19c0e
Author: Nick Dimiduk ndimi...@apache.org
Authored: Mon May 18 16:00:31 2015 -0700
Committer: Nick Dimiduk ndimi...@apache.org
Committed: Mon May 18 16:43:35 2015 -0700

--
 bin/queryserver.py | 17 ++---
 1 file changed, 14 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/1b943dbf/bin/queryserver.py
--
diff --git a/bin/queryserver.py b/bin/queryserver.py
index 6a18741..7666246 100755
--- a/bin/queryserver.py
+++ b/bin/queryserver.py
@@ -78,11 +78,22 @@ phoenix_out_file = '%s.out' % phoenix_file_basename
 phoenix_pid_file = '%s.pid' % phoenix_file_basename
 opts = os.getenv('PHOENIX_QUERYSERVER_OPTS', '')
 
-# load hbase-env.sh to extract JAVA_HOME, HBASE_PID_DIR, HBASE_LOG_DIR
-hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.sh')
+# load hbase-env.??? to extract JAVA_HOME, HBASE_PID_DIR, HBASE_LOG_DIR
+hbase_env_path = None
+hbase_env_cmd  = None
+if os.name == 'posix':
+hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.sh')
+hbase_env_cmd = ['bash', '-c', 'source %s  env' % hbase_env_path]
+elif os.name == 'nt':
+hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.cmd')
+hbase_env_cmd = ['cmd.exe', '/c', 'call %s  set' % hbase_env_path]
+if not hbase_env_path or not hbase_env_cmd:
+print  sys.stderr, hbase-env file unknown on platform %s % os.name
+sys.exit(-1)
+
 hbase_env = {}
 if os.path.isfile(hbase_env_path):
-p = subprocess.Popen(['bash', '-c', 'source %s  env' % hbase_env_path], 
stdout = subprocess.PIPE)
+p = subprocess.Popen(hbase_env_cmd, stdout = subprocess.PIPE)
 for x in p.stdout:
 (k, _, v) = x.partition('=')
 hbase_env[k.strip()] = v.strip()

phoenix git commit: PHOENIX-1990 bin/queryserver makeWinServiceDesc doesn't actually work in Windows

2015-05-18 Thread ndimiduk 
Repository: phoenix
Updated Branches:
  refs/heads/master 6fc53b579 - c83ab9edb


PHOENIX-1990 bin/queryserver makeWinServiceDesc doesn't actually work in Windows


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

Branch: refs/heads/master
Commit: c83ab9edba7b417a001fb702de5d893cbda95f29
Parents: 6fc53b5
Author: Nick Dimiduk ndimi...@apache.org
Authored: Mon May 18 16:00:31 2015 -0700
Committer: Nick Dimiduk ndimi...@apache.org
Committed: Mon May 18 16:00:31 2015 -0700

--
 bin/queryserver.py | 17 ++---
 1 file changed, 14 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c83ab9ed/bin/queryserver.py
--
diff --git a/bin/queryserver.py b/bin/queryserver.py
index 6a18741..7666246 100755
--- a/bin/queryserver.py
+++ b/bin/queryserver.py
@@ -78,11 +78,22 @@ phoenix_out_file = '%s.out' % phoenix_file_basename
 phoenix_pid_file = '%s.pid' % phoenix_file_basename
 opts = os.getenv('PHOENIX_QUERYSERVER_OPTS', '')
 
-# load hbase-env.sh to extract JAVA_HOME, HBASE_PID_DIR, HBASE_LOG_DIR
-hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.sh')
+# load hbase-env.??? to extract JAVA_HOME, HBASE_PID_DIR, HBASE_LOG_DIR
+hbase_env_path = None
+hbase_env_cmd  = None
+if os.name == 'posix':
+hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.sh')
+hbase_env_cmd = ['bash', '-c', 'source %s  env' % hbase_env_path]
+elif os.name == 'nt':
+hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.cmd')
+hbase_env_cmd = ['cmd.exe', '/c', 'call %s  set' % hbase_env_path]
+if not hbase_env_path or not hbase_env_cmd:
+print  sys.stderr, hbase-env file unknown on platform %s % os.name
+sys.exit(-1)
+
 hbase_env = {}
 if os.path.isfile(hbase_env_path):
-p = subprocess.Popen(['bash', '-c', 'source %s  env' % hbase_env_path], 
stdout = subprocess.PIPE)
+p = subprocess.Popen(hbase_env_cmd, stdout = subprocess.PIPE)
 for x in p.stdout:
 (k, _, v) = x.partition('=')
 hbase_env[k.strip()] = v.strip()

phoenix git commit: PHOENIX-1990 bin/queryserver makeWinServiceDesc doesn't actually work in Windows

2015-05-18 Thread ndimiduk 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 8176499c2 - deb478652


PHOENIX-1990 bin/queryserver makeWinServiceDesc doesn't actually work in Windows


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

Branch: refs/heads/4.x-HBase-1.0
Commit: deb478652c00c3570a7be7c4b998f99dfbd66f7a
Parents: 8176499
Author: Nick Dimiduk ndimi...@apache.org
Authored: Mon May 18 16:00:31 2015 -0700
Committer: Nick Dimiduk ndimi...@apache.org
Committed: Mon May 18 16:43:25 2015 -0700

--
 bin/queryserver.py | 17 ++---
 1 file changed, 14 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/deb47865/bin/queryserver.py
--
diff --git a/bin/queryserver.py b/bin/queryserver.py
index 6a18741..7666246 100755
--- a/bin/queryserver.py
+++ b/bin/queryserver.py
@@ -78,11 +78,22 @@ phoenix_out_file = '%s.out' % phoenix_file_basename
 phoenix_pid_file = '%s.pid' % phoenix_file_basename
 opts = os.getenv('PHOENIX_QUERYSERVER_OPTS', '')
 
-# load hbase-env.sh to extract JAVA_HOME, HBASE_PID_DIR, HBASE_LOG_DIR
-hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.sh')
+# load hbase-env.??? to extract JAVA_HOME, HBASE_PID_DIR, HBASE_LOG_DIR
+hbase_env_path = None
+hbase_env_cmd  = None
+if os.name == 'posix':
+hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.sh')
+hbase_env_cmd = ['bash', '-c', 'source %s  env' % hbase_env_path]
+elif os.name == 'nt':
+hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.cmd')
+hbase_env_cmd = ['cmd.exe', '/c', 'call %s  set' % hbase_env_path]
+if not hbase_env_path or not hbase_env_cmd:
+print  sys.stderr, hbase-env file unknown on platform %s % os.name
+sys.exit(-1)
+
 hbase_env = {}
 if os.path.isfile(hbase_env_path):
-p = subprocess.Popen(['bash', '-c', 'source %s  env' % hbase_env_path], 
stdout = subprocess.PIPE)
+p = subprocess.Popen(hbase_env_cmd, stdout = subprocess.PIPE)
 for x in p.stdout:
 (k, _, v) = x.partition('=')
 hbase_env[k.strip()] = v.strip()