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/9e2ac4fa Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/9e2ac4fa Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/9e2ac4fa Branch: refs/heads/hive-14535 Commit: 9e2ac4fa6ac4775b161c750d5cd144631f7a358d Parents: 2e60259 d7a43c7 Author: Sergey Shelukhin <[email protected]> Authored: Thu Oct 27 19:32:47 2016 -0700 Committer: Sergey Shelukhin <[email protected]> Committed: Thu Oct 27 19:32:47 2016 -0700 ---------------------------------------------------------------------- .../apache/hive/beeline/ClassNameCompleter.java | 54 +++-- .../hive/beeline/TestBeelineArgParsing.java | 1 + .../hive/beeline/TestClassNameCompleter.java | 76 +++++++ .../hadoop/hive/common/auth/HiveAuthUtils.java | 125 +++++++++++ .../org/apache/hadoop/hive/conf/HiveConf.java | 12 ++ data/conf/llap/tez-site.xml | 5 + data/conf/perf-reg/tez-site.xml | 4 + data/conf/tez/tez-site.xml | 4 + druid-handler/pom.xml | 5 + .../druid/HiveDruidQueryBasedInputFormat.java | 13 +- .../serde/DruidGroupByQueryRecordReader.java | 18 +- .../serde/DruidSelectQueryRecordReader.java | 2 +- .../druid/serde/DruidTopNQueryRecordReader.java | 2 +- .../hive/hcatalog/cli/TestSemanticAnalysis.java | 9 +- .../org/apache/hive/jdbc/miniHS2/MiniHS2.java | 7 +- .../test/java/org/apache/hive/jdbc/TestSSL.java | 66 ++++++ .../TestThriftHttpCLIServiceFeatures.java | 4 +- .../test/resources/testconfiguration.properties | 1 + .../org/apache/hadoop/hive/ql/QTestUtil.java | 8 +- .../org/apache/hive/jdbc/HiveConnection.java | 7 +- .../hive/llap/registry/impl/TestSlotZnode.java | 27 ++- .../hadoop/hive/metastore/HiveAlterHandler.java | 128 ++++++----- .../hadoop/hive/metastore/HiveMetaStore.java | 40 +++- .../hive/metastore/HiveMetaStoreClient.java | 43 +++- .../hive/metastore/TServerSocketKeepAlive.java | 4 +- pom.xml | 3 +- .../apache/hadoop/hive/ql/exec/FetchTask.java | 2 +- .../hadoop/hive/ql/exec/SMBMapJoinOperator.java | 4 +- .../hadoop/hive/ql/exec/TableScanOperator.java | 10 +- .../hadoop/hive/ql/exec/mr/MapredLocalTask.java | 2 +- .../hadoop/hive/ql/io/HiveInputFormat.java | 8 +- .../hive/ql/io/parquet/ProjectionPusher.java | 6 + .../io/parquet/convert/HiveStructConverter.java | 29 ++- .../parquet/read/DataWritableReadSupport.java | 138 +++++++++++- .../hive/ql/optimizer/ColumnPrunerProcCtx.java | 102 +++++++++ .../ql/optimizer/ColumnPrunerProcFactory.java | 28 +-- .../hadoop/hive/ql/optimizer/FieldNode.java | 80 +++++++ .../NestedColumnFieldPruningUtils.java | 91 ++++++++ .../hive/ql/optimizer/SimpleFetchOptimizer.java | 169 +++++++++------ .../calcite/translator/ASTBuilder.java | 2 +- .../hadoop/hive/ql/parse/CalcitePlanner.java | 53 +++-- .../hadoop/hive/ql/plan/TableScanDesc.java | 10 +- .../io/parquet/HiveParquetSchemaTestUtils.java | 75 +++++++ .../ql/io/parquet/TestHiveSchemaConverter.java | 49 +---- .../read/TestDataWritableReadSupport.java | 112 ++++++++++ .../ql/optimizer/TestColumnPrunerProcCtx.java | 215 +++++++++++++++++++ .../TestNestedColumnFieldPruningUtils.java | 89 ++++++++ .../clientpositive/encryption_move_tbl.q | 43 +++- .../clientpositive/stats_based_fetch_decision.q | 15 ++ .../results/clientpositive/druid_basic2.q.out | 24 +-- .../clientpositive/druid_intervals.q.out | 20 +- .../clientpositive/druid_timeseries.q.out | 26 +-- .../results/clientpositive/druid_topn.q.out | 16 +- .../encrypted/encryption_move_tbl.q.out | 140 +++++++++++- .../llap/stats_based_fetch_decision.q.out | 176 +++++++++++++++ .../hive/serde2/ColumnProjectionUtils.java | 60 +++++- .../StandardStructObjectInspector.java | 10 + .../hive/service/auth/HiveAuthFactory.java | 96 --------- .../cli/thrift/ThriftBinaryCLIService.java | 5 +- .../apache/hadoop/hive/shims/Hadoop23Shims.java | 26 +++ testutils/metastore/metastore-upgrade-test.sh | 2 +- .../ptest2/src/main/resources/batch-exec.vm | 2 +- .../ptest2/src/main/resources/source-prep.vm | 2 +- 63 files changed, 2159 insertions(+), 446 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/9e2ac4fa/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/9e2ac4fa/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java ---------------------------------------------------------------------- diff --cc metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java index 68b00f3,1ea94c2..0a46574 --- a/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java +++ b/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java @@@ -120,8 -121,10 +121,11 @@@ import org.slf4j.LoggerFactory import javax.jdo.JDOException; import java.io.IOException; + import java.net.InetAddress; + import java.net.InetSocketAddress; + import java.net.UnknownHostException; import java.nio.ByteBuffer; +import java.sql.SQLException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.AbstractMap; http://git-wip-us.apache.org/repos/asf/hive/blob/9e2ac4fa/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/9e2ac4fa/ql/src/java/org/apache/hadoop/hive/ql/exec/FetchTask.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/9e2ac4fa/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java ---------------------------------------------------------------------- diff --cc ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java index 428093c,69956ec..8539ccd --- a/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java @@@ -18,21 -18,14 +18,17 @@@ package org.apache.hadoop.hive.ql.io; - import java.util.Arrays; - import org.apache.hadoop.hive.ql.exec.vector.VectorizedInputFormatInterface; - import java.io.DataInput; import java.io.DataOutput; +import java.io.FileNotFoundException; import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; +import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Map; - import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.Map.Entry; http://git-wip-us.apache.org/repos/asf/hive/blob/9e2ac4fa/ql/src/java/org/apache/hadoop/hive/ql/plan/TableScanDesc.java ----------------------------------------------------------------------
