Skip to content

Fixing Typo and Adding Test Cases for JoinReduce #25

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

Closed
WKaiZ wants to merge 6 commits into from
Closed

Fixing Typo and Adding Test Cases for JoinReduce #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3aacd37
AggJoinRmv and AggJoinJoinRmv
WKaiZ Aug 1, 2025
804b5bb
Removing Comments for Simplicity
WKaiZ Aug 1, 2025
44fb6c4
Adding ReduceExpression Rules for Joins
WKaiZ Aug 17, 2025
39c82e4
Typo, Test Cases for JoinReduce
WKaiZ Aug 23, 2025
63e83a6
reverting back java version
WKaiZ Aug 23, 2025
9dc292f
Merge branch 'dsl' into dsl-2
WKaiZ Aug 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 68 additions & 0 deletions rules/FilterProjectTranspose-.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
{
"help" : [ "LogicalFilter(condition=[pred($0)])\n LogicalProject($f0=[proj($0)])\n LogicalTableScan(table=[[Source]])\n", "LogicalProject($f0=[proj($0)])\n LogicalFilter(condition=[pred(proj($0))])\n LogicalTableScan(table=[[Source]])\n" ],
"schemas" : [ {
"types" : [ "INTEGER" ],
"nullable" : [ true ],
"name" : "Source",
"guaranteed" : [ ],
"fields" : [ "col-Source" ],
"key" : [ ]
} ],
"queries" : [ {
"filter" : {
"condition" : {
"type" : "BOOLEAN",
"operand" : [ {
"column" : 0,
"type" : "INTEGER"
} ],
"operator" : "pred"
},
"source" : {
"project" : {
"source" : {
"scan" : 0
},
"target" : [ {
"type" : "INTEGER",
"operand" : [ {
"column" : 0,
"type" : "INTEGER"
} ],
"operator" : "proj"
} ]
}
}
}
}, {
"project" : {
"source" : {
"filter" : {
"condition" : {
"type" : "BOOLEAN",
"operand" : [ {
"type" : "INTEGER",
"operand" : [ {
"column" : 0,
"type" : "INTEGER"
} ],
"operator" : "proj"
} ],
"operator" : "pred"
},
"source" : {
"scan" : 0
}
}
},
"target" : [ {
"type" : "INTEGER",
"operand" : [ {
"column" : 0,
"type" : "INTEGER"
} ],
"operator" : "proj"
} ]
}
} ]
}
41 changes: 41 additions & 0 deletions src/main/java/org/qed/Generated/JoinReduceFalse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package org.qed.Generated;

import org.apache.calcite.plan.RelOptRuleCall;
import org.apache.calcite.plan.RelRule;
import org.apache.calcite.plan.RelOptUtil;
import java.util.List;
import org.apache.calcite.rel.RelNode;
import org.apache.calcite.rel.core.JoinRelType;
import org.apache.calcite.rel.logical.*;

public class JoinReduceFalse extends RelRule<JoinReduceFalse.Config> {
protected JoinReduceFalse(Config config) {
super(config);
}

@Override
public void onMatch(RelOptRuleCall call) {
var var_5 = call.builder();
call.transformTo(var_5.push(call.rel(1)).push(call.rel(2)).join(JoinRelType.LEFT, var_5.push(call.rel(1)).push(call.rel(2)).literal(false)).build());
}

public interface Config extends EmptyConfig {
Config DEFAULT = new Config() {};

@Override
default JoinReduceFalse toRule() {
return new JoinReduceFalse(this);
}

@Override
default String description() {
return "JoinReduceFalse";
}

@Override
default RelRule.OperandTransform operandSupplier() {
return s_2 -> s_2.operand(LogicalJoin.class).inputs(s_0 -> s_0.operand(RelNode.class).anyInputs(), s_1 -> s_1.operand(RelNode.class).anyInputs());
}

}
}
41 changes: 41 additions & 0 deletions src/main/java/org/qed/Generated/JoinReduceTrue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package org.qed.Generated;

import org.apache.calcite.plan.RelOptRuleCall;
import org.apache.calcite.plan.RelRule;
import org.apache.calcite.plan.RelOptUtil;
import java.util.List;
import org.apache.calcite.rel.RelNode;
import org.apache.calcite.rel.core.JoinRelType;
import org.apache.calcite.rel.logical.*;

public class JoinReduceTrue extends RelRule<JoinReduceTrue.Config> {
protected JoinReduceTrue(Config config) {
super(config);
}

@Override
public void onMatch(RelOptRuleCall call) {
var var_5 = call.builder();
call.transformTo(var_5.push(call.rel(1)).push(call.rel(2)).join(JoinRelType.LEFT, ((LogicalJoin) call.rel(0)).getCondition()).build());
}

public interface Config extends EmptyConfig {
Config DEFAULT = new Config() {};

@Override
default JoinReduceTrue toRule() {
return new JoinReduceTrue(this);
}

@Override
default String description() {
return "JoinReduceTrue";
}

@Override
default RelRule.OperandTransform operandSupplier() {
return s_2 -> s_2.operand(LogicalJoin.class).inputs(s_0 -> s_0.operand(RelNode.class).anyInputs(), s_1 -> s_1.operand(RelNode.class).anyInputs());
}

}
}
3 changes: 2 additions & 1 deletion src/main/java/org/qed/Generated/RRuleInstances/JoinReduceFalse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package org.qed.Generated.RRuleInstances;

import org.apache.calcite.rel.core.JoinRelType;
import org.qed.RRule;
import org.qed.RelRN;
import org.qed.RexRN;

public record JoinReduceFalse() {
public record JoinReduceFalse() implements RRule {
static final RelRN left = RelRN.scan("Left", "Left_Type");
static final RelRN right = RelRN.scan("Right", "Right_Type");
static final RexRN joinCond = RexRN.and(left.joinPred("join", right), RexRN.falseLiteral());
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/qed/Generated/RRuleInstances/JoinReduceTrue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package org.qed.Generated.RRuleInstances;

import org.apache.calcite.rel.core.JoinRelType;
import org.qed.RRule;
import org.qed.RelRN;
import org.qed.RexRN;

public record JoinReduceTrue() {
public record JoinReduceTrue() implements RRule {
static final RelRN left = RelRN.scan("Left", "Left_Type");
static final RelRN right = RelRN.scan("Right", "Right_Type");
static final RexRN afterJoinCond = left.joinPred("join", right);
Expand Down
43 changes: 43 additions & 0 deletions src/main/java/org/qed/Generated/Tests/JoinReduceFalseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package org.qed.Generated.Tests;

import kala.collection.Seq;
import kala.tuple.Tuple;
import org.apache.calcite.rel.core.JoinRelType;
import org.apache.calcite.sql.fun.SqlStdOperatorTable;
import org.qed.Generated.CalciteTester;
import org.qed.RelType;
import org.qed.Generated.RRuleInstances.JoinReduceFalse;
import org.qed.RuleBuilder;

public class JoinReduceFalseTest {

public static void runTest() {
var tester = new CalciteTester();
var builder = RuleBuilder.create();

var leftTable = builder.createQedTable(Seq.of(Tuple.of(RelType.fromString("INTEGER", true), false)));
var rightTable = builder.createQedTable(Seq.of(Tuple.of(RelType.fromString("INTEGER", true), false)));
builder.addTable(leftTable);
builder.addTable(rightTable);

var before = builder.scan(leftTable.getName())
.scan(rightTable.getName())
.join(JoinRelType.INNER, builder.call(SqlStdOperatorTable.AND,
builder.call(builder.genericPredicateOp("join", true), builder.joinFields()),
builder.literal(false)))
.build();

var after = builder.scan(leftTable.getName())
.scan(rightTable.getName())
.join(JoinRelType.LEFT, builder.literal(false))
.build();

var runner = CalciteTester.loadRule(org.qed.Generated.JoinReduceFalse.Config.DEFAULT.toRule());
tester.verify(runner, before, after);
}

public static void main(String[] args) {
System.out.println("Running JoinReduceFalse test...");
runTest();
}
}
43 changes: 43 additions & 0 deletions src/main/java/org/qed/Generated/Tests/JoinReduceTrueTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package org.qed.Generated.Tests;

import kala.collection.Seq;
import kala.tuple.Tuple;
import org.apache.calcite.rel.core.JoinRelType;
import org.apache.calcite.sql.fun.SqlStdOperatorTable;
import org.qed.Generated.CalciteTester;
import org.qed.RelType;
import org.qed.Generated.RRuleInstances.JoinReduceTrue;
import org.qed.RuleBuilder;

public class JoinReduceTrueTest {

public static void runTest() {
var tester = new CalciteTester();
var builder = RuleBuilder.create();

var leftTable = builder.createQedTable(Seq.of(Tuple.of(RelType.fromString("INTEGER", true), false)));
var rightTable = builder.createQedTable(Seq.of(Tuple.of(RelType.fromString("INTEGER", true), false)));
builder.addTable(leftTable);
builder.addTable(rightTable);

var before = builder.scan(leftTable.getName())
.scan(rightTable.getName())
.join(JoinRelType.INNER, builder.call(SqlStdOperatorTable.AND,
builder.call(builder.genericPredicateOp("join", true), builder.joinFields()),
builder.literal(true)))
.build();

var after = builder.scan(leftTable.getName())
.scan(rightTable.getName())
.join(JoinRelType.LEFT, builder.call(builder.genericPredicateOp("join", true), builder.joinFields()))
.build();

var runner = CalciteTester.loadRule(org.qed.Generated.JoinReduceTrue.Config.DEFAULT.toRule());
tester.verify(runner, before, after);
}

public static void main(String[] args) {
System.out.println("Running JoinReduceTrue test...");
runTest();
}
}
Loading