incubator-hawq git commit: HAWQ-1396. Add cases for querying hcatalog via PXF with Ranger enable.

2017-03-27 Thread wlin 
Repository: incubator-hawq
Updated Branches:
  refs/heads/master a803aab4e -> 9d88cdd81


HAWQ-1396. Add cases for querying hcatalog via PXF with Ranger enable.


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/9d88cdd8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/9d88cdd8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/9d88cdd8

Branch: refs/heads/master
Commit: 9d88cdd8187b9f26ed8c43411b2b45ea18b65e48
Parents: a803aab
Author: interma 
Authored: Mon Mar 27 13:44:18 2017 +0800
Committer: Wen Lin 
Committed: Tue Mar 28 11:19:46 2017 +0800

--
 src/test/feature/Ranger/ans/pxf1_fail.ans| 10 
 src/test/feature/Ranger/ans/pxf1_success.ans | 14 ++
 src/test/feature/Ranger/data/testhive.sql|  5 
 src/test/feature/Ranger/pxfpolicy/1/1.json   |  1 +
 src/test/feature/Ranger/pxfpolicy/1/2.json   |  1 +
 src/test/feature/Ranger/pxfpolicy/1/3.json   |  1 +
 src/test/feature/Ranger/sql/pxf/1.sql|  2 ++
 src/test/feature/Ranger/test_ranger.cpp  | 31 +++
 8 files changed, 65 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/9d88cdd8/src/test/feature/Ranger/ans/pxf1_fail.ans
--
diff --git a/src/test/feature/Ranger/ans/pxf1_fail.ans 
b/src/test/feature/Ranger/ans/pxf1_fail.ans
new file mode 100644
index 000..a8a7197
--- /dev/null
+++ b/src/test/feature/Ranger/ans/pxf1_fail.ans
@@ -0,0 +1,10 @@
+-- start_ignore
+SET SEARCH_PATH=TestHawqRanger_HcatalogTest;
+SET
+-- end_ignore
+set session role= 'userpxf1';
+SET
+select * from hcatalog.default.testhive;
+psql:/tmp/TestHawqRanger_HcatalogTest.sql:5: ERROR:  permission denied for 
schema default
+LINE 1: select * from hcatalog.default.testhive;
+  ^

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/9d88cdd8/src/test/feature/Ranger/ans/pxf1_success.ans
--
diff --git a/src/test/feature/Ranger/ans/pxf1_success.ans 
b/src/test/feature/Ranger/ans/pxf1_success.ans
new file mode 100644
index 000..8a0088f
--- /dev/null
+++ b/src/test/feature/Ranger/ans/pxf1_success.ans
@@ -0,0 +1,14 @@
+-- start_ignore
+SET SEARCH_PATH=TestHawqRanger_HcatalogTest;
+SET
+-- end_ignore
+set session role= 'userpxf1';
+SET
+select * from hcatalog.default.testhive;
+ a | b 
+---+---
+ 1 | 2
+ 2 | 4
+ 3 | 6
+(3 rows)
+

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/9d88cdd8/src/test/feature/Ranger/data/testhive.sql
--
diff --git a/src/test/feature/Ranger/data/testhive.sql 
b/src/test/feature/Ranger/data/testhive.sql
new file mode 100644
index 000..3ae6c58
--- /dev/null
+++ b/src/test/feature/Ranger/data/testhive.sql
@@ -0,0 +1,5 @@
+drop table if exists testhive;
+CREATE TABLE testhive (a int, b int) ;
+INSERT INTO testhive VALUES(1, 2);
+INSERT INTO testhive VALUES(2, 4);
+INSERT INTO testhive VALUES(3, 6);

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/9d88cdd8/src/test/feature/Ranger/pxfpolicy/1/1.json
--
diff --git a/src/test/feature/Ranger/pxfpolicy/1/1.json 
b/src/test/feature/Ranger/pxfpolicy/1/1.json
new file mode 100644
index 000..50b821b
--- /dev/null
+++ b/src/test/feature/Ranger/pxfpolicy/1/1.json
@@ -0,0 +1 @@
+{"allowExceptions": [], "denyExceptions": [], "denyPolicyItems": [], 
"description": "no description", "isAuditEnabled": true, "isEnabled": true, 
"name": "pxfpolicy1-1", "policyItems": [{"accesses": [{"isAllowed": true, 
"type": "usage-schema"}], "conditions": [], "delegateAdmin": true, "groups": 
null, "users": ["userpxf1"]}], "resources": {"database": {"isExcludes": false, 
"isRecursive": false, "values": ["hcatalog"]}, "schema": {"isExcludes": false, 
"isRecursive": false, "values": ["default"]}, "table": {"isExcludes": false, 
"isRecursive": false, "values": ["*"]}}, "service": "hawq", "version": 3}

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/9d88cdd8/src/test/feature/Ranger/pxfpolicy/1/2.json
--
diff --git a/src/test/feature/Ranger/pxfpolicy/1/2.json 
b/src/test/feature/Ranger/pxfpolicy/1/2.json
new file mode 100644
index 000..ff97050
--- /dev/null
+++ b/src/test/feature/Ranger/pxfpolicy/1/2.json
@@ -0,0 +1 @@
+{"allowExceptions": [], "denyExceptions": [], "denyPolicyItems": [], 
"description": "no description", "isAuditEnabled": true, "isEnabled": true, 
"name": "pxfpolicy1-2", "policyItems": [{"accesses": [{"isAllowed": true, 
"type": "select"}], "conditions": [],

incubator-hawq git commit: HAWQ-1415. Set the default_value of JAVA_HOME for running RPS (close #1197)

2017-03-27 Thread lilima 
Repository: incubator-hawq
Updated Branches:
  refs/heads/master 34cea88d1 -> a803aab4e


HAWQ-1415. Set the default_value of JAVA_HOME for running RPS
(close #1197)


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

Branch: refs/heads/master
Commit: a803aab4eec4a71e83d2bd18bb72b93ba4be31a2
Parents: 34cea88
Author: ljainpivotalio 
Authored: Mon Mar 27 16:28:42 2017 -0700
Committer: Lili Ma 
Committed: Tue Mar 28 10:40:04 2017 +0800

--
 ranger-plugin/conf/rps.properties |  3 +++
 ranger-plugin/scripts/enable-ranger-plugin.sh | 21 -
 ranger-plugin/scripts/rps.sh  |  1 +
 3 files changed, 24 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/a803aab4/ranger-plugin/conf/rps.properties
--
diff --git a/ranger-plugin/conf/rps.properties 
b/ranger-plugin/conf/rps.properties
index 81a6986..7565885 100644
--- a/ranger-plugin/conf/rps.properties
+++ b/ranger-plugin/conf/rps.properties
@@ -36,3 +36,6 @@ RPS_HEAP_SIZE=128m
 
 # use CATALINA_HOME in default and use /usr/lib/bigtop-tomcat if CATALINA_HOME 
not set
 CATALINA_HOME=${CATALINA_HOME:-/usr/lib/bigtop-tomcat}
+
+# use JAVA_HOME in default and use /usr/java/default if JAVA_HOME not set
+JAVA_HOME=${JAVA_HOME:-/usr/java/default}

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/a803aab4/ranger-plugin/scripts/enable-ranger-plugin.sh
--
diff --git a/ranger-plugin/scripts/enable-ranger-plugin.sh 
b/ranger-plugin/scripts/enable-ranger-plugin.sh
index 05a0b1d..febaf81 100755
--- a/ranger-plugin/scripts/enable-ranger-plugin.sh
+++ b/ranger-plugin/scripts/enable-ranger-plugin.sh
@@ -150,7 +150,7 @@ function validate_params() {
   get_hawq_password
   echo "RANGER URL  = ${RANGER_URL}" 
   echo "RANGER User = ${RANGER_USER}" 
-  echo "RANGER Password = $(mask ${RANGER_PASSWORD})" 
+  echo "RANGER Password = $(mask ${RANGER_PASSWORD})"
   echo "HAWQ HOST = ${HAWQ_HOST}"
   echo "HAWQ PORT = ${HAWQ_PORT}"  
   echo "HAWQ User = ${HAWQ_USER}" 
@@ -211,6 +211,24 @@ function update_ranger_url() {
   echo "Updated POLICY_MGR_URL to ${policy_mgr_url} in ${prop_file}"
 }
 
+function update_java_home() {
+  local java_base="/usr/jdk64"
+  if [[ -d ${java_base} ]]; then
+local DIR_NAME=$(ls ${java_base} | sort -r | head -1)
+
+if [[ ${DIR_NAME} ]]; then
+  JAVA_HOME_DIR="${java_base}/${DIR_NAME}"
+  local prop_file=$(dirname ${SCRIPT_DIR})/etc/rps.properties
+  sed -i -e "s|/usr/java/default|${JAVA_HOME_DIR}|g" ${prop_file}
+  echo "Updated default value of JAVA_HOME to ${JAVA_HOME_DIR} in 
${prop_file}"
+fi
+  fi
+
+  if [[ ! ${JAVA_HOME_DIR} && ! ${JAVA_HOME} ]]; then
+echo "Unable to locate JAVA_HOME on this machine. Please modify the 
default value of JAVA_HOME in ${prop_file}."
+  fi
+}
+
 main() {
   if [[ $# -lt 1 ]]; then
 usage
@@ -221,5 +239,6 @@ main() {
   create_hawq_service_definition
   create_hawq_service_instance
   update_ranger_url
+  update_java_home
 }
 main "$@"

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/a803aab4/ranger-plugin/scripts/rps.sh
--
diff --git a/ranger-plugin/scripts/rps.sh b/ranger-plugin/scripts/rps.sh
index fa268c9..70aa547 100755
--- a/ranger-plugin/scripts/rps.sh
+++ b/ranger-plugin/scripts/rps.sh
@@ -32,6 +32,7 @@ BASEDIR=$( dirname ${CWDIR} )
 # read properties from the file
 source ${BASEDIR}/etc/rps.properties
 
+export JAVA_HOME
 export CATALINA_HOME
 export CATALINA_BASE=${BASEDIR}/plugin-service
 export CATALINA_PID=${CATALINA_BASE}/work/rps.pid

[1/2] incubator-hawq git commit: [#140722851] PXF to use file level stats for count(*) without condition.

2017-03-27 Thread odiachenko 
Repository: incubator-hawq
Updated Branches:
  refs/heads/140722851 [created] 478f0a891


[#140722851] PXF to use file level stats for count(*) without condition.


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/73a20485
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/73a20485
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/73a20485

Branch: refs/heads/140722851
Commit: 73a204854f6400d31f5b26237ed8df9dfb087d91
Parents: 55d9e85
Author: Oleksandr Diachenko 
Authored: Wed Mar 8 13:45:13 2017 -0800
Committer: Oleksandr Diachenko 
Committed: Fri Mar 17 15:18:25 2017 -0700

--
 .../pxf/api/utilities/EnumAggregationType.java  |  51 +++
 .../pxf/api/utilities/FragmentMetadata.java |  59 +
 .../hawq/pxf/api/utilities/InputData.java   |   9 ++
 .../hawq/pxf/api/utilities/Utilities.java   |  25 ++
 .../plugins/hdfs/HdfsAtomicDataAccessor.java|   2 +-
 .../hdfs/HdfsSplittableDataAccessor.java|   2 +-
 .../plugins/hdfs/utilities/HdfsUtilities.java   |  26 +-
 .../hawq/pxf/plugins/hive/HiveORCAccessor.java  |  69 ++-
 .../plugins/hive/utilities/HiveUtilities.java   |  23 +
 pxf/pxf-service/src/main/.DS_Store  | Bin 0 -> 6148 bytes
 .../org/apache/hawq/pxf/service/AggBridge.java  |  86 +++
 .../hawq/pxf/service/rest/BridgeResource.java   |   4 +-
 .../pxf/service/utilities/ProtocolData.java |   5 ++
 13 files changed, 333 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/73a20485/pxf/pxf-api/src/main/java/org/apache/hawq/pxf/api/utilities/EnumAggregationType.java
--
diff --git 
a/pxf/pxf-api/src/main/java/org/apache/hawq/pxf/api/utilities/EnumAggregationType.java
 
b/pxf/pxf-api/src/main/java/org/apache/hawq/pxf/api/utilities/EnumAggregationType.java
new file mode 100644
index 000..ee38f18
--- /dev/null
+++ 
b/pxf/pxf-api/src/main/java/org/apache/hawq/pxf/api/utilities/EnumAggregationType.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.hawq.pxf.api.utilities;
+
+public enum EnumAggregationType {
+
+COUNT("count", true),
+UNKNOWN("unknown", false);
+
+private String aggOperationCode;
+private boolean optimizationSupported;
+
+EnumAggregationType(String aggOperationCode, boolean 
optimizationSupported) {
+this.aggOperationCode = aggOperationCode;
+this.optimizationSupported = optimizationSupported;
+}
+
+public String getAggOperationCode() {
+return this.aggOperationCode;
+}
+
+public boolean isOptimizationSupported() {
+return this.optimizationSupported;
+}
+
+public static EnumAggregationType getAggregationType(String 
aggOperationCode) {
+for (EnumAggregationType at : values()) {
+if (at.getAggOperationCode().equals(aggOperationCode)) {
+return at;
+}
+}
+return EnumAggregationType.UNKNOWN;
+}
+}

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/73a20485/pxf/pxf-api/src/main/java/org/apache/hawq/pxf/api/utilities/FragmentMetadata.java
--
diff --git 
a/pxf/pxf-api/src/main/java/org/apache/hawq/pxf/api/utilities/FragmentMetadata.java
 
b/pxf/pxf-api/src/main/java/org/apache/hawq/pxf/api/utilities/FragmentMetadata.java
new file mode 100644
index 000..7a82065
--- /dev/null
+++ 
b/pxf/pxf-api/src/main/java/org/apache/hawq/pxf/api/utilities/FragmentMetadata.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+

[incubator-hawq] Git Push Summary

2017-03-27 Thread odiachenko 
Repository: incubator-hawq
Updated Branches:
  refs/heads/140722851 [deleted] 478f0a891

[2/2] incubator-hawq git commit: [#140722851] Applied code-review feedback.

2017-03-27 Thread odiachenko 
[#140722851] Applied code-review feedback.


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/478f0a89
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/478f0a89
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/478f0a89

Branch: refs/heads/140722851
Commit: 478f0a89163554a835bf3963b4a7e2df3341fe34
Parents: 73a2048
Author: Oleksandr Diachenko 
Authored: Mon Mar 27 17:11:47 2017 -0700
Committer: Oleksandr Diachenko 
Committed: Mon Mar 27 17:11:47 2017 -0700

--
 .../org/apache/hawq/pxf/api/StatsAccessor.java  | 40 ++
 .../pxf/api/utilities/EnumAggregationType.java  |  2 +-
 .../pxf/api/utilities/FragmentMetadata.java | 17 +++-
 .../hawq/pxf/api/utilities/Utilities.java   | 44 ++--
 .../hawq/pxf/plugins/hive/HiveORCAccessor.java  | 42 ++-
 .../org/apache/hawq/pxf/service/AggBridge.java  |  5 +++
 .../pxf/service/utilities/ProtocolData.java |  1 +
 7 files changed, 127 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/478f0a89/pxf/pxf-api/src/main/java/org/apache/hawq/pxf/api/StatsAccessor.java
--
diff --git 
a/pxf/pxf-api/src/main/java/org/apache/hawq/pxf/api/StatsAccessor.java 
b/pxf/pxf-api/src/main/java/org/apache/hawq/pxf/api/StatsAccessor.java
new file mode 100644
index 000..724448b
--- /dev/null
+++ b/pxf/pxf-api/src/main/java/org/apache/hawq/pxf/api/StatsAccessor.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.hawq.pxf.api;
+
+import org.apache.hawq.pxf.api.OneRow;
+
+/**
+ * Interface of accessor which can leverage statistic information for 
aggregate queries
+ *
+ */
+public interface StatsAccessor {
+
+/**
+ * Method which reads needed statistics for current split
+ */
+public void retrieveStats() throws Exception;
+
+/**
+ * Returns next tuple based on statistics information without actual 
reading of data
+ */
+public OneRow emitAggObject();
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/478f0a89/pxf/pxf-api/src/main/java/org/apache/hawq/pxf/api/utilities/EnumAggregationType.java
--
diff --git 
a/pxf/pxf-api/src/main/java/org/apache/hawq/pxf/api/utilities/EnumAggregationType.java
 
b/pxf/pxf-api/src/main/java/org/apache/hawq/pxf/api/utilities/EnumAggregationType.java
index ee38f18..69716c6 100644
--- 
a/pxf/pxf-api/src/main/java/org/apache/hawq/pxf/api/utilities/EnumAggregationType.java
+++ 
b/pxf/pxf-api/src/main/java/org/apache/hawq/pxf/api/utilities/EnumAggregationType.java
@@ -27,7 +27,7 @@ public enum EnumAggregationType {
 private String aggOperationCode;
 private boolean optimizationSupported;
 
-EnumAggregationType(String aggOperationCode, boolean 
optimizationSupported) {
+private EnumAggregationType(String aggOperationCode, boolean 
optimizationSupported) {
 this.aggOperationCode = aggOperationCode;
 this.optimizationSupported = optimizationSupported;
 }

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/478f0a89/pxf/pxf-api/src/main/java/org/apache/hawq/pxf/api/utilities/FragmentMetadata.java
--
diff --git 
a/pxf/pxf-api/src/main/java/org/apache/hawq/pxf/api/utilities/FragmentMetadata.java
 
b/pxf/pxf-api/src/main/java/org/apache/hawq/pxf/api/utilities/FragmentMetadata.java
index 7a82065..7f266ec 100644
--- 
a/pxf/pxf-api/src/main/java/org/apache/hawq/pxf/api/utilities/FragmentMetadata.java
+++ 
b/pxf/pxf-api/src/main/java/org/apache/hawq/pxf/api/utilities/FragmentMetadata.java
@@ -19,9 +19,12 @@
 
 package org.apache.hawq.pxf.api.utilities;
 
+/**
+ * Class which holds metadata of a file split and locality information.
+ *
+ */
 public class FragmentMetadata {
 
-
 private

incubator-hawq git commit: HAWQ-1414. Bump up PXF version to 3.2.1.0.

2017-03-27 Thread odiachenko 
Repository: incubator-hawq
Updated Branches:
  refs/heads/master 9a4ff843f -> 34cea88d1


HAWQ-1414. Bump up PXF version to 3.2.1.0.


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/34cea88d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/34cea88d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/34cea88d

Branch: refs/heads/master
Commit: 34cea88d1e649a88ec86bee2b49425d3c8248181
Parents: 9a4ff84
Author: Oleksandr Diachenko 
Authored: Mon Mar 27 16:54:29 2017 -0700
Committer: Oleksandr Diachenko 
Committed: Mon Mar 27 16:54:29 2017 -0700

--
 contrib/hawq-ambari-plugin/build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/34cea88d/contrib/hawq-ambari-plugin/build.properties
--
diff --git a/contrib/hawq-ambari-plugin/build.properties 
b/contrib/hawq-ambari-plugin/build.properties
index aeb4259..1cd6645 100644
--- a/contrib/hawq-ambari-plugin/build.properties
+++ b/contrib/hawq-ambari-plugin/build.properties
@@ -1,6 +1,6 @@
 hawq.release.version=2.2.0
 hawq.common.services.version=2.0.0
-pxf.release.version=3.2.0
+pxf.release.version=3.2.1
 pxf.common.services.version=3.0.0
 hawq.repo.prefix=hawq
 hawq.addons.repo.prefix=hawq-add-ons

incubator-hawq git commit: HAWQ-1414. Bump up PXF version to 3.2.1.0.

2017-03-27 Thread odiachenko 
Repository: incubator-hawq
Updated Branches:
  refs/heads/master 4921e92c4 -> 9a4ff843f


HAWQ-1414. Bump up PXF version to 3.2.1.0.


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/9a4ff843
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/9a4ff843
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/9a4ff843

Branch: refs/heads/master
Commit: 9a4ff843f91171aff8c0e8311ff920674aa39cc0
Parents: 4921e92
Author: Oleksandr Diachenko 
Authored: Mon Mar 27 14:00:31 2017 -0700
Committer: Oleksandr Diachenko 
Committed: Mon Mar 27 14:00:31 2017 -0700

--
 pxf/gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/9a4ff843/pxf/gradle.properties
--
diff --git a/pxf/gradle.properties b/pxf/gradle.properties
index ba8ad2e..8544e89 100644
--- a/pxf/gradle.properties
+++ b/pxf/gradle.properties
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-version=3.2.0.0
+version=3.2.1.0
 license=ASL 2.0
 vendor=Apache HAWQ Incubating
 hadoopVersion=2.7.1

incubator-hawq-docs git commit: minor edits from last week

2017-03-27 Thread yozie 
Repository: incubator-hawq-docs
Updated Branches:
  refs/heads/feature/ranger-integration d84723fae -> 70693401a


minor edits from last week


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/commit/70693401
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/tree/70693401
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/diff/70693401

Branch: refs/heads/feature/ranger-integration
Commit: 70693401a56b53475a425798d71bd40125fa7eb0
Parents: d84723f
Author: David Yozie 
Authored: Mon Mar 27 09:27:57 2017 -0700
Committer: David Yozie 
Committed: Mon Mar 27 09:32:04 2017 -0700

--
 markdown/ranger/ranger-integration-config.html.md.erb | 4 ++--
 markdown/ranger/ranger-overview.html.md.erb   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/blob/70693401/markdown/ranger/ranger-integration-config.html.md.erb
--
diff --git a/markdown/ranger/ranger-integration-config.html.md.erb 
b/markdown/ranger/ranger-integration-config.html.md.erb
index 6a6a4b3..692a729 100644
--- a/markdown/ranger/ranger-integration-config.html.md.erb
+++ b/markdown/ranger/ranger-integration-config.html.md.erb
@@ -19,7 +19,7 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
--->
+-->
 
 Your HAWQ 2.2.0 installation includes the following HAWQ-related Ranger 
components:
 
@@ -30,7 +30,7 @@ The Ranger Administrative UI is installed when you install 
HDP. You configure th
 
 Installing or upgrading to HAWQ 2.2.0 installs the HAWQ Ranger Plug-in 
Service, but neither configures nor registers the plug-in.  
 
-In order to use Ranger for managing HAWQ authentication events, you must first 
install and register several HAWQ JAR files on the Ranger Administration host. 
This is a one-time configuration that establishes connectivity to your HAWQ 
cluster from the Ranger Administration host. After you have installed the JAR 
files, you enable or disable Ranger integration in HAWQ by setting the 
`hawq_acl_type` configuration parameter.
+In order to use Ranger for managing HAWQ authentication events, you must first 
install and register several HAWQ JAR files on the Ranger Administration host. 
This is a one-time configuration that establishes connectivity to your HAWQ 
cluster from the Ranger Administration host. After you have registered the JAR 
files, you enable or disable Ranger integration in HAWQ by setting the 
`hawq_acl_type` configuration parameter. After Ranger integration is enabled, 
you must use the Ranger interface to create all security policies to manage 
access to HAWQ resources. Ranger is pre-populated only with several policies to 
allow `gpadmin` superuser access to default resources. See [Creating HAWQ 
Authorization Policies in Ranger](ranger-policy-creation.html) for information 
about creating policies in Ranger.
 
 The following procedures describe each configuration activity.
 

http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/blob/70693401/markdown/ranger/ranger-overview.html.md.erb
--
diff --git a/markdown/ranger/ranger-overview.html.md.erb 
b/markdown/ranger/ranger-overview.html.md.erb
index b726a85..c5e1cd9 100644
--- a/markdown/ranger/ranger-overview.html.md.erb
+++ b/markdown/ranger/ranger-overview.html.md.erb
@@ -21,13 +21,13 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-HAWQ supports using Apache Ranger for authorizing user access to HAWQ 
resources. Using Ranger enables you to manage all of your Hadoop components' 
authorization policies using a single user interface, policy store, and 
auditing store.
+HAWQ supports using Apache Ranger for authorizing user access to HAWQ 
resources. Using Ranger enables you to manage all of your Hadoop components' 
authorization policies using the same user interface, policy store, and 
auditing stores.
 
 
 ## Policy Management Architecture
 Each HAWQ installation includes a Ranger plug-in service to support Ranger 
Policy management. The Ranger plug-in service implements the Ranger REST API to 
bridge all requests between the Ranger Policy Manager and a HAWQ instance. 
 
-HAWQ also provides a JAR library that enables the Ranger Policy Manager to 
lookup HAWQ metadata (for example database, schema, and table names) to 
populate the user interface and assist in creating new policies. This JAR uses 
a JDBC connection to HAWQ, and requires a one-time registration with the Ranger 
Policy

incubator-hawq-docs git commit: identify hawq service def in place after run enable script

2017-03-27 Thread lisao 
Repository: incubator-hawq-docs
Updated Branches:
  refs/heads/feature/ranger-integration 458524cc7 -> d84723fae


identify hawq service def in place after run enable script


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/commit/d84723fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/tree/d84723fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/diff/d84723fa

Branch: refs/heads/feature/ranger-integration
Commit: d84723fae8eec60ec62bf9f9cd0ddce61674cabd
Parents: 458524c
Author: Lisa Owen 
Authored: Mon Mar 27 09:07:27 2017 -0700
Committer: Lisa Owen 
Committed: Mon Mar 27 09:07:27 2017 -0700

--
 markdown/ranger/ranger-integration-config.html.md.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/blob/d84723fa/markdown/ranger/ranger-integration-config.html.md.erb
--
diff --git a/markdown/ranger/ranger-integration-config.html.md.erb 
b/markdown/ranger/ranger-integration-config.html.md.erb
index 2031fae..6a6a4b3 100644
--- a/markdown/ranger/ranger-integration-config.html.md.erb
+++ b/markdown/ranger/ranger-integration-config.html.md.erb
@@ -63,14 +63,14 @@ The following procedures describe each configuration 
activity.
 enable-ranger-plugin.sh -r : -u 
 -p  -h : -w  
-q 
 ```
 
-Log in to the HAWQ master node as the `gpadmin` user and execute the 
`enable-ranger-plugin.sh` script. For example:
+Log in to the HAWQ master node as the `gpadmin` user and execute the 
`enable-ranger-plugin.sh` script. Ensure \ identifies the fully 
qualified domain name of the HAWQ master node. For example:
 
 ``` bash
 gpadmin@master$ cd /usr/local/hawq/ranger/bin
 gpadmin@master$ ./enable-ranger-plugin.sh -r ranger_host:6080 -u admin -p 
admin -h hawq_master:5432 -w gpadmin -q gpadmin
 ```
-
-Ensure \ identifies the fully qualified domain name of the 
HAWQ master node.
+
+When the script completes, the default HAWQ service definition is 
registered in the Ranger Admin UI. This service definition is named `hawq`.
 
 6. Edit the `pg_hba.conf` file on the HAWQ master node to configure HAWQ 
access for \ on the \. For example, you would 
add an entry similar to the following for the example `enable-ranger-plugin.sh` 
call above:

incubator-hawq git commit: HAWQ-1406. Update hawq version in pom.xml for hawq 2.2.0.0 incubating release

2017-03-27 Thread huor 
Repository: incubator-hawq
Updated Branches:
  refs/heads/master c8fbc1e90 -> 4921e92c4


HAWQ-1406. Update hawq version in pom.xml for hawq 2.2.0.0 incubating release


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/4921e92c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/4921e92c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/4921e92c

Branch: refs/heads/master
Commit: 4921e92c46733d024629ecf02d7d01709fcd6c2f
Parents: c8fbc1e
Author: Ruilong Huo 
Authored: Mon Mar 27 17:09:31 2017 +0800
Committer: Ruilong Huo 
Committed: Mon Mar 27 17:09:31 2017 +0800

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4921e92c/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 1ccaeee..9803532 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
  
   org.apache.hawq
   hawq
-  2.1
+  2.2
   pom

[1/2] incubator-hawq git commit: HAWQ-1406. Update HAWQ product version strings for 2.2.0.0-incubating release

2017-03-27 Thread huor 
Repository: incubator-hawq
Updated Branches:
  refs/heads/master 6041f4a51 -> c8fbc1e90


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/c8fbc1e9/tools/bin/gppylib/data/2.2.json
--
diff --git a/tools/bin/gppylib/data/2.2.json b/tools/bin/gppylib/data/2.2.json
new file mode 100644
index 000..e62b59d
--- /dev/null
+++ b/tools/bin/gppylib/data/2.2.json
@@ -0,0 +1,10458 @@
+{
+   "__comment" : "Generated by tidycat.pl version 34 on Mon Mar 27 14:07:18 
2017 CATALOG_VERSION_NO=201507221",
+   "__info" : {
+  "CATALOG_VERSION_NO" : "201507221"
+   },
+   "gp_configuration" : {
+  "CamelCaseRelationId" : "GpConfigurationRelationId",
+  "colh" : {
+ "content" : "int2",
+ "datadir" : "text",
+ "dbid" : "int2",
+ "definedprimary" : "bool",
+ "hostname" : "NameData",
+ "isprimary" : "bool",
+ "port" : "int4",
+ "valid" : "bool"
+  },
+  "cols" : [
+ {
+"colname" : "content",
+"ctype" : "int2",
+"precomment" : "\n**TK_BLANK_LINE**",
+"sqltype" : "smallint"
+ },
+ {
+"colname" : "definedprimary",
+"ctype" : "bool",
+"sqltype" : "boolean"
+ },
+ {
+"colname" : "dbid",
+"ctype" : "int2",
+"sqltype" : "smallint"
+ },
+ {
+"colname" : "isprimary",
+"ctype" : "bool",
+"sqltype" : "boolean"
+ },
+ {
+"colname" : "valid",
+"ctype" : "bool",
+"sqltype" : "boolean"
+ },
+ {
+"colname" : "hostname",
+"ctype" : "NameData",
+"sqltype" : "name"
+ },
+ {
+"colname" : "port",
+"ctype" : "int4",
+"sqltype" : "integer"
+ },
+ {
+"colname" : "datadir",
+"ctype" : "text",
+"sqltype" : "text"
+ }
+  ],
+  "filename" : "gp_configuration.h",
+  "indexes" : [
+ {
+"CamelCaseIndexId" : "GpConfigurationContentDefinedprimaryIndexId",
+"cols" : [
+   [
+  "content",
+  "int2_ops"
+   ],
+   [
+  "definedprimary",
+  "bool_ops"
+   ]
+],
+"indexid" : "6101",
+"unique" : "1",
+"with" : {
+   "indexid" : "6101"
+}
+ },
+ {
+"CamelCaseIndexId" : "GpConfigurationDbidIndexId",
+"cols" : [
+   [
+  "dbid",
+  "int2_ops"
+   ]
+],
+"indexid" : "6102",
+"unique" : "1",
+"with" : {
+   "indexid" : "6102"
+}
+ }
+  ],
+  "relid_comment_tag" : "/* relation id: 5000 - gp_configuration */\n",
+  "tabdef_text" : "\n   CREATE TABLE gp_configuration\n   with 
(shared=true, oid=false, relid=5000, content=MASTER_ONLY)\n   (\n   content 
smallint,\n   definedprimary  boolean,\n   dbidsmallint,\n   
isprimary   boolean,\n   valid   boolean,\n   hostname
name,\n   portinteger,\n   datadir text\n   )",
+  "with" : {
+ "bootstrap" : 0,
+ "camelcase" : "GpConfiguration",
+ "content" : "MASTER_ONLY",
+ "oid" : "",
+ "relid" : "5000",
+ "shared" : "1",
+ "text" : "with (shared=true, oid=false, relid=5000, 
content=MASTER_ONLY)"
+  }
+   },
+   "gp_configuration_history" : {
+  "CamelCaseRelationId" : "GpConfigHistoryRelationId",
+  "UppercaseReltypeOid" : "GP_CONFIGURATION_HISTORY_RELTYPE_OID",
+  "colh" : {
+ "description" : "text",
+ "hostname" : "text",
+ "registration_order" : "int4",
+ "time" : "timestamptz"
+  },
+  "cols" : [
+ {
+"colname" : "time",
+"ctype" : "timestamptz",
+"precomment" : "\n**TK_BLANK_LINE**",
+"sqltype" : "timestamp_with_time_zone"
+ },
+ {
+"colname" : "registration_order",
+"ctype" : "int4",
+"sqltype" : "integer"
+ },
+ {
+"colname" : "hostname",
+"ctype" : "text",
+"sqltype" : "text"
+ },
+ {
+"colname" : "description",
+"ctype" : "text",
+"sqltype" : "text"
+ }
+  ],
+  "filename" : "gp_configuration.h",
+  "relid_comment_tag" : "/* relation id: 5006 - gp_configuration_history 
*/\n",
+  "tabdef_text" : "\n   CREATE TABLE gp_configuration_history\n   with 
(camelcase=GpConfigHistory, shared=true, oid=false, relid=5006, 
reltype_oid=6434,

[2/2] incubator-hawq git commit: HAWQ-1406. Update HAWQ product version strings for 2.2.0.0-incubating release

2017-03-27 Thread huor 
HAWQ-1406. Update HAWQ product version strings for 2.2.0.0-incubating release


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

Branch: refs/heads/master
Commit: c8fbc1e902f814d1b71390da467ec7fa505fb556
Parents: 6041f4a
Author: Ruilong Huo 
Authored: Fri Mar 24 22:50:09 2017 +0800
Committer: Ruilong Huo 
Committed: Mon Mar 27 14:17:21 2017 +0800

--
 contrib/hawq-ambari-plugin/build.properties | 4 +-
 contrib/hawq-ambari-plugin/pom.xml  | 2 +-
 getversion  | 2 +-
 tools/bin/gppylib/data/2.2.json | 10458 +
 4 files changed, 10462 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/c8fbc1e9/contrib/hawq-ambari-plugin/build.properties
--
diff --git a/contrib/hawq-ambari-plugin/build.properties 
b/contrib/hawq-ambari-plugin/build.properties
index 696a550..aeb4259 100644
--- a/contrib/hawq-ambari-plugin/build.properties
+++ b/contrib/hawq-ambari-plugin/build.properties
@@ -1,8 +1,8 @@
-hawq.release.version=2.1.0
+hawq.release.version=2.2.0
 hawq.common.services.version=2.0.0
 pxf.release.version=3.2.0
 pxf.common.services.version=3.0.0
 hawq.repo.prefix=hawq
 hawq.addons.repo.prefix=hawq-add-ons
-repository.version=2.1.0.0
+repository.version=2.2.0.0
 default.stack=HDP-2.5

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/c8fbc1e9/contrib/hawq-ambari-plugin/pom.xml
--
diff --git a/contrib/hawq-ambari-plugin/pom.xml 
b/contrib/hawq-ambari-plugin/pom.xml
index 2367a57..ad55e84 100644
--- a/contrib/hawq-ambari-plugin/pom.xml
+++ b/contrib/hawq-ambari-plugin/pom.xml
@@ -21,7 +21,7 @@
   4.0.0
   org.apache.hawq
   hawq-ambari-plugin
-  2.1.0.0
+  2.2.0.0
   hawq-ambari-plugin
   http://maven.apache.org
 

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/c8fbc1e9/getversion
--
diff --git a/getversion b/getversion
index ac43748..8527657 100755
--- a/getversion
+++ b/getversion
@@ -18,7 +18,7 @@
 # under the License.
 #
 
-GP_VERSION="2.1.0.0-incubating"
+GP_VERSION="2.2.0.0-incubating"
 
 GP_BUILDNUMBER=dev
 if [ -f BUILD_NUMBER ] ; then