HIVE-11588 : merge master into branch (Sergey Shelukhin)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/9d9dd72a Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/9d9dd72a Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/9d9dd72a Branch: refs/heads/hbase-metastore Commit: 9d9dd72a06ee2db379dbbae3561d172223d7c96d Parents: 2fe6086 3b6825b Author: Sergey Shelukhin <ser...@apache.org> Authored: Mon Aug 17 15:20:25 2015 -0700 Committer: Sergey Shelukhin <ser...@apache.org> Committed: Mon Aug 17 15:20:25 2015 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hive/conf/HiveConf.java | 6 + data/conf/hive-log4j2.xml | 5 +- data/conf/hive-site.xml | 6 - .../deployers/config/hive/hive-site.mysql.xml | 22 +++ .../hive/hcatalog/streaming/TestStreaming.java | 54 +++++- .../TestOperationLoggingAPIWithMr.java | 2 - .../TestOperationLoggingAPIWithTez.java | 2 - .../operation/TestOperationLoggingLayout.java | 2 - .../hadoop/hive/metastore/HiveMetaStore.java | 18 ++ .../hive/metastore/HouseKeeperService.java | 39 ++++ .../hadoop/hive/metastore/txn/TxnHandler.java | 153 +++++++++++----- .../hive/metastore/txn/TestTxnHandler.java | 7 +- .../java/org/apache/hadoop/hive/ql/Driver.java | 15 +- .../org/apache/hadoop/hive/ql/io/AcidUtils.java | 183 ++++++++++++++----- .../hadoop/hive/ql/io/orc/OrcInputFormat.java | 97 +++++++--- .../apache/hadoop/hive/ql/io/orc/OrcSplit.java | 25 ++- .../hadoop/hive/ql/lib/DefaultGraphWalker.java | 2 +- .../calcite/reloperators/HiveFilter.java | 2 +- .../calcite/translator/ExprNodeConverter.java | 26 --- .../apache/hadoop/hive/ql/parse/ASTNode.java | 18 +- .../hive/ql/txn/AcidHouseKeeperService.java | 104 +++++++++++ .../hive/ql/txn/compactor/CompactorMR.java | 19 +- .../hadoop/hive/ql/txn/compactor/Initiator.java | 10 +- .../hadoop/hive/ql/txn/compactor/Worker.java | 2 +- .../apache/hadoop/hive/ql/TestTxnCommands.java | 21 +++ .../apache/hadoop/hive/ql/TestTxnCommands2.java | 1 + .../apache/hadoop/hive/ql/io/TestAcidUtils.java | 27 +-- .../hive/ql/io/orc/TestInputOutputFormat.java | 6 +- .../hive/ql/lockmgr/TestDbTxnManager.java | 35 +++- .../hadoop/hive/shims/Hadoop20SShims.java | 11 ++ .../apache/hadoop/hive/shims/Hadoop23Shims.java | 66 +++++++ .../apache/hadoop/hive/shims/HadoopShims.java | 15 ++ 32 files changed, 782 insertions(+), 219 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/9d9dd72a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/9d9dd72a/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/9d9dd72a/ql/src/java/org/apache/hadoop/hive/ql/Driver.java ----------------------------------------------------------------------