Merge branch 'master' into llap
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/bc75d72b Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/bc75d72b Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/bc75d72b Branch: refs/heads/master Commit: bc75d72b8e5ed8a538cf69d3b0a7556150e4713e Parents: e073cce b621827 Author: Jason Dere <jd...@hortonworks.com> Authored: Tue May 3 13:30:39 2016 -0700 Committer: Jason Dere <jd...@hortonworks.com> Committed: Tue May 3 13:30:39 2016 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hive/common/FileUtils.java | 19 +- .../org/apache/hadoop/hive/conf/HiveConf.java | 2 +- .../org/apache/hive/jdbc/TestJdbcDriver2.java | 43 +- .../cli/session/TestHiveSessionImpl.java | 2 +- .../test/resources/testconfiguration.properties | 4 + .../org/apache/hive/jdbc/HiveStatement.java | 20 +- .../llap/tezplugins/LlapTaskCommunicator.java | 47 + .../hive/metastore/HiveMetaStoreFsImpl.java | 11 +- .../java/org/apache/hadoop/hive/ql/Driver.java | 27 +- .../org/apache/hadoop/hive/ql/exec/DDLTask.java | 73 +- .../apache/hadoop/hive/ql/exec/MoveTask.java | 7 +- .../hive/ql/exec/vector/VectorExtractRow.java | 12 +- .../ql/exec/vector/VectorizationContext.java | 2 +- .../hadoop/hive/ql/history/HiveHistoryImpl.java | 8 +- .../ql/io/orc/ConvertTreeReaderFactory.java | 3750 +++++++++++++ .../hadoop/hive/ql/io/orc/SchemaEvolution.java | 29 +- .../hive/ql/io/orc/TreeReaderFactory.java | 86 +- .../apache/hadoop/hive/ql/metadata/Hive.java | 27 +- .../hadoop/hive/ql/session/OperationLog.java | 8 +- .../hadoop/hive/ql/session/SessionState.java | 2 +- .../clientnegative/orc_replace_columns2.q | 5 +- .../clientnegative/orc_replace_columns2_acid.q | 5 +- .../clientnegative/orc_replace_columns3.q | 3 + .../clientnegative/orc_replace_columns3_acid.q | 3 + .../clientnegative/orc_type_promotion1.q | 7 +- .../clientnegative/orc_type_promotion1_acid.q | 7 +- .../clientnegative/orc_type_promotion2.q | 5 +- .../clientnegative/orc_type_promotion2_acid.q | 5 +- .../clientnegative/orc_type_promotion3.q | 5 +- .../clientnegative/orc_type_promotion3_acid.q | 5 +- .../clientpositive/orc_int_type_promotion.q | 4 + .../clientpositive/orc_schema_evolution.q | 2 + .../schema_evol_orc_acid_mapwork_part.q | 846 ++- .../schema_evol_orc_acid_mapwork_table.q | 804 ++- .../schema_evol_orc_acidvec_mapwork_part.q | 843 ++- .../schema_evol_orc_acidvec_mapwork_table.q | 801 ++- .../schema_evol_orc_nonvec_fetchwork_part.q | 831 ++- .../schema_evol_orc_nonvec_fetchwork_table.q | 824 ++- .../schema_evol_orc_nonvec_mapwork_part.q | 833 ++- ...a_evol_orc_nonvec_mapwork_part_all_complex.q | 162 + ...evol_orc_nonvec_mapwork_part_all_primitive.q | 481 ++ .../schema_evol_orc_nonvec_mapwork_table.q | 824 ++- .../schema_evol_orc_vec_mapwork_part.q | 831 ++- ...hema_evol_orc_vec_mapwork_part_all_complex.q | 162 + ...ma_evol_orc_vec_mapwork_part_all_primitive.q | 481 ++ .../schema_evol_orc_vec_mapwork_table.q | 819 ++- .../schema_evol_text_nonvec_mapwork_part.q | 5 +- ..._evol_text_nonvec_mapwork_part_all_complex.q | 5 +- ...vol_text_nonvec_mapwork_part_all_primitive.q | 5 +- .../schema_evol_text_nonvec_mapwork_table.q | 5 +- .../schema_evol_text_vec_mapwork_part.q | 2 +- ...ema_evol_text_vec_mapwork_part_all_complex.q | 2 +- ...a_evol_text_vec_mapwork_part_all_primitive.q | 2 +- .../schema_evol_text_vec_mapwork_table.q | 2 +- .../schema_evol_text_vecrow_mapwork_part.q | 2 +- ..._evol_text_vecrow_mapwork_part_all_complex.q | 2 +- ...vol_text_vecrow_mapwork_part_all_primitive.q | 2 +- .../schema_evol_text_vecrow_mapwork_table.q | 2 +- .../clientnegative/orc_replace_columns2.q.out | 13 +- .../orc_replace_columns2_acid.q.out | 13 +- .../clientnegative/orc_replace_columns3.q.out | 11 +- .../orc_replace_columns3_acid.q.out | 11 +- .../clientnegative/orc_type_promotion1.q.out | 13 +- .../orc_type_promotion1_acid.q.out | 13 +- .../clientnegative/orc_type_promotion2.q.out | 13 +- .../orc_type_promotion2_acid.q.out | 13 +- .../clientnegative/orc_type_promotion3.q.out | 11 +- .../clientnegative/orc_type_promotion3_acid.q | 18 + .../orc_type_promotion3_acid.q.out | 11 +- .../schema_evol_orc_acid_mapwork_part.q.out | 4319 ++++++++++++--- .../schema_evol_orc_acid_mapwork_table.q.out | 3334 ++++++++++-- .../schema_evol_orc_acidvec_mapwork_part.q.out | 4319 ++++++++++++--- .../schema_evol_orc_acidvec_mapwork_table.q.out | 3334 ++++++++++-- .../schema_evol_orc_nonvec_fetchwork_part.q.out | 4905 +++++++++++++++-- ...schema_evol_orc_nonvec_fetchwork_table.q.out | 4367 +++++++++++++++- .../schema_evol_orc_nonvec_mapwork_part.q.out | 4909 +++++++++++++++-- ...ol_orc_nonvec_mapwork_part_all_complex.q.out | 726 +++ ..._orc_nonvec_mapwork_part_all_primitive.q.out | 2872 ++++++++++ .../schema_evol_orc_nonvec_mapwork_table.q.out | 4367 +++++++++++++++- .../schema_evol_orc_vec_mapwork_part.q.out | 4929 ++++++++++++++++-- ..._evol_orc_vec_mapwork_part_all_complex.q.out | 726 +++ ...vol_orc_vec_mapwork_part_all_primitive.q.out | 2887 ++++++++++ .../schema_evol_orc_vec_mapwork_table.q.out | 4391 +++++++++++++++- .../tez/schema_evol_orc_acid_mapwork_part.q.out | 4319 ++++++++++++--- .../schema_evol_orc_acid_mapwork_table.q.out | 3334 ++++++++++-- .../schema_evol_orc_acidvec_mapwork_part.q.out | 4319 ++++++++++++--- .../schema_evol_orc_acidvec_mapwork_table.q.out | 3334 ++++++++++-- .../schema_evol_orc_nonvec_fetchwork_part.q.out | 4449 ++++++++++++++-- ...schema_evol_orc_nonvec_fetchwork_table.q.out | 3911 +++++++++++++- .../schema_evol_orc_nonvec_mapwork_part.q.out | 4453 ++++++++++++++-- ...ol_orc_nonvec_mapwork_part_all_complex.q.out | 669 +++ ..._orc_nonvec_mapwork_part_all_primitive.q.out | 2587 +++++++++ .../schema_evol_orc_nonvec_mapwork_table.q.out | 3911 +++++++++++++- .../tez/schema_evol_orc_vec_mapwork_part.q.out | 4449 ++++++++++++++-- ..._evol_orc_vec_mapwork_part_all_complex.q.out | 669 +++ ...vol_orc_vec_mapwork_part_all_primitive.q.out | 2587 +++++++++ .../tez/schema_evol_orc_vec_mapwork_table.q.out | 3911 +++++++++++++- service-rpc/if/TCLIService.thrift | 6 + .../gen/thrift/gen-cpp/TCLIService_types.cpp | 30 +- .../src/gen/thrift/gen-cpp/TCLIService_types.h | 15 +- .../rpc/thrift/TExecuteStatementReq.java | 109 +- .../service/rpc/thrift/TOperationState.java | 5 +- service-rpc/src/gen/thrift/gen-php/Types.php | 25 + .../src/gen/thrift/gen-py/TCLIService/ttypes.py | 18 +- .../gen/thrift/gen-rb/t_c_l_i_service_types.rb | 9 +- .../org/apache/hive/service/cli/CLIService.java | 46 +- .../service/cli/EmbeddedCLIServiceClient.java | 19 +- .../apache/hive/service/cli/ICLIService.java | 16 +- .../apache/hive/service/cli/OperationState.java | 7 +- .../operation/ExecuteStatementOperation.java | 9 +- .../cli/operation/HiveCommandOperation.java | 5 + .../cli/operation/MetadataOperation.java | 7 +- .../hive/service/cli/operation/Operation.java | 17 +- .../service/cli/operation/OperationManager.java | 27 +- .../service/cli/operation/SQLOperation.java | 106 +- .../hive/service/cli/session/HiveSession.java | 28 +- .../service/cli/session/HiveSessionImpl.java | 38 +- .../thrift/RetryingThriftCLIServiceClient.java | 22 +- .../service/cli/thrift/ThriftCLIService.java | 16 +- .../cli/thrift/ThriftCLIServiceClient.java | 32 +- .../cli/thrift/ThriftCLIServiceTest.java | 6 +- .../thrift/ThriftCliServiceTestWithCookie.java | 3 +- .../apache/hadoop/hive/shims/Hadoop23Shims.java | 148 - .../org/apache/hadoop/hive/io/HdfsUtils.java | 156 +- .../apache/hadoop/hive/shims/HadoopShims.java | 41 - .../hadoop/hive/shims/HadoopShimsSecure.java | 10 - 126 files changed, 101719 insertions(+), 10497 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/bc75d72b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/bc75d72b/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskCommunicator.java ----------------------------------------------------------------------