Skip to content

passthrough fields for filters using CAST #675

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
novatechflow merged 4 commits into from
Feb 6, 2026
Merged

passthrough fields for filters using CAST #675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a319d5
Allow CASTed fields in sql-api to be passed through
mspruc Feb 6, 2026
c9b7b68
delete unused import
mspruc Feb 6, 2026
a9d7b65
widening conversions for CAST
mspruc Feb 6, 2026
03c870b
CAST using numbers & widening conversions
mspruc Feb 6, 2026
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
6 changes: 4 additions & 2 deletions .../src/main/java/org/apache/wayang/api/sql/calcite/converter/functions/CallTreeFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.apache.calcite.rex.RexLiteral;
import org.apache.calcite.rex.RexNode;
import org.apache.calcite.sql.SqlKind;
import org.apache.calcite.sql.type.SqlTypeName;
import org.apache.calcite.util.Sarg;
import org.apache.wayang.basic.data.Record;
import org.apache.wayang.core.function.FunctionDescriptor.SerializableFunction;
Expand Down Expand Up @@ -55,10 +56,11 @@ public default Node fromRexNode(final RexNode node) {
* serializable function
*
* @param kind {@link SqlKind} from {@link RexCall} SqlOperator
* @param returnType return type of the {@link RexCall}
* @return a serializable function of +, -, * or /
* @throws UnsupportedOperationException on unrecognized {@link SqlKind}
*/
public SerializableFunction<List<Object>, Object> deriveOperation(final SqlKind kind);
public SerializableFunction<List<Object>, Object> deriveOperation(final SqlKind kind, final SqlTypeName returnType);
}

interface Node extends Serializable {
Expand All @@ -71,7 +73,7 @@ final class Call implements Node {

protected Call(final RexCall call, final CallTreeFactory tree) {
operands = call.getOperands().stream().map(tree::fromRexNode).toList();
operation = tree.deriveOperation(call.getKind());
operation = tree.deriveOperation(call.getKind(), call.getType().getSqlTypeName());
}

@Override
Expand Down
27 changes: 20 additions & 7 deletions .../main/java/org/apache/wayang/api/sql/calcite/converter/functions/FilterPredicateImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.apache.calcite.rex.RexNode;
import org.apache.calcite.runtime.SqlFunctions;
import org.apache.calcite.sql.SqlKind;
import org.apache.calcite.sql.type.SqlTypeName;
import org.apache.calcite.util.DateString;
import org.apache.calcite.util.NlsString;
import org.apache.wayang.basic.data.Record;
Expand All @@ -37,7 +38,7 @@

public class FilterPredicateImpl implements FunctionDescriptor.SerializablePredicate<Record> {
class FilterCallTreeFactory implements CallTreeFactory {
public SerializableFunction<List<Object>, Object> deriveOperation(final SqlKind kind) {
public SerializableFunction<List<Object>, Object> deriveOperation(final SqlKind kind, final SqlTypeName returnType) {
return input -> switch (kind) {
case NOT -> !(boolean) input.get(0);
case IS_NOT_NULL -> !isEqualTo(input.get(0), null);
Expand All @@ -55,6 +56,8 @@ public SerializableFunction<List<Object>, Object> deriveOperation(final SqlKind
case OR -> input.stream().anyMatch(obj -> Boolean.class.cast(obj).booleanValue());
case MINUS -> widenToDouble.apply(input.get(0)) - widenToDouble.apply(input.get(1));
case PLUS -> widenToDouble.apply(input.get(0)) + widenToDouble.apply(input.get(1));
// TODO: may need better support for CASTing in the future. See sqlCast() in this file.
case CAST -> input.get(0) instanceof Number ? widenToDouble.apply(input.get(0)) : ensureComparable.apply(input.get(0));
case SEARCH -> {
if (input.get(0) instanceof final ImmutableRangeSet range) {
assert input.get(1) instanceof Comparable
Expand All @@ -81,14 +84,24 @@ public SerializableFunction<List<Object>, Object> deriveOperation(final SqlKind
};
}

/**
* Java implementation of SQL cast.
* @param input input field
* @param type the new return type of the field
* @return Java-type equivalent to {@link SqlTypeName} counterpart.
*/
private static Object sqlCast(Object input, SqlTypeName type){
throw new UnsupportedOperationException("sqlCasting is not yet implemented.");
}

/**
* Java equivalent of SQL like clauses
*
* @param s1
* @param s2
* @return true if {@code s1} like {@code s2}
*/
private boolean like(final String s1, final String s2) {
private static boolean like(final String s1, final String s2) {
return new SqlFunctions.LikeFunction().like(s1, s2);
}

Expand All @@ -99,7 +112,7 @@ private boolean like(final String s1, final String s2) {
* @param o2
* @return true if {@code o1 > o2}
*/
private boolean isGreaterThan(final Object o1, final Object o2) {
private static boolean isGreaterThan(final Object o1, final Object o2) {
return ensureComparable.apply(o1).compareTo(ensureComparable.apply(o2)) > 0;
}

Expand All @@ -110,7 +123,7 @@ private boolean isGreaterThan(final Object o1, final Object o2) {
* @param o2
* @return true if {@code o1 < o2}
*/
private boolean isLessThan(final Object o1, final Object o2) {
private static boolean isLessThan(final Object o1, final Object o2) {
return ensureComparable.apply(o1).compareTo(ensureComparable.apply(o2)) < 0;
}

Expand All @@ -121,7 +134,7 @@ private boolean isLessThan(final Object o1, final Object o2) {
* @param o2
* @return true if {@code o1 == o2}
*/
private boolean isEqualTo(final Object o1, final Object o2) {
private static boolean isEqualTo(final Object o1, final Object o2) {
return Objects.equals(ensureComparable.apply(o1), ensureComparable.apply(o2));
}
}
Expand All @@ -133,7 +146,7 @@ private boolean isEqualTo(final Object o1, final Object o2) {
*
* @throws UnsupportedOperationException if conversion was not possible
*/
final SerializableFunction<Object, Double> widenToDouble = field -> {
final static SerializableFunction<Object, Double> widenToDouble = field -> {
if (field instanceof final Number number) {
return number.doubleValue();
} else if (field instanceof final Date date) {
Expand All @@ -148,7 +161,7 @@ private boolean isEqualTo(final Object o1, final Object o2) {
/**
* Widening conversions, all numbers to double
*/
final SerializableFunction<Object, Comparable> ensureComparable = field -> {
final static SerializableFunction<Object, Comparable> ensureComparable = field -> {
if (field instanceof final Number number) {
return number.doubleValue();
} else if (field instanceof final Date date) {
Expand Down
4 changes: 2 additions & 2 deletions ...c/main/java/org/apache/wayang/api/sql/calcite/converter/functions/ProjectMapFuncImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import org.apache.calcite.rex.RexNode;
import org.apache.calcite.sql.SqlKind;

import org.apache.calcite.sql.type.SqlTypeName;
import org.apache.wayang.core.function.FunctionDescriptor;
import org.apache.wayang.core.function.FunctionDescriptor.SerializableFunction;
import org.apache.wayang.basic.data.Record;
Expand All @@ -38,7 +38,7 @@ public ProjectMapFuncImpl(final List<RexNode> projects) {
}

class ProjectCallTreeFactory implements CallTreeFactory {
public SerializableFunction<List<Object>, Object> deriveOperation(final SqlKind kind) {
public SerializableFunction<List<Object>, Object> deriveOperation(final SqlKind kind, final SqlTypeName returnType) {
return input ->
switch (kind) {
case PLUS -> asDouble(input.get(0)) + asDouble(input.get(1));
Expand Down
Loading
Loading