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/815e0698 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/815e0698 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/815e0698 Branch: refs/heads/hive-14535 Commit: 815e069889e06c8509c00678c6d14bc431fa8037 Parents: 30fd19f 49f103c Author: Sergey Shelukhin <[email protected]> Authored: Mon Sep 12 13:12:42 2016 -0700 Committer: Sergey Shelukhin <[email protected]> Committed: Mon Sep 12 13:12:42 2016 -0700 ---------------------------------------------------------------------- beeline/pom.xml | 10 - .../java/org/apache/hive/beeline/BeeLine.java | 15 +- .../java/org/apache/hive/beeline/Commands.java | 2 +- .../org/apache/hadoop/hive/conf/Constants.java | 10 +- .../org/apache/hadoop/hive/conf/HiveConf.java | 11 + druid-handler/pom.xml | 201 + .../hadoop/hive/druid/DruidStorageHandler.java | 109 + .../hive/druid/DruidStorageHandlerUtils.java | 90 + .../hive/druid/HiveDruidOutputFormat.java | 55 + .../druid/HiveDruidQueryBasedInputFormat.java | 369 + .../hadoop/hive/druid/HiveDruidSplit.java | 83 + .../serde/DruidGroupByQueryRecordReader.java | 199 + .../druid/serde/DruidQueryRecordReader.java | 142 + .../serde/DruidSelectQueryRecordReader.java | 106 + .../hadoop/hive/druid/serde/DruidSerDe.java | 343 + .../hive/druid/serde/DruidSerDeUtils.java | 83 + .../serde/DruidTimeseriesQueryRecordReader.java | 93 + .../druid/serde/DruidTopNQueryRecordReader.java | 106 + .../hadoop/hive/druid/serde/DruidWritable.java | 81 + .../hadoop/hive/druid/QTestDruidSerDe.java | 88 + .../hive/druid/QTestDruidStorageHandler.java | 34 + .../hadoop/hive/druid/TestDruidSerDe.java | 576 + .../TestHiveDruidQueryBasedInputFormat.java | 101 + .../hive/hcatalog/messaging/MessageFactory.java | 2 +- .../hive/jdbc/miniHS2/AbstractHiveService.java | 2 +- .../org/apache/hive/jdbc/miniHS2/MiniHS2.java | 4 + .../apache/hive/jdbc/TestJdbcWithMiniHS2.java | 44 + .../thrift/TestMiniHS2StateWithNoZookeeper.java | 82 + itests/qtest/pom.xml | 13 + .../resources/testconfiguration.properties.orig | 1377 -- .../org/apache/hadoop/hive/ql/QTestUtil.java | 3 +- .../hadoop/hive/llap/cache/BuddyAllocator.java | 18 +- .../tezplugins/LlapTaskSchedulerService.java | 35 +- .../hadoop/hive/metastore/DatabaseProduct.java | 75 + .../hive/metastore/MetaStoreDirectSql.java | 58 +- .../hadoop/hive/metastore/txn/TxnHandler.java | 52 +- .../hadoop/hive/metastore/txn/TestTxnUtils.java | 7 +- packaging/pom.xml | 5 + pom.xml | 2 + .../org/apache/hadoop/hive/ql/Context.java.orig | 829 -- .../org/apache/hadoop/hive/ql/exec/DDLTask.java | 41 +- .../hadoop/hive/ql/exec/FunctionRegistry.java | 22 +- .../apache/hadoop/hive/ql/exec/MapOperator.java | 110 +- .../apache/hadoop/hive/ql/metadata/Hive.java | 2 +- .../hadoop/hive/ql/metadata/VirtualColumn.java | 41 +- .../optimizer/calcite/HivePlannerContext.java | 17 +- .../calcite/druid/DruidIntervalUtils.java | 466 + .../ql/optimizer/calcite/druid/DruidQuery.java | 1053 ++ .../optimizer/calcite/druid/DruidQueryType.java | 42 + .../ql/optimizer/calcite/druid/DruidRules.java | 591 + .../ql/optimizer/calcite/druid/DruidSchema.java | 51 + .../ql/optimizer/calcite/druid/DruidTable.java | 121 + .../optimizer/calcite/druid/HiveDruidConf.java | 33 + .../functions/HiveSqlCountAggFunction.java | 2 +- .../functions/HiveSqlMinMaxAggFunction.java | 2 +- .../functions/HiveSqlSumAggFunction.java | 2 +- .../reloperators/HiveDateGranularity.java | 54 + .../rules/HiveProjectSortTransposeRule.java | 5 + .../rules/HiveSortProjectTransposeRule.java | 5 + .../calcite/translator/ASTBuilder.java | 38 +- .../calcite/translator/ASTConverter.java | 9 +- .../translator/SqlFunctionConverter.java | 23 +- .../hadoop/hive/ql/parse/CalcitePlanner.java | 119 +- .../hadoop/hive/ql/parse/SemanticAnalyzer.java | 40 +- .../hive/ql/parse/SemanticAnalyzer.java.orig | 13038 ----------------- .../hadoop/hive/ql/parse/TaskCompiler.java | 2 +- .../hadoop/hive/ql/plan/CreateTableDesc.java | 8 +- .../hadoop/hive/ql/plan/TableScanDesc.java | 7 + .../hadoop/hive/ql/session/SessionState.java | 13 + .../apache/hadoop/hive/ql/udf/UDFDateFloor.java | 506 + .../hadoop/hive/ql/udf/UDFDateFloorDay.java | 39 + .../hadoop/hive/ql/udf/UDFDateFloorHour.java | 39 + .../hadoop/hive/ql/udf/UDFDateFloorMinute.java | 39 + .../hadoop/hive/ql/udf/UDFDateFloorMonth.java | 39 + .../hadoop/hive/ql/udf/UDFDateFloorQuarter.java | 39 + .../hadoop/hive/ql/udf/UDFDateFloorSecond.java | 39 + .../hadoop/hive/ql/udf/UDFDateFloorWeek.java | 39 + .../hadoop/hive/ql/udf/UDFDateFloorYear.java | 39 + .../calcite/TestCBORuleFiredOnlyOnce.java | 2 +- .../ql/udf/TestUDFDateFormatGranularity.java | 85 + .../test/queries/clientnegative/druid_address.q | 5 + .../test/queries/clientnegative/druid_buckets.q | 6 + .../queries/clientnegative/druid_datasource.q | 3 + .../queries/clientnegative/druid_external.q | 5 + .../queries/clientnegative/druid_location.q | 6 + .../queries/clientnegative/druid_partitions.q | 6 + .../test/queries/clientpositive/druid_basic1.q | 18 + .../test/queries/clientpositive/druid_basic2.q | 52 + .../queries/clientpositive/druid_intervals.q | 67 + .../queries/clientpositive/druid_timeseries.q | 94 + ql/src/test/queries/clientpositive/druid_topn.q | 75 + .../clientpositive/encryption_drop_partition.q | 7 + .../clientpositive/encryption_drop_table.q | 23 + .../queries/clientpositive/groupby_nullvalues.q | 29 + .../results/clientnegative/druid_address.q.out | 7 + .../results/clientnegative/druid_buckets.q.out | 8 + .../clientnegative/druid_datasource.q.out | 7 + .../results/clientnegative/druid_external.q.out | 7 + .../results/clientnegative/druid_location.q.out | 9 + .../clientnegative/druid_partitions.q.out | 8 + .../results/clientpositive/create_view.q.out | 2 + ql/src/test/results/clientpositive/ctas.q.out | 8 +- .../results/clientpositive/druid_basic1.q.out | 142 + .../results/clientpositive/druid_basic2.q.out | 533 + .../clientpositive/druid_intervals.q.out | 398 + .../clientpositive/druid_timeseries.q.out | 566 + .../results/clientpositive/druid_topn.q.out | 419 + .../encrypted/encryption_drop_partition.q.out | 33 + .../encrypted/encryption_drop_table.q.out | 110 + .../results/clientpositive/explain_ddl.q.out | 2 + .../clientpositive/explain_logical.q.out | 16 + .../clientpositive/groupby_nullvalues.q.out | 83 + .../test/results/clientpositive/join_view.q.out | 4 + .../test/results/clientpositive/llap/ctas.q.out | 8 +- .../clientpositive/llap/explainuser_1.q.out | 10 +- .../test/results/clientpositive/masking_2.q.out | 14 + .../test/results/clientpositive/masking_6.q.out | 8 + .../test/results/clientpositive/masking_7.q.out | 8 + .../clientpositive/serde_user_properties.q.out | 4 + .../results/clientpositive/show_functions.q.out | 9 + .../results/clientpositive/spark/ctas.q.out | 8 +- .../clientpositive/spark/join_view.q.out | 4 + .../results/clientpositive/subquery_notin.q.out | 6 + .../results/clientpositive/subquery_views.q.out | 4 + .../service/cli/session/HiveSessionImpl.java | 9 +- .../service/cli/session/SessionManager.java | 2 +- .../apache/hive/service/server/HiveServer2.java | 17 +- 127 files changed, 9688 insertions(+), 15558 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/815e0698/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/815e0698/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/815e0698/ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java ----------------------------------------------------------------------
