This is an automated email from the ASF dual-hosted git repository.
krisztiankasa pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new a60e593f23f HIVE-29506: HiveRelDecorrelator fails to decorrelate plan
with Values operator (#6360)
a60e593f23f is described below
commit a60e593f23f2dd749870964035b17868cd476a0a
Author: Krisztian Kasa <[email protected]>
AuthorDate: Mon Mar 23 14:17:55 2026 +0100
HIVE-29506: HiveRelDecorrelator fails to decorrelate plan with Values
operator (#6360)
---
.../calcite/rules/HiveRelDecorrelator.java | 13 ---
.../calcite/rules/TestHiveRelDecorrelator.java | 101 +++++++++++++++++++++
2 files changed, 101 insertions(+), 13 deletions(-)
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveRelDecorrelator.java
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveRelDecorrelator.java
index f10a19e41ad..7769191e5d8 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveRelDecorrelator.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveRelDecorrelator.java
@@ -30,7 +30,6 @@
import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
-import java.util.TreeSet;
import javax.annotation.Nonnull;
@@ -57,7 +56,6 @@
import org.apache.calcite.rel.core.JoinRelType;
import org.apache.calcite.rel.core.Project;
import org.apache.calcite.rel.core.Sort;
-import org.apache.calcite.rel.core.Values;
import org.apache.calcite.rel.logical.LogicalCorrelate;
import org.apache.calcite.rel.metadata.RelMdUtil;
import org.apache.calcite.rel.metadata.RelMetadataQuery;
@@ -112,7 +110,6 @@
import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
-import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -461,16 +458,6 @@ public Frame decorrelateRel(Sort rel) {
frame.corDefOutputs);
}
- /**
- * Rewrites a {@link Values}.
- *
- * @param rel Values to be rewritten
- */
- public Frame decorrelateRel(Values rel) {
- // There are no inputs, so rel does not need to be changed.
- return null;
- }
-
/**
* Rewrites a {@link Aggregate}.
*
diff --git
a/ql/src/test/org/apache/hadoop/hive/ql/optimizer/calcite/rules/TestHiveRelDecorrelator.java
b/ql/src/test/org/apache/hadoop/hive/ql/optimizer/calcite/rules/TestHiveRelDecorrelator.java
new file mode 100644
index 00000000000..a3ce1b4afa9
--- /dev/null
+++
b/ql/src/test/org/apache/hadoop/hive/ql/optimizer/calcite/rules/TestHiveRelDecorrelator.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hive.ql.optimizer.calcite.rules;
+
+import org.apache.calcite.plan.RelOptPlanner;
+import org.apache.calcite.plan.RelOptUtil;
+import org.apache.calcite.rel.RelNode;
+import org.apache.calcite.rel.core.JoinRelType;
+import org.apache.calcite.rex.RexCorrelVariable;
+import org.apache.calcite.sql.fun.SqlStdOperatorTable;
+import org.apache.calcite.tools.RelBuilder;
+import org.apache.calcite.util.Holder;
+import org.apache.hadoop.hive.ql.optimizer.calcite.HiveRexExecutorImpl;
+import org.junit.Test;
+
+import java.util.Collections;
+
+import static
org.apache.hadoop.hive.ql.optimizer.calcite.rules.TestRuleHelper.buildPlanner;
+import static org.junit.Assert.assertEquals;
+
+public class TestHiveRelDecorrelator {
+
+ TestRuleHelper.PlanFixture fixture() {
+ RelOptPlanner planner =
buildPlanner(Collections.singletonList(HiveAntiSemiJoinRule.INSTANCE));
+ planner.setExecutor(new HiveRexExecutorImpl());
+ return new TestRuleHelper.PlanFixture(planner)
+ .registerTable("t1", T1Record.class)
+ .registerTable("t2", T2Record.class);
+ }
+
+
+ @Test
+ public void testCorrelateIsRemovedWhenPlanHasEmptyValues() {
+ TestRuleHelper.PlanFixture fixture = fixture();
+ RelBuilder relBuilder = fixture.createRelBuilder();
+ Holder<RexCorrelVariable> v = Holder.empty();
+ RelNode basePlan = relBuilder
+ .scan("t1")
+ .empty()
+ .scan("t1")
+ .variable(v)
+ .scan("t2")
+ .filter(relBuilder.call(
+ SqlStdOperatorTable.EQUALS,
+ relBuilder.getRexBuilder().makeFieldAccess(v.get(), 0),
+ relBuilder.literal(10)))
+ .correlate(JoinRelType.SEMI, v.get().id, relBuilder.field(2, 0,
"t1id"))
+ .union(false)
+ .build();
+
+ String expectedBasePlan = "HiveUnion(all=[true])\n" +
+ " HiveValues(tuples=[[]])\n" +
+ " LogicalCorrelate(correlation=[$cor0], joinType=[semi],
requiredColumns=[{0}])\n" +
+ " LogicalTableScan(table=[[t1]])\n" +
+ " HiveFilter(condition=[=($cor0.t1id, 10)])\n" +
+ " LogicalTableScan(table=[[t2]])\n";
+
+ assertEquals("Original plans do not match", expectedBasePlan,
RelOptUtil.toString(basePlan));
+
+ RelNode decorrelatedPlan = HiveRelDecorrelator.decorrelateQuery(basePlan);
+ String expectedDecorrelatedPlan = "HiveUnion(all=[true])\n" +
+ " HiveValues(tuples=[[]])\n" +
+ " HiveProject(t1id=[$0], t1AnyCol=[$1])\n" +
+ " HiveSemiJoin(condition=[=($5, $2)], joinType=[semi])\n" +
+ " HiveProject(t1id=[$0], t1AnyCol=[$1], $f2=[=($0, 10)])\n" +
+ " LogicalTableScan(table=[[t1]])\n" +
+ " HiveJoin(condition=[true], joinType=[inner], algorithm=[none],
cost=[not available])\n" +
+ " LogicalTableScan(table=[[t2]])\n" +
+ " HiveFilter(condition=[$0])\n" +
+ " HiveAggregate(group=[{0}])\n" +
+ " HiveProject($f2=[=($0, 10)])\n" +
+ " LogicalTableScan(table=[[t1]])\n";
+
+ assertEquals("Optimized plans do not match", expectedDecorrelatedPlan,
RelOptUtil.toString(decorrelatedPlan));
+ }
+
+ static class T1Record {
+ public int t1id;
+ public int t1AnyCol;
+ }
+
+ static class T2Record {
+ public int t2id;
+ public int t2AnyCol;
+ }
+}
