Skip to content
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

chore: Bump calcite to 1.37.0 #5757

Merged
merged 1 commit into from
Jul 11, 2024
Merged

chore: Bump calcite to 1.37.0 #5757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ avro = "1.11.3"
awssdk = "2.24.5"
# See dependency matrix for particular gRPC versions at https://github.com/grpc/grpc-java/blob/master/SECURITY.md#netty
boringssl = "2.0.61.Final"
calcite = "1.36.0"
calcite = "1.37.0"
classgraph = "4.8.165"
commons-compress = "1.26.0"
commons-io = "2.11.0"
Expand Down
7 changes: 0 additions & 7 deletions sql/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,6 @@ description = 'The Deephaven SQL parser'
dependencies {
api project(':qst')
implementation libs.calcite.core
constraints {
// This constraint can be removed once calcite-core has next release and we can
// pick up the fixed dependency transitively.
implementation('com.jayway.jsonpath:json-path:2.9.0') {
because 'json-path Out-of-bounds Write vulnerability, CVE-2023-51074'
}
}

compileOnly project(':util-immutables')
annotationProcessor libs.immutables.value
Expand Down
12 changes: 12 additions & 0 deletions sql/src/main/java/io/deephaven/sql/RexVisitorBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
import org.apache.calcite.rex.RexDynamicParam;
import org.apache.calcite.rex.RexFieldAccess;
import org.apache.calcite.rex.RexInputRef;
import org.apache.calcite.rex.RexLambda;
import org.apache.calcite.rex.RexLambdaRef;
import org.apache.calcite.rex.RexLiteral;
import org.apache.calcite.rex.RexLocalRef;
import org.apache.calcite.rex.RexNode;
Expand Down Expand Up @@ -79,6 +81,16 @@ public T visitPatternFieldRef(RexPatternFieldRef fieldRef) {
throw unsupported(fieldRef);
}

@Override
public T visitLambda(RexLambda fieldRef) {
throw unsupported(fieldRef);
}

@Override
public T visitLambdaRef(RexLambdaRef fieldRef) {
throw unsupported(fieldRef);
}

private UnsupportedOperationException unsupported(RexNode node) {
return new UnsupportedOperationException(String.format("%s: %s", getClass().getName(), node.toString()));
}
Expand Down
Loading