You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by se...@apache.org on 2015/10/13 02:13:05 UTC
[40/51] [abbrv] hive git commit: HIVE-12071 : LLAP: merge master into
branch (Sergey Shelukhin)
HIVE-12071 : LLAP: merge master into branch (Sergey Shelukhin)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/be00a031
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/be00a031
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/be00a031
Branch: refs/heads/master
Commit: be00a031da2d55ce8a6bf7280e2a797eb6741cd2
Parents: 7a23913 aded0d3
Author: Sergey Shelukhin <se...@apache.org>
Authored: Thu Oct 8 12:38:27 2015 -0700
Committer: Sergey Shelukhin <se...@apache.org>
Committed: Thu Oct 8 12:38:27 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/hive/beeline/BeeLine.java | 4 +
.../org/apache/hive/beeline/BeeLineOpts.java | 9 +
.../hive/beeline/TestBeelineArgParsing.java | 1 +
.../org/apache/hadoop/hive/cli/CliDriver.java | 9 +-
.../org/apache/hadoop/hive/conf/HiveConf.java | 3 +
.../apache/hadoop/hive/ql/log/PerfLogger.java | 2 +-
.../apache/hadoop/hive/ql/exec/ColumnInfo.java | 2 +-
.../hive/ql/exec/tez/TezSessionState.java | 203 +++++++++++++++----
.../apache/hadoop/hive/ql/exec/tez/TezTask.java | 6 +-
.../ql/io/avro/AvroGenericRecordReader.java | 22 +-
.../ql/metadata/SessionHiveMetaStoreClient.java | 2 +-
.../hadoop/hive/ql/parse/CalcitePlanner.java | 3 +-
.../hadoop/hive/ql/parse/SemanticAnalyzer.java | 34 +++-
.../hadoop/hive/ql/ppd/OpProcFactory.java | 10 +-
.../hadoop/hive/ql/session/SessionState.java | 60 ++++--
.../hive/ql/udf/generic/GenericUDFUtils.java | 3 +-
.../hadoop/hive/ql/exec/tez/TestTezTask.java | 2 +
.../ql/io/avro/TestAvroGenericRecordReader.java | 59 ++++++
ql/src/test/queries/clientpositive/join44.q | 12 ++
ql/src/test/queries/clientpositive/temp_table.q | 26 +++
ql/src/test/queries/clientpositive/union36.q | 10 +
.../clientpositive/dynamic_rdd_cache.q.out | 28 +--
ql/src/test/results/clientpositive/join44.q.out | 88 ++++++++
.../join_cond_pushdown_unqual1.q.out | 12 +-
.../join_cond_pushdown_unqual3.q.out | 18 +-
.../join_cond_pushdown_unqual4.q.out | 2 +-
.../results/clientpositive/pointlookup2.q.out | 12 +-
.../results/clientpositive/pointlookup3.q.out | 12 +-
.../spark/dynamic_rdd_cache.q.out | 28 +--
.../spark/join_cond_pushdown_unqual1.q.out | 12 +-
.../spark/join_cond_pushdown_unqual3.q.out | 18 +-
.../spark/join_cond_pushdown_unqual4.q.out | 2 +-
.../clientpositive/spark/temp_table.q.out | 107 ++++++++++
.../results/clientpositive/temp_table.q.out | 107 ++++++++++
.../tez/dynamic_partition_pruning.q.out | 4 +-
.../tez/dynamic_partition_pruning_2.q.out | 54 ++---
.../clientpositive/tez/explainuser_1.q.out | 96 ++++-----
.../results/clientpositive/tez/temp_table.q.out | 107 ++++++++++
.../tez/vector_mr_diff_schema_alias.q.out | 2 +-
.../vectorized_dynamic_partition_pruning.q.out | 4 +-
.../test/results/clientpositive/union36.q.out | 28 +++
.../vector_mr_diff_schema_alias.q.out | 2 +-
42 files changed, 986 insertions(+), 239 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/be00a031/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/be00a031/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionState.java
----------------------------------------------------------------------
diff --cc ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionState.java
index 41a742c,6ed6421..e034c71
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionState.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionState.java
@@@ -201,9 -211,7 +251,9 @@@ public class TezSessionState
// and finally we're ready to create and start the session
// generate basic tez config
- TezConfiguration tezConfig = new TezConfiguration(conf);
+ final TezConfiguration tezConfig = new TezConfiguration(conf);
+
+ // set up the staging directory to use
tezConfig.set(TezConfiguration.TEZ_AM_STAGING_DIR, tezScratchDir.toUri().toString());
Utilities.stripHivePasswordDetails(tezConfig);
@@@ -235,9 -223,8 +285,9 @@@
tezConfig.setInt(TezConfiguration.TEZ_AM_SESSION_MIN_HELD_CONTAINERS, n);
}
- session = TezClient.newBuilder("HIVE-" + sessionId, tezConfig).setIsSession(true)
- .setLocalResources(commonLocalResources)
- final TezClient session = TezClient.create("HIVE-" + sessionId, tezConfig, true,
- commonLocalResources, null);
++ final TezClient session = TezClient.newBuilder("HIVE-" + sessionId, tezConfig)
++ .setIsSession(true).setLocalResources(commonLocalResources)
+ .setServicePluginDescriptor(servicePluginsDescriptor).build();
LOG.info("Opening new Tez Session (id: " + sessionId
+ ", scratch dir: " + tezScratchDir + ")");
http://git-wip-us.apache.org/repos/asf/hive/blob/be00a031/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/be00a031/ql/src/test/results/clientpositive/tez/vector_mr_diff_schema_alias.q.out
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/be00a031/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out
----------------------------------------------------------------------