Merge branch 'master' into master-txnstats
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/ac3f5186 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/ac3f5186 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/ac3f5186 Branch: refs/heads/master-txnstats Commit: ac3f5186e8101274e6617ff891a110beda86a707 Parents: 0f09453 9cd3960 Author: sergey <[email protected]> Authored: Thu Jun 21 10:47:49 2018 -0700 Committer: sergey <[email protected]> Committed: Thu Jun 21 10:47:49 2018 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hive/conf/HiveConf.java | 2 +- data/scripts/q_test_init.sql | 52 ---- data/scripts/q_test_init_parse.sql | 10 + .../mapreduce/FileOutputCommitterContainer.java | 60 ++--- .../hadoop/hive/ql/TestLocationQueries.java | 3 +- .../apache/hadoop/hive/ql/TestMTQueries.java | 1 + .../hive/ql/txn/compactor/TestCompactor.java | 2 +- .../apache/hive/jdbc/TestJdbcWithMiniHS2.java | 67 ++++- .../test/resources/testconfiguration.properties | 1 - .../hadoop/hive/accumulo/AccumuloQTestUtil.java | 1 + .../control/AbstractCoreBlobstoreCliDriver.java | 6 +- .../hadoop/hive/cli/control/CliConfigs.java | 2 +- .../hive/cli/control/CoreAccumuloCliDriver.java | 32 ++- .../hadoop/hive/cli/control/CoreCliDriver.java | 8 +- .../hive/cli/control/CoreCompareCliDriver.java | 9 +- .../hive/cli/control/CoreHBaseCliDriver.java | 33 +-- .../cli/control/CoreHBaseNegativeCliDriver.java | 36 ++- .../hive/cli/control/CoreNegativeCliDriver.java | 6 +- .../hive/cli/control/CorePerfCliDriver.java | 5 +- .../org/apache/hadoop/hive/ql/QTestUtil.java | 262 ++++++------------- .../hadoop/hive/ql/parse/CoreParseNegative.java | 3 +- .../java/org/apache/hadoop/hive/ql/Driver.java | 15 +- .../ql/cache/results/QueryResultsCache.java | 6 + .../hive/ql/exec/tez/TezSessionState.java | 33 ++- .../apache/hadoop/hive/ql/io/orc/OrcFile.java | 6 +- .../hive/ql/io/orc/OrcRawRecordMerger.java | 12 +- .../hadoop/hive/ql/io/orc/OrcRecordUpdater.java | 52 +++- .../io/orc/VectorizedOrcAcidRowBatchReader.java | 2 +- .../hadoop/hive/ql/parse/SemanticAnalyzer.java | 7 +- .../hadoop/hive/ql/plan/FileSinkDesc.java | 9 + .../apache/hadoop/hive/ql/TestTxnCommands2.java | 60 +++++ .../apache/hadoop/hive/ql/TestTxnNoBuckets.java | 18 ++ .../clientpositive/druidkafkamini_basic.q | 2 +- .../queries/positive/input_testsequencefile.q | 11 + .../results/clientpositive/acid_nullscan.q.out | 8 +- .../clientpositive/acid_table_stats.q.out | 14 +- .../clientpositive/autoColumnStats_4.q.out | 4 +- .../llap/acid_bucket_pruning.q.out | 6 +- .../llap/acid_vectorization_original.q.out | 4 +- .../llap/default_constraint.q.out | 14 +- .../llap/dynpart_sort_optimization_acid.q.out | 14 +- .../insert_values_orig_table_use_metadata.q.out | 24 +- .../clientpositive/llap/jdbc_handler.q.out | 2 +- .../materialized_view_create_rewrite_3.q.out | 20 +- .../materialized_view_create_rewrite_4.q.out | 22 +- .../materialized_view_create_rewrite_5.q.out | 34 +-- ...ized_view_create_rewrite_rebuild_dummy.q.out | 20 +- .../test/results/clientpositive/row__id.q.out | 18 +- .../tez/acid_vectorization_original_tez.q.out | 4 +- .../clientpositive/tez/explainanalyze_5.q.out | 2 +- .../client/builder/HiveObjectRefBuilder.java | 8 +- .../hive/metastore/tools/HiveSchemaHelper.java | 6 +- .../hadoop/hive/metastore/TestObjectStore.java | 107 +++++++- 53 files changed, 691 insertions(+), 474 deletions(-) ----------------------------------------------------------------------
