HIVE-14671 : merge master into hive-14535 (Sergey Shelukhin)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/ba9cd794 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/ba9cd794 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/ba9cd794 Branch: refs/heads/hive-14535 Commit: ba9cd7947f4530f84f0a2ccb7a636fe12231640b Parents: d7b6272 9375cf3 Author: sergey <ser...@apache.org> Authored: Thu Oct 12 17:06:36 2017 -0700 Committer: sergey <ser...@apache.org> Committed: Thu Oct 12 17:06:36 2017 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hive/conf/HiveConf.java | 12 +- druid-handler/pom.xml | 4 + .../hadoop/hive/druid/DruidStorageHandler.java | 32 +- .../hive/druid/DruidStorageHandlerUtils.java | 50 +- .../druid/io/DruidQueryBasedInputFormat.java | 181 +---- .../hive/druid/TestDruidStorageHandler.java | 195 ++++- .../TestHiveDruidQueryBasedInputFormat.java | 104 --- .../listener/TestDbNotificationListener.java | 6 + .../hive/minikdc/TestJdbcWithDBTokenStore.java | 5 + .../minikdc/TestJdbcWithDBTokenStoreNoDoAs.java | 50 ++ .../hive/minikdc/TestJdbcWithMiniKdc.java | 27 +- itests/pom.xml | 2 + .../test/resources/testconfiguration.properties | 1 - .../hadoop/hive/metastore/HiveMetaStore.java | 3 +- .../hadoop/hive/metastore/ObjectStore.java | 3 + .../metastore/messaging/DropTableMessage.java | 4 + .../messaging/json/JSONDropTableMessage.java | 21 +- .../messaging/json/JSONMessageFactory.java | 3 +- .../hadoop/hive/metastore/TestObjectStore.java | 8 + pom.xml | 2 +- .../hadoop/hive/ql/exec/ReplCopyTask.java | 4 +- .../org/apache/hadoop/hive/ql/exec/Task.java | 8 +- .../apache/hadoop/hive/ql/exec/TaskFactory.java | 13 +- .../ql/exec/repl/bootstrap/ReplLoadTask.java | 2 +- .../ql/exec/vector/VectorizationContext.java | 7 +- .../vector/expressions/IfExprColumnNull.java | 22 +- .../expressions/IfExprConditionalFilter.java | 192 +++++ .../IfExprDoubleColumnDoubleColumn.java | 45 +- .../IfExprIntervalDayTimeColumnColumn.java | 17 +- .../expressions/IfExprLongColumnLongColumn.java | 45 +- .../vector/expressions/IfExprNullColumn.java | 16 +- ...fExprStringGroupColumnStringGroupColumn.java | 17 +- .../IfExprTimestampColumnColumnBase.java | 18 +- .../ql/exec/vector/udf/VectorUDFAdaptor.java | 14 +- .../hive/ql/io/sarg/ConvertAstToSearchArg.java | 59 +- .../hive/ql/optimizer/ConvertJoinMapJoin.java | 4 +- .../calcite/rules/HiveRelDecorrelator.java | 300 ++----- .../calcite/translator/ASTConverter.java | 57 +- .../apache/hadoop/hive/ql/parse/HiveParser.g | 20 +- .../ql/parse/ReplicationSemanticAnalyzer.java | 42 +- .../parse/TestReplicationSemanticAnalyzer.java | 39 +- .../queries/clientnegative/druid_datasource2.q | 3 + .../queries/clientpositive/subquery_exists.q | 24 + .../test/queries/clientpositive/subquery_in.q | 50 +- .../queries/clientpositive/vectorized_case.q | 53 +- .../clientnegative/druid_datasource2.q.out | 7 + .../clientpositive/constprog_partitioner.q.out | 10 +- .../clientpositive/llap/explainuser_1.q.out | 98 +-- .../clientpositive/llap/subquery_exists.q.out | 385 ++++++++- .../clientpositive/llap/subquery_in.q.out | 657 ++------------- .../clientpositive/llap/subquery_multi.q.out | 48 +- .../clientpositive/llap/subquery_notin.q.out | 170 ++-- .../clientpositive/llap/subquery_scalar.q.out | 30 +- .../clientpositive/llap/subquery_select.q.out | 42 +- .../clientpositive/llap/subquery_views.q.out | 82 +- .../clientpositive/llap/vector_coalesce.q.out | 2 +- .../vector_groupby_grouping_sets_grouping.q.out | 2 +- .../llap/vector_mapjoin_reduce.q.out | 12 +- .../llap/vector_ptf_part_simple.q.out | 16 +- .../clientpositive/llap/vectorized_case.q.out | 354 +++++++- .../clientpositive/min_structvalue.q.out | 45 ++ .../clientpositive/perf/spark/query16.q.out | 209 ++++- .../clientpositive/perf/spark/query36.q.out | 6 +- .../clientpositive/perf/spark/query70.q.out | 6 +- .../clientpositive/perf/spark/query86.q.out | 6 +- .../clientpositive/perf/spark/query94.q.out | 209 ++++- .../clientpositive/perf/tez/query14.q.out | 4 +- .../clientpositive/perf/tez/query16.q.out | 263 +++--- .../clientpositive/perf/tez/query23.q.out | 2 +- .../clientpositive/perf/tez/query36.q.out | 4 +- .../clientpositive/perf/tez/query70.q.out | 4 +- .../clientpositive/perf/tez/query86.q.out | 4 +- .../clientpositive/perf/tez/query94.q.out | 263 +++--- .../spark/constprog_partitioner.q.out | 10 +- .../spark/spark_explainuser_1.q.out | 98 +-- .../clientpositive/spark/subquery_exists.q.out | 390 ++++++++- .../clientpositive/spark/subquery_in.q.out | 611 ++------------ .../spark/vector_mapjoin_reduce.q.out | 10 +- .../clientpositive/spark/vectorized_case.q.out | 348 +++++++- .../clientpositive/subquery_exists.q.out | 420 +++++++++- .../clientpositive/subquery_exists_having.q.out | 28 +- .../clientpositive/subquery_in_having.q.out | 803 ++++++++++--------- .../clientpositive/subquery_notexists.q.out | 32 +- .../subquery_notexists_having.q.out | 32 +- .../clientpositive/subquery_notin_having.q.out | 26 +- .../subquery_unqualcolumnrefs.q.out | 82 +- .../clientpositive/vector_coalesce.q.out | 2 +- .../clientpositive/vector_mapjoin_reduce.q.out | 8 +- .../clientpositive/vectorized_case.q.out | 330 +++++++- .../apache/hadoop/hive/thrift/DBTokenStore.java | 3 +- 90 files changed, 4830 insertions(+), 3127 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/ba9cd794/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/ba9cd794/itests/src/test/resources/testconfiguration.properties ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/ba9cd794/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/ba9cd794/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/ba9cd794/metastore/src/test/org/apache/hadoop/hive/metastore/TestObjectStore.java ---------------------------------------------------------------------- diff --cc metastore/src/test/org/apache/hadoop/hive/metastore/TestObjectStore.java index e6661f9,64b2c70..67b798f --- a/metastore/src/test/org/apache/hadoop/hive/metastore/TestObjectStore.java +++ b/metastore/src/test/org/apache/hadoop/hive/metastore/TestObjectStore.java @@@ -19,9 -19,9 +19,10 @@@ package org.apache.hadoop.hive.metastor import com.codahale.metrics.Counter; +import com.google.common.base.Supplier; import com.google.common.collect.ImmutableList; import org.apache.hadoop.hive.conf.HiveConf; + import org.apache.hadoop.hive.metastore.ObjectStore.RetryingExecutor; import org.apache.hadoop.hive.metastore.api.CurrentNotificationEventId; import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.FieldSchema; http://git-wip-us.apache.org/repos/asf/hive/blob/ba9cd794/ql/src/java/org/apache/hadoop/hive/ql/exec/ReplCopyTask.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/ba9cd794/ql/src/java/org/apache/hadoop/hive/ql/exec/TaskFactory.java ----------------------------------------------------------------------
