HIVE-12434: Merge branch 'spark' to master
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/de1b22ff Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/de1b22ff Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/de1b22ff Branch: refs/heads/master Commit: de1b22ff18de42c166d3e5f6550dc4404d3f1040 Parents: 22499db 50b62ca Author: Xuefu Zhang <[email protected]> Authored: Wed Nov 18 13:38:52 2015 -0800 Committer: Xuefu Zhang <[email protected]> Committed: Wed Nov 18 13:38:52 2015 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hive/conf/HiveConf.java | 4 +- .../src/test/templates/TestHBaseCliDriver.vm | 63 +- .../templates/TestHBaseNegativeCliDriver.vm | 64 +- .../test/resources/testconfiguration.properties | 20 +- .../hadoop/hive/hbase/HBaseTestSetup.java | 9 +- pom.xml | 12 +- .../hadoop/hive/ql/exec/ScriptOperator.java | 15 + .../persistence/MapJoinTableContainerSerDe.java | 70 + .../hive/ql/exec/spark/HashTableLoader.java | 18 +- .../ql/exec/spark/RemoteHiveSparkClient.java | 4 +- .../hive/ql/exec/spark/SparkPlanGenerator.java | 17 + .../hive/ql/exec/spark/SparkUtilities.java | 10 +- .../spark/status/impl/JobMetricsListener.java | 89 +- .../mapjoin/VectorMapJoinCommonOperator.java | 4 +- .../fast/VectorMapJoinFastTableContainer.java | 2 +- .../hive/ql/optimizer/physical/Vectorizer.java | 4 +- .../optimizer/spark/SparkMapJoinOptimizer.java | 10 + .../ql/parse/spark/GenSparkProcContext.java | 2 - .../hive/ql/parse/spark/GenSparkWork.java | 7 - ql/src/test/queries/clientpositive/orc_merge1.q | 2 + ql/src/test/queries/clientpositive/orc_merge2.q | 1 + ql/src/test/queries/clientpositive/orc_merge3.q | 1 + ql/src/test/queries/clientpositive/orc_merge4.q | 2 + ql/src/test/queries/clientpositive/orc_merge5.q | 3 + ql/src/test/queries/clientpositive/orc_merge6.q | 3 + ql/src/test/queries/clientpositive/orc_merge7.q | 3 + ql/src/test/queries/clientpositive/orc_merge8.q | 2 + ql/src/test/queries/clientpositive/orc_merge9.q | 1 + .../clientpositive/orc_merge_incompat1.q | 1 + .../clientpositive/orc_merge_incompat2.q | 1 + .../clientpositive/spark/orc_merge1.q.out | 485 ++++++ .../clientpositive/spark/orc_merge2.q.out | 268 ++++ .../clientpositive/spark/orc_merge3.q.out | 207 +++ .../clientpositive/spark/orc_merge4.q.out | 231 +++ .../clientpositive/spark/orc_merge5.q.out | 334 +++++ .../clientpositive/spark/orc_merge6.q.out | 508 +++++++ .../clientpositive/spark/orc_merge7.q.out | 619 ++++++++ .../clientpositive/spark/orc_merge8.q.out | 130 ++ .../clientpositive/spark/orc_merge9.q.out | 186 +++ .../spark/orc_merge_incompat1.q.out | 240 +++ .../spark/orc_merge_incompat2.q.out | 370 +++++ .../spark/vector_inner_join.q.out | 853 +++++++++++ .../spark/vector_outer_join0.q.out | 242 +++ .../spark/vector_outer_join1.q.out | 631 ++++++++ .../spark/vector_outer_join2.q.out | 323 ++++ .../spark/vector_outer_join3.q.out | 630 ++++++++ .../spark/vector_outer_join4.q.out | 1000 +++++++++++++ .../spark/vector_outer_join5.q.out | 1406 ++++++++++++++++++ ql/src/test/templates/TestCliDriver.vm | 74 +- ql/src/test/templates/TestCompareCliDriver.vm | 71 +- ql/src/test/templates/TestNegativeCliDriver.vm | 70 +- ql/src/test/templates/TestParseNegative.vm | 65 +- .../apache/hive/spark/client/JobContext.java | 4 +- .../hive/spark/client/JobContextImpl.java | 8 +- .../apache/hive/spark/client/RemoteDriver.java | 60 +- .../hive/spark/client/SparkClientImpl.java | 2 +- .../hive/spark/client/SparkClientUtilities.java | 25 +- .../ptest2/src/main/resources/batch-exec.vm | 2 - 58 files changed, 9000 insertions(+), 488 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/de1b22ff/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/de1b22ff/itests/src/test/resources/testconfiguration.properties ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/de1b22ff/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinCommonOperator.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/de1b22ff/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/Vectorizer.java ----------------------------------------------------------------------
