Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

HIVE-23877: Hive on Spark incorrect partition pruning ANALYZE TABLE #1278

Closed
wants to merge 1 commit into from
Closed

HIVE-23877: Hive on Spark incorrect partition pruning ANALYZE TABLE #1278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...ava/org/apache/hadoop/hive/ql/optimizer/metainfo/annotation/OpTraitsRulesProcFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,9 @@ public Object process(Node nd, Stack<Node> stack, NodeProcessorCtx procCtx,
Table table = ts.getConf().getTableMetadata();
PrunedPartitionList prunedPartList = null;
try {
boolean analyzeCommand = opTraitsCtx.getParseContext().getQueryProperties().isAnalyzeCommand();
prunedPartList =
opTraitsCtx.getParseContext().getPrunedPartitions(ts.getConf().getAlias(), ts);
opTraitsCtx.getParseContext().getPrunedPartitions(ts, analyzeCommand);
} catch (HiveException e) {
prunedPartList = null;
}
Expand Down
3 changes: 2 additions & 1 deletion ql/src/java/org/apache/hadoop/hive/ql/optimizer/stats/annotation/StatsRulesProcFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,8 @@ public Object process(Node nd, Stack<Node> stack, NodeProcessorCtx procCtx,
Object... nodeOutputs) throws SemanticException {
TableScanOperator tsop = (TableScanOperator) nd;
AnnotateStatsProcCtx aspCtx = (AnnotateStatsProcCtx) procCtx;
PrunedPartitionList partList = aspCtx.getParseContext().getPrunedPartitions(tsop);
boolean analyzeCommand = aspCtx.getParseContext().getQueryProperties().isAnalyzeCommand();
PrunedPartitionList partList = aspCtx.getParseContext().getPrunedPartitions(tsop, analyzeCommand);
ColumnStatsList colStatsCached = aspCtx.getParseContext().getColStatsCached(partList);
Table table = tsop.getConf().getTableMetadata();

Expand Down
24 changes: 24 additions & 0 deletions ql/src/java/org/apache/hadoop/hive/ql/parse/ParseContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package org.apache.hadoop.hive.ql.parse;

import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Multimap;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.ql.Context;
Expand All @@ -39,6 +40,7 @@
import org.apache.hadoop.hive.ql.exec.Task;
import org.apache.hadoop.hive.ql.hooks.LineageInfo;
import org.apache.hadoop.hive.ql.hooks.ReadEntity;
import org.apache.hadoop.hive.ql.metadata.Partition;
import org.apache.hadoop.hive.ql.metadata.Table;
import org.apache.hadoop.hive.ql.optimizer.ppr.PartitionPruner;
import org.apache.hadoop.hive.ql.optimizer.unionproc.UnionProcContext;
Expand Down Expand Up @@ -538,6 +540,28 @@ public PrunedPartitionList getPrunedPartitions(String alias, TableScanOperator t
return partsList;
}

public PrunedPartitionList getPrunedPartitions(TableScanOperator ts, boolean analyzeCommand)
throws SemanticException {
PrunedPartitionList partsList = opToPartList.get(ts);
if (partsList != null) {
return partsList;
}
if (analyzeCommand) {
Table table = ts.getConf().getTableMetadata();
ImmutableSet<Partition> partitions;
if (table.getTableSpec().partitions == null) {
partitions = ImmutableSet.of();
} else {
partitions = ImmutableSet.copyOf(table.getTableSpec().partitions);
}
PrunedPartitionList partList = new PrunedPartitionList(table, partitions, Collections.emptyList(), false);
opToPartList.put(ts, partList);
return partList;
} else {
return getPrunedPartitions(ts);
}
}

/**
* @return the opToPartToSkewedPruner
*/
Expand Down