Skip to content

Commit 55223bf

Browse files
committed
better support for calcite types
1 parent 76b9cf0 commit 55223bf

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

wayang-api/wayang-api-sql/src/main/java/org/apache/wayang/api/sql/calcite/converter/functions/CallTreeFactory.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,6 @@ class Literal implements Node {
8787
final Serializable value;
8888

8989
Literal(final RexLiteral literal) {
90-
System.out.println(literal.getValue().getClass());
91-
System.out.println(literal.getValue2().getClass());
92-
System.out.println(literal.getValue3().getClass());
93-
System.out.println(literal.getValue4().getClass());
94-
9590
value = switch (literal.getTypeName()) {
9691
case DATE -> literal.getValueAs(Calendar.class);
9792
case INTEGER -> literal.getValueAs(Double.class);

wayang-api/wayang-api-sql/src/main/java/org/apache/wayang/api/sql/calcite/converter/functions/FilterPredicateImpl.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.apache.calcite.runtime.SqlFunctions;
2828
import org.apache.calcite.sql.SqlKind;
2929
import org.apache.calcite.util.DateString;
30+
import org.apache.calcite.util.NlsString;
3031
import org.apache.wayang.basic.data.Record;
3132
import org.apache.wayang.core.function.FunctionDescriptor;
3233
import org.apache.wayang.core.function.FunctionDescriptor.SerializableFunction;
@@ -156,7 +157,9 @@ private boolean isEqualTo(final Object o1, final Object o2) {
156157
return (double) calendar.getTime().getTime();
157158
} else if (field instanceof final String string) {
158159
return string;
159-
} else if (field instanceof final Character character) {
160+
} else if (field instanceof final NlsString nlsString) {
161+
return nlsString.getValue();
162+
} else if (field instanceof final Character character) {
160163
return character.toString();
161164
} else if (field instanceof final DateString dateString) {
162165
return (double) dateString.getMillisSinceEpoch();

0 commit comments

Comments
 (0)