You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by od...@apache.org on 2016/03/30 03:18:56 UTC

[2/3] incubator-hawq git commit: Merge remote-tracking branch 'upstream/master' into HAWQ-546

Merge remote-tracking branch 'upstream/master' into HAWQ-546


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

Branch: refs/heads/HAWQ-546
Commit: cac5e17b10710ebf92972df42d277beff07d2b97
Parents: d89173e 01a27b7
Author: Oleksandr Diachenko <od...@pivotal.io>
Authored: Tue Mar 29 12:00:15 2016 -0700
Committer: Oleksandr Diachenko <od...@pivotal.io>
Committed: Tue Mar 29 12:00:15 2016 -0700

----------------------------------------------------------------------
 depends/libyarn/src/CMakeLists.txt              |   2 +-
 depends/libyarn/src/common/Exception.cpp        |   3 +
 depends/libyarn/src/common/Exception.h          |  33 +-
 depends/libyarn/src/common/XmlConfig.cpp        |  40 +-
 depends/libyarn/src/common/XmlConfig.h          |   4 +-
 .../libyarn/src/libyarnclient/LibYarnClient.cpp | 218 ++++---
 .../libyarnserver/ApplicationMasterProtocol.cpp |  12 +-
 pxf/build.gradle                                |  13 +-
 .../java/org/apache/hawq/pxf/api/Metadata.java  |  63 +-
 .../apache/hawq/pxf/api/MetadataFetcher.java    |  24 +-
 .../hawq/pxf/api/utilities/InputData.java       |  12 +
 .../pxf/plugins/hive/HiveDataFragmenter.java    |  27 +-
 .../pxf/plugins/hive/HiveMetadataFetcher.java   |  32 +-
 .../plugins/hive/utilities/HiveUtilities.java   |  78 ++-
 .../plugins/hive/HiveMetadataFetcherTest.java   |  24 +-
 .../hive/utilities/HiveUtilitiesTest.java       |  16 +-
 .../pxf/service/MetadataFetcherFactory.java     |   6 +-
 .../pxf/service/MetadataResponseFormatter.java  |  85 +--
 .../hawq/pxf/service/rest/MetadataResource.java |  52 +-
 .../pxf/service/utilities/ProtocolData.java     |  19 +
 .../src/main/resources/pxf-profiles-default.xml |   4 +-
 .../service/MetadataResponseFormatterTest.java  | 166 ++++--
 src/all_src_files.txt                           |   4 +
 src/backend/access/external/hd_work_mgr.c       |  18 +-
 src/backend/access/external/pxfmasterapi.c      |  52 +-
 src/backend/access/external/pxfuriparser.c      |   6 +-
 src/backend/access/parquet/parquetam.c          |   9 +
 src/backend/catalog/Makefile                    |   2 +-
 src/backend/catalog/catalog.c                   |  29 +-
 src/backend/catalog/external/Makefile           |  32 +
 src/backend/catalog/external/externalmd.c       | 586 +++++++++++++++++++
 src/backend/catalog/hcatalog/Makefile           |  32 -
 src/backend/catalog/hcatalog/externalmd.c       | 562 ------------------
 src/backend/catalog/namespace.c                 |   2 +-
 src/backend/cdb/cdbdatalocality.c               |   7 +-
 src/backend/cdb/cdbexplain.c                    |   7 +-
 src/backend/cdb/cdbmutate.c                     | 117 ++--
 src/backend/cdb/cdbpersistentrelfile.c          | 152 -----
 src/backend/cdb/cdbvars.c                       |   3 +-
 src/backend/cdb/dispatcher.c                    |  19 +
 src/backend/commands/analyze.c                  |  14 +-
 src/backend/commands/copy.c                     |   2 +-
 src/backend/commands/explain.c                  |   2 +-
 src/backend/commands/tablecmds.c                |  29 +-
 src/backend/executor/execHHashagg.c             |   4 +-
 src/backend/executor/execWorkfile.c             |   4 +-
 src/backend/executor/nodeHash.c                 |   6 +-
 src/backend/executor/nodeHashjoin.c             |  12 +-
 src/backend/executor/nodeSubplan.c              |   8 +-
 src/backend/gp_libpq_fe/fe-exec.c               |  13 +-
 src/backend/postmaster/identity.c               |  38 +-
 .../communication/rmcomm_QD2RM.c                |  32 +-
 .../include/communication/rmcomm_QD2RM.h        |   2 +-
 src/backend/resourcemanager/include/dynrm.h     |   3 -
 src/backend/resourcemanager/include/errorcode.h |   1 +
 .../resourcemanager/include/resourcepool.h      |   2 -
 src/backend/resourcemanager/requesthandler.c    |  79 +--
 .../resourcemanager/requesthandler_ddl.c        |  47 --
 src/backend/resourcemanager/resourcemanager.c   |  17 +-
 src/backend/resourcemanager/resourcepool.c      | 210 +++----
 src/backend/resourcemanager/resqueuemanager.c   | 512 ++--------------
 src/backend/storage/file/fd.c                   |  29 +
 src/backend/tcop/pquery.c                       |  21 +-
 src/backend/utils/adt/Makefile                  |   2 +-
 src/backend/utils/adt/pxf_functions.c           | 186 ++++++
 src/backend/utils/init/postinit.c               |   4 +
 src/backend/utils/misc/faultinjector.c          |   9 +
 src/backend/utils/misc/guc.c                    |  46 +-
 src/backend/utils/mmgr/memaccounting.c          |   2 +
 src/backend/utils/sort/logtape.c                |   2 +-
 src/backend/utils/sort/tuplesort.c              |   2 +-
 src/backend/utils/sort/tuplesort_mk.c           |   2 +-
 src/backend/utils/sort/tuplestorenew.c          |  10 +-
 .../utils/workfile_manager/workfile_file.c      |   4 +-
 .../utils/workfile_manager/workfile_mgr.c       |   4 +-
 .../utils/workfile_manager/workfile_mgr_test.c  |  16 +-
 .../workfile_manager/workfile_queryspace.c      |  15 +-
 src/include/access/hd_work_mgr.h                |   4 +-
 src/include/access/pxfmasterapi.h               |   4 +-
 src/include/access/pxfuriparser.h               |   4 +-
 src/include/catalog/external/externalmd.h       |  35 ++
 src/include/catalog/external/itemmd.h           |  71 +++
 src/include/catalog/hcatalog/externalmd.h       |  35 --
 src/include/catalog/hcatalog/hcatalogmd.h       |  68 ---
 src/include/catalog/pg_proc.h                   |   6 +-
 src/include/catalog/pg_proc.sql                 |   2 +
 src/include/cdb/cdbpersistentrelfile.h          |  19 -
 src/include/cdb/cdbvars.h                       |   2 +
 src/include/executor/execWorkfile.h             |   2 +-
 src/include/postmaster/identity.h               |   3 -
 src/include/storage/fd.h                        |   2 +
 src/include/utils/builtins.h                    |   3 +
 src/include/utils/faultinjector.h               |   3 +
 src/include/utils/guc.h                         |   6 +-
 src/include/utils/workfile_mgr.h                |   2 +-
 .../data/hcatalog/invalid_numeric_range.json    |   2 +-
 .../hcatalog/invalid_typemod_timestamp.json     |   2 +-
 src/test/regress/data/hcatalog/multi_table.json |   2 +-
 .../data/hcatalog/multi_table_duplicates.json   |   2 +-
 .../regress/data/hcatalog/single_table.json     |   2 +-
 src/test/regress/input/hcatalog_lookup.source   |   4 +
 src/test/regress/json_utils.c                   |  11 +-
 src/test/regress/output/exttab1.source          |   4 +-
 src/test/regress/output/hcatalog_lookup.source  |   7 +
 src/test/regress/output/json_load.source        |   2 +-
 tools/bin/gppylib/programs/clsInjectFault.py    |   3 +
 tools/bin/hawq_ctl                              |  83 ++-
 tools/bin/hawqconfig                            | 197 +++----
 tools/bin/hawqpylib/hawqlib.py                  |  80 ++-
 tools/bin/hawqpylib/programs/clsInjectFault.py  |   3 +
 tools/bin/hawqstate                             |   7 +
 111 files changed, 2371 insertions(+), 2274 deletions(-)
----------------------------------------------------------------------