Merge branch 'master' of https://github.com/apache/incubator-hawq
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/80d62f1b Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/80d62f1b Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/80d62f1b Branch: refs/heads/master Commit: 80d62f1be1790ee4766ea8f6416bd904b28565ff Parents: 50c0945 2153c6d Author: Kyle Dunn <[email protected]> Authored: Tue May 16 09:06:23 2017 -0600 Committer: Kyle Dunn <[email protected]> Committed: Tue May 16 09:06:23 2017 -0600 ---------------------------------------------------------------------- GNUmakefile.in | 9 + config/programs.m4 | 2 +- config/tomcat.m4 | 2 + configure | 2 +- contrib/Makefile | 1 + contrib/hawq-ambari-plugin/build.properties | 6 +- contrib/hawq-ambari-plugin/pom.xml | 2 +- contrib/hawq-package/Makefile | 38 + contrib/hawq-package/README | 38 + contrib/hawq-package/build_hawq_rpm.sh | 89 + contrib/hawq-package/hawq.spec | 98 + contrib/hawq-package/make_rpm_tarball.sh | 83 + doc/src/sgml/ref/alter_schema.sgml | 2 +- getversion | 2 +- pom.xml | 2 +- pxf/Makefile | 14 +- pxf/build.gradle | 15 +- pxf/gradle.properties | 2 +- .../org/apache/hawq/pxf/api/StatsAccessor.java | 40 + .../pxf/api/utilities/EnumAggregationType.java | 50 + .../pxf/api/utilities/FragmentMetadata.java | 86 + .../hawq/pxf/api/utilities/InputData.java | 60 + .../hawq/pxf/api/utilities/Utilities.java | 83 + .../hawq/pxf/api/utilities/UtilitiesTest.java | 108 + .../plugins/hdfs/HdfsAtomicDataAccessor.java | 2 +- .../hdfs/HdfsSplittableDataAccessor.java | 2 +- .../plugins/hdfs/utilities/HdfsUtilities.java | 26 +- .../hdfs/utilities/HdfsUtilitiesTest.java | 21 + .../pxf/plugins/hive/HiveDataFragmenter.java | 11 +- .../plugins/hive/HiveInputFormatFragmenter.java | 2 +- .../hawq/pxf/plugins/hive/HiveORCAccessor.java | 77 +- .../plugins/hive/utilities/HiveUtilities.java | 27 +- .../pxf/plugins/hive/HiveORCAccessorTest.java | 14 + .../hawq/pxf/plugins/jdbc/JdbcPlugin.java | 2 - .../hawq/pxf/plugins/json/JsonAccessor.java | 2 +- .../org/apache/hawq/pxf/service/AggBridge.java | 95 + .../hawq/pxf/service/rest/BridgeResource.java | 5 +- .../pxf/service/utilities/ProtocolData.java | 14 + .../src/main/resources/pxf-profiles-default.xml | 4 +- ranger-plugin/Makefile | 9 + ranger-plugin/admin-plugin/pom.xml | 3 +- ranger-plugin/conf/rps.properties | 3 + ranger-plugin/integration/admin/pom.xml | 2 +- ranger-plugin/integration/pom.xml | 2 +- ranger-plugin/integration/service/pom.xml | 2 +- .../integration/service/tests/DatabaseTest.java | 4 +- .../integration/service/tests/FunctionTest.java | 4 +- .../integration/service/tests/LanguageTest.java | 4 +- .../integration/service/tests/ProtocolTest.java | 4 +- .../integration/service/tests/SchemaTest.java | 4 +- .../integration/service/tests/SequenceTest.java | 4 +- .../integration/service/tests/TableTest.java | 4 +- .../service/tests/TablespaceTest.java | 4 +- .../service/tests/common/ServiceTestBase.java | 1 + .../tests/common/SimpleResourceTestBase.java | 18 +- ranger-plugin/pom.xml | 39 +- ranger-plugin/scripts/build_ranger_rpm.sh | 50 + ranger-plugin/scripts/enable-ranger-plugin.sh | 73 +- ranger-plugin/scripts/rps.sh | 4 +- ranger-plugin/service/pom.xml | 12 +- .../authorization/RangerHawqAuthorizer.java | 25 +- .../authorization/RangerHawqAuthorizerTest.java | 47 +- .../service/src/test/resources/log4j.properties | 2 +- src/backend/Makefile | 14 +- .../access/appendonly/appendonlywriter.c | 60 +- src/backend/access/external/fileam.c | 10 +- src/backend/access/external/pxfheaders.c | 12 + src/backend/access/heap/heapam.c | 8 + src/backend/access/transam/xact.c | 6 +- src/backend/access/transam/xlog.c | 4 +- src/backend/catalog/aclchk.c | 1213 +- src/backend/commands/analyze.c | 26 +- src/backend/executor/nodeAgg.c | 13 + src/backend/executor/nodeExternalscan.c | 7 +- src/backend/libpq/rangerrest.c | 157 +- src/backend/postmaster/walsendserver.c | 3 +- src/backend/resourcemanager/resourcemanager.c | 2 +- src/backend/resourcemanager/resqueuemanager.c | 19 +- .../resourcemanager/utils/network_utils.c | 21 +- src/backend/storage/ipc/ipci.c | 12 +- src/backend/storage/lmgr/lock.c | 45 +- src/backend/tcop/postgres.c | 10 +- src/backend/utils/cache/relcache.c | 3 +- src/backend/utils/init/flatfiles.c | 2 +- src/backend/utils/misc/etc/hawq-site.xml | 19 +- src/backend/utils/misc/guc.c | 47 +- src/backend/utils/resowner/resowner.c | 66 +- src/bin/gpfusion/gpbridgeapi.c | 8 +- src/include/access/extprotocol.h | 2 +- src/include/access/fileam.h | 4 +- src/include/access/heapam.h | 1 + src/include/access/pxfheaders.h | 2 + src/include/executor/executor.h | 2 + src/include/nodes/execnodes.h | 1 + src/include/utils/guc.h | 9 +- src/include/utils/rangerrest.h | 4 + src/include/utils/resowner.h | 2 + src/pl/pljava/Makefile | 20 +- src/test/feature/.gitignore | 2 + .../ManagementTool/test_hawq_extract.cpp | 103 + .../feature/ManagementTool/test_hawq_extract.h | 46 + .../test_hawq_register_usage2_case1.cpp | 90 +- .../feature/Ranger/ans/manual10000_success.ans | 10 + .../feature/Ranger/ans/normal10000_success.ans | 10 - src/test/feature/Ranger/ans/pxf1_fail.ans | 10 + src/test/feature/Ranger/ans/pxf1_success.ans | 14 + src/test/feature/Ranger/ans/pxf2_fail.ans | 9 + src/test/feature/Ranger/ans/pxf2_success.ans | 8 + src/test/feature/Ranger/ans/pxf3_success.ans | 10 + src/test/feature/Ranger/ans/pxf4_fail.ans | 9 + src/test/feature/Ranger/ans/pxf4_success.ans | 8 + src/test/feature/Ranger/ans/pxf5_success.ans | 13 + src/test/feature/Ranger/ans/pxf6_fail.ans | 8 + src/test/feature/Ranger/ans/pxf6_success.ans | 8 + src/test/feature/Ranger/ans/pxf7_success.ans | 14 + src/test/feature/Ranger/ans/pxf8_fail.ans | 9 + src/test/feature/Ranger/ans/pxf8_success.ans | 8 + src/test/feature/Ranger/ans/pxf9_success.ans | 12 + src/test/feature/Ranger/data/testhive.sql | 5 + .../Ranger/data/testhive_externaltable.sql | 5 + src/test/feature/Ranger/policy/10000/1.json | 1 - src/test/feature/Ranger/policy_helper.cpp | 204 + src/test/feature/Ranger/policy_helper.h | 110 + 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/rangerpolicy.py | 56 +- src/test/feature/Ranger/rangerrest.py | 1 + src/test/feature/Ranger/sql/manual/10000.sql | 2 +- src/test/feature/Ranger/sql/pxf/1.sql | 2 + src/test/feature/Ranger/sql/pxf/2.sql | 4 + src/test/feature/Ranger/sql/pxf/3.sql | 4 + src/test/feature/Ranger/sql/pxf/4.sql | 4 + src/test/feature/Ranger/sql/pxf/5.sql | 3 + src/test/feature/Ranger/sql/pxf/6.sql | 4 + src/test/feature/Ranger/sql/pxf/7.sql | 3 + src/test/feature/Ranger/sql/pxf/8.sql | 4 + src/test/feature/Ranger/sql/pxf/9.sql | 3 + src/test/feature/Ranger/test_policyhelper.cpp | 92 + src/test/feature/Ranger/test_ranger.cpp | 320 +- src/test/feature/Ranger/test_ranger.h | 7 +- src/test/feature/catalog/ans/entrydb.ans | 35 + src/test/feature/catalog/sql/entrydb.sql | 22 + src/test/feature/catalog/test_entrydb.cpp | 37 + src/test/feature/full_tests.txt | 2 +- src/test/feature/lib/sql_util.cpp | 14 + src/test/feature/sanity_tests.txt | 4 +- src/test/regress/GNUmakefile | 2 +- src/test/unit/mock/mocker.py | 5 +- tools/bin/Makefile | 12 +- tools/bin/ext/Makefile | 12 +- tools/bin/gppylib/Makefile | 13 +- tools/bin/gppylib/data/2.0.json | 16 +- tools/bin/gppylib/data/2.1.json | 16 +- tools/bin/gppylib/data/2.2.json | 10458 +++++++++++++++++ tools/bin/hawq_ctl | 66 +- tools/bin/hawqextract | 27 +- tools/bin/hawqpylib/Makefile | 12 +- tools/bin/hawqpylib/hawqlib.py | 17 +- tools/bin/hawqregister | 6 + tools/bin/hawqstate | 23 +- tools/bin/pythonSrc/PyGreSQL-4.0/setup.py | 4 + tools/doc/Makefile | 10 +- tools/gpnetbench/Makefile | 4 +- 164 files changed, 14197 insertions(+), 1154 deletions(-) ----------------------------------------------------------------------
