Skip to content

added minus operator and generated code for MinusMerge #16

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

Merged
joyemang33 merged 3 commits into from
Jun 9, 2025
Merged

added minus operator and generated code for MinusMerge #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d30a1f7
added minus operator and generated code for MinusMerge
yushinliang Jun 6, 2025
2342786
Ignore .vscode/ folder
yushinliang Jun 9, 2025
f445b43
Merge branch 'dsl' into dsl
yushinliang Jun 9, 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
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ target/
*.iml
.mvn/wrapper/maven-wrapper.jar
.vscode
.devcontainer
.devcontainer
10 changes: 10 additions & 0 deletions src/main/java/org/qed/CodeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ default E onMatch(E env, RelRN pattern) {
case RelRN.Join join -> onMatchJoin(env, join);
case RelRN.Union union -> onMatchUnion(env, union);
case RelRN.Intersect intersect -> onMatchIntersect(env, intersect);
case RelRN.Minus minus -> onMatchMinus(env, minus);
case RelRN.Empty empty -> onMatchEmpty(env, empty);
default -> onMatchCustom(env, pattern);
};
Expand Down Expand Up @@ -62,6 +63,7 @@ default E transform(E env, RelRN target) {
case RelRN.Join join -> transformJoin(env, join);
case RelRN.Union union -> transformUnion(env, union);
case RelRN.Intersect intersect -> transformIntersect(env, intersect);
case RelRN.Minus minus -> transformMinus(env, minus);
case RelRN.Empty empty -> transformEmpty(env, empty);
default -> transformCustom(env, target);
};
Expand Down Expand Up @@ -121,6 +123,10 @@ default E onMatchIntersect(E env, RelRN.Intersect intersect) {
return unimplementedOnMatch(env, intersect);
}

default E onMatchMinus(E env, RelRN.Minus minus) {
return unimplementedOnMatch(env, minus);
}

default E onMatchCustom(E env, RelRN custom) {
return unimplementedOnMatch(env, custom);
}
Expand Down Expand Up @@ -193,6 +199,10 @@ default E transformIntersect(E env, RelRN.Intersect intersect) {
return unimplementedTransform(env, intersect);
}

default E transformMinus(E env, RelRN.Minus minus) {
return unimplementedTransform(env, minus);
}

default E transformCustom(E env, RelRN custom) {
return unimplementedTransform(env, custom);
}
Expand Down
49 changes: 49 additions & 0 deletions src/main/java/org/qed/Generated/CalciteGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,36 @@ public Env onMatchIntersect(Env env, RelRN.Intersect intersect) {
return current_env.grow("operand(" + operatorClass + ".class).inputs(" + inputsBuilder.toString() + ")");
}

@Override
public Env onMatchMinus(Env env, RelRN.Minus minus) {
// Get the all flag from the minus
boolean all = minus.all();

// Process each source in the minus
var current_env = env;
var skeletons = Seq.empty();

// Process all sources in the sequence
for (var source : minus.sources()) {
var next_env = current_env.next();
var source_env = onMatch(next_env, source);
skeletons = skeletons.appended(source_env.skeleton());
current_env = source_env;
}

// Build the input skeletons string for the operand
StringBuilder inputsBuilder = new StringBuilder();
for (int i = 0; i < skeletons.size(); i++) {
if (i > 0) {
inputsBuilder.append(", ");
}
inputsBuilder.append(skeletons.get(i).toString());
}

// Create the minus operand
return current_env.grow("operand(LogicalMinus.class).inputs(" + inputsBuilder.toString() + ")");
}

@Override
public Env onMatchField(Env env, RexRN.Field field) {
// Generate a unique symbolic name for this field
Expand Down Expand Up @@ -320,6 +350,25 @@ public Env transformIntersect(Env env, RelRN.Intersect intersect) {
return current_env.focus(current_env.current() + "." + methodName + "(" + all + ", " + sourceCount + ")");
}

@Override
public Env transformMinus(Env env, RelRN.Minus minus) {
// Get the all flag from the minus
boolean all = minus.all();

// The number of sources
int sourceCount = minus.sources().size();

// Transform each source
var current_env = env;
for (var source : minus.sources()) {
current_env = transform(current_env, source);
}

// Use the minus method with the all flag and source count
// This matches the expected Calcite RelBuilder.minus(boolean all, int n) signature
return current_env.focus(current_env.current() + ".minus(" + all + ", " + sourceCount + ")");
}

@Override
public Env transformField(Env env, RexRN.Field field) {
// In Calcite, field references are typically created with a "field" method
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/qed/Generated/CalciteTester.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ public static void runAllTests() {
org.qed.Generated.Tests.FilterSetOpTransposeTest.runTest();
org.qed.Generated.Tests.JoinExtractFilterTest.runTest();
org.qed.Generated.Tests.SemiJoinFilterTransposeTest.runTest();
org.qed.Generated.Tests.MinusMergeTest.runTest();
org.qed.Generated.Tests.ProjectFilterTransposeTest.runTest();
org.qed.Generated.Tests.JoinPushTransitivePredicatesTest.runTest();
org.qed.Generated.Tests.SemiJoinProjectTransposeTest.runTest();
Expand Down
39 changes: 39 additions & 0 deletions src/main/java/org/qed/Generated/MinusMerge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package org.qed.Generated;

import org.apache.calcite.plan.RelOptRuleCall;
import org.apache.calcite.plan.RelRule;
import org.apache.calcite.rel.RelNode;
import org.apache.calcite.rel.core.JoinRelType;
import org.apache.calcite.rel.logical.*;

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

@Override
public void onMatch(RelOptRuleCall call) {
var var_5 = call.builder();
call.transformTo(var_5.push(call.rel(2)).push(call.rel(3)).push(call.rel(4)).union(false, 2).minus(false, 2).build());
}

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

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

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

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

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

import kala.collection.Map;
import kala.collection.Seq;
import org.apache.calcite.rel.core.JoinRelType;
import org.apache.calcite.sql.fun.SqlStdOperatorTable;
import org.qed.RelRN;
import org.qed.RexRN;
import org.qed.RRule;
import org.qed.RuleBuilder;

public record MinusMerge() implements RRule {
static final RelRN a = RelRN.scan("A", "Common_Type");
static final RelRN b = RelRN.scan("B", "Common_Type");
static final RelRN c = RelRN.scan("C", "Common_Type");

@Override
public RelRN before() {
return a.minus(false, b).minus(false, c);
}

@Override
public RelRN after() {
return a.minus(false, b.union(false, c));
}
}
48 changes: 48 additions & 0 deletions src/main/java/org/qed/Generated/Tests/MinusMergeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package org.qed.Generated.Tests;

import kala.collection.Seq;
import kala.tuple.Tuple;
import org.qed.Generated.CalciteTester;
import org.qed.RelType;
import org.qed.Generated.RRuleInstances.UnionMerge;
import org.qed.RuleBuilder;

/**
* Test for the MinusMerge rule.
*/
public class MinusMergeTest {

/**
* Run test for MinusMerge rule.
*/
public static void runTest() {
var tester = new CalciteTester();
var builder = RuleBuilder.create();
var table = builder.createQedTable(Seq.of(
Tuple.of(RelType.fromString("INTEGER", true), false)
));
builder.addTable(table);

var scan1 = builder.scan(table.getName()).build();
var scan2 = builder.scan(table.getName()).build();
var scan3 = builder.scan(table.getName()).build();

// (A − B) − C
var before = builder.push(scan1).push(scan2).minus(false, 2).push(scan3).minus(false, 2).build();

// A − (B ∪ C)
var union = builder.push(scan2).push(scan3).union(false).build();
var after = builder.push(scan1).push(union).minus(false, 2).build();

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

/**
* Main method to run this test independently.
*/
public static void main(String[] args) {
System.out.println("Running MinusMerge test...");
runTest();
}
}
12 changes: 12 additions & 0 deletions src/main/java/org/qed/RelRN.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@ default Intersect intersect(boolean all, RelRN... sources) {
return new Intersect(all, Seq.of(this).appendedAll(sources));
}

default Minus minus (boolean all, RelRN... sources) {
return new Minus(all, Seq.of(this).appendedAll(sources));
}

default Empty empty() {
return new Empty(this);
}
Expand Down Expand Up @@ -180,6 +184,14 @@ public RelNode semantics() {
}
}

record Minus(boolean all, Seq<RelRN> sources) implements RelRN {

@Override
public RelNode semantics() {
return RuleBuilder.create().pushAll(sources.map(RelRN::semantics)).minus(all, sources.size()).build();
}
}

record Empty(RelRN sourceType) implements RelRN {

@Override
Expand Down