You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by we...@apache.org on 2017/05/24 23:52:28 UTC

[54/54] [abbrv] hive git commit: Merge branch 'master' into hive-14535

Merge branch 'master' into hive-14535


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/21c209e3
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/21c209e3
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/21c209e3

Branch: refs/heads/hive-14535
Commit: 21c209e324649a56e7928ccfcb2211bbff8e089e
Parents: 93aec12 a74c1e7
Author: Wei Zheng <we...@apache.org>
Authored: Wed May 24 15:08:14 2017 -0700
Committer: Wei Zheng <we...@apache.org>
Committed: Wed May 24 15:08:14 2017 -0700

----------------------------------------------------------------------
 .../java/org/apache/hive/beeline/Commands.java  |    6 +-
 .../org/apache/hive/beeline/HiveSchemaTool.java |   25 +-
 .../apache/hive/beeline/cli/TestHiveCli.java    |    9 +
 .../apache/hadoop/hive/common/FileUtils.java    |   42 +-
 .../common/jsonexplain/DagJsonParserUtils.java  |    2 +-
 .../hadoop/hive/common/jsonexplain/Op.java      |    6 +-
 .../org/apache/hadoop/hive/conf/HiveConf.java   |   12 +
 .../hadoop/hive/common/TestFileUtils.java       |   22 +
 data/files/4col_data.txt                        |    7 +
 data/files/5col_data.txt                        |    3 +
 data/files/part.orc                             |  Bin 0 -> 2689 bytes
 .../mutate/worker/GroupingValidator.java        |    4 +-
 .../hive/hcatalog/streaming/TestStreaming.java  |    8 +-
 hcatalog/webhcat/java-client/pom.xml            |   24 +-
 .../api/repl/ErroredReplicationTask.java        |   52 +
 .../repl/exim/EximReplicationTaskFactory.java   |    5 +-
 .../api/repl/ReplicationV1CompatRule.java       |  208 ++
 .../main/java/org/apache/hive/hplsql/Utils.java |    2 +-
 itests/hcatalog-unit/pom.xml                    |    7 +
 .../listener/DummyRawStoreFailEvent.java        |    4 +-
 .../listener/TestDbNotificationListener.java    |   19 +
 .../src/test/queries/clientpositive/join.q      |   66 +
 .../src/test/queries/clientpositive/join2.q     |   19 +
 .../src/test/queries/clientpositive/map_join.q  |   24 +
 .../queries/clientpositive/map_join_on_filter.q |   16 +
 .../queries/clientpositive/nested_outer_join.q  |   25 +
 .../clientpositive/ptf_general_queries.q        |   34 +
 .../test/queries/clientpositive/ptf_matchpath.q |   35 +
 .../test/queries/clientpositive/ptf_orcfile.q   |   32 +
 .../queries/clientpositive/ptf_persistence.q    |   15 +
 .../test/queries/clientpositive/ptf_rcfile.q    |   32 +
 .../test/queries/clientpositive/ptf_seqfile.q   |   32 +
 .../src/test/results/clientpositive/join.q.out  |  198 ++
 .../src/test/results/clientpositive/join2.q.out |   64 +
 .../test/results/clientpositive/map_join.q.out  |  563 ++++
 .../clientpositive/map_join_on_filter.q.out     |   50 +
 .../clientpositive/nested_outer_join.q.out      |   76 +
 .../clientpositive/ptf_general_queries.q.out    |  139 +
 .../results/clientpositive/ptf_matchpath.q.out  |  105 +
 .../results/clientpositive/ptf_orcfile.q.out    |  104 +
 .../clientpositive/ptf_persistence.q.out        |  549 ++++
 .../results/clientpositive/ptf_rcfile.q.out     |  104 +
 .../results/clientpositive/ptf_seqfile.q.out    |  104 +
 itests/hive-unit/pom.xml                        |   12 +
 .../hive/metastore/TestMetastoreVersion.java    |    9 +-
 .../hive/ql/parse/TestReplicationScenarios.java |   89 +-
 ...TestReplicationScenariosAcrossInstances.java |   30 +-
 .../hadoop/hive/ql/parse/WarehouseInstance.java |   15 +-
 .../org/apache/hive/beeline/TestSchemaTool.java |   10 +-
 .../apache/hive/jdbc/TestJdbcWithMiniLlap.java  |  312 ++-
 .../test/resources/testconfiguration.properties |   12 +-
 .../hive/cli/control/CoreBeeLineDriver.java     |   58 +-
 .../org/apache/hadoop/hive/ql/QTestUtil.java    |    2 +-
 ...DummyHiveMetastoreAuthorizationProvider.java |    2 +-
 .../java/org/apache/hive/beeline/QFile.java     |   32 +-
 .../org/apache/hive/jdbc/HiveConnection.java    |   16 +-
 .../hadoop/hive/llap/LlapRowRecordReader.java   |   24 +-
 .../daemon/rpc/LlapDaemonProtocolProtos.java    |  250 +-
 .../org/apache/hadoop/hive/llap/Schema.java     |    2 +-
 .../hive/llap/security/SecretManager.java       |   20 +-
 .../src/protobuf/LlapDaemonProtocol.proto       |    1 +
 .../hadoop/hive/llap/LlapBaseInputFormat.java   |   24 +-
 .../hadoop/hive/llap/LlapRowInputFormat.java    |    6 +-
 .../hadoop/hive/llap/daemon/impl/QueryInfo.java |    9 +-
 .../hive/llap/daemon/impl/QueryTracker.java     |  198 +-
 .../llap/shufflehandler/ShuffleHandler.java     |   40 +-
 .../daemon/impl/TaskExecutorTestHelpers.java    |    2 +-
 .../upgrade/derby/041-HIVE-16556.derby.sql      |    6 +-
 .../upgrade/derby/hive-schema-3.0.0.derby.sql   |    6 +-
 .../upgrade/mssql/026-HIVE-16556.mssql.sql      |    5 +-
 .../upgrade/mssql/hive-schema-3.0.0.mssql.sql   |    5 +-
 .../upgrade/mysql/041-HIVE-16556.mysql.sql      |    4 +-
 .../upgrade/mysql/hive-schema-3.0.0.mysql.sql   |    4 +-
 .../upgrade/oracle/041-HIVE-16556.oracle.sql    |    5 +-
 .../upgrade/oracle/hive-schema-3.0.0.oracle.sql |    4 +-
 .../postgres/040-HIVE-16556.postgres.sql        |    6 +-
 .../postgres/hive-schema-3.0.0.postgres.sql     |    5 +-
 .../hive/metastore/IMetaStoreSchemaInfo.java    |   92 +
 .../hive/metastore/MetaStoreDirectSql.java      |   73 +-
 .../hive/metastore/MetaStoreSchemaInfo.java     |   39 +-
 .../metastore/MetaStoreSchemaInfoFactory.java   |   65 +
 .../hadoop/hive/metastore/MetaStoreUtils.java   |   11 +-
 .../hadoop/hive/metastore/ObjectStore.java      |   26 +-
 .../apache/hadoop/hive/metastore/RawStore.java  |    8 +-
 .../hive/metastore/RetryingHMSHandler.java      |    2 +-
 .../hive/metastore/StatObjectConverter.java     |  148 ++
 .../hadoop/hive/metastore/cache/CacheUtils.java |   31 +
 .../hive/metastore/cache/CachedStore.java       |  943 ++++---
 .../hive/metastore/cache/SharedCache.java       |  293 ++-
 .../metastore/hbase/HBaseFilterPlanUtil.java    |    2 +-
 .../hadoop/hive/metastore/hbase/HBaseStore.java |    2 +-
 .../hadoop/hive/metastore/hbase/HBaseUtils.java |    8 +-
 .../stats/merge/ColumnStatsMergerFactory.java   |   18 +-
 .../stats/merge/DateColumnStatsMerger.java      |   55 +
 metastore/src/model/package.jdo                 |   10 +-
 .../DummyRawStoreControlledCommit.java          |    2 +-
 .../DummyRawStoreForJdoConnection.java          |    2 +-
 .../InjectableBehaviourObjectStore.java         |   70 +
 .../metastore/TestMetaStoreSchemaFactory.java   |   67 +
 .../hive/metastore/TestMetaStoreSchemaInfo.java |   19 +-
 .../hive/metastore/cache/TestCachedStore.java   |  450 +++-
 .../txn/TestValidCompactorTxnList.java          |   14 +-
 .../hive/ql/exec/ColumnStatsUpdateTask.java     |   12 +-
 .../hadoop/hive/ql/exec/MapJoinOperator.java    |    4 +
 .../hadoop/hive/ql/exec/MemoryMonitorInfo.java  |  166 ++
 .../hadoop/hive/ql/exec/ReplCopyTask.java       |   15 +-
 .../hive/ql/exec/SerializationUtilities.java    |    1 +
 .../hadoop/hive/ql/exec/tez/DagUtils.java       |   29 +-
 .../hive/ql/exec/tez/HashTableLoader.java       |   68 +-
 .../hive/ql/exec/tez/TezSessionState.java       |    5 +-
 .../apache/hadoop/hive/ql/exec/tez/TezTask.java |   14 +-
 .../hive/ql/exec/vector/VectorAssignRow.java    |  220 +-
 .../ql/exec/vector/VectorDeserializeRow.java    |  912 +++++--
 .../hive/ql/exec/vector/VectorExtractRow.java   |  282 +-
 .../hive/ql/exec/vector/VectorSerializeRow.java |  373 ++-
 .../fast/VectorMapJoinFastHashTableLoader.java  |   73 +-
 .../fast/VectorMapJoinFastValueStore.java       |    2 +-
 .../ql/io/orc/encoded/EncodedReaderImpl.java    |   81 +-
 .../vector/VectorizedParquetRecordReader.java   |   31 +-
 .../ql/metadata/SessionHiveMetaStoreClient.java |   76 +
 .../hive/ql/optimizer/ConvertJoinMapJoin.java   |   48 +-
 .../hive/ql/optimizer/MapJoinProcessor.java     |    4 +-
 .../hive/ql/optimizer/SharedScanOptimizer.java  |   33 +-
 .../rules/HiveProjectSortTransposeRule.java     |   56 +-
 .../calcite/rules/HiveRelFieldTrimmer.java      |    4 +
 .../calcite/translator/HiveOpConverter.java     |    2 +-
 .../physical/GenMRSkewJoinProcessor.java        |    2 +-
 .../physical/GenSparkSkewJoinProcessor.java     |    2 +-
 .../hive/ql/optimizer/physical/LlapDecider.java |    4 +-
 .../hive/ql/optimizer/ppr/PartitionPruner.java  |   23 +-
 .../optimizer/spark/SparkMapJoinOptimizer.java  |    3 +-
 .../hadoop/hive/ql/parse/CalcitePlanner.java    |  198 +-
 .../ql/parse/ReplicationSemanticAnalyzer.java   |    6 +
 .../hadoop/hive/ql/parse/SemanticAnalyzer.java  |   14 +-
 .../hive/ql/parse/TypeCheckProcFactory.java     |    2 +-
 .../hadoop/hive/ql/parse/repl/DumpType.java     |    7 +
 .../repl/dump/events/DropFunctionHandler.java   |   42 +
 .../repl/dump/events/EventHandlerFactory.java   |    1 +
 .../repl/load/message/DropFunctionHandler.java  |   48 +
 .../repl/load/message/DropTableHandler.java     |    8 +-
 .../hadoop/hive/ql/plan/JoinCondDesc.java       |   10 +-
 .../apache/hadoop/hive/ql/plan/JoinDesc.java    |   23 +-
 .../apache/hadoop/hive/ql/plan/MapJoinDesc.java |    5 +-
 .../hadoop/hive/ql/plan/TableScanDesc.java      |    2 +-
 .../ql/udf/generic/GenericUDTFGetSplits.java    |   23 +-
 .../hadoop/hive/ql/exec/TestOperators.java      |   57 +-
 .../hadoop/hive/ql/exec/tez/TestTezTask.java    |   10 +-
 .../ql/exec/vector/TestVectorRowObject.java     |   13 +-
 .../hive/ql/exec/vector/TestVectorSerDeRow.java |  498 +---
 .../ql/exec/vector/VectorRandomRowSource.java   |  776 ++++--
 .../hive/ql/exec/vector/VectorVerifyFast.java   |  698 +++++
 .../TestVectorStringExpressions.java            |    6 +-
 .../mapjoin/fast/CheckFastRowHashMap.java       |   50 +-
 .../fast/TestVectorMapJoinFastRowHashMap.java   |  143 +-
 .../exec/vector/mapjoin/fast/VerifyFastRow.java |  874 +++++--
 .../io/orc/encoded/TestEncodedReaderImpl.java   |   77 +
 .../test/queries/clientnegative/ct_noperm_loc.q |   11 +
 .../queries/clientnegative/ctas_noperm_loc.q    |   11 +
 .../queries/clientpositive/order_by_expr_1.q    |   44 +
 .../queries/clientpositive/order_by_expr_2.q    |   11 +
 .../queries/clientpositive/partition_pruning.q  |   15 +
 .../clientpositive/partition_shared_scan.q      |   23 +
 .../test/queries/clientpositive/perf/query24.q  |   51 +
 .../spark_use_file_size_for_mapjoin.q           |   30 -
 .../spark_use_ts_stats_for_mapjoin.q            |   75 +
 .../queries/clientpositive/subquery_scalar.q    |    4 +
 .../clientpositive/temp_table_truncate.q        |   21 +
 .../vector_partitioned_date_time.q              |  113 +
 .../results/clientnegative/ct_noperm_loc.q.out  |    1 +
 .../clientnegative/ctas_noperm_loc.q.out        |    1 +
 .../clientpositive/annotate_stats_join.q.out    |    4 +-
 .../clientpositive/annotate_stats_select.q.out  |   25 +-
 .../results/clientpositive/auto_join20.q.out    |    4 +-
 .../results/clientpositive/auto_join21.q.out    |    4 +-
 .../results/clientpositive/auto_join28.q.out    |   16 +-
 .../results/clientpositive/auto_join29.q.out    |   24 +-
 .../results/clientpositive/auto_join31.q.out    |    6 +-
 .../results/clientpositive/auto_join4.q.out     |    2 +-
 .../results/clientpositive/auto_join5.q.out     |    2 +-
 .../results/clientpositive/auto_join7.q.out     |    2 +-
 .../results/clientpositive/auto_join8.q.out     |    2 +-
 .../clientpositive/auto_sortmerge_join_14.q.out |    8 +-
 .../clientpositive/auto_sortmerge_join_15.q.out |    8 +-
 .../beeline/create_merge_compressed.q.out       |  138 +
 .../beeline/escape_comments.q.out               |    2 -
 .../clientpositive/beeline/smb_mapjoin_1.q.out  |    8 +-
 .../clientpositive/beeline/smb_mapjoin_2.q.out  |    8 +-
 .../clientpositive/beeline/smb_mapjoin_3.q.out  |    8 +-
 .../cbo_SortUnionTransposeRule.q.out            |    8 +-
 .../results/clientpositive/cbo_rp_join0.q.out   |    6 +-
 .../clientpositive/constant_prop_3.q.out        |    2 +-
 .../clientpositive/correlationoptimizer8.q.out  |    8 +-
 ql/src/test/results/clientpositive/cp_sel.q.out |   22 +-
 .../clientpositive/cross_join_merge.q.out       |    4 +-
 .../results/clientpositive/druid_basic2.q.out   |   10 +-
 .../clientpositive/dynamic_rdd_cache.q.out      |    8 +-
 .../results/clientpositive/empty_join.q.out     |    2 +-
 .../clientpositive/filter_cond_pushdown2.q.out  |    2 +-
 .../groupby_grouping_sets_grouping.q.out        |    6 +-
 .../clientpositive/infer_join_preds.q.out       |    6 +-
 .../test/results/clientpositive/innerjoin.q.out |    2 +-
 ql/src/test/results/clientpositive/join20.q.out |    4 +-
 ql/src/test/results/clientpositive/join21.q.out |    4 +-
 ql/src/test/results/clientpositive/join39.q.out |    2 +-
 ql/src/test/results/clientpositive/join4.q.out  |    2 +-
 ql/src/test/results/clientpositive/join40.q.out |    8 +-
 ql/src/test/results/clientpositive/join41.q.out |    4 +-
 ql/src/test/results/clientpositive/join45.q.out |   10 +-
 ql/src/test/results/clientpositive/join46.q.out |   32 +-
 ql/src/test/results/clientpositive/join5.q.out  |    2 +-
 ql/src/test/results/clientpositive/join7.q.out  |    2 +-
 ql/src/test/results/clientpositive/join8.q.out  |    2 +-
 .../join_cond_pushdown_unqual5.q.out            |    4 +-
 .../clientpositive/join_emit_interval.q.out     |    4 +-
 .../clientpositive/join_filters_overlap.q.out   |   22 +-
 .../results/clientpositive/join_merging.q.out   |    6 +-
 .../results/clientpositive/join_reorder.q.out   |   20 +-
 .../test/results/clientpositive/join_star.q.out |   18 +-
 .../test/results/clientpositive/lineage1.q.out  |    4 +-
 .../clientpositive/llap/auto_join21.q.out       |    4 +-
 .../clientpositive/llap/auto_join29.q.out       |   24 +-
 .../clientpositive/llap/auto_join30.q.out       |   18 +-
 .../llap/auto_sortmerge_join_14.q.out           |    4 +-
 .../llap/auto_sortmerge_join_15.q.out           |    4 +-
 .../clientpositive/llap/bucket_groupby.q.out    |    2 +-
 .../llap/bucket_map_join_tez2.q.out             |    4 +-
 .../llap/correlationoptimizer1.q.out            |   20 +-
 .../llap/correlationoptimizer2.q.out            |    8 +-
 .../llap/correlationoptimizer4.q.out            |   24 +-
 .../llap/dynamic_partition_pruning.q.out        |   54 +-
 .../llap/dynamic_semijoin_reduction_3.q.out     |    6 +-
 .../clientpositive/llap/explainuser_1.q.out     |  221 +-
 .../llap/hybridgrace_hashjoin_1.q.out           |    4 +-
 .../clientpositive/llap/join32_lessSize.q.out   |    2 +-
 .../results/clientpositive/llap/join46.q.out    |   32 +-
 .../llap/join_emit_interval.q.out               |    4 +-
 .../llap/limit_join_transpose.q.out             |   36 +-
 .../clientpositive/llap/limit_pushdown.q.out    |    6 +-
 .../clientpositive/llap/limit_pushdown3.q.out   |    6 +-
 .../clientpositive/llap/llap_nullscan.q.out     |    2 +-
 .../results/clientpositive/llap/mapjoin3.q.out  |    2 +-
 .../results/clientpositive/llap/mapjoin46.q.out |   30 +-
 .../llap/mapjoin_emit_interval.q.out            |    4 +-
 .../results/clientpositive/llap/mergejoin.q.out |    4 +-
 .../llap/offset_limit_ppd_optimizer.q.out       |    6 +-
 .../clientpositive/llap/optimize_nullscan.q.out |    6 +-
 .../clientpositive/llap/partition_pruning.q.out |  387 +++
 .../llap/partition_shared_scan.q.out            |  293 +++
 .../results/clientpositive/llap/semijoin.q.out  |   10 +-
 .../results/clientpositive/llap/skewjoin.q.out  |    2 +-
 .../clientpositive/llap/skewjoinopt15.q.out     |    4 +-
 .../clientpositive/llap/smb_mapjoin_17.q.out    |   64 +-
 .../clientpositive/llap/smb_mapjoin_4.q.out     |   28 +-
 .../clientpositive/llap/smb_mapjoin_5.q.out     |   28 +-
 .../results/clientpositive/llap/sqlmerge.q.out  |    4 +-
 .../clientpositive/llap/subquery_in.q.out       |   24 +-
 .../clientpositive/llap/subquery_multi.q.out    |   30 +-
 .../clientpositive/llap/subquery_notin.q.out    |   92 +-
 .../clientpositive/llap/subquery_null_agg.q.out |    2 +-
 .../clientpositive/llap/subquery_scalar.q.out   |  175 +-
 .../clientpositive/llap/subquery_select.q.out   |   94 +-
 .../clientpositive/llap/subquery_views.q.out    |    8 +-
 .../llap/table_nonprintable.q.out               |    2 +-
 .../llap/tez_dynpart_hashjoin_3.q.out           |    4 +-
 .../clientpositive/llap/tez_join_tests.q.out    |    4 +-
 .../clientpositive/llap/tez_joins_explain.q.out |    4 +-
 .../clientpositive/llap/tez_nway_join.q.out     |    8 +-
 .../clientpositive/llap/tez_smb_empty.q.out     |    6 +-
 .../clientpositive/llap/tez_smb_main.q.out      |   18 +-
 .../results/clientpositive/llap/tez_union.q.out |    6 +-
 .../llap/tez_union_group_by.q.out               |    2 +-
 .../clientpositive/llap/unionDistinct_1.q.out   |    2 +-
 .../clientpositive/llap/vector_coalesce.q.out   |   96 +-
 .../clientpositive/llap/vector_coalesce_3.q.out |    2 +-
 .../clientpositive/llap/vector_date_1.q.out     |   30 +-
 .../clientpositive/llap/vector_decimal_2.q.out  |  297 +--
 .../llap/vector_decimal_round.q.out             |   26 +-
 .../vector_groupby_grouping_sets_grouping.q.out |    6 +-
 .../vector_groupby_grouping_sets_limit.q.out    |    2 +-
 .../llap/vector_groupby_mapjoin.q.out           |    2 +-
 .../clientpositive/llap/vector_interval_1.q.out |   12 +-
 .../llap/vector_interval_arithmetic.q.out       |   67 +-
 .../clientpositive/llap/vector_join30.q.out     |   18 +-
 .../llap/vector_left_outer_join.q.out           |    4 +-
 .../llap/vector_left_outer_join2.q.out          |   12 +-
 .../llap/vector_leftsemi_mapjoin.q.out          |   32 +-
 .../llap/vector_outer_join0.q.out               |    4 +-
 .../llap/vector_outer_join1.q.out               |    8 +-
 .../llap/vector_outer_join2.q.out               |    4 +-
 .../llap/vector_partitioned_date_time.q.out     | 2428 ++++++++++++++++++
 .../vectorized_dynamic_partition_pruning.q.out  |   62 +-
 .../clientpositive/llap/vectorized_join46.q.out |   26 +-
 .../test/results/clientpositive/mapjoin1.q.out  |   12 +-
 .../test/results/clientpositive/mapjoin3.q.out  |    2 +-
 .../test/results/clientpositive/mapjoin46.q.out |   30 +-
 .../mapjoin_filter_on_outerjoin.q.out           |    4 +-
 .../clientpositive/mapjoin_test_outer.q.out     |    4 +-
 .../results/clientpositive/masking_10.q.out     |    4 +-
 .../test/results/clientpositive/mergejoin.q.out |    4 +-
 .../results/clientpositive/mergejoins.q.out     |    2 +-
 .../clientpositive/mergejoins_mixed.q.out       |   40 +-
 .../multi_insert_with_join2.q.out               |    4 +-
 .../results/clientpositive/optional_outer.q.out |    8 +-
 ql/src/test/results/clientpositive/order3.q.out |   22 +-
 .../clientpositive/order_by_expr_1.q.out        |  566 ++++
 .../clientpositive/order_by_expr_2.q.out        |  100 +
 .../clientpositive/partition_pruning.q.out      |  396 +++
 ql/src/test/results/clientpositive/pcr.q.out    |  114 +-
 .../results/clientpositive/perf/query24.q.out   |  308 +++
 .../results/clientpositive/perf/query31.q.out   |   68 +-
 .../results/clientpositive/perf/query36.q.out   |   20 +-
 .../results/clientpositive/perf/query39.q.out   |   34 +-
 .../results/clientpositive/perf/query42.q.out   |   30 +-
 .../results/clientpositive/perf/query52.q.out   |   30 +-
 .../results/clientpositive/perf/query64.q.out   |  154 +-
 .../results/clientpositive/perf/query66.q.out   |   56 +-
 .../results/clientpositive/perf/query70.q.out   |   30 +-
 .../results/clientpositive/perf/query75.q.out   |  682 ++---
 .../results/clientpositive/perf/query81.q.out   |  274 +-
 .../results/clientpositive/perf/query85.q.out   |   34 +-
 .../results/clientpositive/perf/query86.q.out   |   16 +-
 .../results/clientpositive/perf/query89.q.out   |   22 +-
 .../results/clientpositive/perf/query91.q.out   |   28 +-
 .../results/clientpositive/pointlookup2.q.out   |   94 +-
 .../results/clientpositive/pointlookup3.q.out   |   96 +-
 .../clientpositive/position_alias_test_1.q.out  |    4 +-
 .../clientpositive/ppd_outer_join5.q.out        |    6 +-
 .../results/clientpositive/ppd_udf_case.q.out   |   36 +-
 .../clientpositive/rcfile_null_value.q.out      |    2 +-
 .../test/results/clientpositive/skewjoin.q.out  |    2 +-
 .../clientpositive/skewjoin_mapjoin1.q.out      |    8 +-
 .../clientpositive/skewjoin_mapjoin10.q.out     |    8 +-
 .../skewjoin_union_remove_1.q.out               |    8 +-
 .../results/clientpositive/skewjoinopt1.q.out   |    8 +-
 .../results/clientpositive/skewjoinopt2.q.out   |    8 +-
 .../results/clientpositive/smb_mapjoin_1.q.out  |    8 +-
 .../results/clientpositive/smb_mapjoin_2.q.out  |    8 +-
 .../results/clientpositive/smb_mapjoin_3.q.out  |    8 +-
 .../results/clientpositive/smb_mapjoin_46.q.out |   26 +-
 .../spark/annotate_stats_join.q.out             |    4 +-
 .../clientpositive/spark/auto_join20.q.out      |    4 +-
 .../clientpositive/spark/auto_join21.q.out      |    4 +-
 .../clientpositive/spark/auto_join28.q.out      |   16 +-
 .../clientpositive/spark/auto_join29.q.out      |   24 +-
 .../clientpositive/spark/auto_join30.q.out      |   18 +-
 .../clientpositive/spark/auto_join31.q.out      |    2 +-
 .../clientpositive/spark/auto_join4.q.out       |    2 +-
 .../clientpositive/spark/auto_join5.q.out       |    2 +-
 .../clientpositive/spark/auto_join7.q.out       |    2 +-
 .../clientpositive/spark/auto_join8.q.out       |    2 +-
 .../spark/auto_sortmerge_join_14.q.out          |    4 +-
 .../spark/auto_sortmerge_join_15.q.out          |    4 +-
 .../spark/bucket_map_join_tez2.q.out            |    4 +-
 .../spark/dynamic_rdd_cache.q.out               |    8 +-
 .../clientpositive/spark/innerjoin.q.out        |    2 +-
 .../results/clientpositive/spark/join20.q.out   |    4 +-
 .../results/clientpositive/spark/join21.q.out   |    4 +-
 .../clientpositive/spark/join32_lessSize.q.out  |    2 +-
 .../results/clientpositive/spark/join39.q.out   |    2 +-
 .../results/clientpositive/spark/join4.q.out    |    2 +-
 .../results/clientpositive/spark/join41.q.out   |    4 +-
 .../results/clientpositive/spark/join5.q.out    |    2 +-
 .../results/clientpositive/spark/join7.q.out    |    2 +-
 .../results/clientpositive/spark/join8.q.out    |    2 +-
 .../spark/join_filters_overlap.q.out            |   22 +-
 .../clientpositive/spark/join_merging.q.out     |    6 +-
 .../clientpositive/spark/join_reorder.q.out     |   20 +-
 .../clientpositive/spark/join_star.q.out        |   18 +-
 .../clientpositive/spark/limit_pushdown.q.out   |    2 +-
 .../results/clientpositive/spark/mapjoin1.q.out |   12 +-
 .../spark/mapjoin_filter_on_outerjoin.q.out     |    4 +-
 .../spark/mapjoin_test_outer.q.out              |    4 +-
 .../clientpositive/spark/mergejoins.q.out       |    2 +-
 .../clientpositive/spark/mergejoins_mixed.q.out |   40 +-
 .../spark/optimize_nullscan.q.out               |    6 +-
 .../test/results/clientpositive/spark/pcr.q.out |   44 +-
 .../clientpositive/spark/ppd_outer_join5.q.out  |    6 +-
 .../results/clientpositive/spark/semijoin.q.out |   10 +-
 .../results/clientpositive/spark/skewjoin.q.out |    2 +-
 .../spark/skewjoin_union_remove_1.q.out         |    8 +-
 .../clientpositive/spark/skewjoinopt1.q.out     |    8 +-
 .../clientpositive/spark/skewjoinopt15.q.out    |    8 +-
 .../clientpositive/spark/skewjoinopt2.q.out     |    8 +-
 .../clientpositive/spark/smb_mapjoin_1.q.out    |    8 +-
 .../clientpositive/spark/smb_mapjoin_17.q.out   |   64 +-
 .../clientpositive/spark/smb_mapjoin_2.q.out    |    8 +-
 .../clientpositive/spark/smb_mapjoin_3.q.out    |    8 +-
 .../clientpositive/spark/smb_mapjoin_4.q.out    |   28 +-
 .../clientpositive/spark/smb_mapjoin_5.q.out    |   28 +-
 .../spark/spark_use_ts_stats_for_mapjoin.q.out  |  574 +++++
 .../clientpositive/spark/subquery_in.q.out      |   20 +-
 .../spark/subquery_multiinsert.q.out            |    4 +-
 .../clientpositive/spark/tez_join_tests.q.out   |    4 +-
 .../spark/tez_joins_explain.q.out               |    4 +-
 .../results/clientpositive/spark/union22.q.out  |    2 +-
 .../spark/union_lateralview.q.out               |    2 +-
 .../spark/vector_left_outer_join.q.out          |    4 +-
 .../spark/vector_outer_join0.q.out              |    4 +-
 .../spark/vector_outer_join1.q.out              |    8 +-
 .../spark/vector_outer_join2.q.out              |    4 +-
 .../clientpositive/subquery_in_having.q.out     |   20 +-
 .../clientpositive/subquery_multiinsert.q.out   |    4 +-
 .../clientpositive/subquery_notexists.q.out     |   12 +-
 .../subquery_notexists_having.q.out             |    4 +-
 .../clientpositive/subquery_notin_having.q.out  |   14 +-
 .../subquery_unqual_corr_expr.q.out             |    2 +-
 .../subquery_unqualcolumnrefs.q.out             |    4 +-
 .../clientpositive/temp_table_truncate.q.out    |  143 ++
 .../clientpositive/tez/explainanalyze_3.q.out   |    8 +-
 .../clientpositive/tez/explainuser_3.q.out      |    8 +-
 .../tez/hybridgrace_hashjoin_1.q.out            |    4 +-
 .../test/results/clientpositive/union22.q.out   |    4 +-
 .../clientpositive/union_lateralview.q.out      |    2 +-
 .../results/clientpositive/union_offcbo.q.out   |    8 +-
 .../clientpositive/vector_coalesce.q.out        |   38 +-
 .../clientpositive/vector_coalesce_3.q.out      |    2 +-
 .../results/clientpositive/vector_date_1.q.out  |   25 +-
 .../clientpositive/vector_decimal_round.q.out   |   24 +-
 .../clientpositive/vector_groupby_mapjoin.q.out |    4 +-
 .../clientpositive/vector_interval_1.q.out      |   12 +-
 .../vector_interval_arithmetic.q.out            |   50 +-
 .../clientpositive/vector_left_outer_join.q.out |    4 +-
 .../vector_left_outer_join2.q.out               |   12 +-
 .../clientpositive/vector_outer_join0.q.out     |    4 +-
 .../clientpositive/vector_outer_join1.q.out     |    8 +-
 .../clientpositive/vector_outer_join2.q.out     |    4 +-
 .../clientpositive/vector_outer_join3.q.out     |    6 +-
 .../clientpositive/vector_outer_join4.q.out     |    6 +-
 .../clientpositive/vector_outer_join6.q.out     |    4 +-
 .../results/clientpositive/view_alias.q.out     |   40 +-
 .../fast/BinarySortableDeserializeRead.java     |  301 ++-
 .../fast/BinarySortableSerializeWrite.java      |  295 +--
 .../hive/serde2/fast/DeserializeRead.java       |  114 +-
 .../hadoop/hive/serde2/fast/SerializeWrite.java |   30 +
 .../hive/serde2/io/TimestampWritable.java       |    4 +-
 .../hadoop/hive/serde2/lazy/VerifyLazy.java     |  444 ++++
 .../lazy/fast/LazySimpleDeserializeRead.java    | 1036 ++++++--
 .../lazy/fast/LazySimpleSerializeWrite.java     |  320 ++-
 .../fast/LazyBinaryDeserializeRead.java         |  649 +++--
 .../fast/LazyBinarySerializeWrite.java          |  791 +++---
 .../StandardUnionObjectInspector.java           |   25 +
 .../hive/serde2/SerdeRandomRowSource.java       |  627 ++++-
 .../apache/hadoop/hive/serde2/VerifyFast.java   |  877 +++++--
 .../hive/serde2/binarysortable/MyTestClass.java |   24 +-
 .../binarysortable/TestBinarySortableFast.java  |  121 +-
 .../hive/serde2/lazy/TestLazySimpleFast.java    |  171 +-
 .../serde2/lazybinary/TestLazyBinaryFast.java   |  113 +-
 shims/0.23/pom.xml                              |   10 +-
 .../apache/hadoop/hive/shims/Hadoop23Shims.java |   46 +-
 .../hadoop/hive/shims/TestHadoop23Shims.java    |   96 +
 .../apache/hadoop/hive/shims/HadoopShims.java   |   14 +
 451 files changed, 22520 insertions(+), 7184 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/21c209e3/common/src/java/org/apache/hadoop/hive/common/FileUtils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/21c209e3/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/21c209e3/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/listener/DummyRawStoreFailEvent.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/21c209e3/itests/src/test/resources/testconfiguration.properties
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/21c209e3/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/21c209e3/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/21c209e3/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
----------------------------------------------------------------------
diff --cc metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
index 344eb19,28b1e57..763b218
--- a/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
+++ b/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
@@@ -7764,9 -7730,9 +7760,9 @@@ public class ObjectStore implements Raw
        } catch (JDODataStoreException e) {
          if (e.getCause() instanceof MissingTableException) {
            throw new MetaException("Version table not found. " + "The metastore is not upgraded to "
-               + MetaStoreSchemaInfo.getHiveSchemaVersion());
+               + MetaStoreSchemaInfoFactory.get(getConf()).getHiveSchemaVersion());
          } else {
 -          throw MetaStoreUtils.newMetaException(e);
 +          throw e;
          }
        }
        committed = commitTransaction();

http://git-wip-us.apache.org/repos/asf/hive/blob/21c209e3/metastore/src/java/org/apache/hadoop/hive/metastore/RawStore.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/21c209e3/metastore/src/java/org/apache/hadoop/hive/metastore/cache/CachedStore.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/21c209e3/metastore/src/java/org/apache/hadoop/hive/metastore/hbase/HBaseStore.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/21c209e3/metastore/src/model/package.jdo
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/21c209e3/metastore/src/test/org/apache/hadoop/hive/metastore/DummyRawStoreControlledCommit.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/21c209e3/metastore/src/test/org/apache/hadoop/hive/metastore/DummyRawStoreForJdoConnection.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/21c209e3/ql/src/java/org/apache/hadoop/hive/ql/exec/ReplCopyTask.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/21c209e3/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/GenMRSkewJoinProcessor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/21c209e3/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/GenSparkSkewJoinProcessor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/21c209e3/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/21c209e3/ql/src/java/org/apache/hadoop/hive/ql/plan/TableScanDesc.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/21c209e3/ql/src/test/results/clientpositive/tez/explainuser_3.q.out
----------------------------------------------------------------------