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/98b0b8ee Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/98b0b8ee Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/98b0b8ee Branch: refs/heads/hive-14535 Commit: 98b0b8ee88a35fd5517dad82505a9651262c69c7 Parents: a057e12 19999da Author: Sergey Shelukhin <[email protected]> Authored: Thu Oct 20 15:02:43 2016 -0700 Committer: Sergey Shelukhin <[email protected]> Committed: Thu Oct 20 15:02:43 2016 -0700 ---------------------------------------------------------------------- beeline/src/main/resources/BeeLine.properties | 2 +- .../org/apache/hive/jdbc/miniHS2/MiniHS2.java | 71 +- .../BeelineWithHS2ConnectionFileTestBase.java | 218 + .../TestBeelineConnectionUsingHiveSite.java | 9 +- .../TestBeelineWithHS2ConnectionFile.java | 214 - .../TestBeelineWithUserHs2ConnectionFile.java | 3 +- .../apache/hive/jdbc/TestJdbcWithMiniHS2.java | 7 +- .../test/java/org/apache/hive/jdbc/TestSSL.java | 9 +- .../jdbc/TestServiceDiscoveryWithMiniHS2.java | 6 +- .../org/apache/hive/jdbc/TestXSRFFilter.java | 14 +- .../test/resources/testconfiguration.properties | 14 +- .../org/apache/hadoop/hive/ql/QTestUtil.java | 45 +- metastore/if/hive_metastore.thrift | 3 +- .../gen/thrift/gen-cpp/hive_metastore_types.cpp | 22 + .../gen/thrift/gen-cpp/hive_metastore_types.h | 12 +- .../hive/metastore/api/LockComponent.java | 109 +- .../src/gen/thrift/gen-php/metastore/Types.php | 23 + .../gen/thrift/gen-py/hive_metastore/ttypes.py | 15 +- .../gen/thrift/gen-rb/hive_metastore_types.rb | 4 +- pom.xml | 14 +- .../hive/ql/udf/generic/GenericUDAFSum.java | 16 +- .../queries/clientpositive/acid_globallimit.q | 2 +- .../queries/clientpositive/acid_table_stats.q | 1 + ql/src/test/queries/clientpositive/cte_1.q | 32 +- ql/src/test/queries/clientpositive/cte_2.q | 5 + .../clientpositive/current_date_timestamp.q | 102 + .../queries/clientpositive/decimal_precision.q | 7 + .../queries/clientpositive/join_acid_non_acid.q | 10 + .../test/queries/clientpositive/lvj_mapjoin.q | 9 + .../test/queries/clientpositive/orc_ppd_basic.q | 48 + .../schema_evol_orc_acid_part_update.q | 42 + .../queries/clientpositive/vectorization_0.q | 67 + .../clientpositive/acid_table_stats.q.out | 13 + ql/src/test/results/clientpositive/cte_1.q.out | 18948 +++++++++++ ql/src/test/results/clientpositive/cte_2.q.out | 28 + .../clientpositive/current_date_timestamp.q.out | 350 + .../clientpositive/decimal_precision.q.out | 36 + .../clientpositive/llap/acid_globallimit.q.out | 24 +- .../results/clientpositive/llap/cte_1.q.out | 18948 +++++++++++ .../results/clientpositive/llap/cte_2.q.out | 28 + .../llap/join_acid_non_acid.q.out | 16 + .../clientpositive/llap/lvj_mapjoin.q.out | 47 + .../clientpositive/llap/orc_ppd_basic.q.out | 220 + .../llap/schema_evol_orc_acid_part_update.q.out | 1148 + .../clientpositive/llap/vectorization_0.q.out | 29603 ++++++++++++++++ .../clientpositive/spark/vectorization_0.q.out | 29599 ++++++++++++++++ .../clientpositive/vectorization_0.q.out | 29871 +++++++++++++++++ .../ptest2/src/main/resources/batch-exec.vm | 2 - 48 files changed, 129744 insertions(+), 292 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/98b0b8ee/metastore/if/hive_metastore.thrift ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/98b0b8ee/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/98b0b8ee/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/98b0b8ee/metastore/src/gen/thrift/gen-php/metastore/Types.php ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/98b0b8ee/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/98b0b8ee/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb ----------------------------------------------------------------------
