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 2017/10/04 03:39:15 UTC

[6/6] hive git commit: HIVE-14671 : merge master into hive-14535 (Sergey Shelukhin)

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/14c94820
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/14c94820
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/14c94820

Branch: refs/heads/hive-14535
Commit: 14c9482017f5bb7263e0893023cc47a8d37ec3de
Parents: 6401597 d376157
Author: sergey <se...@apache.org>
Authored: Tue Oct 3 20:33:47 2017 -0700
Committer: sergey <se...@apache.org>
Committed: Tue Oct 3 20:33:47 2017 -0700

----------------------------------------------------------------------
 .../hadoop/hive/druid/DruidStorageHandler.java  |    8 +-
 .../ExpressionTemplates/IfExprColumnScalar.txt  |    4 +
 .../org/apache/hadoop/hive/ql/exec/DDLTask.java |   49 +-
 .../apache/hadoop/hive/ql/metadata/Hive.java    |   95 +-
 .../metadata/HiveMaterializedViewsRegistry.java |    8 +-
 .../apache/hadoop/hive/ql/metadata/Table.java   |    5 +-
 ...tedDynPartitionTimeGranularityOptimizer.java |   12 +-
 .../ql/optimizer/calcite/HiveCalciteUtil.java   |   12 +-
 .../ql/optimizer/calcite/RelOptHiveTable.java   |   78 +-
 .../rules/views/HiveMaterializedViewRule.java   |   27 +-
 .../hadoop/hive/ql/parse/CalcitePlanner.java    |  168 +-
 .../hadoop/hive/ql/parse/SemanticAnalyzer.java  |    5 +-
 .../hadoop/hive/ql/plan/CreateTableDesc.java    |   19 +-
 .../hadoop/hive/ql/plan/CreateViewDesc.java     |    1 +
 .../apache/hadoop/hive/ql/plan/PlanUtils.java   |   99 +-
 .../materialized_view_create_rewrite_2.q        |   88 +
 .../materialized_view_rewrite_ssb.q             |  346 ++++
 .../materialized_view_rewrite_ssb_2.q           |  347 ++++
 .../queries/clientpositive/vector_if_expr_2.q   |   19 +
 .../clientpositive/llap/subquery_notin.q.out    |  116 +-
 .../materialized_view_create_rewrite_2.q.out    |  574 ++++++
 .../materialized_view_describe.q.out            |   12 +-
 .../materialized_view_rewrite_ssb.q.out         | 1621 +++++++++++++++++
 .../materialized_view_rewrite_ssb_2.q.out       | 1627 ++++++++++++++++++
 .../outer_reference_windowed.q.out              |   34 +-
 .../clientpositive/vector_if_expr_2.q.out       |  117 ++
 .../vector_outer_reference_windowed.q.out       |   34 +-
 27 files changed, 5303 insertions(+), 222 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/14c94820/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/14c94820/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
----------------------------------------------------------------------
diff --cc ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
index 7464a29,b0e68b1..37ee6b6
--- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
@@@ -51,10 -51,8 +51,11 @@@ import java.util.concurrent.ExecutorSer
  import java.util.concurrent.Executors;
  import java.util.concurrent.Future;
  import java.util.concurrent.atomic.AtomicInteger;
+ import java.util.stream.Collectors;
  
 +import com.google.common.base.Preconditions;
 +import com.google.common.collect.ImmutableMap;
 +
  import javax.jdo.JDODataStoreException;
  
  import org.apache.calcite.plan.RelOptMaterialization;
@@@ -63,13 -61,10 +64,12 @@@ import org.apache.hadoop.conf.Configura
  import org.apache.hadoop.fs.FileChecksum;
  import org.apache.hadoop.fs.FileStatus;
  import org.apache.hadoop.fs.FileSystem;
 +import org.apache.hadoop.fs.LocatedFileStatus;
  import org.apache.hadoop.fs.Path;
  import org.apache.hadoop.fs.PathFilter;
- import org.apache.hadoop.hive.common.BlobStorageUtils;
  import org.apache.hadoop.hive.common.FileUtils;
  import org.apache.hadoop.hive.common.HiveStatsUtils;
 +import org.apache.hadoop.hive.common.JavaUtils;
  import org.apache.hadoop.hive.common.ObjectPair;
  import org.apache.hadoop.hive.common.StatsSetupConst;
  import org.apache.hadoop.hive.common.classification.InterfaceAudience.LimitedPrivate;

http://git-wip-us.apache.org/repos/asf/hive/blob/14c94820/ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java
----------------------------------------------------------------------

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

http://git-wip-us.apache.org/repos/asf/hive/blob/14c94820/ql/src/java/org/apache/hadoop/hive/ql/plan/CreateTableDesc.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/14c94820/ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java
----------------------------------------------------------------------