You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2014/10/20 23:35:37 UTC
svn commit: r1633233 -
/hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
Author: hashutosh
Date: Mon Oct 20 21:35:37 2014
New Revision: 1633233
URL: http://svn.apache.org/r1633233
Log:
HIVE-7914 : Simplify join predicates for CBO to avoid cross products (John Pullokkaran via Ashutosh Chauhan)
Modified:
hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
Modified: hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java?rev=1633233&r1=1633232&r2=1633233&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java (original)
+++ hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java Mon Oct 20 21:35:37 2014
@@ -41,6 +41,7 @@ import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
import com.google.common.annotations.VisibleForTesting;
+
import net.hydromatic.optiq.SchemaPlus;
import net.hydromatic.optiq.tools.Frameworks;
@@ -272,6 +273,7 @@ import org.eigenbase.reltype.RelDataType
import org.eigenbase.rex.RexBuilder;
import org.eigenbase.rex.RexInputRef;
import org.eigenbase.rex.RexNode;
+import org.eigenbase.rex.RexUtil;
import org.eigenbase.rex.RexWindowBound;
import org.eigenbase.rex.RexFieldCollation;
import org.eigenbase.sql.SqlAggFunction;
@@ -12829,8 +12831,9 @@ public class SemanticAnalyzer extends Ba
.get(srcRel);
RexNode convertedFilterExpr = new RexNodeConverter(cluster, srcRel.getRowType(),
hiveColNameOptiqPosMap, 0, true).convert(filterCondn);
+ RexNode factoredFilterExpr = RexUtil.pullFactors(cluster.getRexBuilder(), convertedFilterExpr);
RelNode filterRel = new HiveFilterRel(cluster, cluster.traitSetOf(HiveRel.CONVENTION),
- srcRel, convertedFilterExpr);
+ srcRel, factoredFilterExpr);
this.relToHiveColNameOptiqPosMap.put(filterRel, hiveColNameOptiqPosMap);
relToHiveRR.put(filterRel, relToHiveRR.get(srcRel));
relToHiveColNameOptiqPosMap.put(filterRel, hiveColNameOptiqPosMap);