HIVE-12096 : LLAP: 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/4e53bfd1 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/4e53bfd1 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/4e53bfd1 Branch: refs/heads/master Commit: 4e53bfd10e1d6bd2a24d112d2af452ac49d8b16f Parents: 1d9574a 09f5e84 Author: Sergey Shelukhin <[email protected]> Authored: Mon Oct 12 10:47:39 2015 -0700 Committer: Sergey Shelukhin <[email protected]> Committed: Mon Oct 12 10:47:39 2015 -0700 ---------------------------------------------------------------------- .../apache/hive/hcatalog/data/JsonSerDe.java | 8 +- .../hive/hcatalog/data/TestJsonSerDe.java | 36 ++++ .../hive/hcatalog/streaming/HiveEndPoint.java | 21 ++ .../hive/hcatalog/streaming/InvalidTable.java | 8 + .../mutate/worker/BucketIdResolverImpl.java | 16 +- .../hive/hcatalog/streaming/TestStreaming.java | 68 +++++- .../mutate/worker/TestBucketIdResolverImpl.java | 2 +- .../hive/ql/txn/compactor/TestCompactor.java | 13 +- .../test/resources/testconfiguration.properties | 1 + .../hadoop/hive/metastore/txn/TxnHandler.java | 4 + .../hadoop/hive/ql/exec/FileSinkOperator.java | 9 +- .../hadoop/hive/ql/exec/ReduceSinkOperator.java | 23 +- .../ql/exec/spark/RemoteHiveSparkClient.java | 22 ++ .../hive/ql/io/DefaultHivePartitioner.java | 3 +- .../hadoop/hive/ql/lockmgr/DbTxnManager.java | 34 ++- .../ql/optimizer/calcite/HiveConfigContext.java | 37 ---- .../calcite/HiveHepPlannerContext.java | 37 ++++ .../calcite/HiveVolcanoPlannerContext.java | 37 ++++ .../calcite/cost/HiveVolcanoPlanner.java | 6 +- .../calcite/rules/HivePreFilteringRule.java | 100 ++++++--- .../calcite/rules/HiveRulesRegistry.java | 44 ++++ .../hadoop/hive/ql/parse/CalcitePlanner.java | 11 +- .../hive/ql/txn/compactor/CompactorMR.java | 8 +- .../hive/ql/udf/generic/GenericUDFHash.java | 11 +- .../hive/ql/lockmgr/TestDbTxnManager.java | 8 +- .../calcite/TestCBORuleFiredOnlyOnce.java | 168 +++++++++++++++ .../clientpositive/filter_cond_pushdown.q | 5 + .../test/queries/clientpositive/json_serde1.q | 36 ++++ .../clientpositive/skewjoin_onesideskew.q | 22 ++ .../clientpositive/filter_cond_pushdown.q.out | 80 +++++++ .../results/clientpositive/json_serde1.q.out | 113 ++++++++++ .../clientpositive/skewjoin_onesideskew.q.out | 212 +++++++++++++++++++ .../objectinspector/ObjectInspectorUtils.java | 13 +- .../TestObjectInspectorUtils.java | 25 +++ .../apache/hive/spark/client/SparkClient.java | 5 + .../hive/spark/client/SparkClientImpl.java | 5 + .../org/apache/hive/spark/client/rpc/Rpc.java | 4 + .../hive/ptest/execution/JIRAService.java | 96 +++++---- .../hive/ptest/execution/TestJIRAService.java | 89 +++++++- ...RAService.testErrorWithMessages.approved.txt | 20 ++ ...ervice.testErrorWithoutMessages.approved.txt | 14 ++ .../TestJIRAService.testFailAdd.approved.txt | 21 ++ .../TestJIRAService.testFailNoAdd.approved.txt | 21 ++ .../TestJIRAService.testSuccessAdd.approved.txt | 16 ++ ...estJIRAService.testSuccessNoAdd.approved.txt | 16 ++ .../resources/test-configuration.properties | 2 + 46 files changed, 1358 insertions(+), 192 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/4e53bfd1/itests/src/test/resources/testconfiguration.properties ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/4e53bfd1/ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/4e53bfd1/ql/src/java/org/apache/hadoop/hive/ql/exec/ReduceSinkOperator.java ----------------------------------------------------------------------
