diff --git a/.gitignore b/.gitignore index a8933b21a152..9e10a6f9d79b 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,10 @@ sdks/**/vendor/**/* runners/**/vendor/**/* **/.gradletasknamecache +# Ignore sources generated into the main tree +**/src/main/generated/** +**/src/test/generated_tests/** + # Ignore files generated by the Maven build process. **/bin/**/* **/dependency-reduced-pom.xml @@ -96,3 +100,8 @@ sdks/python/coverage.xml .pytest_cache .pytest_cache/**/* + + +# Ignore files the developer has laying around +**/*.patch +**/*.diff diff --git a/CHANGES.md b/CHANGES.md index d5f9fdd89e07..44e039889931 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -139,6 +139,7 @@ This has not enabled by default to preserve backwards compatibility; use the `--type_check_additional=ptransform_fn` flag to enable. It may be enabled by default in future versions of Beam. +* Updated Calcite to version 1.26 ## Breaking Changes diff --git a/build.gradle b/build.gradle index 15cfc245c8e9..24b5fd42b396 100644 --- a/build.gradle +++ b/build.gradle @@ -54,6 +54,10 @@ rat { // Default eclipse excludes neglect subprojects + // Generated AutoValue java sources outside the build directory + "**/src/main/generated/**/AutoValue_*.java", + "**/src/test/generated_tests/**/AutoValue_*.java", + // Proto/grpc generated wrappers "**/apache_beam/portability/api/*_pb2*.py", "**/go/pkg/beam/**/*.pb.go", @@ -74,6 +78,7 @@ rat { "**/Gemfile.lock", "**/Rakefile", "**/.htaccess", + "website/www/node_modules/**/*", "website/www/site/assets/scss/_bootstrap.scss", "website/www/site/assets/scss/bootstrap/**/*", "website/www/site/static/images/mascot/*.ai", diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index 913d332a3bd9..1609ab5ea2c2 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -616,7 +616,7 @@ class BeamModulePlugin implements Plugin { vendored_bytebuddy_1_10_8 : "org.apache.beam:beam-vendor-bytebuddy-1_10_8:0.1", vendored_grpc_1_26_0 : "org.apache.beam:beam-vendor-grpc-1_26_0:0.3", vendored_guava_26_0_jre : "org.apache.beam:beam-vendor-guava-26_0-jre:0.1", - vendored_calcite_1_20_0 : "org.apache.beam:beam-vendor-calcite-1_20_0:0.1", + vendored_calcite_1_26_0 : "org.apache.beam:beam-vendor-calcite-1_26_0:0.1-SNAPSHOT", // FIXME: Should be 0.1 ... woodstox_core_asl : "org.codehaus.woodstox:woodstox-core-asl:4.4.1", zstd_jni : "com.github.luben:zstd-jni:1.4.5-2", quickcheck_core : "com.pholser:junit-quickcheck-core:$quickcheck_version", diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/OrderedCodeTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/OrderedCodeTest.java index 311e00851b9f..59a400f4696b 100644 --- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/OrderedCodeTest.java +++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/OrderedCodeTest.java @@ -148,7 +148,7 @@ public void testSignedNumIncreasing_write() { * Convert a string of hex digits (e.g. "3fbf") to a byte[] (e.g. { (byte) 0x3f, (byte) 0xbf }). */ private static byte[] bytesFromHexString(String hexDigits) { - return BaseEncoding.base16().lowerCase().decode(hexDigits); + return new ByteString(BaseEncoding.base16().lowerCase().decode(hexDigits)); } /** diff --git a/sdks/java/extensions/sql/build.gradle b/sdks/java/extensions/sql/build.gradle index 5db332297087..87f12cd9bad5 100644 --- a/sdks/java/extensions/sql/build.gradle +++ b/sdks/java/extensions/sql/build.gradle @@ -59,7 +59,7 @@ dependencies { javacc "net.java.dev.javacc:javacc:4.0" fmppTask "com.googlecode.fmpp-maven-plugin:fmpp-maven-plugin:1.0" fmppTask "org.freemarker:freemarker:2.3.28" - fmppTemplates library.java.vendored_calcite_1_20_0 + fmppTemplates library.java.vendored_calcite_1_26_0 compile project(":sdks:java:core") compile project(":sdks:java:extensions:join-library") compile project(path: ":runners:direct-java", configuration: "shadow") @@ -67,7 +67,7 @@ dependencies { compile library.java.commons_csv compile library.java.jackson_databind compile library.java.joda_time - compile library.java.vendored_calcite_1_20_0 + compile library.java.vendored_calcite_1_26_0 compile "com.alibaba:fastjson:1.2.69" compile "org.codehaus.janino:janino:3.0.11" compile "org.codehaus.janino:commons-compiler:3.0.11" @@ -79,7 +79,7 @@ dependencies { provided library.java.jackson_dataformat_xml provided library.java.hadoop_client provided library.java.kafka_clients - testCompile library.java.vendored_calcite_1_20_0 + testCompile library.java.vendored_calcite_1_26_0 testCompile library.java.vendored_guava_26_0_jre testCompile library.java.junit testCompile library.java.hamcrest_core @@ -119,11 +119,11 @@ task copyFmppTemplatesFromCalciteCore(type: Copy) { into "${project.buildDir}/templates-fmpp" filter{ line -> - line.replace('import org.apache.calcite.', 'import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.') + line.replace('import org.apache.calcite.', 'import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.') } filter{ line -> - line.replace('import static org.apache.calcite.', 'import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.') + line.replace('import static org.apache.calcite.', 'import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.') } } diff --git a/sdks/java/extensions/sql/datacatalog/src/main/java/org/apache/beam/sdk/extensions/sql/example/BeamSqlDataCatalogExample.java b/sdks/java/extensions/sql/datacatalog/src/main/java/org/apache/beam/sdk/extensions/sql/example/BeamSqlDataCatalogExample.java index fd56ff488454..9e73ab27baa1 100644 --- a/sdks/java/extensions/sql/datacatalog/src/main/java/org/apache/beam/sdk/extensions/sql/example/BeamSqlDataCatalogExample.java +++ b/sdks/java/extensions/sql/datacatalog/src/main/java/org/apache/beam/sdk/extensions/sql/example/BeamSqlDataCatalogExample.java @@ -31,7 +31,7 @@ import org.apache.beam.sdk.transforms.MapElements; import org.apache.beam.sdk.values.Row; import org.apache.beam.sdk.values.TypeDescriptor; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Strings; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdks/java/extensions/sql/datacatalog/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/datacatalog/DataCatalogTableProvider.java b/sdks/java/extensions/sql/datacatalog/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/datacatalog/DataCatalogTableProvider.java index a2eb4e23f5fa..a5ffeb089d2b 100644 --- a/sdks/java/extensions/sql/datacatalog/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/datacatalog/DataCatalogTableProvider.java +++ b/sdks/java/extensions/sql/datacatalog/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/datacatalog/DataCatalogTableProvider.java @@ -42,7 +42,7 @@ import org.apache.beam.sdk.extensions.sql.meta.provider.pubsub.PubsubTableProvider; import org.apache.beam.sdk.extensions.sql.meta.provider.text.TextTableProvider; import org.apache.beam.sdk.schemas.Schema; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.MoreObjects; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/sdks/java/extensions/sql/datacatalog/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/datacatalog/SchemaUtils.java b/sdks/java/extensions/sql/datacatalog/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/datacatalog/SchemaUtils.java index 2b3bcc36bf73..e5274b686db7 100644 --- a/sdks/java/extensions/sql/datacatalog/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/datacatalog/SchemaUtils.java +++ b/sdks/java/extensions/sql/datacatalog/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/datacatalog/SchemaUtils.java @@ -28,8 +28,8 @@ import org.apache.beam.sdk.schemas.Schema.Field; import org.apache.beam.sdk.schemas.Schema.FieldType; import org.apache.beam.sdk.schemas.logicaltypes.SqlTypes; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Strings; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Strings; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableMap; @Experimental(Kind.SCHEMAS) class SchemaUtils { diff --git a/sdks/java/extensions/sql/jdbc/src/test/java/org/apache/beam/sdk/extensions/sql/jdbc/BeamSqlLineTest.java b/sdks/java/extensions/sql/jdbc/src/test/java/org/apache/beam/sdk/extensions/sql/jdbc/BeamSqlLineTest.java index 34bae8dc0f06..45cd9729fcb1 100644 --- a/sdks/java/extensions/sql/jdbc/src/test/java/org/apache/beam/sdk/extensions/sql/jdbc/BeamSqlLineTest.java +++ b/sdks/java/extensions/sql/jdbc/src/test/java/org/apache/beam/sdk/extensions/sql/jdbc/BeamSqlLineTest.java @@ -20,13 +20,14 @@ import static org.apache.beam.sdk.extensions.sql.jdbc.BeamSqlLineTestingUtils.buildArgs; import static org.apache.beam.sdk.extensions.sql.jdbc.BeamSqlLineTestingUtils.toLines; import static org.hamcrest.CoreMatchers.everyItem; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.oneOf; import java.io.ByteArrayOutputStream; import java.io.File; import java.util.Arrays; import java.util.List; -import org.hamcrest.collection.IsIn; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -94,7 +95,7 @@ public void testSqlLine_select() throws Exception { List> lines = toLines(byteArrayOutputStream); assertThat( Arrays.asList(Arrays.asList("3", "hello", "2018-05-28")), - everyItem(IsIn.isOneOf(lines.toArray()))); + everyItem(is(oneOf(lines.toArray())))); } @Test @@ -114,7 +115,7 @@ public void testSqlLine_selectFromTable() throws Exception { Arrays.asList( Arrays.asList("col_a", "col_b", "col_c", "col_x", "col_y", "col_z"), Arrays.asList("a", "b", "c", "1", "2", "3")), - everyItem(IsIn.isOneOf(lines.toArray()))); + everyItem(is(oneOf(lines)))); } @Test @@ -129,8 +130,7 @@ public void testSqlLine_insertSelect() throws Exception { BeamSqlLine.runSqlLine(args, null, byteArrayOutputStream, null); List> lines = toLines(byteArrayOutputStream); - assertThat( - Arrays.asList(Arrays.asList("3", "hello")), everyItem(IsIn.isOneOf(lines.toArray()))); + assertThat(Arrays.asList(Arrays.asList("3", "hello")), everyItem(is(oneOf(lines.toArray())))); } @Test @@ -149,7 +149,7 @@ public void testSqlLine_GroupBy() throws Exception { List> lines = toLines(byteArrayOutputStream); assertThat( Arrays.asList(Arrays.asList("3", "2"), Arrays.asList("4", "1")), - everyItem(IsIn.isOneOf(lines.toArray()))); + everyItem(is(oneOf(lines.toArray())))); } @Test @@ -169,7 +169,7 @@ public void testSqlLine_fixedWindow() throws Exception { assertThat( Arrays.asList( Arrays.asList("2018-07-01 21:26:06", "1"), Arrays.asList("2018-07-01 21:26:07", "1")), - everyItem(IsIn.isOneOf(lines.toArray()))); + everyItem(is(oneOf(lines.toArray())))); } @Test @@ -195,6 +195,6 @@ public void testSqlLine_slidingWindow() throws Exception { Arrays.asList("2018-07-01 21:26:09", "2"), Arrays.asList("2018-07-01 21:26:10", "2"), Arrays.asList("2018-07-01 21:26:11", "1")), - everyItem(IsIn.isOneOf(lines.toArray()))); + everyItem(is(oneOf(lines.toArray())))); } } diff --git a/sdks/java/extensions/sql/perf-tests/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryIOPushDownIT.java b/sdks/java/extensions/sql/perf-tests/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryIOPushDownIT.java index 1194baac4414..d2808cdd1c22 100644 --- a/sdks/java/extensions/sql/perf-tests/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryIOPushDownIT.java +++ b/sdks/java/extensions/sql/perf-tests/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryIOPushDownIT.java @@ -46,9 +46,9 @@ import org.apache.beam.sdk.transforms.ParDo; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.RuleSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.RuleSets; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.RuleSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.RuleSets; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.junit.Before; import org.junit.BeforeClass; diff --git a/sdks/java/extensions/sql/src/main/codegen/config.fmpp b/sdks/java/extensions/sql/src/main/codegen/config.fmpp index 8dcb04b9404f..0e076cea1675 100644 --- a/sdks/java/extensions/sql/src/main/codegen/config.fmpp +++ b/sdks/java/extensions/sql/src/main/codegen/config.fmpp @@ -21,10 +21,10 @@ data: { # List of import statements. imports: [ - "org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.ColumnStrategy" - "org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlCreate" - "org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlDrop" - "org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.SqlTypeName" + "org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.ColumnStrategy" + "org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlCreate" + "org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlDrop" + "org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.SqlTypeName" "org.apache.beam.sdk.extensions.sql.impl.parser.SqlCreateExternalTable" "org.apache.beam.sdk.extensions.sql.impl.parser.SqlDdlNodes" "org.apache.beam.sdk.extensions.sql.impl.parser.SqlSetOptionBeam" @@ -43,6 +43,7 @@ data: { # List of keywords from "keywords" section that are not reserved. nonReservedKeywords: [ "A" + "ABSENT" "ABSOLUTE" "ACTION" "ADA" @@ -65,11 +66,11 @@ data: { "CATALOG_NAME" "CENTURY" "CHAIN" + "CHARACTERISTICS" + "CHARACTERS" "CHARACTER_SET_CATALOG" "CHARACTER_SET_NAME" "CHARACTER_SET_SCHEMA" - "CHARACTERISTICS" - "CHARACTERS" "CLASS_ORIGIN" "COBOL" "COLLATION" @@ -80,13 +81,14 @@ data: { "COMMAND_FUNCTION" "COMMAND_FUNCTION_CODE" "COMMITTED" + "CONDITIONAL" "CONDITION_NUMBER" "CONNECTION" "CONNECTION_NAME" "CONSTRAINT_CATALOG" "CONSTRAINT_NAME" - "CONSTRAINT_SCHEMA" "CONSTRAINTS" + "CONSTRAINT_SCHEMA" "CONSTRUCTOR" "CONTINUE" "CURSOR_NAME" @@ -94,6 +96,7 @@ data: { "DATABASE" "DATETIME_INTERVAL_CODE" "DATETIME_INTERVAL_PRECISION" + "DAYS" "DECADE" "DEFAULTS" "DEFERRABLE" @@ -113,13 +116,16 @@ data: { "DOY" "DYNAMIC_FUNCTION" "DYNAMIC_FUNCTION_CODE" + "ENCODING" "EPOCH" + "ERROR" "EXCEPTION" "EXCLUDE" "EXCLUDING" "FINAL" "FIRST" "FOLLOWING" + "FORMAT" "FORTRAN" "FOUND" "FRAC_SECOND" @@ -131,6 +137,9 @@ data: { "GOTO" "GRANTED" "HIERARCHY" + "HOP" + "HOURS" + "IGNORE" "IMMEDIATE" "IMMEDIATELY" "IMPLEMENTATION" @@ -142,8 +151,8 @@ data: { "INSTANTIABLE" "INVOKER" "ISODOW" - "ISOYEAR" "ISOLATION" + "ISOYEAR" "JAVA" "JSON" "K" @@ -160,13 +169,15 @@ data: { "MAP" "MATCHED" "MAXVALUE" - "MICROSECOND" "MESSAGE_LENGTH" "MESSAGE_OCTET_LENGTH" "MESSAGE_TEXT" - "MILLISECOND" + "MICROSECOND" "MILLENNIUM" + "MILLISECOND" + "MINUTES" "MINVALUE" + "MONTHS" "MORE_" "MUMPS" "NAME" @@ -195,6 +206,7 @@ data: { "PARAMETER_SPECIFIC_SCHEMA" "PARTIAL" "PASCAL" + "PASSING" "PASSTHROUGH" "PAST" "PATH" @@ -211,24 +223,28 @@ data: { "RELATIVE" "REPEATABLE" "REPLACE" + "RESPECT" "RESTART" "RESTRICT" "RETURNED_CARDINALITY" "RETURNED_LENGTH" "RETURNED_OCTET_LENGTH" "RETURNED_SQLSTATE" + "RETURNING" "ROLE" "ROUTINE" "ROUTINE_CATALOG" "ROUTINE_NAME" "ROUTINE_SCHEMA" "ROW_COUNT" + "SCALAR" "SCALE" "SCHEMA" "SCHEMA_NAME" "SCOPE_CATALOGS" "SCOPE_NAME" "SCOPE_SCHEMA" + "SECONDS" "SECTION" "SECURITY" "SELF" @@ -269,8 +285,8 @@ data: { "SQL_INTERVAL_YEAR" "SQL_INTERVAL_YEAR_TO_MONTH" "SQL_LONGVARBINARY" - "SQL_LONGVARNCHAR" "SQL_LONGVARCHAR" + "SQL_LONGVARNCHAR" "SQL_NCHAR" "SQL_NCLOB" "SQL_NUMERIC" @@ -313,9 +329,11 @@ data: { "TRIGGER_CATALOG" "TRIGGER_NAME" "TRIGGER_SCHEMA" + "TUMBLE" "TYPE" "UNBOUNDED" "UNCOMMITTED" + "UNCONDITIONAL" "UNDER" "UNNAMED" "USAGE" @@ -323,13 +341,17 @@ data: { "USER_DEFINED_TYPE_CODE" "USER_DEFINED_TYPE_NAME" "USER_DEFINED_TYPE_SCHEMA" + "UTF16" + "UTF32" + "UTF8" "VERSION" "VIEW" "WEEK" - "WRAPPER" "WORK" + "WRAPPER" "WRITE" "XML" + "YEARS" "ZONE" # added in Beam @@ -339,28 +361,49 @@ data: { "TBLPROPERTIES" ] + # List of non-reserved keywords to add; + # items in this list become non-reserved + nonReservedKeywordsToAdd: [ + ] + + # List of non-reserved keywords to remove; + # items in this list become reserved + nonReservedKeywordsToRemove: [ + ] + # List of additional join types. Each is a method with no arguments. # Example: LeftSemiJoin() joinTypes: [ ] # List of methods for parsing custom SQL statements. + # Return type of method implementation should be 'SqlNode'. + # Example: SqlShowDatabases(), SqlShowTables(). statementParserMethods: [ "SqlSetOptionBeam(Span.of(), null)" - "SqlCreateExternalTable()" ] # List of methods for parsing custom literals. + # Return type of method implementation should be "SqlNode". # Example: ParseJsonLiteral(). literalParserMethods: [ ] # List of methods for parsing custom data types. + # Return type of method implementation should be "SqlTypeNameSpec". + # Example: SqlParseTimeStampZ(). dataTypeParserMethods: [ ] + # List of methods for parsing builtin function calls. + # Return type of method implementation should be "SqlNode". + # Example: DateFunctionCall(). + builtinFunctionCallMethods: [ + ] + # List of methods for parsing extensions to "ALTER " calls. # Each must accept arguments "(SqlParserPos pos, String scope)". + # Example: "SqlUploadJarNode" alterStatementParserMethods: [ "SqlSetOptionBeam" ] @@ -368,7 +411,8 @@ data: { # List of methods for parsing extensions to "CREATE [OR REPLACE]" calls. # Each must accept arguments "(SqlParserPos pos, boolean replace)". createStatementParserMethods: [ - SqlCreateTableNotSupportedMessage + "SqlCreateExternalTable" + "SqlCreateTableNotSupportedMessage" ] # List of methods for parsing extensions to "DROP" calls. @@ -377,6 +421,14 @@ data: { "SqlDropTable" ] + # Binary operators tokens + binaryOperatorsTokens: [ + ] + + # Binary operators initialization + extraBinaryExpressions: [ + ] + # List of files in @includes directory that have parser method # implementations for parsing custom SQL statements, literals or types # given as part of "statementParserMethods", "literalParserMethods" or @@ -385,16 +437,14 @@ data: { "parserImpls.ftl" ] - # List of methods for parsing builtin function calls. - builtinFunctionCallMethods: [ - ] - + includePosixOperators: false includeCompoundIdentifier: true includeBraces: true includeAdditionalDeclarations: false } } + freemarkerLinks: { includes: includes/ } diff --git a/sdks/java/extensions/sql/src/main/codegen/includes/parserImpls.ftl b/sdks/java/extensions/sql/src/main/codegen/includes/parserImpls.ftl index 1fd6efda54fe..f7dbb5532bb2 100644 --- a/sdks/java/extensions/sql/src/main/codegen/includes/parserImpls.ftl +++ b/sdks/java/extensions/sql/src/main/codegen/includes/parserImpls.ftl @@ -146,10 +146,10 @@ Schema.Field Field() : * ( LOCATION location_string )? * ( TBLPROPERTIES tbl_properties )? */ -SqlCreate SqlCreateExternalTable() : +SqlCreate SqlCreateExternalTable(Span s, boolean replace) : { - final Span s = Span.of(); - final boolean replace = false; +<#-- final Span s = Span.of();--> +<#-- final boolean replace = false;--> final boolean ifNotExists; final SqlIdentifier id; List fieldList = null; @@ -160,7 +160,7 @@ SqlCreate SqlCreateExternalTable() : } { - { +
{ s.add(this); } @@ -294,7 +294,7 @@ List RowFields() : Schema.FieldType SimpleType() : { final Span s = Span.of(); - final SqlTypeName simpleTypeName; + final SqlTypeNameSpec simpleTypeName; } { simpleTypeName = SqlTypeName(s) diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/SqlTransform.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/SqlTransform.java index 7b8ff5c9bf87..5de7a9522ce7 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/SqlTransform.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/SqlTransform.java @@ -42,8 +42,8 @@ import org.apache.beam.sdk.values.PValue; import org.apache.beam.sdk.values.Row; import org.apache.beam.sdk.values.TupleTag; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableMap; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.MoreObjects; import org.checkerframework.checker.nullness.qual.Nullable; @@ -192,7 +192,8 @@ private void registerFunctions(BeamSqlEnvBuilder sqlEnvBuilder) { *

Any available implementation of {@link QueryPlanner} can be used as the query planner in * {@link SqlTransform}. An implementation can be specified globally for the entire pipeline with * {@link BeamSqlPipelineOptions#getPlannerName()}. The global planner can be overridden - * per-transform with {@link #withQueryPlannerClass(Class)}. + * per-transform with {@link #withQueryPlannerClass(Class) #withQueryPlannerClass(Class)}. */ public static SqlTransform query(String queryString) { return builder() diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/TableNameExtractionUtils.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/TableNameExtractionUtils.java index c6b17740e771..5b1c416ba682 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/TableNameExtractionUtils.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/TableNameExtractionUtils.java @@ -23,13 +23,13 @@ import java.util.Collections; import java.util.List; import org.apache.beam.sdk.extensions.sql.impl.TableName; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlAsOperator; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlIdentifier; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlJoin; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlSelect; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlSetOperator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlAsOperator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlIdentifier; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlJoin; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlSelect; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlSetOperator; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamCalciteSchema.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamCalciteSchema.java index d3d376d0030e..accbf63c5352 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamCalciteSchema.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamCalciteSchema.java @@ -24,13 +24,13 @@ import java.util.Set; import org.apache.beam.sdk.extensions.sql.meta.Table; import org.apache.beam.sdk.extensions.sql.meta.provider.TableProvider; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.tree.Expression; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelProtoDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.Function; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.Schema; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.SchemaPlus; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.SchemaVersion; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.Schemas; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.tree.Expression; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelProtoDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.Function; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.Schema; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.SchemaPlus; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.SchemaVersion; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.Schemas; import org.checkerframework.checker.nullness.qual.Nullable; /** Adapter from {@link TableProvider} to {@link Schema}. */ @@ -101,7 +101,7 @@ public Set getTypeNames() { } @Override - public org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.Table getTable( + public org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.Table getTable( String name) { Table table = tableProvider.getTable(name); if (table == null) { diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamCalciteSchemaFactory.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamCalciteSchemaFactory.java index b7b2a177a173..08ba342fe860 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamCalciteSchemaFactory.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamCalciteSchemaFactory.java @@ -27,16 +27,16 @@ import org.apache.beam.sdk.extensions.sql.meta.provider.TableProvider; import org.apache.beam.sdk.extensions.sql.meta.store.InMemoryMetaStore; import org.apache.beam.sdk.extensions.sql.meta.store.MetaStore; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableMap; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.CalciteConnection; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.tree.Expression; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelProtoDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.Function; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.Schema; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.SchemaFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.SchemaPlus; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.SchemaVersion; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.Table; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CalciteConnection; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.tree.Expression; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelProtoDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.Function; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.Schema; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.SchemaFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.SchemaPlus; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.SchemaVersion; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.Table; /** * Factory classes that Calcite uses to create initial schema for JDBC connection. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamCalciteTable.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamCalciteTable.java index deade435b27d..d74e791670a7 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamCalciteTable.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamCalciteTable.java @@ -27,21 +27,21 @@ import org.apache.beam.sdk.extensions.sql.impl.utils.CalciteUtils; import org.apache.beam.sdk.extensions.sql.meta.BeamSqlTable; import org.apache.beam.sdk.options.PipelineOptions; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableMap; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.java.AbstractQueryableTable; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.QueryProvider; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.Queryable; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptTable; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.prepare.Prepare; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.TableModify; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataTypeFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.ModifiableTable; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.SchemaPlus; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.TranslatableTable; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.java.AbstractQueryableTable; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.QueryProvider; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.Queryable; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptTable; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.prepare.Prepare; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.TableModify; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataTypeFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.ModifiableTable; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.SchemaPlus; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.TranslatableTable; /** Adapter from {@link BeamSqlTable} to a calcite Table. */ @SuppressWarnings({ diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamSqlEnv.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamSqlEnv.java index cbe32246d497..c4a2213020b5 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamSqlEnv.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamSqlEnv.java @@ -17,7 +17,7 @@ */ package org.apache.beam.sdk.extensions.sql.impl; -import static org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Preconditions.checkNotNull; +import static org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Preconditions.checkNotNull; import java.lang.reflect.Method; import java.sql.SQLException; @@ -45,12 +45,11 @@ import org.apache.beam.sdk.options.PipelineOptionsFactory; import org.apache.beam.sdk.transforms.Combine.CombineFn; import org.apache.beam.sdk.transforms.SerializableFunction; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Strings; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.CalcitePrepare; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptUtil; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.Function; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlExecutableStatement; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.RuleSet; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Strings; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CalcitePrepare; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptUtil; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.Function; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.RuleSet; /** * Contains the metadata of tables/UDF functions, and exposes APIs to diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamSqlPipelineOptionsRegistrar.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamSqlPipelineOptionsRegistrar.java index 5a1d31353bea..ae88d401a33a 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamSqlPipelineOptionsRegistrar.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamSqlPipelineOptionsRegistrar.java @@ -20,7 +20,7 @@ import com.google.auto.service.AutoService; import org.apache.beam.sdk.options.PipelineOptions; import org.apache.beam.sdk.options.PipelineOptionsRegistrar; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; /** {@link AutoService} registrar for {@link BeamSqlPipelineOptions}. */ @AutoService(PipelineOptionsRegistrar.class) diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamTableStatistics.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamTableStatistics.java index b5d6a2ebdfd7..537ad8700e39 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamTableStatistics.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamTableStatistics.java @@ -18,16 +18,17 @@ package org.apache.beam.sdk.extensions.sql.impl; import java.io.Serializable; +import java.util.Collections; import java.util.List; import org.apache.beam.sdk.annotations.Experimental; import org.apache.beam.sdk.annotations.Internal; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelCollation; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelDistribution; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelDistributionTraitDef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelReferentialConstraint; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.Statistic; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.ImmutableBitSet; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelCollation; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelDistribution; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelDistributionTraitDef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelReferentialConstraint; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.Statistic; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.ImmutableBitSet; /** This class stores row count statistics. */ @Experimental @@ -76,6 +77,11 @@ public boolean isKey(ImmutableBitSet columns) { return false; } + @Override + public List getKeys() { + return Collections.emptyList(); // FIXME BEAM-9379: Is this correct??? + } + @Override public List getReferentialConstraints() { return ImmutableList.of(); diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/CalciteConnectionWrapper.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/CalciteConnectionWrapper.java index 0bdab106cb29..c99076d657b7 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/CalciteConnectionWrapper.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/CalciteConnectionWrapper.java @@ -35,14 +35,14 @@ import java.util.Map; import java.util.Properties; import java.util.concurrent.Executor; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.java.JavaTypeFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.config.CalciteConnectionConfig; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.CalciteConnection; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.CalcitePrepare; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.Enumerator; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.Queryable; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.tree.Expression; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.SchemaPlus; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.java.JavaTypeFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.config.CalciteConnectionConfig; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CalciteConnection; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CalcitePrepare; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.Enumerator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.Queryable; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.tree.Expression; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.SchemaPlus; /** * Abstract wrapper for {@link CalciteConnection} to simplify extension. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/CalciteFactoryWrapper.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/CalciteFactoryWrapper.java index 6bd714ff6ba0..8fb51b7e26a3 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/CalciteFactoryWrapper.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/CalciteFactoryWrapper.java @@ -21,18 +21,18 @@ import java.sql.SQLException; import java.util.Properties; import java.util.TimeZone; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.java.JavaTypeFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.AvaticaConnection; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.AvaticaFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.AvaticaPreparedStatement; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.AvaticaResultSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.AvaticaSpecificDatabaseMetaData; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.AvaticaStatement; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.Meta; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.QueryState; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.UnregisteredDriver; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.CalciteFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.CalciteSchema; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.java.JavaTypeFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.AvaticaConnection; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.AvaticaFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.AvaticaPreparedStatement; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.AvaticaResultSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.AvaticaSpecificDatabaseMetaData; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.AvaticaStatement; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.Meta; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.QueryState; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.UnregisteredDriver; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CalciteFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CalciteSchema; /** * Wrapper for {@link CalciteFactory}. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/CalciteQueryPlanner.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/CalciteQueryPlanner.java index b24b973fd618..6d64f06d4dda 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/CalciteQueryPlanner.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/CalciteQueryPlanner.java @@ -19,50 +19,49 @@ import java.util.Collection; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; -import org.apache.beam.sdk.extensions.sql.impl.QueryPlanner.Factory; import org.apache.beam.sdk.extensions.sql.impl.QueryPlanner.QueryParameters.Kind; import org.apache.beam.sdk.extensions.sql.impl.planner.BeamCostModel; import org.apache.beam.sdk.extensions.sql.impl.planner.RelMdNodeStats; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamRelNode; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.config.CalciteConnectionConfig; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.CalciteSchema; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.Contexts; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.ConventionTraitDef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCost; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptPlanner.CannotPlanException; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptUtil; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitDef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.prepare.CalciteCatalogReader; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelRoot; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.BuiltInMetadata; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.ChainedRelMetadataProvider; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.JaninoRelMetadataProvider; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.MetadataDef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.MetadataHandler; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.ReflectiveRelMetadataProvider; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataProvider; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataQuery; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.SchemaPlus; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlOperatorTable; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.fun.SqlStdOperatorTable; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.parser.SqlParseException; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.parser.SqlParser; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.parser.SqlParserImplFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.util.ChainedSqlOperatorTable; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.FrameworkConfig; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.Frameworks; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.Planner; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.RelConversionException; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.RuleSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.ValidationException; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.BuiltInMethod; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.Table; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.config.CalciteConnectionConfig; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CalciteSchema; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.Contexts; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.ConventionTraitDef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCost; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptPlanner.CannotPlanException; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptUtil; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitDef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.prepare.CalciteCatalogReader; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelRoot; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.BuiltInMetadata; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.ChainedRelMetadataProvider; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.JaninoRelMetadataProvider; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.MetadataDef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.MetadataHandler; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.ReflectiveRelMetadataProvider; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataProvider; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.SchemaPlus; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlOperatorTable; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.fun.SqlStdOperatorTable; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.parser.SqlParseException; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.parser.SqlParser; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.parser.SqlParserImplFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.util.SqlOperatorTables; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.FrameworkConfig; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.Frameworks; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.Planner; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.RelConversionException; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.RuleSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.ValidationException; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.BuiltInMethod; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -133,7 +132,7 @@ public FrameworkConfig defaultConfig(JdbcConnection connection, Collection costKeys = - mq.map.entrySet().stream() + List> costKeys = + mq.map.cellSet().stream() .filter(entry -> entry.getValue() instanceof BeamCostModel) .filter(entry -> ((BeamCostModel) entry.getValue()).isInfinite()) - .map(Map.Entry::getKey) .collect(Collectors.toList()); - costKeys.forEach(mq.map::remove); + costKeys.forEach(cell -> mq.map.remove(cell.getRowKey(), cell.getColumnKey())); return ((BeamRelNode) rel).beamComputeSelfCost(rel.getCluster().getPlanner(), mq); } diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/JdbcConnection.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/JdbcConnection.java index 3ae7177e92c5..2ff8d6f2e23d 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/JdbcConnection.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/JdbcConnection.java @@ -24,10 +24,10 @@ import org.apache.beam.sdk.extensions.sql.meta.provider.TableProvider; import org.apache.beam.sdk.options.PipelineOptions; import org.apache.beam.sdk.values.KV; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableMap; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.CalciteConnection; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.CalciteSchema; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.SchemaPlus; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CalciteConnection; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CalciteSchema; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.SchemaPlus; import org.checkerframework.checker.nullness.qual.Nullable; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/JdbcDriver.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/JdbcDriver.java index 931d7b5ba475..1c08ea0f6fc0 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/JdbcDriver.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/JdbcDriver.java @@ -17,8 +17,8 @@ */ package org.apache.beam.sdk.extensions.sql.impl; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.config.CalciteConnectionProperty.SCHEMA_FACTORY; -import static org.apache.beam.vendor.calcite.v1_20_0.org.codehaus.commons.compiler.CompilerFactoryFactory.getDefaultCompilerFactory; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.config.CalciteConnectionProperty.SCHEMA_FACTORY; +import static org.apache.beam.vendor.calcite.v1_26_0.org.codehaus.commons.compiler.CompilerFactoryFactory.getDefaultCompilerFactory; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.auto.service.AutoService; @@ -32,19 +32,18 @@ import org.apache.beam.sdk.extensions.sql.impl.planner.BeamRuleSets; import org.apache.beam.sdk.extensions.sql.meta.provider.TableProvider; import org.apache.beam.sdk.options.PipelineOptions; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.AvaticaFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.CalciteConnection; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.CalciteFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.Driver; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptPlanner; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitDef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.prepare.CalcitePrepareImpl; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelCollationTraitDef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.CalcRemoveRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.SortRemoveRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.runtime.Hook; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.RuleSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.enumerable.EnumerableRules; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.AvaticaFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CalciteConnection; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CalciteFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.Driver; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptPlanner; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitDef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelCollationTraitDef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.rules.CoreRules; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.runtime.Hook; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.RuleSet; /** * Calcite JDBC driver with Beam defaults. @@ -86,10 +85,10 @@ public class JdbcDriver extends Driver { planner.addRule(rule); } } - planner.removeRule(CalcRemoveRule.INSTANCE); - planner.removeRule(SortRemoveRule.INSTANCE); + planner.removeRule(CoreRules.CALC_REMOVE); + planner.removeRule(CoreRules.SORT_REMOVE); - for (RelOptRule rule : CalcitePrepareImpl.ENUMERABLE_RULES) { + for (RelOptRule rule : EnumerableRules.ENUMERABLE_RULES) { planner.removeRule(rule); } diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/JdbcFactory.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/JdbcFactory.java index 22a6a524b8d7..8afadc263ed8 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/JdbcFactory.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/JdbcFactory.java @@ -18,26 +18,26 @@ package org.apache.beam.sdk.extensions.sql.impl; import static org.apache.beam.sdk.extensions.sql.impl.JdbcDriver.TOP_LEVEL_BEAM_SCHEMA; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.BuiltInConnectionProperty.TIME_ZONE; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.config.CalciteConnectionProperty.LEX; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.config.CalciteConnectionProperty.PARSER_FACTORY; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.config.CalciteConnectionProperty.SCHEMA; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.config.CalciteConnectionProperty.SCHEMA_FACTORY; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.config.CalciteConnectionProperty.TYPE_SYSTEM; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.BuiltInConnectionProperty.TIME_ZONE; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.config.CalciteConnectionProperty.LEX; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.config.CalciteConnectionProperty.PARSER_FACTORY; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.config.CalciteConnectionProperty.SCHEMA; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.config.CalciteConnectionProperty.SCHEMA_FACTORY; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.config.CalciteConnectionProperty.TYPE_SYSTEM; import java.util.Properties; import org.apache.beam.sdk.extensions.sql.impl.parser.impl.BeamSqlParserImpl; import org.apache.beam.sdk.extensions.sql.impl.planner.BeamRelDataTypeSystem; import org.apache.beam.sdk.extensions.sql.meta.provider.TableProvider; import org.apache.beam.sdk.util.ReleaseInfo; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.java.JavaTypeFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.AvaticaConnection; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.AvaticaFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.ConnectionProperty; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.UnregisteredDriver; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.config.Lex; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.CalciteFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.CalciteSchema; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.java.JavaTypeFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.AvaticaConnection; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.AvaticaFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.ConnectionProperty; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.UnregisteredDriver; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.config.Lex; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CalciteFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CalciteSchema; /** * Implements {@link CalciteFactory} that is used by Clacite JDBC driver to instantiate different @@ -45,9 +45,9 @@ * *

The purpose of this class is to intercept the connection creation and force a cache-less root * schema ({@link - * org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.SimpleCalciteSchema}). Otherwise + * org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.SimpleCalciteSchema}). Otherwise * Calcite uses {@link - * org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.CachingCalciteSchema} that eagerly + * org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CachingCalciteSchema} that eagerly * caches table information. This behavior does not work well for dynamic table providers. */ class JdbcFactory extends CalciteFactoryWrapper { diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/QueryPlanner.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/QueryPlanner.java index 9ae01b6e86bb..48374a599d67 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/QueryPlanner.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/QueryPlanner.java @@ -22,10 +22,10 @@ import java.util.List; import java.util.Map; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamRelNode; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableMap; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.RuleSet; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.RuleSet; /** * An interface that planners should implement to convert sql statement to {@link BeamRelNode} or diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/ScalarFunctionImpl.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/ScalarFunctionImpl.java index da8cb269748d..1d95af426a7a 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/ScalarFunctionImpl.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/ScalarFunctionImpl.java @@ -17,7 +17,7 @@ */ package org.apache.beam.sdk.extensions.sql.impl; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.Static.RESOURCE; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.Static.RESOURCE; import java.lang.reflect.Constructor; import java.lang.reflect.Method; @@ -27,29 +27,29 @@ import java.util.Arrays; import java.util.List; import org.apache.beam.sdk.extensions.sql.impl.utils.CalciteUtils; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Preconditions; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableMultimap; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.enumerable.CallImplementor; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.enumerable.NullPolicy; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.enumerable.ReflectiveCallNotNullImplementor; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.enumerable.RexImpTable; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.enumerable.RexToLixTranslator; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.util.ByteString; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.function.SemiStrict; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.function.Strict; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.tree.Expression; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.tree.Expressions; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataTypeFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.Function; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.ImplementableFunction; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.ScalarFunction; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlOperatorBinding; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Preconditions; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableMultimap; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.enumerable.CallImplementor; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.enumerable.NullPolicy; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.enumerable.ReflectiveCallNotNullImplementor; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.enumerable.RexImpTable; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.enumerable.RexToLixTranslator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.util.ByteString; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.function.SemiStrict; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.function.Strict; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.tree.Expression; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.tree.Expressions; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataTypeFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.Function; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.ImplementableFunction; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.ScalarFunction; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlOperatorBinding; /** * Beam-customized version from {@link - * org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.impl.ScalarFunctionImpl} , to + * org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.impl.ScalarFunctionImpl} , to * address BEAM-5921. */ @SuppressWarnings({ @@ -68,7 +68,7 @@ private ScalarFunctionImpl(Method method, CallImplementor implementor) { } /** - * Creates {@link org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.Function} for + * Creates {@link org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.Function} for * each method in a given class. */ public static ImmutableMultimap createAll(Class clazz) { @@ -87,7 +87,7 @@ public static ImmutableMultimap createAll(Class clazz) { } /** - * Creates {@link org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.Function} from + * Creates {@link org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.Function} from * given class. * *

If a method of the given name is not found or it does not suit, returns {@code null}. @@ -105,7 +105,7 @@ public static Function create(Class clazz, String methodName) { } /** - * Creates {@link org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.Function} from + * Creates {@link org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.Function} from * given method. When {@code eval} method does not suit, {@code null} is returned. * * @param method method that is used to implement the function diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/SqlExecutableStatement.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/SqlExecutableStatement.java new file mode 100644 index 000000000000..194f86739cbc --- /dev/null +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/SqlExecutableStatement.java @@ -0,0 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.beam.sdk.extensions.sql.impl; + +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CalcitePrepare; + +public interface SqlExecutableStatement { + void execute(CalcitePrepare.Context context); +} diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/TableResolutionUtils.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/TableResolutionUtils.java index 842a7e0ddd8e..00ac8b5d9a15 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/TableResolutionUtils.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/TableResolutionUtils.java @@ -28,8 +28,8 @@ import org.apache.beam.sdk.extensions.sql.TableNameExtractionUtils; import org.apache.beam.sdk.extensions.sql.meta.CustomTableResolver; import org.apache.beam.sdk.extensions.sql.meta.provider.TableProvider; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.CalciteSchema; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CalciteSchema; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlNode; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -172,7 +172,7 @@ private static List tablesForSchema( */ private static class SchemaWithName { String name; - org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.Schema schema; + org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.Schema schema; static SchemaWithName create(JdbcConnection connection, String name) { SchemaWithName schemaWithName = new SchemaWithName(); diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/UdafImpl.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/UdafImpl.java index e93edc16fdce..7bf78d5045aa 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/UdafImpl.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/UdafImpl.java @@ -25,12 +25,12 @@ import org.apache.beam.sdk.annotations.Internal; import org.apache.beam.sdk.extensions.sql.impl.utils.CalciteUtils; import org.apache.beam.sdk.transforms.Combine.CombineFn; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.enumerable.AggImplementor; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataTypeFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.AggregateFunction; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.FunctionParameter; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.ImplementableAggFunction; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.enumerable.AggImplementor; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataTypeFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.AggregateFunction; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.FunctionParameter; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.ImplementableAggFunction; /** Implement {@link AggregateFunction} to take a {@link CombineFn} as UDAF. */ @Experimental diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/UdfImpl.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/UdfImpl.java index a84b3ff5ac39..44e98d579a1f 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/UdfImpl.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/UdfImpl.java @@ -18,9 +18,9 @@ package org.apache.beam.sdk.extensions.sql.impl; import java.lang.reflect.Method; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.Function; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.TranslatableTable; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.impl.TableMacroImpl; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.Function; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.TranslatableTable; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.impl.TableMacroImpl; /** Beam-customized facade behind {@link Function} to address BEAM-5921. */ @SuppressWarnings({ @@ -31,7 +31,7 @@ class UdfImpl { private UdfImpl() {} /** - * Creates {@link org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.Function} from + * Creates {@link org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.Function} from * given class. * *

If a method of the given name is not found or it does not suit, returns {@code null}. @@ -49,7 +49,7 @@ public static Function create(Class clazz, String methodName) { } /** - * Creates {@link org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.Function} from + * Creates {@link org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.Function} from * given method. * * @param method method that is used to implement the function diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/UdfImplReflectiveFunctionBase.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/UdfImplReflectiveFunctionBase.java index 9146e0579fae..452b0a4b9319 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/UdfImplReflectiveFunctionBase.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/UdfImplReflectiveFunctionBase.java @@ -23,13 +23,13 @@ import java.util.ArrayList; import java.util.List; import org.apache.beam.sdk.extensions.sql.impl.utils.CalciteUtils; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataTypeFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.Function; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.FunctionParameter; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.impl.ReflectiveFunctionBase; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.ReflectUtil; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataTypeFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.Function; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.FunctionParameter; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.impl.ReflectiveFunctionBase; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.ReflectUtil; /** Beam-customized version from {@link ReflectiveFunctionBase}, to address BEAM-5921. */ @SuppressWarnings({ @@ -100,7 +100,7 @@ public static ParameterListBuilder builder() { /** * Helps build lists of {@link - * org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.FunctionParameter}. + * org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.FunctionParameter}. */ public static class ParameterListBuilder { final List builder = new ArrayList<>(); diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/ZetaSqlUserDefinedSQLNativeTableValuedFunction.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/ZetaSqlUserDefinedSQLNativeTableValuedFunction.java index 07c9cbdde8a6..00d37827229b 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/ZetaSqlUserDefinedSQLNativeTableValuedFunction.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/ZetaSqlUserDefinedSQLNativeTableValuedFunction.java @@ -19,13 +19,13 @@ import java.util.List; import org.apache.beam.sdk.annotations.Internal; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.Function; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlIdentifier; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.SqlOperandTypeChecker; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.SqlOperandTypeInference; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.SqlReturnTypeInference; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.validate.SqlUserDefinedFunction; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.Function; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlIdentifier; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.SqlOperandTypeChecker; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.SqlOperandTypeInference; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.SqlReturnTypeInference; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.validate.SqlUserDefinedFunction; /** This is a class to indicate that a TVF is a ZetaSQL SQL native UDTVF. */ @Internal diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/CEPCall.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/CEPCall.java index fb1d6da04471..6ee91e81040d 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/CEPCall.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/CEPCall.java @@ -19,11 +19,11 @@ import java.util.ArrayList; import java.util.List; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexLiteral; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexPatternFieldRef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlOperator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexLiteral; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexPatternFieldRef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlOperator; /** * A {@code CEPCall} instance represents an operation (node) that contains an operator and a list of diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/CEPFieldRef.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/CEPFieldRef.java index 68aaf8d45e12..664bb5bb7da0 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/CEPFieldRef.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/CEPFieldRef.java @@ -17,7 +17,7 @@ */ package org.apache.beam.sdk.extensions.sql.impl.cep; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexPatternFieldRef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexPatternFieldRef; /** * A {@code CEPFieldRef} instance represents a node that points to a specified field in a {@code diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/CEPLiteral.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/CEPLiteral.java index d67576719eb4..5f83cf2d01f1 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/CEPLiteral.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/CEPLiteral.java @@ -20,7 +20,7 @@ import java.math.BigDecimal; import org.apache.beam.sdk.extensions.sql.impl.SqlConversionException; import org.apache.beam.sdk.schemas.Schema; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexLiteral; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexLiteral; import org.joda.time.ReadableDateTime; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/CEPOperation.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/CEPOperation.java index 50f735ffcd47..13f6321d8cca 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/CEPOperation.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/CEPOperation.java @@ -19,10 +19,10 @@ import java.io.Serializable; import org.apache.beam.sdk.extensions.sql.impl.SqlConversionException; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexLiteral; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexPatternFieldRef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexLiteral; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexPatternFieldRef; /** * {@code CEPOperation} is the base class for the evaluation operations defined in the {@code diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/CEPOperator.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/CEPOperator.java index 9dc3abb227e4..84fb72e978ad 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/CEPOperator.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/CEPOperator.java @@ -19,8 +19,8 @@ import java.io.Serializable; import java.util.Map; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlOperator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlOperator; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/CEPPattern.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/CEPPattern.java index dc7a4072d780..ed6668840c5b 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/CEPPattern.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/CEPPattern.java @@ -23,7 +23,7 @@ import javax.annotation.Nullable; import org.apache.beam.sdk.schemas.Schema; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexCall; /** Core pattern class that stores the definition of a single pattern. */ @SuppressWarnings({ diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/CEPUtils.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/CEPUtils.java index 1c45f60875f4..6244871ea43d 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/CEPUtils.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/CEPUtils.java @@ -21,14 +21,14 @@ import java.util.List; import java.util.Map; import org.apache.beam.sdk.schemas.Schema; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelCollation; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelFieldCollation; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexInputRef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexLiteral; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlOperator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelCollation; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelFieldCollation; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexLiteral; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlOperator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.ImmutableBitSet; /** * Some utility methods for transforming Calcite's constructs into our own Beam constructs (for @@ -156,11 +156,11 @@ public static ArrayList makeOrderKeysFromCollation(RelCollation orderK } /** Transform the partition columns into serializable CEPFieldRef. */ - public static List getCEPFieldRefFromParKeys(List parKeys) { + public static List getCEPFieldRefFromParKeys(ImmutableBitSet parKeys) { ArrayList fieldList = new ArrayList<>(); - for (RexNode i : parKeys) { - RexInputRef parKey = (RexInputRef) i; - fieldList.add(new CEPFieldRef(parKey.getName(), parKey.getIndex())); + for (int index : parKeys.asList()) { + // FIXME: Don't know where to get a better name. + fieldList.add(new CEPFieldRef("Partition Key " + index, index)); } return fieldList; } diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/OrderKey.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/OrderKey.java index 85825e65f2da..07d6654d4ece 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/OrderKey.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/cep/OrderKey.java @@ -18,7 +18,7 @@ package org.apache.beam.sdk.extensions.sql.impl.cep; import java.io.Serializable; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelFieldCollation; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelFieldCollation; /** * The {@code OrderKey} class stores the information to sort a column. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlCheckConstraint.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlCheckConstraint.java index a6d145dc3fd2..95c96de6387e 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlCheckConstraint.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlCheckConstraint.java @@ -18,15 +18,15 @@ package org.apache.beam.sdk.extensions.sql.impl.parser; import java.util.List; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlIdentifier; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlOperator; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlSpecialOperator; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlWriter; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.parser.SqlParserPos; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.ImmutableNullableList; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlIdentifier; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlOperator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlSpecialOperator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlWriter; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.parser.SqlParserPos; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.ImmutableNullableList; /** * Parse tree for {@code UNIQUE}, {@code PRIMARY KEY} constraints. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlColumnDeclaration.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlColumnDeclaration.java index 1ffe80f0502d..ba3e9fed6a3f 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlColumnDeclaration.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlColumnDeclaration.java @@ -18,16 +18,16 @@ package org.apache.beam.sdk.extensions.sql.impl.parser; import java.util.List; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlDataTypeSpec; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlIdentifier; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlOperator; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlSpecialOperator; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlWriter; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.parser.SqlParserPos; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlDataTypeSpec; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlIdentifier; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlOperator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlSpecialOperator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlWriter; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.parser.SqlParserPos; /** Parse tree for column. */ public class SqlColumnDeclaration extends SqlCall { diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlCreateExternalTable.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlCreateExternalTable.java index 900856109afd..f60b9fade126 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlCreateExternalTable.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlCreateExternalTable.java @@ -19,28 +19,28 @@ import static com.alibaba.fastjson.JSON.parseObject; import static org.apache.beam.sdk.schemas.Schema.toSchema; -import static org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Preconditions.checkNotNull; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.Static.RESOURCE; +import static org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Preconditions.checkNotNull; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.Static.RESOURCE; import com.alibaba.fastjson.JSONObject; import java.util.List; import org.apache.beam.sdk.extensions.sql.impl.BeamCalciteSchema; +import org.apache.beam.sdk.extensions.sql.impl.SqlExecutableStatement; import org.apache.beam.sdk.extensions.sql.impl.utils.CalciteUtils; import org.apache.beam.sdk.extensions.sql.meta.Table; import org.apache.beam.sdk.schemas.Schema; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.CalcitePrepare; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.CalciteSchema; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlCreate; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlExecutableStatement; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlIdentifier; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlOperator; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlSpecialOperator; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlUtil; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlWriter; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.parser.SqlParserPos; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.Pair; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CalcitePrepare; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CalciteSchema; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlCreate; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlIdentifier; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlOperator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlSpecialOperator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlUtil; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlWriter; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.parser.SqlParserPos; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.Pair; /** Parse tree for {@code CREATE EXTERNAL TABLE} statement. */ @SuppressWarnings({ diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlDdlNodes.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlDdlNodes.java index 55c4fa4dcdfe..256b9b712863 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlDdlNodes.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlDdlNodes.java @@ -18,16 +18,16 @@ package org.apache.beam.sdk.extensions.sql.impl.parser; import java.util.List; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.CalcitePrepare; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.CalciteSchema; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlDataTypeSpec; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlIdentifier; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlLiteral; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.parser.SqlParserPos; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.NlsString; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.Pair; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.Util; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CalcitePrepare; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CalciteSchema; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlDataTypeSpec; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlIdentifier; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlLiteral; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.parser.SqlParserPos; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.NlsString; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.Pair; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.Util; import org.checkerframework.checker.nullness.qual.Nullable; /** Utilities concerning {@link SqlNode} for DDL. */ diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlDropObject.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlDropObject.java index 2801dcd4b34a..2bac79d859d2 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlDropObject.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlDropObject.java @@ -17,21 +17,21 @@ */ package org.apache.beam.sdk.extensions.sql.impl.parser; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.Static.RESOURCE; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.Static.RESOURCE; import java.util.List; import org.apache.beam.sdk.extensions.sql.impl.BeamCalciteSchema; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.CalcitePrepare; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.CalciteSchema; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlDrop; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlExecutableStatement; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlIdentifier; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlOperator; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlUtil; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlWriter; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.parser.SqlParserPos; +import org.apache.beam.sdk.extensions.sql.impl.SqlExecutableStatement; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CalcitePrepare; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CalciteSchema; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlDrop; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlIdentifier; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlOperator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlUtil; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlWriter; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.parser.SqlParserPos; /** * Base class for parse trees of {@code DROP TABLE}, {@code DROP VIEW} and {@code DROP MATERIALIZED diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlDropTable.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlDropTable.java index 9541242a8604..3cc83a2884e6 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlDropTable.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlDropTable.java @@ -17,11 +17,11 @@ */ package org.apache.beam.sdk.extensions.sql.impl.parser; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlIdentifier; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlOperator; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlSpecialOperator; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.parser.SqlParserPos; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlIdentifier; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlOperator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlSpecialOperator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.parser.SqlParserPos; /** Parse tree for {@code DROP TABLE} statement. */ public class SqlDropTable extends SqlDropObject { diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlSetOptionBeam.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlSetOptionBeam.java index 98d64663aba9..ac5bf93695b7 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlSetOptionBeam.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlSetOptionBeam.java @@ -17,18 +17,18 @@ */ package org.apache.beam.sdk.extensions.sql.impl.parser; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.Static.RESOURCE; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.Static.RESOURCE; import org.apache.beam.sdk.extensions.sql.impl.BeamCalciteSchema; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.CalcitePrepare; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.CalciteSchema; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlExecutableStatement; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlIdentifier; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlSetOption; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlUtil; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.parser.SqlParserPos; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.Pair; +import org.apache.beam.sdk.extensions.sql.impl.SqlExecutableStatement; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CalcitePrepare; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CalciteSchema; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlIdentifier; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlSetOption; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlUtil; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.parser.SqlParserPos; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.Pair; /** SQL parse tree node to represent {@code SET} and {@code RESET} statements. */ @SuppressWarnings({ diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamCostModel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamCostModel.java index c3989cd62c7a..aa3a640709f1 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamCostModel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamCostModel.java @@ -18,9 +18,9 @@ package org.apache.beam.sdk.extensions.sql.impl.planner; import java.util.Objects; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCost; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCostFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptUtil; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCost; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCostFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptUtil; import org.checkerframework.checker.nullness.qual.Nullable; /** @@ -218,7 +218,7 @@ public static BeamCostModel convertRelOptCost(RelOptCost ic) { /** * Implementation of {@link - * org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCostFactory} that creates + * org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCostFactory} that creates * {@link BeamCostModel}s. */ public static class Factory implements RelOptCostFactory { diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamJavaTypeFactory.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamJavaTypeFactory.java index bc67b93a47e9..3eac11a9997a 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamJavaTypeFactory.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamJavaTypeFactory.java @@ -18,12 +18,12 @@ package org.apache.beam.sdk.extensions.sql.impl.planner; import java.lang.reflect.Type; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.java.JavaTypeFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.JavaTypeFactoryImpl; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.BasicSqlType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.IntervalSqlType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.SqlTypeName; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.java.JavaTypeFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.JavaTypeFactoryImpl; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.BasicSqlType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.IntervalSqlType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.SqlTypeName; /** customized data type in Beam. */ public class BeamJavaTypeFactory extends JavaTypeFactoryImpl { diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamRelDataTypeSystem.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamRelDataTypeSystem.java index 445242200af9..2ae691af6628 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamRelDataTypeSystem.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamRelDataTypeSystem.java @@ -17,9 +17,9 @@ */ package org.apache.beam.sdk.extensions.sql.impl.planner; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataTypeSystem; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataTypeSystemImpl; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.SqlTypeName; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataTypeSystem; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataTypeSystemImpl; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.SqlTypeName; /** customized data type in Beam. */ public class BeamRelDataTypeSystem extends RelDataTypeSystemImpl { diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamRuleSets.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamRuleSets.java index d9bc23663b04..42294a427f5f 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamRuleSets.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamRuleSets.java @@ -42,34 +42,13 @@ import org.apache.beam.sdk.extensions.sql.impl.rule.BeamUnnestRule; import org.apache.beam.sdk.extensions.sql.impl.rule.BeamValuesRule; import org.apache.beam.sdk.extensions.sql.impl.rule.BeamWindowRule; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.AggregateJoinTransposeRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.AggregateRemoveRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.AggregateUnionAggregateRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.CalcMergeRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.FilterAggregateTransposeRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.FilterCalcMergeRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.FilterJoinRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.FilterProjectTransposeRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.FilterSetOpTransposeRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.FilterToCalcRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.JoinCommuteRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.JoinPushExpressionsRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.ProjectCalcMergeRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.ProjectFilterTransposeRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.ProjectMergeRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.ProjectSetOpTransposeRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.ProjectSortTransposeRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.ProjectToCalcRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.ProjectToWindowRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.PruneEmptyRules; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.SortProjectTransposeRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.UnionEliminatorRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.UnionToDistinctRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.RuleSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.RuleSets; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.rules.CoreRules; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.rules.PruneEmptyRules; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.RuleSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.RuleSets; /** * {@link RuleSet} used in {@code BeamQueryPlanner}. It translates a standard Calcite {@link @@ -80,66 +59,65 @@ public class BeamRuleSets { private static final List LOGICAL_OPTIMIZATIONS = ImmutableList.of( // Rules for window functions - ProjectToWindowRule.PROJECT, + CoreRules.PROJECT_TO_LOGICAL_PROJECT_AND_WINDOW, // Rules so we only have to implement Calc - FilterCalcMergeRule.INSTANCE, - ProjectCalcMergeRule.INSTANCE, - FilterToCalcRule.INSTANCE, - ProjectToCalcRule.INSTANCE, + CoreRules.FILTER_CALC_MERGE, + CoreRules.PROJECT_CALC_MERGE, + CoreRules.FILTER_TO_CALC, + CoreRules.PROJECT_TO_CALC, BeamIOPushDownRule.INSTANCE, // disabled due to https://issues.apache.org/jira/browse/BEAM-6810 - // CalcRemoveRule.INSTANCE, - CalcMergeRule.INSTANCE, + // CoreRules.CALC_REMOVE, + CoreRules.CALC_MERGE, // push a filter into a join - FilterJoinRule.FILTER_ON_JOIN, + CoreRules.FILTER_INTO_JOIN, // push filter into the children of a join - FilterJoinRule.JOIN, + CoreRules.JOIN_CONDITION_PUSH, // push filter through an aggregation - FilterAggregateTransposeRule.INSTANCE, + CoreRules.FILTER_AGGREGATE_TRANSPOSE, // push filter through set operation - FilterSetOpTransposeRule.INSTANCE, + CoreRules.FILTER_SET_OP_TRANSPOSE, // push project through set operation - ProjectSetOpTransposeRule.INSTANCE, + CoreRules.PROJECT_SET_OP_TRANSPOSE, // aggregation and projection rules BeamAggregateProjectMergeRule.INSTANCE, // push a projection past a filter or vice versa - ProjectFilterTransposeRule.INSTANCE, - FilterProjectTransposeRule.INSTANCE, + CoreRules.PROJECT_FILTER_TRANSPOSE, + CoreRules.FILTER_PROJECT_TRANSPOSE, // push a projection to the children of a join // merge projections - ProjectMergeRule.INSTANCE, - // ProjectRemoveRule.INSTANCE, + CoreRules.PROJECT_MERGE, + // CoreRules.PROJECT_REMOVE, // reorder sort and projection - SortProjectTransposeRule.INSTANCE, - ProjectSortTransposeRule.INSTANCE, + CoreRules.SORT_PROJECT_TRANSPOSE, // join rules - JoinPushExpressionsRule.INSTANCE, - JoinCommuteRule.INSTANCE, + CoreRules.JOIN_PUSH_EXPRESSIONS, + CoreRules.JOIN_COMMUTE, BeamJoinAssociateRule.INSTANCE, BeamJoinPushThroughJoinRule.RIGHT, BeamJoinPushThroughJoinRule.LEFT, // remove union with only a single child - UnionEliminatorRule.INSTANCE, + CoreRules.UNION_REMOVE, // convert non-all union into all-union + distinct - UnionToDistinctRule.INSTANCE, + CoreRules.UNION_TO_DISTINCT, // remove aggregation if it does not aggregate and input is already distinct - AggregateRemoveRule.INSTANCE, + CoreRules.AGGREGATE_REMOVE, // push aggregate through join - AggregateJoinTransposeRule.EXTENDED, + CoreRules.AGGREGATE_JOIN_TRANSPOSE_EXTENDED, // aggregate union rule - AggregateUnionAggregateRule.INSTANCE, + CoreRules.AGGREGATE_UNION_AGGREGATE, // reduce aggregate functions like AVG, STDDEV_POP etc. - // AggregateReduceFunctionsRule.INSTANCE, + CoreRules.AGGREGATE_REDUCE_FUNCTIONS, // remove unnecessary sort rule // https://issues.apache.org/jira/browse/BEAM-5073 - // SortRemoveRule.INSTANCE, + // CoreRules.SORT_REMOVE,, BeamTableFunctionScanRule.INSTANCE, // prune empty results rules PruneEmptyRules.AGGREGATE_INSTANCE, diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/NodeStatsMetadata.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/NodeStatsMetadata.java index f0991afc5bdb..daa749bb0ef4 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/NodeStatsMetadata.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/NodeStatsMetadata.java @@ -18,12 +18,12 @@ package org.apache.beam.sdk.extensions.sql.impl.planner; import java.lang.reflect.Method; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.tree.Types; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.Metadata; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.MetadataDef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.MetadataHandler; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.tree.Types; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.Metadata; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.MetadataDef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.MetadataHandler; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataQuery; /** * This is a metadata used for row count and rate estimation. It extends Calcite's Metadata diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/RelMdNodeStats.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/RelMdNodeStats.java index df325bcb1e06..2cbb2a66c565 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/RelMdNodeStats.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/RelMdNodeStats.java @@ -17,16 +17,17 @@ */ package org.apache.beam.sdk.extensions.sql.impl.planner; +import java.util.ArrayList; import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; +import java.util.Set; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamRelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.MetadataDef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.MetadataHandler; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.ReflectiveRelMetadataProvider; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataProvider; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.Table; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.MetadataDef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.MetadataHandler; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.ReflectiveRelMetadataProvider; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataProvider; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataQuery; /** * This is the implementation of NodeStatsMetadata. Methods to estimate rate and row count for @@ -71,16 +72,34 @@ private NodeStats getBeamNodeStats(BeamRelNode rel, RelMetadataQuery mq) { // wraps the metadata provider with CachingRelMetadataProvider. However, // CachingRelMetadataProvider checks timestamp before returning previous results. Therefore, // there wouldn't be a problem in that case. - List keys = - mq.map.entrySet().stream() - .filter(entry -> entry.getValue() instanceof NodeStats) - .filter(entry -> ((NodeStats) entry.getValue()).isUnknown()) - .map(Map.Entry::getKey) - .collect(Collectors.toList()); - - for (List key : keys) { - mq.map.remove(key); + Set> cells = mq.map.cellSet(); + List> keys = new ArrayList<>(cells.size()); + for (Table.Cell cell : cells) { + if (cell == null) { + continue; + } + Object rawValue = cell.getValue(); + if (!(rawValue instanceof NodeStats)) { + continue; + } + NodeStats nodeStats = (NodeStats) rawValue; + if (nodeStats.isUnknown()) { + keys.add(cell); + } } + // List> keys = + // mq.map.cellSet().stream() + // .filter(entry -> entry.getValue() instanceof NodeStats) + // .filter(entry -> ((NodeStats) entry.getValue()).isUnknown()) + // .collect(Collectors.toList()); + + // === > Task :sdks:java:extensions:sql:compileJava + // === error: [dereference.of.nullable] dereference of possibly-null reference + // ((NodeStats)entry.getValue()) + // === .filter(entry -> ((NodeStats) entry.getValue()).isUnknown()) + // === ^ + + keys.forEach(cell -> mq.map.remove(cell.getRowKey(), cell.getColumnKey())); return rel.estimateNodeStats(mq); } diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/AbstractBeamCalcRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/AbstractBeamCalcRel.java index 7ef101e36613..0bcaae23a8ec 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/AbstractBeamCalcRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/AbstractBeamCalcRel.java @@ -20,15 +20,15 @@ import org.apache.beam.sdk.annotations.Internal; import org.apache.beam.sdk.extensions.sql.impl.planner.BeamCostModel; import org.apache.beam.sdk.extensions.sql.impl.planner.NodeStats; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptPlanner; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Calc; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataQuery; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexLocalRef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexProgram; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptPlanner; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Calc; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexLocalRef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexProgram; /** BeamRelNode to replace {@code Project} and {@code Filter} node. */ @Internal diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamAggregationRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamAggregationRel.java index a77d04d171bf..d94a74367ba0 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamAggregationRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamAggregationRel.java @@ -19,7 +19,7 @@ import static java.util.stream.Collectors.toList; import static org.apache.beam.sdk.values.PCollection.IsBounded.BOUNDED; -import static org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Preconditions.checkArgument; +import static org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Preconditions.checkArgument; import java.io.Serializable; import java.util.List; @@ -50,15 +50,15 @@ import org.apache.beam.sdk.values.PCollectionList; import org.apache.beam.sdk.values.Row; import org.apache.beam.sdk.values.WindowingStrategy; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptPlanner; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelWriter; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Aggregate; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.AggregateCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataQuery; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.ImmutableBitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptPlanner; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelWriter; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Aggregate; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.AggregateCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.ImmutableBitSet; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Lists; import org.checkerframework.checker.nullness.qual.Nullable; import org.joda.time.Duration; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamCalcRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamCalcRel.java index 6dd0b72887ff..e8f2a43bb256 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamCalcRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamCalcRel.java @@ -19,7 +19,7 @@ import static org.apache.beam.sdk.schemas.Schema.FieldType; import static org.apache.beam.sdk.schemas.Schema.TypeName; -import static org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Preconditions.checkArgument; +import static org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Preconditions.checkArgument; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -51,35 +51,35 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionList; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.DataContext; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.enumerable.JavaRowFormat; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.enumerable.PhysType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.enumerable.PhysTypeImpl; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.enumerable.RexToLixTranslator; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.java.JavaTypeFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.util.ByteString; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.QueryProvider; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.tree.BlockBuilder; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.tree.Expression; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.tree.Expressions; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.tree.GotoExpressionKind; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.tree.MemberDeclaration; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.tree.ParameterExpression; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.tree.Types; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptPredicateList; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Calc; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataQuery; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexBuilder; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexProgram; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexSimplify; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexUtil; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.SchemaPlus; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.validate.SqlConformance; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.validate.SqlConformanceEnum; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.BuiltInMethod; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.DataContext; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.enumerable.JavaRowFormat; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.enumerable.PhysType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.enumerable.PhysTypeImpl; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.enumerable.RexToLixTranslator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.java.JavaTypeFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.util.ByteString; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.QueryProvider; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.tree.BlockBuilder; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.tree.Expression; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.tree.Expressions; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.tree.GotoExpressionKind; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.tree.MemberDeclaration; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.tree.ParameterExpression; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.tree.Types; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptPredicateList; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Calc; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexBuilder; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexProgram; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexSimplify; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexUtil; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.SchemaPlus; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.validate.SqlConformance; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.validate.SqlConformanceEnum; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.BuiltInMethod; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Lists; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamCoGBKJoinRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamCoGBKJoinRel.java index 9debc62f51e5..2bd3f429e8dc 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamCoGBKJoinRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamCoGBKJoinRel.java @@ -40,14 +40,14 @@ import org.apache.beam.sdk.values.PCollectionList; import org.apache.beam.sdk.values.Row; import org.apache.beam.sdk.values.WindowingStrategy; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.CorrelationId; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Join; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.JoinRelType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.Pair; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.CorrelationId; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Join; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.JoinRelType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.Pair; /** * A {@code BeamJoinRel} which does CoGBK Join diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamEnumerableConverter.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamEnumerableConverter.java index 9b91285e034c..4b900d82e336 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamEnumerableConverter.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamEnumerableConverter.java @@ -17,7 +17,7 @@ */ package org.apache.beam.sdk.extensions.sql.impl.rel; -import static org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Preconditions.checkArgument; +import static org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Preconditions.checkArgument; import java.io.IOException; import java.time.LocalDate; @@ -57,24 +57,24 @@ import org.apache.beam.sdk.values.PCollection.IsBounded; import org.apache.beam.sdk.values.PValue; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.enumerable.EnumerableRel; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.enumerable.EnumerableRelImplementor; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.enumerable.PhysType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.enumerable.PhysTypeImpl; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.Enumerable; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.Linq4j; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.tree.BlockBuilder; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.tree.Expression; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.tree.Expressions; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.ConventionTraitDef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCost; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptPlanner; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.convert.ConverterImpl; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataQuery; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.enumerable.EnumerableRel; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.enumerable.EnumerableRelImplementor; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.enumerable.PhysType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.enumerable.PhysTypeImpl; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.Enumerable; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.Linq4j; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.tree.BlockBuilder; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.tree.Expression; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.tree.Expressions; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.ConventionTraitDef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCost; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptPlanner; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.convert.ConverterImpl; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; import org.checkerframework.checker.nullness.qual.Nullable; import org.joda.time.Duration; import org.joda.time.ReadableInstant; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIOSinkRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIOSinkRel.java index 3af4509cba33..f672621f4759 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIOSinkRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIOSinkRel.java @@ -17,7 +17,7 @@ */ package org.apache.beam.sdk.extensions.sql.impl.rel; -import static org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Preconditions.checkArgument; +import static org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Preconditions.checkArgument; import java.util.List; import java.util.Map; @@ -29,16 +29,16 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionList; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptPlanner; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptTable; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.prepare.Prepare; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.TableModify; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataQuery; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql2rel.RelStructuredTypeFlattener; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptPlanner; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptTable; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.prepare.Prepare; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.TableModify; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql2rel.RelStructuredTypeFlattener; /** BeamRelNode to replace a {@code TableModify} node. */ public class BeamIOSinkRel extends TableModify diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIOSourceRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIOSourceRel.java index f67238457168..3917c8eef232 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIOSourceRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIOSourceRel.java @@ -17,7 +17,7 @@ */ package org.apache.beam.sdk.extensions.sql.impl.rel; -import static org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Preconditions.checkArgument; +import static org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Preconditions.checkArgument; import java.util.List; import java.util.Map; @@ -31,15 +31,15 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionList; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCost; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptPlanner; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptTable; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.prepare.RelOptTableImpl; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.TableScan; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataQuery; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCost; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptPlanner; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptTable; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.prepare.RelOptTableImpl; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.TableScan; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; /** BeamRelNode to replace a {@code TableScan} node. */ public class BeamIOSourceRel extends TableScan implements BeamRelNode { diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIntersectRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIntersectRel.java index 80db5038394a..e69e14aecf33 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIntersectRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIntersectRel.java @@ -24,13 +24,13 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionList; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptPlanner; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Intersect; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.SetOp; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptPlanner; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Intersect; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.SetOp; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataQuery; /** * {@code BeamRelNode} to replace a {@code Intersect} node. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamJoinRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamJoinRel.java index d0a42cba3b1b..d81e8a750850 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamJoinRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamJoinRel.java @@ -25,23 +25,23 @@ import org.apache.beam.sdk.extensions.sql.impl.planner.NodeStats; import org.apache.beam.sdk.extensions.sql.meta.BeamSqlTable; import org.apache.beam.sdk.values.PCollection; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Optional; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptPlanner; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.volcano.RelSubset; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.CorrelationId; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Join; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.JoinRelType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataQuery; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexFieldAccess; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexInputRef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexLiteral; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.Pair; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Optional; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptPlanner; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.volcano.RelSubset; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.CorrelationId; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Join; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.JoinRelType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexFieldAccess; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexInputRef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexLiteral; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.Pair; /** * An abstract {@code BeamRelNode} to implement Join Rels. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamLogicalConvention.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamLogicalConvention.java index 0cbe757c2573..f744973ff328 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamLogicalConvention.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamLogicalConvention.java @@ -17,12 +17,12 @@ */ package org.apache.beam.sdk.extensions.sql.impl.rel; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.Convention; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.ConventionTraitDef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptPlanner; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTrait; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitDef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.Convention; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.ConventionTraitDef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptPlanner; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTrait; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitDef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; /** Convertion for Beam SQL. */ @SuppressWarnings({ diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamMatchRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamMatchRel.java index d970c6912213..3512b5aa91da 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamMatchRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamMatchRel.java @@ -18,7 +18,7 @@ package org.apache.beam.sdk.extensions.sql.impl.rel; import static org.apache.beam.sdk.extensions.sql.impl.cep.CEPUtils.makeOrderKeysFromCollation; -import static org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Preconditions.checkArgument; +import static org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Preconditions.checkArgument; import java.util.ArrayList; import java.util.List; @@ -48,18 +48,18 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionList; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptPlanner; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelCollation; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Match; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataQuery; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexInputRef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptPlanner; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelCollation; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Match; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.ImmutableBitSet; /** * {@code BeamRelNode} to replace a {@code Match} node. @@ -87,7 +87,7 @@ public BeamMatchRel( RexNode after, Map> subsets, boolean allRows, - List partitionKeys, + ImmutableBitSet partitionKeys, RelCollation orderKeys, RexNode interval) { @@ -134,7 +134,7 @@ public PTransform, PCollection> buildPTransform() { private class MatchTransform extends PTransform, PCollection> { - private final List parKeys; + private final ImmutableBitSet parKeys; private final RelCollation orderKeys; private final Map measures; private final boolean allRows; @@ -142,7 +142,7 @@ private class MatchTransform extends PTransform, PCollectio private final Map patternDefs; public MatchTransform( - List parKeys, + ImmutableBitSet parKeys, RelCollation orderKeys, Map measures, boolean allRows, @@ -168,9 +168,7 @@ public PCollection expand(PCollectionList pinput) { Schema outSchema = CalciteUtils.toSchema(getRowType()); Schema.Builder schemaBuilder = new Schema.Builder(); - for (RexNode i : parKeys) { - RexInputRef varNode = (RexInputRef) i; - int index = varNode.getIndex(); + for (int index : parKeys.asList()) { schemaBuilder.addField(upstreamSchema.getField(index)); } Schema partitionKeySchema = schemaBuilder.build(); @@ -432,7 +430,6 @@ public void processElement(@Element Row eleRow, OutputReceiver> out } } - @Override public Match copy( RelNode input, RelDataType rowType, @@ -444,7 +441,7 @@ public Match copy( RexNode after, Map> subsets, boolean allRows, - List partitionKeys, + ImmutableBitSet partitionKeys, RelCollation orderKeys, RexNode interval) { @@ -465,4 +462,26 @@ public Match copy( orderKeys, interval); } + + @Override + public RelNode copy(RelTraitSet traitSet, List inputs) { + // FIXME: THIS IS PROBABLY WRONG + return new BeamMatchRel( + getCluster(), + traitSet, + input, + rowType, + pattern, + strictStart, + strictEnd, + patternDefinitions, + measures, + after, + subsets, + allRows, + partitionKeys, + orderKeys, + interval); + } + } diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamMinusRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamMinusRel.java index 5e9e075652de..53357b41710d 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamMinusRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamMinusRel.java @@ -24,13 +24,13 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionList; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptPlanner; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Minus; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.SetOp; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptPlanner; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Minus; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.SetOp; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataQuery; /** * {@code BeamRelNode} to replace a {@code Minus} node. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamPushDownIOSourceRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamPushDownIOSourceRel.java index 1e9b551b8662..edc324001ce3 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamPushDownIOSourceRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamPushDownIOSourceRel.java @@ -17,7 +17,7 @@ */ package org.apache.beam.sdk.extensions.sql.impl.rel; -import static org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Preconditions.checkArgument; +import static org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Preconditions.checkArgument; import java.util.List; import java.util.Map; @@ -33,13 +33,13 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionList; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Preconditions; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptPlanner; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptTable; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelWriter; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Preconditions; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptPlanner; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptTable; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelWriter; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataQuery; public class BeamPushDownIOSourceRel extends BeamIOSourceRel { private final List usedFields; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamRelNode.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamRelNode.java index 935ec6cae628..fc7bdf1f42e1 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamRelNode.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamRelNode.java @@ -25,9 +25,9 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionList; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptPlanner; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptPlanner; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataQuery; /** A {@link RelNode} that can also give a {@link PTransform} that implements the expression. */ @SuppressWarnings({ @@ -76,8 +76,8 @@ default Map getPipelineOptions() { * estimate its NodeStats, it may need NodeStat of its inputs. However, it should not call this * directly (because maybe its inputs are not physical yet). It should call {@link * org.apache.beam.sdk.extensions.sql.impl.rel.BeamSqlRelUtils#getNodeStats( - * org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode, - * org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataQuery)} + * org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode, + * org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataQuery)} * instead. */ NodeStats estimateNodeStats(RelMetadataQuery mq); diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSetOperatorRelBase.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSetOperatorRelBase.java index 9f0873426614..ca7bd212d24d 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSetOperatorRelBase.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSetOperatorRelBase.java @@ -17,7 +17,7 @@ */ package org.apache.beam.sdk.extensions.sql.impl.rel; -import static org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Preconditions.checkArgument; +import static org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Preconditions.checkArgument; import java.io.Serializable; import org.apache.beam.sdk.extensions.sql.impl.transform.BeamSetOperatorsTransforms; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSideInputJoinRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSideInputJoinRel.java index ebe38aeefbd3..7fedd9bb06b6 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSideInputJoinRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSideInputJoinRel.java @@ -32,14 +32,14 @@ import org.apache.beam.sdk.values.PCollection.IsBounded; import org.apache.beam.sdk.values.PCollectionList; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.CorrelationId; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Join; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.JoinRelType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.Pair; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.CorrelationId; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Join; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.JoinRelType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.Pair; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSideInputLookupJoinRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSideInputLookupJoinRel.java index b4dbd565bd2c..248fd98074a4 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSideInputLookupJoinRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSideInputLookupJoinRel.java @@ -26,13 +26,13 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionList; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.CorrelationId; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Join; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.JoinRelType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.CorrelationId; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Join; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.JoinRelType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; /** * A {@code BeamJoinRel} which does Lookup Join diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSortRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSortRel.java index 3c056f6280b0..a636ec2f1ef7 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSortRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSortRel.java @@ -17,8 +17,8 @@ */ package org.apache.beam.sdk.extensions.sql.impl.rel; -import static org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.MoreObjects.firstNonNull; -import static org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Preconditions.checkArgument; +import static org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.MoreObjects.firstNonNull; +import static org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Preconditions.checkArgument; import java.io.Serializable; import java.math.BigDecimal; @@ -50,19 +50,19 @@ import org.apache.beam.sdk.values.PCollectionList; import org.apache.beam.sdk.values.Row; import org.apache.beam.sdk.values.WindowingStrategy; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptPlanner; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelCollation; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelCollationImpl; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelFieldCollation; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Sort; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataQuery; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexInputRef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexLiteral; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.SqlTypeName; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptPlanner; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelCollation; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelCollationImpl; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelFieldCollation; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Sort; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexInputRef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexLiteral; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.SqlTypeName; /** * {@code BeamRelNode} to replace a {@code Sort} node. @@ -112,7 +112,8 @@ public BeamSortRel( RexNode fetch) { super(cluster, traits, child, collation, offset, fetch); - List fieldExps = getChildExps(); + // https://issues.apache.org/jira/browse/CALCITE-4079?focusedCommentId=17165904&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-17165904 + List fieldExps = getSortExps(); RelCollationImpl collationImpl = (RelCollationImpl) collation; List collations = collationImpl.getFieldCollations(); for (int i = 0; i < fieldExps.size(); i++) { diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSqlRelUtils.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSqlRelUtils.java index fbe6dd463d1e..b35d84c61db3 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSqlRelUtils.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSqlRelUtils.java @@ -28,9 +28,9 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionList; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.volcano.RelSubset; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.volcano.RelSubset; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataQuery; /** Utilities for {@code BeamRelNode}. */ @SuppressWarnings({ diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamTableFunctionScanRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamTableFunctionScanRel.java index 8f45a3fa4aef..7bf28e397d4c 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamTableFunctionScanRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamTableFunctionScanRel.java @@ -17,7 +17,7 @@ */ package org.apache.beam.sdk.extensions.sql.impl.rel; -import static org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Preconditions.checkArgument; +import static org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Preconditions.checkArgument; import java.lang.reflect.Type; import java.util.ArrayList; @@ -51,18 +51,18 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionList; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptPlanner; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.TableFunctionScan; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelColumnMapping; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataQuery; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexInputRef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexLiteral; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptPlanner; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.TableFunctionScan; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelColumnMapping; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexInputRef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexLiteral; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.joda.time.Duration; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamUncollectRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamUncollectRel.java index b569a22477db..40d3b5f27e26 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamUncollectRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamUncollectRel.java @@ -17,8 +17,9 @@ */ package org.apache.beam.sdk.extensions.sql.impl.rel; -import static org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Preconditions.checkArgument; +import static org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Preconditions.checkArgument; +import java.util.Collections; import org.apache.beam.sdk.extensions.sql.impl.planner.BeamCostModel; import org.apache.beam.sdk.extensions.sql.impl.planner.NodeStats; import org.apache.beam.sdk.extensions.sql.impl.utils.CalciteUtils; @@ -29,12 +30,12 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionList; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptPlanner; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Uncollect; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptPlanner; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Uncollect; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataQuery; /** {@link BeamRelNode} to implement an uncorrelated {@link Uncollect}, aka UNNEST. */ @SuppressWarnings({ @@ -44,7 +45,7 @@ public class BeamUncollectRel extends Uncollect implements BeamRelNode { public BeamUncollectRel( RelOptCluster cluster, RelTraitSet traitSet, RelNode input, boolean withOrdinality) { - super(cluster, traitSet, input, withOrdinality); + super(cluster, traitSet, input, withOrdinality, Collections.emptyList()); } @Override diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamUnionRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamUnionRel.java index 5fc3d07f18be..2e410107a9ef 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamUnionRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamUnionRel.java @@ -25,13 +25,13 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionList; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptPlanner; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.SetOp; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Union; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptPlanner; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.SetOp; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Union; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataQuery; /** * {@link BeamRelNode} to replace a {@link Union}. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamUnnestRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamUnnestRel.java index 811d642150f8..4fb1ec629057 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamUnnestRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamUnnestRel.java @@ -29,18 +29,18 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionList; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptPlanner; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelWriter; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Correlate; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.JoinRelType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Uncollect; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataQuery; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.validate.SqlValidatorUtil; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptPlanner; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelWriter; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Correlate; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.JoinRelType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Uncollect; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.validate.SqlValidatorUtil; import org.checkerframework.checker.nullness.qual.Nullable; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamValuesRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamValuesRel.java index 9fa50370189b..c09077172478 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamValuesRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamValuesRel.java @@ -20,7 +20,7 @@ import static java.util.stream.Collectors.toList; import static org.apache.beam.sdk.extensions.sql.impl.schema.BeamTableUtils.autoCastField; import static org.apache.beam.sdk.values.Row.toRow; -import static org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Preconditions.checkArgument; +import static org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Preconditions.checkArgument; import java.util.List; import java.util.Map; @@ -34,15 +34,15 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionList; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableMap; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptPlanner; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Values; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataQuery; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexLiteral; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptPlanner; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Values; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexLiteral; /** * {@code BeamRelNode} to replace a {@code Values} node. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamWindowRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamWindowRel.java index d9a15a15be84..a1ed5cddb96a 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamWindowRel.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamWindowRel.java @@ -40,18 +40,18 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionList; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptPlanner; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelFieldCollation; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.AggregateCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Window; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataQuery; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexInputRef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexLiteral; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptPlanner; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelFieldCollation; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.AggregateCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Window; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexInputRef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexLiteral; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Lists; /** diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/package-info.java index 0eb883fb6900..8b81b6df6d8f 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/package-info.java @@ -18,7 +18,7 @@ /** * BeamSQL specified nodes, to replace {@link - * org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode}. + * org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode}. */ @DefaultAnnotation(NonNull.class) package org.apache.beam.sdk.extensions.sql.impl.rel; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamAggregateProjectMergeRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamAggregateProjectMergeRule.java index 9499e1bca475..fd7ba2112165 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamAggregateProjectMergeRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamAggregateProjectMergeRule.java @@ -21,16 +21,16 @@ import java.util.List; import java.util.Set; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamIOSourceRel; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRuleCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.volcano.RelSubset; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.SingleRel; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Aggregate; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Filter; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Project; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.RelFactories; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.AggregateProjectMergeRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.RelBuilderFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRuleCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.volcano.RelSubset; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.SingleRel; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Aggregate; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Filter; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Project; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.RelFactories; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.rules.AggregateProjectMergeRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.RelBuilderFactory; /** * This rule is essentially a wrapper around Calcite's {@code AggregateProjectMergeRule}. In the diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamAggregationRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamAggregationRule.java index ae0183cd595f..a20438f59218 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamAggregationRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamAggregationRule.java @@ -25,18 +25,18 @@ import org.apache.beam.sdk.transforms.windowing.Sessions; import org.apache.beam.sdk.transforms.windowing.SlidingWindows; import org.apache.beam.sdk.transforms.windowing.WindowFn; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRuleCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Aggregate; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Project; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.RelFactories; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexLiteral; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.RelBuilderFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.ImmutableBitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRuleCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Aggregate; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Project; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.RelFactories; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexLiteral; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.RelBuilderFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.ImmutableBitSet; import org.checkerframework.checker.nullness.qual.Nullable; import org.joda.time.Duration; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamBasicAggregationRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamBasicAggregationRule.java index f12ddc4f2b2b..e7e788e9eb53 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamBasicAggregationRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamBasicAggregationRule.java @@ -22,19 +22,19 @@ import java.util.stream.Collectors; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamAggregationRel; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRuleCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.volcano.RelSubset; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Aggregate; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Calc; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Filter; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Project; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.RelFactories; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.RelBuilderFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRuleCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.volcano.RelSubset; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Aggregate; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Calc; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Filter; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Project; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.RelFactories; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.RelBuilderFactory; /** * Aggregation rule that doesn't include projection. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamCalcRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamCalcRule.java index 7a820424c8d4..01532b455f26 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamCalcRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamCalcRule.java @@ -20,15 +20,15 @@ import java.util.List; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamCalcRel; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.Convention; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRuleCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.convert.ConverterRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Calc; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalCalc; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexOver; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.Convention; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRuleCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.convert.ConverterRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Calc; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalCalc; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexOver; /** A {@code ConverterRule} to replace {@link Calc} with {@link BeamCalcRel}. */ public class BeamCalcRule extends ConverterRule { diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamCoGBKJoinRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamCoGBKJoinRule.java index 516bc094ee4a..3d47c8429484 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamCoGBKJoinRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamCoGBKJoinRule.java @@ -21,12 +21,12 @@ import org.apache.beam.sdk.extensions.sql.impl.rel.BeamJoinRel; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; import org.apache.beam.sdk.values.PCollection; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRuleCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Join; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.RelFactories; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalJoin; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRuleCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Join; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.RelFactories; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalJoin; /** * Rule to convert {@code LogicalJoin} node to {@code BeamCoGBKJoinRel} node. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamEnumerableConverterRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamEnumerableConverterRule.java index 773fef11875e..15de4ff8092d 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamEnumerableConverterRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamEnumerableConverterRule.java @@ -20,10 +20,10 @@ import org.apache.beam.sdk.extensions.sql.impl.rel.BeamEnumerableConverter; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamRelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.enumerable.EnumerableConvention; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.convert.ConverterRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.enumerable.EnumerableConvention; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.convert.ConverterRule; /** A {@code ConverterRule} to Convert {@link BeamRelNode} to {@link EnumerableConvention}. */ public class BeamEnumerableConverterRule extends ConverterRule { diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamIOPushDownRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamIOPushDownRule.java index 9767fbf452da..2c3c02bb90fe 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamIOPushDownRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamIOPushDownRule.java @@ -38,24 +38,24 @@ import org.apache.beam.sdk.schemas.FieldAccessDescriptor.FieldDescriptor; import org.apache.beam.sdk.schemas.Schema; import org.apache.beam.sdk.schemas.utils.SelectHelpers; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRuleCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Calc; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.RelFactories; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataTypeField; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelRecordType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexInputRef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexLiteral; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexLocalRef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexProgram; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.RelBuilder; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.RelBuilderFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.Pair; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRuleCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Calc; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.RelFactories; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataTypeField; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelRecordType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexInputRef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexLiteral; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexLocalRef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexProgram; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.RelBuilder; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.RelBuilderFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.Pair; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; @SuppressWarnings({ @@ -141,7 +141,7 @@ public void onMatch(RelOptRuleCall call) { if (canDropCalc(program, beamSqlTable.supportsProjects(), tableFilter)) { // Tell the optimizer to not use old IO, since the new one is better. - call.getPlanner().setImportance(ioSourceRel, 0.0); + call.getPlanner().prune(ioSourceRel); call.transformTo( ioSourceRel.createPushDownRel( calc.getRowType(), @@ -174,7 +174,7 @@ public void onMatch(RelOptRuleCall call) { // Smaller Calc programs are indisputably better, as well as IOs with less projected fields. // We can consider something with the same number of filters. // Tell the optimizer not to use old Calc and IO. - call.getPlanner().setImportance(ioSourceRel, 0); + call.getPlanner().prune(ioSourceRel); call.transformTo(result); } } diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamIOSinkRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamIOSinkRule.java index d67e106b93af..0e7a2231f902 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamIOSinkRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamIOSinkRule.java @@ -20,9 +20,9 @@ import java.util.Arrays; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamIOSinkRel; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.convert.ConverterRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.TableModify; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.convert.ConverterRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.TableModify; /** A {@code ConverterRule} to replace {@link TableModify} with {@link BeamIOSinkRel}. */ public class BeamIOSinkRule extends ConverterRule { diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamIntersectRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamIntersectRule.java index 1a91e4c68a75..7c51deacd5b7 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamIntersectRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamIntersectRule.java @@ -20,11 +20,11 @@ import java.util.List; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamIntersectRel; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.Convention; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.convert.ConverterRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Intersect; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalIntersect; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.Convention; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.convert.ConverterRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Intersect; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalIntersect; /** {@code ConverterRule} to replace {@code Intersect} with {@code BeamIntersectRel}. */ public class BeamIntersectRule extends ConverterRule { diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamJoinAssociateRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamJoinAssociateRule.java index 3eb7ab5f18fd..d9445da50f94 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamJoinAssociateRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamJoinAssociateRule.java @@ -18,15 +18,15 @@ package org.apache.beam.sdk.extensions.sql.impl.rule; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamJoinRel; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRuleCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Join; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.RelFactories; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.JoinAssociateRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.RelBuilderFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRuleCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Join; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.RelFactories; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.rules.JoinAssociateRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.RelBuilderFactory; /** * This is very similar to {@link - * org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.JoinAssociateRule}. It only + * org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.rules.JoinAssociateRule}. It only * checks if the resulting condition is supported before transforming. */ public class BeamJoinAssociateRule extends JoinAssociateRule { diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamJoinPushThroughJoinRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamJoinPushThroughJoinRule.java index f2a10b9e9374..3fb4bf5deaee 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamJoinPushThroughJoinRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamJoinPushThroughJoinRule.java @@ -18,17 +18,17 @@ package org.apache.beam.sdk.extensions.sql.impl.rule; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamJoinRel; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRuleCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Join; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.RelFactories; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalJoin; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.JoinPushThroughJoinRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.RelBuilderFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRuleCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Join; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.RelFactories; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalJoin; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.rules.JoinPushThroughJoinRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.RelBuilderFactory; /** * This is exactly similar to {@link - * org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.JoinPushThroughJoinRule}. It + * org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.rules.JoinPushThroughJoinRule}. It * only checks if the condition of the new bottom join is supported. */ public class BeamJoinPushThroughJoinRule extends JoinPushThroughJoinRule { diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamMatchRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamMatchRule.java index 6441c79840f7..c70162d5f639 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamMatchRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamMatchRule.java @@ -19,11 +19,11 @@ import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamMatchRel; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.Convention; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.convert.ConverterRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Match; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalMatch; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.Convention; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.convert.ConverterRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Match; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalMatch; /** {@code ConverterRule} to replace {@code Match} with {@code BeamMatchRel}. */ public class BeamMatchRule extends ConverterRule { diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamMinusRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamMinusRule.java index 29d4a974e9be..24b691a1f63d 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamMinusRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamMinusRule.java @@ -20,11 +20,11 @@ import java.util.List; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamMinusRel; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.Convention; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.convert.ConverterRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Minus; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalMinus; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.Convention; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.convert.ConverterRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Minus; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalMinus; /** {@code ConverterRule} to replace {@code Minus} with {@code BeamMinusRel}. */ public class BeamMinusRule extends ConverterRule { diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamSideInputJoinRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamSideInputJoinRule.java index 98227bbe966b..3aa2fa4965f7 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamSideInputJoinRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamSideInputJoinRule.java @@ -21,12 +21,12 @@ import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamSideInputJoinRel; import org.apache.beam.sdk.values.PCollection; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRuleCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Join; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.RelFactories; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalJoin; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRuleCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Join; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.RelFactories; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalJoin; /** * Rule to convert {@code LogicalJoin} node to {@code BeamSideInputJoinRel} node. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamSideInputLookupJoinRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamSideInputLookupJoinRule.java index 2c96bd9563b7..c94e72e9af3a 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamSideInputLookupJoinRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamSideInputLookupJoinRule.java @@ -20,12 +20,12 @@ import org.apache.beam.sdk.extensions.sql.impl.rel.BeamJoinRel; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamSideInputLookupJoinRel; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.Convention; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRuleCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.convert.ConverterRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Join; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalJoin; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.Convention; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRuleCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.convert.ConverterRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Join; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalJoin; /** * Rule to convert {@code LogicalJoin} node to {@code BeamSideInputLookupJoinRel} node. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamSortRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamSortRule.java index 1647bf7290c8..06c17ecb0f4c 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamSortRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamSortRule.java @@ -19,11 +19,11 @@ import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamSortRel; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.Convention; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.convert.ConverterRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Sort; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalSort; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.Convention; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.convert.ConverterRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Sort; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalSort; /** {@code ConverterRule} to replace {@code Sort} with {@code BeamSortRel}. */ public class BeamSortRule extends ConverterRule { diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamTableFunctionScanRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamTableFunctionScanRule.java index 20959b51261b..a78bd2277a70 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamTableFunctionScanRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamTableFunctionScanRule.java @@ -17,18 +17,18 @@ */ package org.apache.beam.sdk.extensions.sql.impl.rule; -import static org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Preconditions.checkArgument; +import static org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Preconditions.checkArgument; import java.util.ArrayList; import java.util.Collections; import java.util.List; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamTableFunctionScanRel; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.Convention; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.convert.ConverterRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.TableFunctionScan; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalTableFunctionScan; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.Convention; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.convert.ConverterRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.TableFunctionScan; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalTableFunctionScan; /** * This is the conveter rule that converts a Calcite {@code TableFunctionScan} to Beam {@code diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamUncollectRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamUncollectRule.java index 393882b26877..fdbdbbcb617a 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamUncollectRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamUncollectRule.java @@ -19,10 +19,10 @@ import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamUncollectRel; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.Convention; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.convert.ConverterRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Uncollect; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.Convention; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.convert.ConverterRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Uncollect; /** A {@code ConverterRule} to replace {@link Uncollect} with {@link BeamUncollectRule}. */ public class BeamUncollectRule extends ConverterRule { diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamUnionRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamUnionRule.java index 7b84e25eab76..704a937560de 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamUnionRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamUnionRule.java @@ -19,15 +19,15 @@ import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamUnionRel; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.Convention; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.convert.ConverterRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Union; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalUnion; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.Convention; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.convert.ConverterRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Union; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalUnion; /** * A {@code ConverterRule} to replace {@link - * org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Union} with {@link + * org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Union} with {@link * BeamUnionRule}. */ public class BeamUnionRule extends ConverterRule { diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamUnnestRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamUnnestRule.java index 502a2346cea6..ac1aa497aa7f 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamUnnestRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamUnnestRule.java @@ -19,19 +19,19 @@ import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamUnnestRel; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRuleCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.volcano.RelSubset; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.SingleRel; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Correlate; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.JoinRelType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Uncollect; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalCorrelate; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalProject; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexFieldAccess; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRuleCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.volcano.RelSubset; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.SingleRel; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Correlate; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.JoinRelType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Uncollect; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalCorrelate; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalProject; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexFieldAccess; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; /** * A {@code ConverterRule} to replace {@link Correlate} {@link Uncollect} with {@link diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamValuesRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamValuesRule.java index 6fbe1e0910bc..98b9254fb789 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamValuesRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamValuesRule.java @@ -19,11 +19,11 @@ import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamValuesRel; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.Convention; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.convert.ConverterRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Values; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalValues; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.Convention; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.convert.ConverterRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Values; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalValues; /** {@code ConverterRule} to replace {@code Values} with {@code BeamValuesRel}. */ public class BeamValuesRule extends ConverterRule { diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamWindowRule.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamWindowRule.java index 73c10ccc6f62..4995a3e8d5a3 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamWindowRule.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/BeamWindowRule.java @@ -19,11 +19,11 @@ import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamWindowRel; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.Convention; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.convert.ConverterRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Window; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalWindow; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.Convention; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.convert.ConverterRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Window; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalWindow; /** A {@code ConverterRule} to replace {@link Window} with {@link BeamWindowRel}. */ public class BeamWindowRule extends ConverterRule { diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/JoinRelOptRuleCall.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/JoinRelOptRuleCall.java index 62ebf3c64b06..26c7260b3f76 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/JoinRelOptRuleCall.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/JoinRelOptRuleCall.java @@ -19,13 +19,14 @@ import java.util.List; import java.util.Map; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptPlanner; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRuleCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRuleOperand; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataQuery; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.RelBuilder; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelHintsPropagator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptPlanner; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRuleCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRuleOperand; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.RelBuilder; /** * This is a class to catch the built join and check if it is a legal join before passing it to the @@ -53,6 +54,15 @@ public void transformTo(RelNode rel, Map equiv) { } } + @Override + public void transformTo( + RelNode relNode, Map map, RelHintsPropagator relHintsPropagator) { + if (checker.check(relNode)) { + // FIXME: CHECK IF THIS IS CORRECT + originalCall.transformTo(relNode, map, relHintsPropagator); + } + } + /** This is a function gets the output relation and checks if it is a legal relational node. */ public interface JoinChecker { boolean check(RelNode rel); diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/package-info.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/package-info.java index 43cf0b909fc1..90e53618c990 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/package-info.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rule/package-info.java @@ -17,7 +17,7 @@ */ /** - * {@link org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRule} to generate + * {@link org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRule} to generate * {@link org.apache.beam.sdk.extensions.sql.impl.rel.BeamRelNode}. */ @DefaultAnnotation(NonNull.class) diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/schema/BeamTableUtils.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/schema/BeamTableUtils.java index 205196911188..4309ff4e0d55 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/schema/BeamTableUtils.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/schema/BeamTableUtils.java @@ -35,8 +35,8 @@ import org.apache.beam.sdk.schemas.Schema.FieldType; import org.apache.beam.sdk.schemas.Schema.TypeName; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.util.ByteString; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.NlsString; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.util.ByteString; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.NlsString; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVPrinter; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamBuiltinAggregations.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamBuiltinAggregations.java index 9f668505ab23..9ed0d8dd1706 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamBuiltinAggregations.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamBuiltinAggregations.java @@ -41,7 +41,7 @@ import org.apache.beam.sdk.transforms.Sample; import org.apache.beam.sdk.transforms.Sum; import org.apache.beam.sdk.values.KV; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableMap; import org.checkerframework.checker.nullness.qual.Nullable; /** Built-in aggregations functions for COUNT/MAX/MIN/SUM/AVG/VAR_POP/VAR_SAMP. */ diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamBuiltinAnalyticFunctions.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamBuiltinAnalyticFunctions.java index e9709784755f..26da1aa46267 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamBuiltinAnalyticFunctions.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamBuiltinAnalyticFunctions.java @@ -24,7 +24,7 @@ import org.apache.beam.sdk.schemas.Schema; import org.apache.beam.sdk.transforms.Combine; import org.apache.beam.sdk.values.KV; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableMap; /** Built-in Analytic Functions for the aggregation analytics functionality. */ @SuppressWarnings({ diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamJoinTransforms.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamJoinTransforms.java index 009ae43a7b8f..6cac136263af 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamJoinTransforms.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamJoinTransforms.java @@ -33,10 +33,10 @@ import org.apache.beam.sdk.transforms.ParDo; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexInputRef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.Pair; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexInputRef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.Pair; /** Collections of {@code PTransform} and {@code DoFn} used to perform JOIN operation. */ @SuppressWarnings({ diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/agg/AggregationCombineFnAdapter.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/agg/AggregationCombineFnAdapter.java index 53175424a55a..2178a2d47b28 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/agg/AggregationCombineFnAdapter.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/agg/AggregationCombineFnAdapter.java @@ -27,8 +27,8 @@ import org.apache.beam.sdk.schemas.SchemaCoder; import org.apache.beam.sdk.transforms.Combine.CombineFn; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.AggregateCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.validate.SqlUserDefinedAggFunction; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.AggregateCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.validate.SqlUserDefinedAggFunction; import org.checkerframework.checker.nullness.qual.Nullable; /** Wrapper {@link CombineFn}s for aggregation function calls. */ diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/agg/CovarianceFn.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/agg/CovarianceFn.java index 579955fef6a0..f8112e29834e 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/agg/CovarianceFn.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/agg/CovarianceFn.java @@ -17,7 +17,7 @@ */ package org.apache.beam.sdk.extensions.sql.impl.transform.agg; -import static org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Preconditions.checkArgument; +import static org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Preconditions.checkArgument; import java.math.BigDecimal; import java.math.MathContext; @@ -32,7 +32,7 @@ import org.apache.beam.sdk.transforms.Combine; import org.apache.beam.sdk.transforms.SerializableFunction; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.runtime.SqlFunctions; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.runtime.SqlFunctions; /** * {@link Combine.CombineFn} for Covariance on {@link Number} types. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/agg/VarianceFn.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/agg/VarianceFn.java index f0ffbd495ec3..ae1d9c8e5641 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/agg/VarianceFn.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/agg/VarianceFn.java @@ -29,7 +29,7 @@ import org.apache.beam.sdk.schemas.Schema; import org.apache.beam.sdk.transforms.Combine; import org.apache.beam.sdk.transforms.SerializableFunction; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.runtime.SqlFunctions; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.runtime.SqlFunctions; /** * {@link Combine.CombineFn} for Variance on {@link Number} types. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/udf/BuiltinHashFunctions.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/udf/BuiltinHashFunctions.java index c3fc82b1fdb5..8f3d0959b09f 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/udf/BuiltinHashFunctions.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/udf/BuiltinHashFunctions.java @@ -19,7 +19,8 @@ import com.google.auto.service.AutoService; import org.apache.beam.sdk.schemas.Schema; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.function.Strict; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.util.ByteString; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.function.Strict; /** Hash Functions. */ @AutoService(BeamBuiltinFunctionProvider.class) @@ -28,112 +29,112 @@ public class BuiltinHashFunctions extends BeamBuiltinFunctionProvider { /** * MD5(X) * - *

Calculates the MD5 digest and returns the value as a 16 element {@code byte[]}. + *

Calculates the MD5 digest and returns the value as a 16 element {@code ByteString}. */ @UDF( funcName = "MD5", parameterArray = {Schema.TypeName.STRING}, returnType = Schema.TypeName.BYTES) @Strict - public byte[] md5String(String str) { - return org.apache.commons.codec.digest.DigestUtils.md5(str); + public ByteString md5String(String str) { + return new ByteString(org.apache.commons.codec.digest.DigestUtils.md5(str)); } /** * MD5(X) * - *

Calculates the MD5 digest and returns the value as a 16 element {@code byte[]}. + *

Calculates the MD5 digest and returns the value as a 16 element {@code ByteString}. */ @UDF( funcName = "MD5", parameterArray = {Schema.TypeName.BYTES}, returnType = Schema.TypeName.BYTES) @Strict - public byte[] md5Bytes(byte[] bytes) { - return org.apache.commons.codec.digest.DigestUtils.md5(bytes); + public ByteString md5Bytes(byte[] bytes) { + return new ByteString(org.apache.commons.codec.digest.DigestUtils.md5(bytes)); } /** * SHA1(X) * - *

Calculates the SHA-1 digest and returns the value as a {@code byte[]}. + *

Calculates the SHA-1 digest and returns the value as a {@code ByteString}. */ @UDF( funcName = "SHA1", parameterArray = {Schema.TypeName.STRING}, returnType = Schema.TypeName.BYTES) @Strict - public byte[] sha1String(String str) { - return org.apache.commons.codec.digest.DigestUtils.sha1(str); + public ByteString sha1String(String str) { + return new ByteString(org.apache.commons.codec.digest.DigestUtils.sha1(str)); } /** * SHA1(X) * - *

Calculates the SHA-1 digest and returns the value as a {@code byte[]}. + *

Calculates the SHA-1 digest and returns the value as a {@code ByteString}. */ @UDF( funcName = "SHA1", parameterArray = {Schema.TypeName.BYTES}, returnType = Schema.TypeName.BYTES) @Strict - public byte[] sha1Bytes(byte[] bytes) { - return org.apache.commons.codec.digest.DigestUtils.sha1(bytes); + public ByteString sha1Bytes(byte[] bytes) { + return new ByteString(org.apache.commons.codec.digest.DigestUtils.sha1(bytes)); } /** * SHA256(X) * - *

Calculates the SHA-1 digest and returns the value as a {@code byte[]}. + *

Calculates the SHA-1 digest and returns the value as a {@code ByteString}. */ @UDF( funcName = "SHA256", parameterArray = {Schema.TypeName.STRING}, returnType = Schema.TypeName.BYTES) @Strict - public byte[] sha256String(String str) { - return org.apache.commons.codec.digest.DigestUtils.sha256(str); + public ByteString sha256String(String str) { + return new ByteString(org.apache.commons.codec.digest.DigestUtils.sha256(str)); } /** * SHA256(X) * - *

Calculates the SHA-1 digest and returns the value as a {@code byte[]}. + *

Calculates the SHA-1 digest and returns the value as a {@code ByteString}. */ @UDF( funcName = "SHA256", parameterArray = {Schema.TypeName.BYTES}, returnType = Schema.TypeName.BYTES) @Strict - public byte[] sha256Bytes(byte[] bytes) { - return org.apache.commons.codec.digest.DigestUtils.sha256(bytes); + public ByteString sha256Bytes(byte[] bytes) { + return new ByteString(org.apache.commons.codec.digest.DigestUtils.sha256(bytes)); } /** * SHA512(X) * - *

Calculates the SHA-1 digest and returns the value as a {@code byte[]}. + *

Calculates the SHA-1 digest and returns the value as a {@code ByteString}. */ @UDF( funcName = "SHA512", parameterArray = {Schema.TypeName.STRING}, returnType = Schema.TypeName.BYTES) @Strict - public byte[] sha512String(String str) { - return org.apache.commons.codec.digest.DigestUtils.sha512(str); + public ByteString sha512String(String str) { + return new ByteString(org.apache.commons.codec.digest.DigestUtils.sha512(str)); } /** * SHA512(X) * - *

Calculates the SHA-1 digest and returns the value as a {@code byte[]}. + *

Calculates the SHA-1 digest and returns the value as a {@code ByteString}. */ @UDF( funcName = "SHA512", parameterArray = {Schema.TypeName.BYTES}, returnType = Schema.TypeName.BYTES) @Strict - public byte[] sha512Bytes(byte[] bytes) { - return org.apache.commons.codec.digest.DigestUtils.sha512(bytes); + public ByteString sha512Bytes(byte[] bytes) { + return new ByteString(org.apache.commons.codec.digest.DigestUtils.sha512(bytes)); } } diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/udf/BuiltinStringFunctions.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/udf/BuiltinStringFunctions.java index b7f931821846..8cea4f6aece0 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/udf/BuiltinStringFunctions.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/udf/BuiltinStringFunctions.java @@ -24,7 +24,8 @@ import org.apache.beam.repackaged.core.org.apache.commons.lang3.ArrayUtils; import org.apache.beam.repackaged.core.org.apache.commons.lang3.StringUtils; import org.apache.beam.sdk.schemas.Schema.TypeName; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.function.Strict; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.util.ByteString; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.function.Strict; import org.apache.commons.codec.DecoderException; import org.apache.commons.codec.binary.Hex; @@ -82,10 +83,11 @@ public String reverseString(String str) { parameterArray = {TypeName.BYTES}, returnType = TypeName.BYTES) @Strict - public byte[] reverseBytes(byte[] bytes) { + public ByteString reverseBytes(ByteString byteString) { + byte[] bytes = byteString.getBytes(); byte[] ret = Arrays.copyOf(bytes, bytes.length); ArrayUtils.reverse(ret); - return ret; + return new ByteString(ret); } @UDF( @@ -93,9 +95,9 @@ public byte[] reverseBytes(byte[] bytes) { parameterArray = {TypeName.STRING}, returnType = TypeName.BYTES) @Strict - public byte[] fromHex(String str) { + public ByteString fromHex(String str) { try { - return Hex.decodeHex(str.toCharArray()); + return new ByteString(Hex.decodeHex(str.toCharArray())); } catch (DecoderException e) { throw new RuntimeException(e); } @@ -106,8 +108,8 @@ public byte[] fromHex(String str) { parameterArray = {TypeName.BYTES}, returnType = TypeName.STRING) @Strict - public String toHex(byte[] bytes) { - return Hex.encodeHexString(bytes); + public String toHex(ByteString bytes) { + return Hex.encodeHexString(bytes.getBytes()); } @UDF( @@ -144,8 +146,8 @@ public String lpad(String originalValue, Long returnLength, String pattern) { parameterArray = {TypeName.BYTES, TypeName.INT64}, returnType = TypeName.BYTES) @Strict - public byte[] lpad(byte[] originalValue, Long returnLength) { - return lpad(originalValue, returnLength, " ".getBytes(UTF_8)); + public ByteString lpad(ByteString originalValue, Long returnLength) { + return new ByteString(lpad(originalValue.getBytes(), returnLength, " ".getBytes(UTF_8))); } @UDF( @@ -153,7 +155,11 @@ public byte[] lpad(byte[] originalValue, Long returnLength) { parameterArray = {TypeName.BYTES, TypeName.INT64, TypeName.BYTES}, returnType = TypeName.BYTES) @Strict - public byte[] lpad(byte[] originalValue, Long returnLength, byte[] pattern) { + public ByteString lpad(ByteString originalValue, Long returnLength, ByteString pattern) { + return new ByteString(lpad(originalValue.getBytes(), returnLength, pattern.getBytes())); + } + + private byte[] lpad(byte[] originalValue, Long returnLength, byte[] pattern) { if (returnLength < -1 || pattern.length == 0) { throw new IllegalArgumentException("returnLength cannot be 0 or pattern cannot be empty."); } @@ -215,8 +221,8 @@ public String rpad(String originalValue, Long returnLength, String pattern) { parameterArray = {TypeName.BYTES, TypeName.INT64}, returnType = TypeName.BYTES) @Strict - public byte[] rpad(byte[] originalValue, Long returnLength) { - return lpad(originalValue, returnLength, " ".getBytes(UTF_8)); + public ByteString rpad(ByteString originalValue, Long returnLength) { + return new ByteString(lpad(originalValue.getBytes(), returnLength, " ".getBytes(UTF_8))); } @UDF( @@ -224,7 +230,11 @@ public byte[] rpad(byte[] originalValue, Long returnLength) { parameterArray = {TypeName.BYTES, TypeName.INT64, TypeName.BYTES}, returnType = TypeName.BYTES) @Strict - public byte[] rpad(byte[] originalValue, Long returnLength, byte[] pattern) { + public ByteString rpad(ByteString originalValue, Long returnLength, ByteString pattern) { + return new ByteString(rpad(originalValue.getBytes(), returnLength, pattern.getBytes())); + } + + private byte[] rpad(byte[] originalValue, Long returnLength, byte[] pattern) { if (returnLength < -1 || pattern.length == 0) { throw new IllegalArgumentException("returnLength cannot be 0 or pattern cannot be empty."); } diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/BigDecimalConverter.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/BigDecimalConverter.java index d00e6d6d2d6b..d987c38c775a 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/BigDecimalConverter.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/BigDecimalConverter.java @@ -21,7 +21,7 @@ import java.util.Map; import org.apache.beam.sdk.schemas.Schema.TypeName; import org.apache.beam.sdk.transforms.SerializableFunction; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableMap; /** * Provides converters from {@link BigDecimal} to other numeric types based on the input {@link diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/CalciteUtils.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/CalciteUtils.java index acd6e6c6b046..8ebe4f1b8a2c 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/CalciteUtils.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/CalciteUtils.java @@ -27,14 +27,15 @@ import org.apache.beam.sdk.schemas.Schema.TypeName; import org.apache.beam.sdk.schemas.logicaltypes.PassThroughLogicalType; import org.apache.beam.sdk.schemas.logicaltypes.SqlTypes; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.BiMap; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableBiMap; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableMap; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.util.ByteString; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataTypeFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataTypeField; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.SqlTypeName; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.BiMap; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableBiMap; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.util.ByteString; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataTypeFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataTypeField; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlTypeNameSpec; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.SqlTypeName; import org.joda.time.Instant; import org.joda.time.base.AbstractInstant; @@ -198,6 +199,11 @@ public static SqlTypeName toSqlTypeName(FieldType type) { } } + public static FieldType toFieldType(SqlTypeNameSpec sqlTypeName) { + // FIXME: NO CLUE IF THIS IS CORRECT + return toFieldType(SqlTypeName.get(sqlTypeName.getTypeName().getSimple())); + } + public static FieldType toFieldType(SqlTypeName sqlTypeName) { switch (sqlTypeName) { case MAP: diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/SerializableRexFieldAccess.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/SerializableRexFieldAccess.java index ce75b92f8f50..62a22ae534db 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/SerializableRexFieldAccess.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/SerializableRexFieldAccess.java @@ -20,8 +20,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexFieldAccess; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexInputRef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexFieldAccess; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexInputRef; /** SerializableRexFieldAccess. */ public class SerializableRexFieldAccess extends SerializableRexNode { diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/SerializableRexInputRef.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/SerializableRexInputRef.java index 4d4d364c8d00..d7b4ec7154c5 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/SerializableRexInputRef.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/SerializableRexInputRef.java @@ -17,7 +17,7 @@ */ package org.apache.beam.sdk.extensions.sql.impl.utils; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexInputRef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexInputRef; /** SerializableRexInputRef. */ public class SerializableRexInputRef extends SerializableRexNode { diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/SerializableRexNode.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/SerializableRexNode.java index 9796bf31b944..b4ef1a031041 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/SerializableRexNode.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/SerializableRexNode.java @@ -18,9 +18,9 @@ package org.apache.beam.sdk.extensions.sql.impl.utils; import java.io.Serializable; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexFieldAccess; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexInputRef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexFieldAccess; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexInputRef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; /** SerializableRexNode. */ public abstract class SerializableRexNode implements Serializable { diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/BaseBeamTable.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/BaseBeamTable.java index d9149551904d..c8ad21a260e9 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/BaseBeamTable.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/BaseBeamTable.java @@ -21,7 +21,7 @@ import org.apache.beam.sdk.values.PBegin; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; /** Basic implementation of {@link BeamSqlTable} methods used by predicate and filter push-down. */ public abstract class BaseBeamTable implements BeamSqlTable { diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/BeamSqlTable.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/BeamSqlTable.java index be2c205389e6..de13042a276f 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/BeamSqlTable.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/BeamSqlTable.java @@ -25,7 +25,7 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.POutput; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; /** This interface defines a Beam Sql Table. */ public interface BeamSqlTable { diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/BeamSqlTableFilter.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/BeamSqlTableFilter.java index 623c27eae4c0..0828eccbbb96 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/BeamSqlTableFilter.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/BeamSqlTableFilter.java @@ -18,8 +18,8 @@ package org.apache.beam.sdk.extensions.sql.meta; import java.util.List; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; /** This interface defines Beam SQL Table Filter. */ public interface BeamSqlTableFilter { diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/DefaultTableFilter.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/DefaultTableFilter.java index 16a6906da316..c09c5528de8b 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/DefaultTableFilter.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/DefaultTableFilter.java @@ -18,7 +18,7 @@ package org.apache.beam.sdk.extensions.sql.meta; import java.util.List; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; /** * This default implementation of {@link BeamSqlTableFilter} interface. Assumes that predicate diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/ReadOnlyTableProvider.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/ReadOnlyTableProvider.java index ce6a00e15f60..d00166216cce 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/ReadOnlyTableProvider.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/ReadOnlyTableProvider.java @@ -21,7 +21,7 @@ import org.apache.beam.sdk.extensions.sql.meta.BeamSqlTable; import org.apache.beam.sdk.extensions.sql.meta.Table; import org.apache.beam.sdk.schemas.Schema; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableMap; /** * A {@code ReadOnlyTableProvider} provides in-memory read only set of {@code BeamSqlTable diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BeamBigQuerySqlDialect.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BeamBigQuerySqlDialect.java index 7fa53f3bcda9..f0c56078ff49 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BeamBigQuerySqlDialect.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BeamBigQuerySqlDialect.java @@ -19,30 +19,34 @@ import java.util.List; import java.util.Map; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.util.Casing; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.util.TimeUnit; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.config.NullCollation; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataTypeSystem; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlAbstractDateTimeLiteral; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlDataTypeSpec; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlDialect; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlIdentifier; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlIntervalLiteral; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlIntervalQualifier; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlLiteral; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlOperator; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlSetOperator; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlSyntax; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlTimestampLiteral; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlWriter; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.dialect.BigQuerySqlDialect; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.fun.SqlTrimFunction; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.parser.SqlParserPos; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.BasicSqlType; +import java.util.Objects; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.util.Casing; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.util.TimeUnit; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.config.NullCollation; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataTypeSystem; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlAbstractDateTimeLiteral; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlDataTypeSpec; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlDialect; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlIdentifier; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlIntervalLiteral; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlIntervalQualifier; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlLiteral; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlOperator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlSetOperator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlSyntax; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlTimestampLiteral; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlTypeNameSpec; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlWriter; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.dialect.BigQuerySqlDialect; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.fun.SqlTrimFunction; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.parser.SqlParserPos; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.BasicSqlType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.validate.SqlValidator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.Litmus; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; @@ -411,14 +415,41 @@ public SqlNode getCastSpec(final RelDataType type) { return super.getCastSpec(type); } + public static class SqlBigQueryTypeNameSpec extends SqlTypeNameSpec { + private final RelDataType relDataType; + private final String name; + + SqlBigQueryTypeNameSpec(RelDataType relDataType, String name) { + super(new SqlIdentifier(name, SqlParserPos.ZERO), SqlParserPos.ZERO); + this.relDataType = relDataType; + this.name = name; + } + + @Override + public RelDataType deriveType(SqlValidator sqlValidator) { + return relDataType; + } + + @Override + public void unparse(SqlWriter sqlWriter, int i, int i1) { + // TODO: NO idea yet what to put here + } + + @Override + public boolean equalsDeep(SqlTypeNameSpec node, Litmus litmus) { + if (node instanceof SqlBigQueryTypeNameSpec) { + SqlBigQueryTypeNameSpec that = (SqlBigQueryTypeNameSpec) node; + if (Objects.equals(this.relDataType, that.relDataType) + && Objects.equals(this.name, that.name)) { + return litmus.succeed(); + } + } + return litmus.fail("{} != {}", this, node); + } + } + private static SqlNode typeFromName(RelDataType type, String name) { - return new SqlDataTypeSpec( - new SqlIdentifier(name, SqlParserPos.ZERO), - type.getPrecision(), - -1, - null, - null, - SqlParserPos.ZERO); + return new SqlDataTypeSpec(new SqlBigQueryTypeNameSpec(type, name), SqlParserPos.ZERO); } @Override diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BeamSqlUnparseContext.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BeamSqlUnparseContext.java index e55263d499b9..03b406308ff7 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BeamSqlUnparseContext.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BeamSqlUnparseContext.java @@ -17,7 +17,7 @@ */ package org.apache.beam.sdk.extensions.sql.meta.provider.bigquery; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rel2sql.SqlImplementor.POS; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.rel2sql.SqlImplementor.POS; import java.util.HashMap; import java.util.Map; @@ -27,24 +27,24 @@ import org.apache.beam.repackaged.core.org.apache.commons.lang3.text.translate.EntityArrays; import org.apache.beam.repackaged.core.org.apache.commons.lang3.text.translate.JavaUnicodeEscaper; import org.apache.beam.repackaged.core.org.apache.commons.lang3.text.translate.LookupTranslator; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.util.ByteString; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.util.TimeUnitRange; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rel2sql.SqlImplementor; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexDynamicParam; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexLiteral; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexProgram; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlDynamicParam; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlLiteral; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlWriter; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.parser.SqlParserPos; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.SqlTypeFamily; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.SqlTypeName; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.BitString; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.TimestampString; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.util.ByteString; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.util.TimeUnitRange; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.rel2sql.SqlImplementor; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexDynamicParam; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexLiteral; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexProgram; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlDynamicParam; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlLiteral; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlWriter; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.parser.SqlParserPos; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.SqlTypeFamily; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.SqlTypeName; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.BitString; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.TimestampString; import org.checkerframework.checker.nullness.qual.Nullable; @SuppressWarnings({ diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryFilter.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryFilter.java index c028a7ea6287..526ae6c209a1 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryFilter.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryFilter.java @@ -17,29 +17,29 @@ */ package org.apache.beam.sdk.extensions.sql.meta.provider.bigquery; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind.AND; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind.BETWEEN; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind.CAST; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind.COMPARISON; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind.DIVIDE; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind.LIKE; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind.MINUS; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind.MOD; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind.OR; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind.PLUS; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind.TIMES; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind.AND; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind.BETWEEN; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind.CAST; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind.COMPARISON; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind.DIVIDE; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind.LIKE; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind.MINUS; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind.MOD; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind.OR; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind.PLUS; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind.TIMES; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; import org.apache.beam.repackaged.core.org.apache.commons.lang3.tuple.Pair; import org.apache.beam.sdk.extensions.sql.meta.BeamSqlTableFilter; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexInputRef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexLiteral; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.SqlTypeName; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexInputRef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexLiteral; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.SqlTypeName; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableSet; @SuppressWarnings({ diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryTable.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryTable.java index 6e6203d1e1e3..68b9e00e5b16 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryTable.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryTable.java @@ -48,13 +48,13 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.POutput; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.annotations.VisibleForTesting; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rel2sql.SqlImplementor; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlIdentifier; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.fun.SqlStdOperatorTable; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.parser.SqlParserPos; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.annotations.VisibleForTesting; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.rel2sql.SqlImplementor; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlIdentifier; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.fun.SqlStdOperatorTable; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.parser.SqlParserPos; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryTableProvider.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryTableProvider.java index b1646aa69347..717cd239e7f5 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryTableProvider.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryTableProvider.java @@ -17,7 +17,7 @@ */ package org.apache.beam.sdk.extensions.sql.meta.provider.bigquery; -import static org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.MoreObjects.firstNonNull; +import static org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.MoreObjects.firstNonNull; import com.alibaba.fastjson.JSONObject; import com.google.auto.service.AutoService; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/BeamKafkaTable.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/BeamKafkaTable.java index e52bd550184d..8481fe778fa0 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/BeamKafkaTable.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/BeamKafkaTable.java @@ -17,7 +17,7 @@ */ package org.apache.beam.sdk.extensions.sql.meta.provider.kafka; -import static org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Preconditions.checkArgument; +import static org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Preconditions.checkArgument; import java.util.Collection; import java.util.HashMap; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/mongodb/MongoDbTable.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/mongodb/MongoDbTable.java index 8955d294df83..5354553e85e5 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/mongodb/MongoDbTable.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/mongodb/MongoDbTable.java @@ -17,9 +17,9 @@ */ package org.apache.beam.sdk.extensions.sql.meta.provider.mongodb; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind.AND; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind.COMPARISON; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind.OR; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind.AND; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind.COMPARISON; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind.OR; import com.mongodb.client.model.Filters; import java.io.Serializable; @@ -57,13 +57,13 @@ import org.apache.beam.sdk.values.PCollection.IsBounded; import org.apache.beam.sdk.values.POutput; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.annotations.VisibleForTesting; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexInputRef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexLiteral; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.SqlTypeName; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.annotations.VisibleForTesting; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexInputRef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexLiteral; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.SqlTypeName; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.bson.Document; import org.bson.conversions.Bson; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestTableFilter.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestTableFilter.java index 1f05d3c529e3..ae99c61320f3 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestTableFilter.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestTableFilter.java @@ -17,18 +17,18 @@ */ package org.apache.beam.sdk.extensions.sql.meta.provider.test; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind.COMPARISON; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind.IN; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind.COMPARISON; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind.IN; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; import org.apache.beam.sdk.extensions.sql.meta.BeamSqlTableFilter; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexInputRef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexLiteral; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.SqlTypeName; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexInputRef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexLiteral; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.SqlTypeName; @SuppressWarnings({ "nullness" // TODO(https://issues.apache.org/jira/browse/BEAM-10402) diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestTableProvider.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestTableProvider.java index c865ede20976..7c25993353a5 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestTableProvider.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestTableProvider.java @@ -17,7 +17,7 @@ */ package org.apache.beam.sdk.extensions.sql.meta.provider.test; -import static org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Preconditions.checkArgument; +import static org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Preconditions.checkArgument; import com.google.auto.service.AutoService; import java.io.Serializable; @@ -55,11 +55,11 @@ import org.apache.beam.sdk.values.PDone; import org.apache.beam.sdk.values.POutput; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexInputRef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexLiteral; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.SqlTypeName; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexInputRef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexLiteral; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.SqlTypeName; /** * Test in-memory table provider for use in tests. diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestTableUtils.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestTableUtils.java index a4d41f274f47..9ee6c298f9c9 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestTableUtils.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestTableUtils.java @@ -27,7 +27,7 @@ import org.apache.beam.sdk.schemas.Schema; import org.apache.beam.sdk.schemas.Schema.FieldType; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.Lists; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.Lists; /** Utility functions for mock classes. */ @Experimental diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestUnboundedTable.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestUnboundedTable.java index 05cbc55ee5d8..80f177283682 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestUnboundedTable.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestUnboundedTable.java @@ -29,7 +29,7 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.Row; import org.apache.beam.sdk.values.TimestampedValue; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.Pair; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.Pair; import org.joda.time.Duration; import org.joda.time.Instant; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/text/TextTableProvider.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/text/TextTableProvider.java index 28e7f0c4c994..d50a14cbac0f 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/text/TextTableProvider.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/text/TextTableProvider.java @@ -51,9 +51,9 @@ import org.apache.beam.sdk.values.TupleTag; import org.apache.beam.sdk.values.TupleTagList; import org.apache.beam.sdk.values.TypeDescriptors; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.annotations.VisibleForTesting; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.MoreObjects; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableSet; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.annotations.VisibleForTesting; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.MoreObjects; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableSet; import org.apache.commons.csv.CSVFormat; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/store/InMemoryMetaStore.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/store/InMemoryMetaStore.java index 5030be66505a..68901c9a8ad7 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/store/InMemoryMetaStore.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/store/InMemoryMetaStore.java @@ -22,7 +22,7 @@ import org.apache.beam.sdk.extensions.sql.meta.BeamSqlTable; import org.apache.beam.sdk.extensions.sql.meta.Table; import org.apache.beam.sdk.extensions.sql.meta.provider.TableProvider; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableMap; /** * A {@link MetaStore} which stores the meta info in memory. diff --git a/sdks/java/extensions/sql/src/main/resources/org.apache.beam.vendor.calcite.v1_20_0.org.codehaus.commons.compiler.properties b/sdks/java/extensions/sql/src/main/resources/org.apache.beam.vendor.calcite.v1_26_0.org.codehaus.commons.compiler.properties similarity index 93% rename from sdks/java/extensions/sql/src/main/resources/org.apache.beam.vendor.calcite.v1_20_0.org.codehaus.commons.compiler.properties rename to sdks/java/extensions/sql/src/main/resources/org.apache.beam.vendor.calcite.v1_26_0.org.codehaus.commons.compiler.properties index ab9a23481740..9bcf38628f06 100644 --- a/sdks/java/extensions/sql/src/main/resources/org.apache.beam.vendor.calcite.v1_20_0.org.codehaus.commons.compiler.properties +++ b/sdks/java/extensions/sql/src/main/resources/org.apache.beam.vendor.calcite.v1_26_0.org.codehaus.commons.compiler.properties @@ -15,4 +15,4 @@ # See the License for the specific language governing permissions and # limitations under the License. ################################################################################ -compilerFactory=org.apache.beam.vendor.calcite.v1_20_0.org.codehaus.janino.CompilerFactory +compilerFactory=org.apache.beam.vendor.calcite.v1_26_0.org.codehaus.janino.CompilerFactory diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamComplexTypeTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamComplexTypeTest.java index 5e778764520e..2d7e0e03730a 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamComplexTypeTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamComplexTypeTest.java @@ -35,8 +35,8 @@ import org.apache.beam.sdk.transforms.Create; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableMap; import org.joda.time.Duration; import org.joda.time.Instant; import org.junit.Ignore; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslAggregationTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslAggregationTest.java index 4c83b7cef194..c733ea1e2b89 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslAggregationTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslAggregationTest.java @@ -767,7 +767,7 @@ public void testWindowOnNonTimestampField() throws Exception { exceptions.expectCause( hasMessage( containsString( - "Cannot apply 'TUMBLE' to arguments of type 'TUMBLE(, )'"))); + "Cannot apply '$TUMBLE' to arguments of type '$TUMBLE(, )'"))); pipeline.enableAbandonedNodeEnforcement(false); String sql = diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslSqlStdOperatorsTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslSqlStdOperatorsTest.java index 9c0fd681802f..9cac45af6e0b 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslSqlStdOperatorsTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslSqlStdOperatorsTest.java @@ -17,6 +17,7 @@ */ package org.apache.beam.sdk.extensions.sql; +import static java.math.RoundingMode.UNNECESSARY; import static org.apache.beam.sdk.extensions.sql.utils.DateTimeUtils.parseTimestampWithUTCTimeZone; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; @@ -30,7 +31,6 @@ import java.lang.annotation.Target; import java.lang.reflect.Method; import java.math.BigDecimal; -import java.math.RoundingMode; import java.time.LocalDate; import java.time.LocalTime; import java.util.Arrays; @@ -44,14 +44,14 @@ import org.apache.beam.sdk.extensions.sql.integrationtest.BeamSqlBuiltinFunctionsIntegrationTestBase; import org.apache.beam.sdk.schemas.Schema; import org.apache.beam.sdk.schemas.Schema.FieldType; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Joiner; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.Lists; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.Ordering; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.runtime.SqlFunctions; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlOperator; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.fun.SqlStdOperatorTable; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Joiner; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.Lists; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.Ordering; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.runtime.SqlFunctions; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlOperator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.fun.SqlStdOperatorTable; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; @@ -59,19 +59,19 @@ /** * DSL compliance tests for the row-level operators of {@link - * org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.fun.SqlStdOperatorTable}. + * org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.fun.SqlStdOperatorTable}. */ @SuppressWarnings({ "nullness" // TODO(https://issues.apache.org/jira/browse/BEAM-10402) }) public class BeamSqlDslSqlStdOperatorsTest extends BeamSqlBuiltinFunctionsIntegrationTestBase { - private static final BigDecimal ZERO = BigDecimal.valueOf(0.0); - private static final BigDecimal ONE = BigDecimal.valueOf(1.0); - private static final BigDecimal ONE2 = BigDecimal.valueOf(1.0).multiply(BigDecimal.valueOf(1.0)); - private static final BigDecimal ONE10 = - BigDecimal.ONE.divide(BigDecimal.ONE, 10, RoundingMode.HALF_EVEN); - private static final BigDecimal TWO = BigDecimal.valueOf(2.0); - private static final BigDecimal TWO0 = BigDecimal.ONE.add(BigDecimal.ONE); + private static final BigDecimal ZERO_0 = BigDecimal.valueOf(0).setScale(0, UNNECESSARY); + private static final BigDecimal ZERO_1 = BigDecimal.valueOf(0).setScale(1, UNNECESSARY); + private static final BigDecimal ONE_0 = BigDecimal.valueOf(1).setScale(0, UNNECESSARY); + private static final BigDecimal ONE_1 = BigDecimal.valueOf(1).setScale(1, UNNECESSARY); + private static final BigDecimal ONE_2 = BigDecimal.valueOf(1).setScale(2, UNNECESSARY); + private static final BigDecimal TWO_0 = BigDecimal.valueOf(2).setScale(0, UNNECESSARY); + private static final BigDecimal TWO_1 = BigDecimal.valueOf(2).setScale(1, UNNECESSARY); private static final int INTEGER_VALUE = 1; private static final long LONG_VALUE = 1L; @@ -79,6 +79,7 @@ public class BeamSqlDslSqlStdOperatorsTest extends BeamSqlBuiltinFunctionsIntegr private static final byte BYTE_VALUE = 1; private static final double DOUBLE_VALUE = 1.0; private static final float FLOAT_VALUE = 1.0f; + private static final BigDecimal DECIMAL_VALUE = BigDecimal.ONE; @Rule public ExpectedException thrown = ExpectedException.none(); @@ -236,9 +237,11 @@ public void testThatOperatorsExist() { } @Test - @SqlOperatorTest(name = "OR", kind = "OR") - @SqlOperatorTest(name = "NOT", kind = "NOT") - @SqlOperatorTest(name = "AND", kind = "AND") + @SqlOperatorTests({ + @SqlOperatorTest(name = "OR", kind = "OR"), + @SqlOperatorTest(name = "NOT", kind = "NOT"), + @SqlOperatorTest(name = "AND", kind = "AND"), + }) public void testLogicOperators() { ExpressionChecker checker = new ExpressionChecker() @@ -283,23 +286,25 @@ public void testLogicOperators() { } @Test - @SqlOperatorTest(name = "+", kind = "PLUS") - @SqlOperatorTest(name = "-", kind = "MINUS") - @SqlOperatorTest(name = "*", kind = "TIMES") - @SqlOperatorTest(name = "/", kind = "DIVIDE") - @SqlOperatorTest(name = "MOD", kind = "MOD") + @SqlOperatorTests({ + @SqlOperatorTest(name = "+", kind = "PLUS"), + @SqlOperatorTest(name = "-", kind = "MINUS"), + @SqlOperatorTest(name = "*", kind = "TIMES"), + @SqlOperatorTest(name = "/", kind = "DIVIDE"), + @SqlOperatorTest(name = "MOD", kind = "MOD"), + }) public void testArithmeticOperator() { ExpressionChecker checker = new ExpressionChecker() .addExpr("1 + 1", 2) - .addExpr("1.0 + 1", TWO) - .addExpr("1 + 1.0", TWO) - .addExpr("1.0 + 1.0", TWO) + .addExpr("1.0 + 1", TWO_1) + .addExpr("1 + 1.0", TWO_1) + .addExpr("1.0 + 1.0", TWO_1) .addExpr("c_tinyint + c_tinyint", (byte) 2) .addExpr("c_smallint + c_smallint", (short) 2) .addExpr("c_bigint + c_bigint", 2L) - .addExpr("c_decimal + c_decimal", TWO0) - .addExpr("c_tinyint + c_decimal", TWO0) + .addExpr("c_decimal + c_decimal", TWO_0) + .addExpr("c_tinyint + c_decimal", TWO_0) .addExpr("c_float + c_decimal", 2.0) .addExpr("c_double + c_decimal", 2.0) .addExpr("c_float + c_float", 2.0f) @@ -308,9 +313,9 @@ public void testArithmeticOperator() { .addExpr("c_float + c_bigint", 2.0f) .addExpr("c_double + c_bigint", 2.0) .addExpr("1 - 1", 0) - .addExpr("1.0 - 1", ZERO) - .addExpr("1 - 0.0", ONE) - .addExpr("1.0 - 1.0", ZERO) + .addExpr("1.0 - 1", ZERO_1) + .addExpr("1 - 0.0", ONE_1) + .addExpr("1.0 - 1.0", ZERO_1) .addExpr("c_tinyint - c_tinyint", (byte) 0) .addExpr("c_smallint - c_smallint", (short) 0) .addExpr("c_bigint - c_bigint", 0L) @@ -324,14 +329,14 @@ public void testArithmeticOperator() { .addExpr("c_float - c_bigint", 0.0f) .addExpr("c_double - c_bigint", 0.0) .addExpr("1 * 1", 1) - .addExpr("1.0 * 1", ONE) - .addExpr("1 * 1.0", ONE) - .addExpr("1.0 * 1.0", ONE2) + .addExpr("1.0 * 1", ONE_1) + .addExpr("1 * 1.0", ONE_1) + .addExpr("1.0 * 1.0", ONE_2) .addExpr("c_tinyint * c_tinyint", (byte) 1) .addExpr("c_smallint * c_smallint", (short) 1) .addExpr("c_bigint * c_bigint", 1L) - .addExpr("c_decimal * c_decimal", BigDecimal.ONE) - .addExpr("c_tinyint * c_decimal", BigDecimal.ONE) + .addExpr("c_decimal * c_decimal", ONE_0) + .addExpr("c_tinyint * c_decimal", ONE_0) .addExpr("c_float * c_decimal", 1.0) .addExpr("c_double * c_decimal", 1.0) .addExpr("c_float * c_float", 1.0f) @@ -340,14 +345,14 @@ public void testArithmeticOperator() { .addExpr("c_float * c_bigint", 1.0f) .addExpr("c_double * c_bigint", 1.0) .addExpr("1 / 1", 1) - .addExpr("1.0 / 1", ONE) - .addExpr("1 / 1.0", BigDecimal.ONE) - .addExpr("1.0 / 1.0", BigDecimal.ONE) + .addExpr("1.0 / 1", ONE_1) + .addExpr("1 / 1.0", ONE_0) + .addExpr("1.0 / 1.0", ONE_0) .addExpr("c_tinyint / c_tinyint", (byte) 1) .addExpr("c_smallint / c_smallint", (short) 1) .addExpr("c_bigint / c_bigint", 1L) - .addExpr("c_decimal / c_decimal", BigDecimal.ONE) - .addExpr("c_tinyint / c_decimal", BigDecimal.ONE) + .addExpr("c_decimal / c_decimal", ONE_0) + .addExpr("c_tinyint / c_decimal", ONE_0) .addExpr("c_float / c_decimal", 1.0) .addExpr("c_double / c_decimal", 1.0) .addExpr("c_float / c_float", 1.0f) @@ -356,14 +361,14 @@ public void testArithmeticOperator() { .addExpr("c_float / c_bigint", 1.0f) .addExpr("c_double / c_bigint", 1.0) .addExpr("mod(1, 1)", 0) - .addExpr("mod(1.0, 1)", 0) - .addExpr("mod(1, 1.0)", BigDecimal.ZERO) - .addExpr("mod(1.0, 1.0)", ZERO) + .addExpr("mod(1.0, 1)", ZERO_1) + .addExpr("mod(1, 1.0)", ZERO_1) + .addExpr("mod(1.0, 1.0)", ZERO_1) .addExpr("mod(c_tinyint, c_tinyint)", (byte) 0) .addExpr("mod(c_smallint, c_smallint)", (short) 0) .addExpr("mod(c_bigint, c_bigint)", 0L) - .addExpr("mod(c_decimal, c_decimal)", BigDecimal.ZERO) - .addExpr("mod(c_tinyint, c_decimal)", BigDecimal.ZERO) + .addExpr("mod(c_decimal, c_decimal)", ZERO_0) + .addExpr("mod(c_tinyint, c_decimal)", ZERO_0) // Test overflow .addExpr("c_tinyint_max + c_tinyint_max", (byte) -2) .addExpr("c_smallint_max + c_smallint_max", (short) -2) @@ -374,8 +379,10 @@ public void testArithmeticOperator() { } @Test - @SqlOperatorTest(name = "LIKE", kind = "LIKE") - @SqlOperatorTest(name = "NOT LIKE", kind = "LIKE") + @SqlOperatorTests({ + @SqlOperatorTest(name = "LIKE", kind = "LIKE"), + @SqlOperatorTest(name = "NOT LIKE", kind = "LIKE"), + }) public void testLikeAndNotLike() { ExpressionChecker checker = new ExpressionChecker() @@ -454,22 +461,24 @@ public void testLikeAndNotLike() { } @Test - @SqlOperatorTest(name = "<", kind = "LESS_THAN") - @SqlOperatorTest(name = ">", kind = "GREATER_THAN") - @SqlOperatorTest(name = "<=", kind = "LESS_THAN_OR_EQUAL") - @SqlOperatorTest(name = "<>", kind = "NOT_EQUALS") - @SqlOperatorTest(name = "=", kind = "EQUALS") - @SqlOperatorTest(name = ">=", kind = "GREATER_THAN_OR_EQUAL") - @SqlOperatorTest(name = "IS NOT NULL", kind = "IS_NOT_NULL") - @SqlOperatorTest(name = "IS NULL", kind = "IS_NULL") - @SqlOperatorTest(name = "IS TRUE", kind = "IS_TRUE") - @SqlOperatorTest(name = "IS NOT TRUE", kind = "IS_NOT_TRUE") - @SqlOperatorTest(name = "IS FALSE", kind = "IS_FALSE") - @SqlOperatorTest(name = "IS NOT FALSE", kind = "IS_NOT_FALSE") - @SqlOperatorTest(name = "IS UNKNOWN", kind = "IS_NULL") - @SqlOperatorTest(name = "IS NOT UNKNOWN", kind = "IS_NOT_NULL") - @SqlOperatorTest(name = "IS DISTINCT FROM", kind = "IS_DISTINCT_FROM") - @SqlOperatorTest(name = "IS NOT DISTINCT FROM", kind = "IS_NOT_DISTINCT_FROM") + @SqlOperatorTests({ + @SqlOperatorTest(name = "<", kind = "LESS_THAN"), + @SqlOperatorTest(name = ">", kind = "GREATER_THAN"), + @SqlOperatorTest(name = "<=", kind = "LESS_THAN_OR_EQUAL"), + @SqlOperatorTest(name = "<>", kind = "NOT_EQUALS"), + @SqlOperatorTest(name = "=", kind = "EQUALS"), + @SqlOperatorTest(name = ">=", kind = "GREATER_THAN_OR_EQUAL"), + @SqlOperatorTest(name = "IS NOT NULL", kind = "IS_NOT_NULL"), + @SqlOperatorTest(name = "IS NULL", kind = "IS_NULL"), + @SqlOperatorTest(name = "IS TRUE", kind = "IS_TRUE"), + @SqlOperatorTest(name = "IS NOT TRUE", kind = "IS_NOT_TRUE"), + @SqlOperatorTest(name = "IS FALSE", kind = "IS_FALSE"), + @SqlOperatorTest(name = "IS NOT FALSE", kind = "IS_NOT_FALSE"), + @SqlOperatorTest(name = "IS UNKNOWN", kind = "IS_NULL"), + @SqlOperatorTest(name = "IS NOT UNKNOWN", kind = "IS_NOT_NULL"), + @SqlOperatorTest(name = "IS DISTINCT FROM", kind = "IS_DISTINCT_FROM"), + @SqlOperatorTest(name = "IS NOT DISTINCT FROM", kind = "IS_NOT_DISTINCT_FROM"), + }) public void testComparisonOperatorFunction() { ExpressionChecker checker = new ExpressionChecker() @@ -701,16 +710,18 @@ public void testAggrationFunctions() { } @Test - @SqlOperatorTest(name = "CHARACTER_LENGTH", kind = "OTHER_FUNCTION") - @SqlOperatorTest(name = "CHAR_LENGTH", kind = "OTHER_FUNCTION") - @SqlOperatorTest(name = "INITCAP", kind = "OTHER_FUNCTION") - @SqlOperatorTest(name = "LOWER", kind = "OTHER_FUNCTION") - @SqlOperatorTest(name = "POSITION", kind = "POSITION") - @SqlOperatorTest(name = "OVERLAY", kind = "OTHER_FUNCTION") - @SqlOperatorTest(name = "SUBSTRING", kind = "OTHER_FUNCTION") - @SqlOperatorTest(name = "TRIM", kind = "TRIM") - @SqlOperatorTest(name = "UPPER", kind = "OTHER_FUNCTION") - @SqlOperatorTest(name = "||", kind = "OTHER") + @SqlOperatorTests({ + @SqlOperatorTest(name = "CHARACTER_LENGTH", kind = "OTHER_FUNCTION"), + @SqlOperatorTest(name = "CHAR_LENGTH", kind = "OTHER_FUNCTION"), + @SqlOperatorTest(name = "INITCAP", kind = "OTHER_FUNCTION"), + @SqlOperatorTest(name = "LOWER", kind = "OTHER_FUNCTION"), + @SqlOperatorTest(name = "POSITION", kind = "POSITION"), + @SqlOperatorTest(name = "OVERLAY", kind = "OTHER_FUNCTION"), + @SqlOperatorTest(name = "SUBSTRING", kind = "OTHER_FUNCTION"), + @SqlOperatorTest(name = "TRIM", kind = "TRIM"), + @SqlOperatorTest(name = "UPPER", kind = "OTHER_FUNCTION"), + @SqlOperatorTest(name = "||", kind = "OTHER"), + }) public void testStringFunctions() throws Exception { SqlExpressionChecker checker = new SqlExpressionChecker() @@ -756,7 +767,7 @@ public void testAbs() { .addExpr("ABS(c_tinyint)", (byte) Math.abs(BYTE_VALUE)) .addExpr("ABS(c_double)", Math.abs(DOUBLE_VALUE)) .addExpr("ABS(c_float)", Math.abs(FLOAT_VALUE)) - .addExpr("ABS(c_decimal)", new BigDecimal(Math.abs(ONE.doubleValue()))); + .addExpr("ABS(c_decimal)", ONE_0.abs()); checker.buildRunAndCheck(); } @@ -771,7 +782,7 @@ public void testLn() { .addExpr("LN(c_tinyint)", Math.log(BYTE_VALUE)) .addExpr("LN(c_double)", Math.log(DOUBLE_VALUE)) .addExpr("LN(c_float)", Math.log(FLOAT_VALUE)) - .addExpr("LN(c_decimal)", Math.log(ONE.doubleValue())); + .addExpr("LN(c_decimal)", Math.log(DECIMAL_VALUE.doubleValue())); checker.buildRunAndCheck(); } @@ -786,7 +797,7 @@ public void testSqrt() { .addExpr("SQRT(c_tinyint)", Math.sqrt(BYTE_VALUE)) .addExpr("SQRT(c_double)", Math.sqrt(DOUBLE_VALUE)) .addExpr("SQRT(c_float)", Math.sqrt(FLOAT_VALUE)) - .addExpr("SQRT(c_decimal)", Math.sqrt(ONE.doubleValue())); + .addExpr("SQRT(c_decimal)", Math.sqrt(DECIMAL_VALUE.doubleValue())); checker.buildRunAndCheck(); } @@ -802,7 +813,8 @@ public void testRound() { .addExpr("ROUND(c_double, 0)", SqlFunctions.sround(DOUBLE_VALUE, 0)) .addExpr("ROUND(c_float, 0)", (float) SqlFunctions.sround(FLOAT_VALUE, 0)) .addExpr( - "ROUND(c_decimal, 0)", new BigDecimal(SqlFunctions.sround(ONE.doubleValue(), 0))); + "ROUND(c_decimal, 0)", + SqlFunctions.sround(ONE_0, 0)); checker.buildRunAndCheck(); } @@ -817,7 +829,7 @@ public void testLog10() { .addExpr("LOG10(c_tinyint)", Math.log10(BYTE_VALUE)) .addExpr("LOG10(c_double)", Math.log10(DOUBLE_VALUE)) .addExpr("LOG10(c_float)", Math.log10(FLOAT_VALUE)) - .addExpr("LOG10(c_decimal)", Math.log10(ONE.doubleValue())); + .addExpr("LOG10(c_decimal)", Math.log10(DECIMAL_VALUE.doubleValue())); checker.buildRunAndCheck(); } @@ -832,7 +844,7 @@ public void testExp() { .addExpr("EXP(c_tinyint)", Math.exp(BYTE_VALUE)) .addExpr("EXP(c_double)", Math.exp(DOUBLE_VALUE)) .addExpr("EXP(c_float)", Math.exp(FLOAT_VALUE)) - .addExpr("EXP(c_decimal)", Math.exp(ONE.doubleValue())); + .addExpr("EXP(c_decimal)", Math.exp(DECIMAL_VALUE.doubleValue())); checker.buildRunAndCheck(); } @@ -847,7 +859,7 @@ public void testAcos() { .addExpr("ACOS(c_tinyint)", Math.acos(BYTE_VALUE)) .addExpr("ACOS(c_double)", Math.acos(DOUBLE_VALUE)) .addExpr("ACOS(c_float)", Math.acos(FLOAT_VALUE)) - .addExpr("ACOS(c_decimal)", Math.acos(ONE.doubleValue())); + .addExpr("ACOS(c_decimal)", Math.acos(DECIMAL_VALUE.doubleValue())); checker.buildRunAndCheck(); } @@ -862,7 +874,7 @@ public void testAsin() { .addExpr("ASIN(c_tinyint)", Math.asin(BYTE_VALUE)) .addExpr("ASIN(c_double)", Math.asin(DOUBLE_VALUE)) .addExpr("ASIN(c_float)", Math.asin(FLOAT_VALUE)) - .addExpr("ASIN(c_decimal)", Math.asin(ONE.doubleValue())); + .addExpr("ASIN(c_decimal)", Math.asin(DECIMAL_VALUE.doubleValue())); checker.buildRunAndCheck(); } @@ -877,7 +889,7 @@ public void testAtan() { .addExpr("ATAN(c_tinyint)", Math.atan(BYTE_VALUE)) .addExpr("ATAN(c_double)", Math.atan(DOUBLE_VALUE)) .addExpr("ATAN(c_float)", Math.atan(FLOAT_VALUE)) - .addExpr("ATAN(c_decimal)", Math.atan(ONE.doubleValue())); + .addExpr("ATAN(c_decimal)", Math.atan(DECIMAL_VALUE.doubleValue())); checker.buildRunAndCheck(); } @@ -892,7 +904,7 @@ public void testCot() { .addExpr("COT(c_tinyint)", 1.0d / Math.tan(BYTE_VALUE)) .addExpr("COT(c_double)", 1.0d / Math.tan(DOUBLE_VALUE)) .addExpr("COT(c_float)", 1.0d / Math.tan(FLOAT_VALUE)) - .addExpr("COT(c_decimal)", 1.0d / Math.tan(ONE.doubleValue())); + .addExpr("COT(c_decimal)", 1.0d / Math.tan(DECIMAL_VALUE.doubleValue())); checker.buildRunAndCheck(); } @@ -907,7 +919,7 @@ public void testDegrees() { .addExpr("DEGREES(c_tinyint)", Math.toDegrees(BYTE_VALUE)) .addExpr("DEGREES(c_double)", Math.toDegrees(DOUBLE_VALUE)) .addExpr("DEGREES(c_float)", Math.toDegrees(FLOAT_VALUE)) - .addExpr("DEGREES(c_decimal)", Math.toDegrees(ONE.doubleValue())); + .addExpr("DEGREES(c_decimal)", Math.toDegrees(DECIMAL_VALUE.doubleValue())); checker.buildRunAndCheck(); } @@ -922,7 +934,7 @@ public void testRadians() { .addExpr("RADIANS(c_tinyint)", Math.toRadians(BYTE_VALUE)) .addExpr("RADIANS(c_double)", Math.toRadians(DOUBLE_VALUE)) .addExpr("RADIANS(c_float)", Math.toRadians(FLOAT_VALUE)) - .addExpr("RADIANS(c_decimal)", Math.toRadians(ONE.doubleValue())); + .addExpr("RADIANS(c_decimal)", Math.toRadians(DECIMAL_VALUE.doubleValue())); checker.buildRunAndCheck(); } @@ -937,7 +949,7 @@ public void testCos() { .addExpr("COS(c_tinyint)", Math.cos(BYTE_VALUE)) .addExpr("COS(c_double)", Math.cos(DOUBLE_VALUE)) .addExpr("COS(c_float)", Math.cos(FLOAT_VALUE)) - .addExpr("COS(c_decimal)", Math.cos(ONE.doubleValue())); + .addExpr("COS(c_decimal)", Math.cos(DECIMAL_VALUE.doubleValue())); checker.buildRunAndCheck(); } @@ -952,7 +964,7 @@ public void testSin() { .addExpr("SIN(c_tinyint)", Math.sin(BYTE_VALUE)) .addExpr("SIN(c_double)", Math.sin(DOUBLE_VALUE)) .addExpr("SIN(c_float)", Math.sin(FLOAT_VALUE)) - .addExpr("SIN(c_decimal)", Math.sin(ONE.doubleValue())); + .addExpr("SIN(c_decimal)", Math.sin(DECIMAL_VALUE.doubleValue())); checker.buildRunAndCheck(); } @@ -967,7 +979,7 @@ public void testTan() { .addExpr("TAN(c_tinyint)", Math.tan(BYTE_VALUE)) .addExpr("TAN(c_double)", Math.tan(DOUBLE_VALUE)) .addExpr("TAN(c_float)", Math.tan(FLOAT_VALUE)) - .addExpr("TAN(c_decimal)", Math.tan(ONE.doubleValue())); + .addExpr("TAN(c_decimal)", Math.tan(DECIMAL_VALUE.doubleValue())); checker.buildRunAndCheck(); } @@ -983,7 +995,7 @@ public void testSign() { .addExpr("SIGN(c_tinyint)", (byte) Integer.signum(BYTE_VALUE)) .addExpr("SIGN(c_double)", Math.signum(DOUBLE_VALUE)) .addExpr("SIGN(c_float)", Math.signum(FLOAT_VALUE)) - .addExpr("SIGN(c_decimal)", BigDecimal.valueOf(ONE.signum())); + .addExpr("SIGN(c_decimal)", BigDecimal.valueOf(DECIMAL_VALUE.signum())); checker.buildRunAndCheck(); } @@ -999,14 +1011,14 @@ public void testPower() { .addExpr("POWER(c_tinyint, 2)", Math.pow(BYTE_VALUE, 2)) .addExpr("POWER(c_double, 2)", Math.pow(DOUBLE_VALUE, 2)) .addExpr("POWER(c_float, 2)", Math.pow(FLOAT_VALUE, 2)) - .addExpr("POWER(c_decimal, 2)", Math.pow(ONE.doubleValue(), 2)); + .addExpr("POWER(c_decimal, 2)", Math.pow(DECIMAL_VALUE.doubleValue(), 2)); checker.buildRunAndCheck(); } @Test @SqlOperatorTest(name = "PI", kind = "OTHER_FUNCTION") - public void testPi() throws Exception { + public void testPi() { ExpressionChecker checker = new ExpressionChecker().addExpr("PI", Math.PI); checker.buildRunAndCheck(); @@ -1023,7 +1035,7 @@ public void testAtan2() { .addExpr("ATAN2(c_tinyint, 2)", Math.atan2(BYTE_VALUE, 2)) .addExpr("ATAN2(c_double, 2)", Math.atan2(DOUBLE_VALUE, 2)) .addExpr("ATAN2(c_float, 2)", Math.atan2(FLOAT_VALUE, 2)) - .addExpr("ATAN2(c_decimal, 2)", Math.atan2(ONE.doubleValue(), 2)); + .addExpr("ATAN2(c_decimal, 2)", Math.atan2(DECIMAL_VALUE.doubleValue(), 2)); checker.buildRunAndCheck(); } @@ -1039,7 +1051,7 @@ public void testTruncate() { .addExpr("TRUNCATE(c_tinyint, 2)", (byte) SqlFunctions.struncate(BYTE_VALUE, 2)) .addExpr("TRUNCATE(c_double, 2)", SqlFunctions.struncate(DOUBLE_VALUE, 2)) .addExpr("TRUNCATE(c_float, 2)", (float) SqlFunctions.struncate(FLOAT_VALUE, 2)) - .addExpr("TRUNCATE(c_decimal, 2)", SqlFunctions.struncate(ONE, 2)); + .addExpr("TRUNCATE(c_decimal, 2)", SqlFunctions.struncate(DECIMAL_VALUE, 2)); checker.buildRunAndCheck(); } @@ -1068,9 +1080,11 @@ public void testRandInteger() { } @Test - @SqlOperatorTest(name = "ARRAY", kind = "ARRAY_VALUE_CONSTRUCTOR") - @SqlOperatorTest(name = "CARDINALITY", kind = "OTHER_FUNCTION") - @SqlOperatorTest(name = "ELEMENT", kind = "OTHER_FUNCTION") + @SqlOperatorTests({ + @SqlOperatorTest(name = "ARRAY", kind = "ARRAY_VALUE_CONSTRUCTOR"), + @SqlOperatorTest(name = "CARDINALITY", kind = "OTHER_FUNCTION"), + @SqlOperatorTest(name = "ELEMENT", kind = "OTHER_FUNCTION"), + }) public void testArrayFunctions() { ExpressionChecker checker = new ExpressionChecker() @@ -1089,17 +1103,19 @@ public void testArrayFunctions() { } @Test - @SqlOperatorTest(name = "DAYOFMONTH", kind = "OTHER") - @SqlOperatorTest(name = "DAYOFWEEK", kind = "OTHER") - @SqlOperatorTest(name = "DAYOFYEAR", kind = "OTHER") - @SqlOperatorTest(name = "EXTRACT", kind = "EXTRACT") - @SqlOperatorTest(name = "YEAR", kind = "OTHER") - @SqlOperatorTest(name = "QUARTER", kind = "OTHER") - @SqlOperatorTest(name = "MONTH", kind = "OTHER") - @SqlOperatorTest(name = "WEEK", kind = "OTHER") - @SqlOperatorTest(name = "HOUR", kind = "OTHER") - @SqlOperatorTest(name = "MINUTE", kind = "OTHER") - @SqlOperatorTest(name = "SECOND", kind = "OTHER") + @SqlOperatorTests({ + @SqlOperatorTest(name = "DAYOFMONTH", kind = "OTHER"), + @SqlOperatorTest(name = "DAYOFWEEK", kind = "OTHER"), + @SqlOperatorTest(name = "DAYOFYEAR", kind = "OTHER"), + @SqlOperatorTest(name = "EXTRACT", kind = "EXTRACT"), + @SqlOperatorTest(name = "YEAR", kind = "OTHER"), + @SqlOperatorTest(name = "QUARTER", kind = "OTHER"), + @SqlOperatorTest(name = "MONTH", kind = "OTHER"), + @SqlOperatorTest(name = "WEEK", kind = "OTHER"), + @SqlOperatorTest(name = "HOUR", kind = "OTHER"), + @SqlOperatorTest(name = "MINUTE", kind = "OTHER"), + @SqlOperatorTest(name = "SECOND", kind = "OTHER"), + }) public void testBasicDateTimeFunctions() { ExpressionChecker checker = new ExpressionChecker() @@ -1368,9 +1384,11 @@ public void testTimestampMinusInterval() { } @Test - @SqlOperatorTest(name = "CASE", kind = "CASE") - @SqlOperatorTest(name = "NULLIF", kind = "NULLIF") - @SqlOperatorTest(name = "COALESCE", kind = "COALESCE") + @SqlOperatorTests({ + @SqlOperatorTest(name = "CASE", kind = "CASE"), + @SqlOperatorTest(name = "NULLIF", kind = "NULLIF"), + @SqlOperatorTest(name = "COALESCE", kind = "COALESCE"), + }) public void testConditionalOperatorsAndFunctions() { ExpressionChecker checker = new ExpressionChecker() diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslUdfUdafTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslUdfUdafTest.java index 7bc1aafaa6aa..93612f31664f 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslUdfUdafTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslUdfUdafTest.java @@ -39,9 +39,9 @@ import org.apache.beam.sdk.values.PCollectionTuple; import org.apache.beam.sdk.values.Row; import org.apache.beam.sdk.values.TupleTag; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableMap; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.function.Parameter; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.TranslatableTable; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.function.Parameter; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.TranslatableTable; import org.joda.time.Instant; import org.junit.Test; @@ -216,7 +216,7 @@ public void testBeamSqlUdfWithDefaultParameters() throws Exception { } /** - * test {@link org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.TableMacro} UDF. + * test {@link org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.TableMacro} UDF. */ @Test public void testTableMacroUdf() throws Exception { @@ -404,7 +404,7 @@ public static Integer eval(java.util.List i) { /** * UDF to test support for {@link - * org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.TableMacro}. + * org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.TableMacro}. */ public static final class RangeUdf implements BeamSqlUdf { public static TranslatableTable eval(int startInclusive, int endExclusive) { diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlExplainTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlExplainTest.java index 602af4dd18f7..2c9b2aaf66dc 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlExplainTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlExplainTest.java @@ -21,9 +21,9 @@ import org.apache.beam.sdk.extensions.sql.meta.provider.text.TextTableProvider; import org.apache.beam.sdk.extensions.sql.meta.store.InMemoryMetaStore; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.parser.SqlParseException; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.RelConversionException; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.ValidationException; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.parser.SqlParseException; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.RelConversionException; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.ValidationException; import org.junit.Before; import org.junit.Ignore; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlMapTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlMapTest.java index e1755302fa08..ba7c9e48efd9 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlMapTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlMapTest.java @@ -23,7 +23,7 @@ import org.apache.beam.sdk.transforms.Create; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableMap; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlMultipleSchemasTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlMultipleSchemasTest.java index 41f916bef236..b891bd3d383c 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlMultipleSchemasTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlMultipleSchemasTest.java @@ -29,7 +29,7 @@ import org.apache.beam.sdk.values.PBegin; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableMap; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/PubsubToBigqueryIT.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/PubsubToBigqueryIT.java index 68f301114a5a..90986386f6d7 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/PubsubToBigqueryIT.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/PubsubToBigqueryIT.java @@ -35,8 +35,8 @@ import org.apache.beam.sdk.schemas.Schema; import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableMap; import org.joda.time.Duration; import org.joda.time.Instant; import org.junit.Rule; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/TestUtils.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/TestUtils.java index 33ae73959adc..bd72373a483f 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/TestUtils.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/TestUtils.java @@ -17,7 +17,7 @@ */ package org.apache.beam.sdk.extensions.sql; -import static org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Preconditions.checkArgument; +import static org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Preconditions.checkArgument; import java.util.ArrayList; import java.util.Arrays; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/JdbcDriverTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/JdbcDriverTest.java index d50a4aa8a629..4e7dab886619 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/JdbcDriverTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/JdbcDriverTest.java @@ -50,10 +50,10 @@ import org.apache.beam.sdk.schemas.Schema; import org.apache.beam.sdk.util.ReleaseInfo; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableMap; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.CalciteConnection; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.CalciteSchema; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.SchemaPlus; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CalciteConnection; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CalciteSchema; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.SchemaPlus; import org.joda.time.DateTime; import org.joda.time.Duration; import org.joda.time.ReadableInstant; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/parser/BeamDDLNestedTypesTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/parser/BeamDDLNestedTypesTest.java index 32b6ff40d68a..1faac1924f0a 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/parser/BeamDDLNestedTypesTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/parser/BeamDDLNestedTypesTest.java @@ -32,7 +32,7 @@ import org.apache.beam.sdk.extensions.sql.utils.QuickCheckGenerators.PrimitiveTypes; import org.apache.beam.sdk.schemas.Schema; import org.apache.beam.sdk.schemas.Schema.FieldType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.parser.SqlParseException; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.parser.SqlParseException; import org.junit.runner.RunWith; /** diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/planner/NodeStatsTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/planner/NodeStatsTest.java index a68d96286bd3..5eb8736adf8a 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/planner/NodeStatsTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/planner/NodeStatsTest.java @@ -21,11 +21,11 @@ import org.apache.beam.sdk.extensions.sql.impl.rel.BeamSqlRelUtils; import org.apache.beam.sdk.extensions.sql.meta.provider.test.TestBoundedTable; import org.apache.beam.sdk.schemas.Schema; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.volcano.RelSubset; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.SingleRel; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.volcano.RelSubset; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.SingleRel; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamAggregationRelTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamAggregationRelTest.java index 3ebe01e42024..0b97ff66713e 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamAggregationRelTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamAggregationRelTest.java @@ -23,7 +23,7 @@ import org.apache.beam.sdk.extensions.sql.meta.provider.test.TestBoundedTable; import org.apache.beam.sdk.extensions.sql.meta.provider.test.TestUnboundedTable; import org.apache.beam.sdk.schemas.Schema; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; import org.joda.time.DateTime; import org.joda.time.Duration; import org.junit.Assert; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamCalcRelTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamCalcRelTest.java index 8b1c2dcde281..27baad3b138d 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamCalcRelTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamCalcRelTest.java @@ -23,7 +23,7 @@ import org.apache.beam.sdk.extensions.sql.meta.provider.test.TestBoundedTable; import org.apache.beam.sdk.extensions.sql.meta.provider.test.TestUnboundedTable; import org.apache.beam.sdk.schemas.Schema; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; import org.joda.time.DateTime; import org.joda.time.Duration; import org.junit.Assert; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamCoGBKJoinRelBoundedVsBoundedTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamCoGBKJoinRelBoundedVsBoundedTest.java index f6826a57aac4..e4cbd831e125 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamCoGBKJoinRelBoundedVsBoundedTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamCoGBKJoinRelBoundedVsBoundedTest.java @@ -25,7 +25,7 @@ import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; import org.hamcrest.core.StringContains; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamCoGBKJoinRelUnboundedVsUnboundedTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamCoGBKJoinRelUnboundedVsUnboundedTest.java index f4fe3dfd55ce..69e8c866dd3c 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamCoGBKJoinRelUnboundedVsUnboundedTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamCoGBKJoinRelUnboundedVsUnboundedTest.java @@ -28,7 +28,7 @@ import org.apache.beam.sdk.transforms.ParDo; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; import org.joda.time.DateTime; import org.joda.time.Duration; import org.junit.Assert; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamEnumerableConverterTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamEnumerableConverterTest.java index 797d423994df..c66cf08369df 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamEnumerableConverterTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamEnumerableConverterTest.java @@ -39,18 +39,18 @@ import org.apache.beam.sdk.values.PDone; import org.apache.beam.sdk.values.POutput; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.java.JavaTypeFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.JavaTypeFactoryImpl; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.Enumerable; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.Enumerator; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.volcano.VolcanoPlanner; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.prepare.RelOptTableImpl; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataTypeSystem; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexBuilder; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexLiteral; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.java.JavaTypeFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.JavaTypeFactoryImpl; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.Enumerable; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.Enumerator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.volcano.VolcanoPlanner; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.prepare.RelOptTableImpl; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataTypeSystem; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexBuilder; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexLiteral; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIOSourceRelTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIOSourceRelTest.java index ff0d70fa5df6..ddec055cc5e8 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIOSourceRelTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIOSourceRelTest.java @@ -24,8 +24,8 @@ import org.apache.beam.sdk.extensions.sql.meta.provider.test.TestUnboundedTable; import org.apache.beam.sdk.schemas.Schema; import org.apache.beam.sdk.testing.TestPipeline; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataQuery; import org.joda.time.DateTime; import org.joda.time.Duration; import org.junit.Assert; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIntersectRelTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIntersectRelTest.java index d5acfabd0ae1..6c7995ba28b7 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIntersectRelTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamIntersectRelTest.java @@ -26,7 +26,7 @@ import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Rule; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamMinusRelTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamMinusRelTest.java index 074c4476926e..b1916c42e2fe 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamMinusRelTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamMinusRelTest.java @@ -28,7 +28,7 @@ import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; import org.joda.time.DateTime; import org.joda.time.Duration; import org.junit.Assert; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSideInputJoinRelTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSideInputJoinRelTest.java index b217425d5816..282ab34cb3da 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSideInputJoinRelTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSideInputJoinRelTest.java @@ -28,7 +28,7 @@ import org.apache.beam.sdk.transforms.ParDo; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; import org.joda.time.DateTime; import org.joda.time.Duration; import org.junit.Assert; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSortRelTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSortRelTest.java index 99c7860b8fa8..1d5f7cc80423 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSortRelTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSortRelTest.java @@ -25,7 +25,7 @@ import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; import org.joda.time.DateTime; import org.junit.Assert; import org.junit.Before; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamUncollectRelTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamUncollectRelTest.java index 640a1df33ef1..4b99d6a2a138 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamUncollectRelTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamUncollectRelTest.java @@ -27,7 +27,7 @@ import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamUnionRelTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamUnionRelTest.java index 6f777517057f..b729ae9f4394 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamUnionRelTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamUnionRelTest.java @@ -26,7 +26,7 @@ import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Rule; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamValuesRelTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamValuesRelTest.java index 07877519762b..6adfc98a6865 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamValuesRelTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamValuesRelTest.java @@ -25,7 +25,7 @@ import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Rule; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rule/IOPushDownRuleTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rule/IOPushDownRuleTest.java index 164e226416da..2108d0525feb 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rule/IOPushDownRuleTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rule/IOPushDownRuleTest.java @@ -36,17 +36,13 @@ import org.apache.beam.sdk.schemas.Schema; import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Calc; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.CalcMergeRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.FilterCalcMergeRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.FilterToCalcRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.ProjectCalcMergeRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.ProjectToCalcRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.RuleSets; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.Pair; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Calc; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.rules.CoreRules; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.RuleSets; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.Pair; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -68,11 +64,11 @@ public class IOPushDownRuleTest { private static final List defaultRules = ImmutableList.of( BeamCalcRule.INSTANCE, - FilterCalcMergeRule.INSTANCE, - ProjectCalcMergeRule.INSTANCE, - FilterToCalcRule.INSTANCE, - ProjectToCalcRule.INSTANCE, - CalcMergeRule.INSTANCE); + CoreRules.FILTER_CALC_MERGE, + CoreRules.PROJECT_CALC_MERGE, + CoreRules.FILTER_TO_CALC, + CoreRules.PROJECT_TO_CALC, + CoreRules.CALC_MERGE); private BeamSqlEnv sqlEnv; @Rule public TestPipeline pipeline = TestPipeline.create(); diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rule/JoinReorderingTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rule/JoinReorderingTest.java index bd392cde756c..68414ef5d6f3 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rule/JoinReorderingTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/rule/JoinReorderingTest.java @@ -31,43 +31,43 @@ import org.apache.beam.sdk.options.PipelineOptions; import org.apache.beam.sdk.options.PipelineOptionsFactory; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableMap; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.DataContext; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.enumerable.EnumerableConvention; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.enumerable.EnumerableRules; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.Enumerable; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.Linq4j; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.ConventionTraitDef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelCollationTraitDef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelCollations; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelFieldCollation; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelRoot; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Join; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.TableScan; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.JoinCommuteRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.SortProjectTransposeRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataTypeFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.ScannableTable; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.SchemaPlus; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.Statistic; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.Statistics; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.Table; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.impl.AbstractSchema; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.impl.AbstractTable; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.parser.SqlParser; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.FrameworkConfig; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.Frameworks; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.Planner; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.Programs; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.RuleSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.RuleSets; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.ImmutableBitSet; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.DataContext; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.enumerable.EnumerableConvention; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.enumerable.EnumerableRules; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.Enumerable; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.Linq4j; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.ConventionTraitDef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelCollationTraitDef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelCollations; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelFieldCollation; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelRoot; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Join; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.TableScan; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.rules.CoreRules; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.rules.JoinCommuteRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataTypeFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.ScannableTable; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.SchemaPlus; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.Statistic; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.Statistics; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.Table; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.impl.AbstractSchema; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.impl.AbstractTable; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.parser.SqlParser; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.FrameworkConfig; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.Frameworks; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.Planner; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.Programs; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.RuleSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.RuleSets; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.ImmutableBitSet; import org.junit.Assert; import org.junit.Test; @@ -115,7 +115,7 @@ public void testTableSizes() { public void testBeamJoinAssociationRule() throws Exception { RuleSet prepareRules = RuleSets.ofList( - SortProjectTransposeRule.INSTANCE, + CoreRules.SORT_PROJECT_TRANSPOSE, EnumerableRules.ENUMERABLE_JOIN_RULE, EnumerableRules.ENUMERABLE_PROJECT_RULE, EnumerableRules.ENUMERABLE_SORT_RULE, @@ -144,7 +144,7 @@ public void testBeamJoinAssociationRule() throws Exception { public void testBeamJoinPushThroughJoinRuleLeft() throws Exception { RuleSet prepareRules = RuleSets.ofList( - SortProjectTransposeRule.INSTANCE, + CoreRules.SORT_PROJECT_TRANSPOSE, EnumerableRules.ENUMERABLE_JOIN_RULE, EnumerableRules.ENUMERABLE_PROJECT_RULE, EnumerableRules.ENUMERABLE_SORT_RULE, @@ -173,7 +173,7 @@ public void testBeamJoinPushThroughJoinRuleLeft() throws Exception { public void testBeamJoinPushThroughJoinRuleRight() throws Exception { RuleSet prepareRules = RuleSets.ofList( - SortProjectTransposeRule.INSTANCE, + CoreRules.SORT_PROJECT_TRANSPOSE, EnumerableRules.ENUMERABLE_JOIN_RULE, EnumerableRules.ENUMERABLE_PROJECT_RULE, EnumerableRules.ENUMERABLE_SORT_RULE, @@ -423,7 +423,7 @@ public ThreeTablesSchema() { } @Override - protected Map + protected Map getTableMap() { return tables; } diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/schema/BeamSqlRowCoderTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/schema/BeamSqlRowCoderTest.java index d4819fc966a6..6bf95097f642 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/schema/BeamSqlRowCoderTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/schema/BeamSqlRowCoderTest.java @@ -27,10 +27,10 @@ import org.apache.beam.sdk.schemas.SchemaCoder; import org.apache.beam.sdk.testing.CoderProperties; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.JavaTypeFactoryImpl; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataTypeSystem; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.SqlTypeName; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.JavaTypeFactoryImpl; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataTypeSystem; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.SqlTypeName; import org.joda.time.DateTime; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/utils/CalciteUtilsTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/utils/CalciteUtilsTest.java index 8a86348efffa..b6291c247ef8 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/utils/CalciteUtilsTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/utils/CalciteUtilsTest.java @@ -24,11 +24,11 @@ import java.util.Map; import java.util.stream.Collectors; import org.apache.beam.sdk.schemas.Schema; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataTypeFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataTypeSystem; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.SqlTypeFactoryImpl; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.SqlTypeName; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataTypeFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataTypeSystem; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.SqlTypeFactoryImpl; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.SqlTypeName; import org.junit.Before; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlBuiltinFunctionsIntegrationTestBase.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlBuiltinFunctionsIntegrationTestBase.java index af7ede35856a..ba72e5483f41 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlBuiltinFunctionsIntegrationTestBase.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlBuiltinFunctionsIntegrationTestBase.java @@ -19,7 +19,7 @@ import static org.apache.beam.sdk.extensions.sql.utils.DateTimeUtils.parseTimestampWithUTCTimeZone; import static org.apache.beam.sdk.extensions.sql.utils.RowAsserts.matchesScalar; -import static org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Preconditions.checkArgument; +import static org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Preconditions.checkArgument; import static org.junit.Assert.assertTrue; import com.google.auto.value.AutoValue; @@ -50,8 +50,8 @@ import org.apache.beam.sdk.values.PDone; import org.apache.beam.sdk.values.Row; import org.apache.beam.sdk.values.TypeDescriptors; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableMap; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.Iterables; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.Iterables; import org.checkerframework.checker.nullness.qual.Nullable; import org.joda.time.DateTime; import org.junit.Rule; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlDateFunctionsIntegrationTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlDateFunctionsIntegrationTest.java index a824c011af40..5362171e1209 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlDateFunctionsIntegrationTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlDateFunctionsIntegrationTest.java @@ -17,8 +17,8 @@ */ package org.apache.beam.sdk.extensions.sql.integrationtest; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.util.DateTimeUtils.MILLIS_PER_DAY; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.util.DateTimeUtils.MILLIS_PER_SECOND; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.util.DateTimeUtils.MILLIS_PER_DAY; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.util.DateTimeUtils.MILLIS_PER_SECOND; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/CustomTableResolverTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/CustomTableResolverTest.java index f4d589e1070a..2e584243b025 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/CustomTableResolverTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/CustomTableResolverTest.java @@ -32,8 +32,8 @@ import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; import org.joda.time.Duration; import org.junit.Rule; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryReadWriteIT.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryReadWriteIT.java index acc2d068c0d4..5b3c83ec3650 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryReadWriteIT.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryReadWriteIT.java @@ -60,7 +60,7 @@ import org.apache.beam.sdk.transforms.Create; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableMap; import org.joda.time.Duration; import org.junit.Rule; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryRowCountIT.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryRowCountIT.java index bd6d9ae18e83..a2c5f835363a 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryRowCountIT.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryRowCountIT.java @@ -38,7 +38,7 @@ import org.apache.beam.sdk.schemas.Schema; import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.transforms.Create; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryTestTableProvider.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryTestTableProvider.java index 1a682c8dec7e..56e7ee95cf20 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryTestTableProvider.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryTestTableProvider.java @@ -17,7 +17,7 @@ */ package org.apache.beam.sdk.extensions.sql.meta.provider.bigquery; -import static org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.MoreObjects.firstNonNull; +import static org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.MoreObjects.firstNonNull; import java.util.HashMap; import java.util.Map; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/datastore/DataStoreReadWriteIT.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/datastore/DataStoreReadWriteIT.java index c2c499a5cce6..107da0d29b23 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/datastore/DataStoreReadWriteIT.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/datastore/DataStoreReadWriteIT.java @@ -50,7 +50,7 @@ import org.apache.beam.sdk.transforms.Create; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.util.ByteString; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.util.ByteString; import org.joda.time.Duration; import org.junit.Rule; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/KafkaTableProviderTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/KafkaTableProviderTest.java index 565561d6779f..30146cd7d030 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/KafkaTableProviderTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/kafka/KafkaTableProviderTest.java @@ -28,7 +28,7 @@ import org.apache.beam.sdk.extensions.sql.meta.BeamSqlTable; import org.apache.beam.sdk.extensions.sql.meta.Table; import org.apache.beam.sdk.schemas.Schema; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; import org.checkerframework.checker.nullness.qual.Nullable; import org.junit.Test; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/mongodb/MongoDbTableProviderTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/mongodb/MongoDbTableProviderTest.java index 459af5679620..5d75bba583fb 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/mongodb/MongoDbTableProviderTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/mongodb/MongoDbTableProviderTest.java @@ -27,7 +27,7 @@ import org.apache.beam.sdk.extensions.sql.meta.BeamSqlTable; import org.apache.beam.sdk.extensions.sql.meta.Table; import org.apache.beam.sdk.schemas.Schema; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/pubsub/PubsubTableProviderIT.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/pubsub/PubsubTableProviderIT.java index ab7880980422..6d2e3eb6a02a 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/pubsub/PubsubTableProviderIT.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/pubsub/PubsubTableProviderIT.java @@ -56,10 +56,10 @@ import org.apache.beam.sdk.util.common.ReflectHelpers; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableMap; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.CalciteConnection; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CalciteConnection; import org.hamcrest.Matcher; import org.joda.time.Duration; import org.joda.time.Instant; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestTableProviderTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestTableProviderTest.java index 01ac8e35e5b7..dd629a8bcd1c 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestTableProviderTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestTableProviderTest.java @@ -28,7 +28,7 @@ import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; import org.joda.time.Duration; import org.junit.Before; import org.junit.Rule; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestTableProviderWithFilterAndProjectPushDown.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestTableProviderWithFilterAndProjectPushDown.java index 950c3118373a..c489750131e1 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestTableProviderWithFilterAndProjectPushDown.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestTableProviderWithFilterAndProjectPushDown.java @@ -41,14 +41,10 @@ import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.CalcMergeRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.FilterCalcMergeRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.FilterToCalcRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.ProjectCalcMergeRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.ProjectToCalcRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.RuleSets; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.rules.CoreRules; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.RuleSets; import org.joda.time.Duration; import org.junit.Before; import org.junit.Rule; @@ -72,12 +68,12 @@ public class TestTableProviderWithFilterAndProjectPushDown { private static final List rulesWithPushDown = ImmutableList.of( BeamCalcRule.INSTANCE, - FilterCalcMergeRule.INSTANCE, - ProjectCalcMergeRule.INSTANCE, + CoreRules.FILTER_CALC_MERGE, + CoreRules.PROJECT_CALC_MERGE, BeamIOPushDownRule.INSTANCE, - FilterToCalcRule.INSTANCE, - ProjectToCalcRule.INSTANCE, - CalcMergeRule.INSTANCE); + CoreRules.FILTER_TO_CALC, + CoreRules.PROJECT_TO_CALC, + CoreRules.CALC_MERGE); private BeamSqlEnv sqlEnv; @Rule public TestPipeline pipeline = TestPipeline.create(); diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestTableProviderWithFilterPushDown.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestTableProviderWithFilterPushDown.java index 738c9dfe33a5..d07266030362 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestTableProviderWithFilterPushDown.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestTableProviderWithFilterPushDown.java @@ -42,15 +42,11 @@ import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Calc; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.CalcMergeRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.FilterCalcMergeRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.FilterToCalcRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.ProjectCalcMergeRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.ProjectToCalcRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.RuleSets; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Calc; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.rules.CoreRules; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.RuleSets; import org.hamcrest.collection.IsIterableContainingInAnyOrder; import org.joda.time.Duration; import org.junit.Before; @@ -75,12 +71,12 @@ public class TestTableProviderWithFilterPushDown { private static final List rulesWithPushDown = ImmutableList.of( BeamCalcRule.INSTANCE, - FilterCalcMergeRule.INSTANCE, - ProjectCalcMergeRule.INSTANCE, + CoreRules.FILTER_CALC_MERGE, + CoreRules.PROJECT_CALC_MERGE, BeamIOPushDownRule.INSTANCE, - FilterToCalcRule.INSTANCE, - ProjectToCalcRule.INSTANCE, - CalcMergeRule.INSTANCE); + CoreRules.FILTER_TO_CALC, + CoreRules.PROJECT_TO_CALC, + CoreRules.CALC_MERGE); private BeamSqlEnv sqlEnv; @Rule public TestPipeline pipeline = TestPipeline.create(); diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestTableProviderWithProjectPushDown.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestTableProviderWithProjectPushDown.java index d37c4b2259c0..d8a748132c59 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestTableProviderWithProjectPushDown.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/test/TestTableProviderWithProjectPushDown.java @@ -41,14 +41,10 @@ import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.CalcMergeRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.FilterCalcMergeRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.FilterToCalcRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.ProjectCalcMergeRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.ProjectToCalcRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.RuleSets; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.rules.CoreRules; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.RuleSets; import org.joda.time.Duration; import org.junit.Before; import org.junit.Rule; @@ -71,12 +67,12 @@ public class TestTableProviderWithProjectPushDown { private static final List rulesWithPushDown = ImmutableList.of( BeamCalcRule.INSTANCE, - FilterCalcMergeRule.INSTANCE, - ProjectCalcMergeRule.INSTANCE, + CoreRules.FILTER_CALC_MERGE, + CoreRules.PROJECT_CALC_MERGE, BeamIOPushDownRule.INSTANCE, - FilterToCalcRule.INSTANCE, - ProjectToCalcRule.INSTANCE, - CalcMergeRule.INSTANCE); + CoreRules.FILTER_TO_CALC, + CoreRules.PROJECT_TO_CALC, + CoreRules.CALC_MERGE); private BeamSqlEnv sqlEnv; @Rule public TestPipeline pipeline = TestPipeline.create(); diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/text/TextTableProviderTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/text/TextTableProviderTest.java index 1c1b6bab2420..4a25123cdad4 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/text/TextTableProviderTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/text/TextTableProviderTest.java @@ -34,7 +34,7 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.Row; import org.apache.beam.sdk.values.TypeDescriptors; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Charsets; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Charsets; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/utils/RowAsserts.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/utils/RowAsserts.java index b94578199993..01db755e4fb3 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/utils/RowAsserts.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/utils/RowAsserts.java @@ -22,7 +22,7 @@ import org.apache.beam.sdk.transforms.SerializableFunction; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.Iterables; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.Iterables; /** Contain helpers to assert {@link Row}s. */ @SuppressWarnings({ diff --git a/sdks/java/extensions/sql/zetasql/build.gradle b/sdks/java/extensions/sql/zetasql/build.gradle index 9589301e90ca..db73f311b736 100644 --- a/sdks/java/extensions/sql/zetasql/build.gradle +++ b/sdks/java/extensions/sql/zetasql/build.gradle @@ -33,7 +33,7 @@ dependencies { compile enforcedPlatform(library.java.google_cloud_platform_libraries_bom) compile project(":sdks:java:core") compile project(":sdks:java:extensions:sql") - compile library.java.vendored_calcite_1_20_0 + compile library.java.vendored_calcite_1_26_0 compile library.java.guava compile library.java.grpc_api compile library.java.protobuf_java @@ -43,7 +43,7 @@ dependencies { compile "com.google.zetasql:zetasql-jni-channel:$zetasql_version" compile "com.google.zetasql:zetasql-client:$zetasql_version" compile "com.google.zetasql:zetasql-types:$zetasql_version" - testCompile library.java.vendored_calcite_1_20_0 + testCompile library.java.vendored_calcite_1_26_0 testCompile library.java.vendored_guava_26_0_jre testCompile library.java.junit testCompile library.java.hamcrest_core diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/BeamZetaSqlCalcRel.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/BeamZetaSqlCalcRel.java index 0aa16e58c1ee..f6f0c33f7311 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/BeamZetaSqlCalcRel.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/BeamZetaSqlCalcRel.java @@ -40,19 +40,19 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionList; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Calc; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexBuilder; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexProgram; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlDialect; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlIdentifier; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.fun.SqlStdOperatorTable; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.parser.SqlParserPos; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Calc; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexBuilder; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexProgram; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlDialect; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlIdentifier; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.fun.SqlStdOperatorTable; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.parser.SqlParserPos; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/BeamZetaSqlCalcRule.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/BeamZetaSqlCalcRule.java index 2e7ea0f7a2cc..3777eaf49d8d 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/BeamZetaSqlCalcRule.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/BeamZetaSqlCalcRule.java @@ -18,13 +18,13 @@ package org.apache.beam.sdk.extensions.sql.zetasql; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.Convention; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRuleCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.convert.ConverterRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Calc; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalCalc; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.Convention; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRuleCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.convert.ConverterRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Calc; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalCalc; /** A {@code ConverterRule} to replace {@link Calc} with {@link BeamZetaSqlCalcRel}. */ public class BeamZetaSqlCalcRule extends ConverterRule { diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/DateTimeUtils.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/DateTimeUtils.java index d1f092470c93..b258597e4472 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/DateTimeUtils.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/DateTimeUtils.java @@ -21,7 +21,7 @@ import io.grpc.Status; import java.time.LocalTime; import java.util.List; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.util.TimeUnit; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.util.TimeUnit; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Splitter; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Lists; diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/SqlAnalyzer.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/SqlAnalyzer.java index b4666cd11405..bf911f3b9366 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/SqlAnalyzer.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/SqlAnalyzer.java @@ -59,10 +59,10 @@ import org.apache.beam.sdk.extensions.sql.impl.SqlConversionException; import org.apache.beam.sdk.extensions.sql.impl.utils.TVFStreamingUtils; import org.apache.beam.sdk.extensions.sql.zetasql.TableResolution.SimpleTableWithPath; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.java.JavaTypeFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataTypeField; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.SchemaPlus; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.java.JavaTypeFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataTypeField; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.SchemaPlus; /** Adapter for {@link Analyzer} to simplify the API for parsing the query and resolving the AST. */ @SuppressWarnings({ @@ -325,7 +325,7 @@ private void addTableToLeafCatalog( SimpleCatalog leafCatalog = createNestedCatalogs(topLevelCatalog, tablePath); - org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.Table calciteTable = + org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.Table calciteTable = TableResolution.resolveCalciteTable(topLevelSchema, tablePath); if (calciteTable == null) { diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/TableResolution.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/TableResolution.java index b76884d55607..907a39ae5f16 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/TableResolution.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/TableResolution.java @@ -23,10 +23,10 @@ import org.apache.beam.sdk.extensions.sql.impl.BeamCalciteSchema; import org.apache.beam.sdk.extensions.sql.impl.TableName; import org.apache.beam.sdk.extensions.sql.meta.CustomTableResolver; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.CalciteSchema; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.Schema; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.SchemaPlus; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.Table; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CalciteSchema; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.Schema; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.SchemaPlus; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.Table; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; /** Utility methods to resolve a table, given a top-level Calcite schema and a table path. */ diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSQLPlannerImpl.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSQLPlannerImpl.java index 6259d12485c3..4de94049b211 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSQLPlannerImpl.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSQLPlannerImpl.java @@ -36,22 +36,22 @@ import org.apache.beam.sdk.extensions.sql.zetasql.translation.ExpressionConverter; import org.apache.beam.sdk.extensions.sql.zetasql.translation.QueryStatementConverter; import org.apache.beam.sdk.extensions.sql.zetasql.translation.UserFunctionDefinitions; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.java.JavaTypeFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptPlanner; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelRoot; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexBuilder; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexExecutor; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.SchemaPlus; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.FrameworkConfig; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.Frameworks; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.Program; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.Util; -import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.java.JavaTypeFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptPlanner; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelRoot; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexBuilder; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexExecutor; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.SchemaPlus; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.FrameworkConfig; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.Frameworks; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.Program; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.Util; /** ZetaSQLPlannerImpl. */ @SuppressWarnings({ diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSQLQueryPlanner.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSQLQueryPlanner.java index b943ab3d2b74..78ae5075dd64 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSQLQueryPlanner.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSQLQueryPlanner.java @@ -38,31 +38,31 @@ import org.apache.beam.sdk.extensions.sql.impl.rule.BeamUnnestRule; import org.apache.beam.sdk.extensions.sql.zetasql.unnest.BeamZetaSqlUncollectRule; import org.apache.beam.sdk.extensions.sql.zetasql.unnest.BeamZetaSqlUnnestRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.config.CalciteConnectionConfig; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.CalciteSchema; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.ConventionTraitDef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitDef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.prepare.CalciteCatalogReader; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelRoot; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.ChainedRelMetadataProvider; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.JaninoRelMetadataProvider; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataQuery; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.FilterCalcMergeRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.JoinCommuteRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.rules.ProjectCalcMergeRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.SchemaPlus; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlOperatorTable; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.fun.SqlStdOperatorTable; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.parser.SqlParser; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.parser.SqlParserImplFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.util.ChainedSqlOperatorTable; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.FrameworkConfig; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.Frameworks; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.RuleSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.RuleSets; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.config.CalciteConnectionConfig; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CalciteSchema; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.ConventionTraitDef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitDef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.prepare.CalciteCatalogReader; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelRoot; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.ChainedRelMetadataProvider; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.JaninoRelMetadataProvider; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.rules.FilterCalcMergeRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.rules.JoinCommuteRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.rules.ProjectCalcMergeRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.SchemaPlus; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlOperatorTable; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.fun.SqlStdOperatorTable; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.parser.SqlParser; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.parser.SqlParserImplFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.util.SqlOperatorTables; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.FrameworkConfig; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.Frameworks; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.RuleSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.RuleSets; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; /** ZetaSQLQueryPlanner. */ @@ -189,7 +189,7 @@ private BeamRelNode convertToBeamRelInternal(String sql, QueryParameters queryPa .getCluster() .setMetadataProvider( ChainedRelMetadataProvider.of( - org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList.of( + org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList.of( NonCumulativeCostImpl.SOURCE, RelMdNodeStats.SOURCE, root.rel.getCluster().getMetadataProvider()))); @@ -236,7 +236,7 @@ private static FrameworkConfig defaultConfig( .ruleSets(ruleSets.toArray(new RuleSet[0])) .costFactory(BeamCostModel.FACTORY) .typeSystem(connection.getTypeFactory().getTypeSystem()) - .operatorTable(ChainedSqlOperatorTable.of(opTab0, catalogReader)) + .operatorTable(SqlOperatorTables.chain(opTab0, catalogReader)) .build(); } } diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSqlCalciteTranslationUtils.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSqlCalciteTranslationUtils.java index 203337c2ec9c..1bbd1efe40c0 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSqlCalciteTranslationUtils.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSqlCalciteTranslationUtils.java @@ -34,17 +34,17 @@ import org.apache.beam.sdk.annotations.Internal; import org.apache.beam.sdk.extensions.sql.meta.provider.bigquery.BeamBigQuerySqlDialect; import org.apache.beam.sdk.extensions.sql.zetasql.translation.SqlOperators; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.util.ByteString; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.util.TimeUnit; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.util.TimeUnitRange; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexBuilder; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.fun.SqlStdOperatorTable; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.SqlTypeName; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.DateString; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.TimeString; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.TimestampString; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.util.ByteString; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.util.TimeUnit; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.util.TimeUnitRange; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexBuilder; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.fun.SqlStdOperatorTable; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.SqlTypeName; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.DateString; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.TimeString; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.TimestampString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/AggregateScanConverter.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/AggregateScanConverter.java index 0a76bbde8274..6b84116b8eb6 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/AggregateScanConverter.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/AggregateScanConverter.java @@ -34,15 +34,15 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import org.apache.beam.sdk.extensions.sql.zetasql.ZetaSqlCalciteTranslationUtils; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelCollations; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.AggregateCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalAggregate; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalProject; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlAggFunction; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.ImmutableBitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelCollations; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.AggregateCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalAggregate; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalProject; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlAggFunction; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.ImmutableBitSet; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; @@ -170,7 +170,7 @@ private LogicalProject convertAggregateScanInputScanToLogicalProject( } } - return LogicalProject.create(input, projects, fieldNames); + return LogicalProject.create(input, ImmutableList.of(), projects, fieldNames); } private AggregateCall convertAggCall( diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/ArrayScanColumnRefToUncollect.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/ArrayScanColumnRefToUncollect.java index 08a0fdae54a0..655140d412c2 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/ArrayScanColumnRefToUncollect.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/ArrayScanColumnRefToUncollect.java @@ -22,17 +22,17 @@ import java.util.Collections; import java.util.List; import org.apache.beam.sdk.extensions.sql.zetasql.unnest.ZetaSqlUnnest; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.CorrelationId; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.JoinRelType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalCorrelate; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalProject; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexBuilder; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexInputRef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.ImmutableBitSet; -import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.CorrelationId; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.JoinRelType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalCorrelate; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalProject; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexBuilder; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexInputRef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.ImmutableBitSet; /** * Converts array scan that represents a reference to an array column, or an (possibly nested) array @@ -87,6 +87,7 @@ public RelNode convert(ResolvedNodes.ResolvedArrayScan zetaNode, List i RelNode projectNode = LogicalProject.create( createOneRow(getCluster()), + ImmutableList.of(), Collections.singletonList( convertArrayExpr( zetaNode.getArrayExpr(), getCluster().getRexBuilder(), convertedColumnRef)), diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/ArrayScanLiteralToUncollectConverter.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/ArrayScanLiteralToUncollectConverter.java index 402bb7b4b2c8..f194840b7bd9 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/ArrayScanLiteralToUncollectConverter.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/ArrayScanLiteralToUncollectConverter.java @@ -21,9 +21,9 @@ import java.util.Collections; import java.util.List; import org.apache.beam.sdk.extensions.sql.zetasql.unnest.ZetaSqlUnnest; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalProject; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalProject; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; /** Converts array scan that represents an array literal to uncollect. */ @@ -51,6 +51,7 @@ public RelNode convert(ResolvedArrayScan zetaNode, List inputs) { RelNode projectNode = LogicalProject.create( createOneRow(getCluster()), + ImmutableList.of(), Collections.singletonList(arrayLiteralExpression), ImmutableList.of(fieldName)); diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/ArrayScanToJoinConverter.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/ArrayScanToJoinConverter.java index 629d0367c433..ccc43ab1410b 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/ArrayScanToJoinConverter.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/ArrayScanToJoinConverter.java @@ -24,15 +24,15 @@ import java.util.Collections; import java.util.List; import org.apache.beam.sdk.extensions.sql.zetasql.unnest.ZetaSqlUnnest; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.CorrelationId; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.JoinRelType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalJoin; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalProject; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexInputRef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableSet; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.CorrelationId; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.JoinRelType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalJoin; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalProject; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexInputRef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; /** Converts array scan that represents join of an uncollect(array_field) to uncollect. */ class ArrayScanToJoinConverter extends RelConverter { @@ -80,7 +80,8 @@ public RelNode convert(ResolvedArrayScan zetaNode, List inputs) { columnRef.getColumn().getId(), zetaNode.getInputScan().getColumnList()))); RelNode projectNode = - LogicalProject.create(createOneRow(getCluster()), projects, ImmutableList.of(columnName)); + LogicalProject.create( + createOneRow(getCluster()), ImmutableList.of(), projects, ImmutableList.of(columnName)); // Create an UnCollect boolean ordinality = (zetaNode.getArrayOffsetColumn() != null); @@ -104,13 +105,22 @@ public RelNode convert(ResolvedArrayScan zetaNode, List inputs) { zetaNode.getArrayOffsetColumn().getColumn().getName())); } - RelNode rightInput = LogicalProject.create(uncollectNode, rightProjects, rightNames); + RelNode rightInput = + LogicalProject.create(uncollectNode, ImmutableList.of(), rightProjects, rightNames); // Join condition should be a RexNode converted from join_expr. RexNode condition = getExpressionConverter().convertRexNodeFromResolvedExpr(zetaNode.getJoinExpr()); JoinRelType joinRelType = zetaNode.getIsOuter() ? JoinRelType.LEFT : JoinRelType.INNER; - return LogicalJoin.create(leftInput, rightInput, condition, ImmutableSet.of(), joinRelType); + return LogicalJoin.create( + leftInput, + rightInput, + ImmutableList.of(), + condition, + ImmutableSet.of(), + joinRelType, + false, + ImmutableList.of()); } } diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/ConversionContext.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/ConversionContext.java index 9523b7669f15..bdfd9970015c 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/ConversionContext.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/ConversionContext.java @@ -23,9 +23,9 @@ import java.util.Map; import org.apache.beam.sdk.annotations.Internal; import org.apache.beam.sdk.extensions.sql.zetasql.QueryTrait; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.FrameworkConfig; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.FrameworkConfig; /** Conversion context, some rules need this data to convert the nodes. */ @Internal diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/ExpressionConverter.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/ExpressionConverter.java index 24a5e1c74c09..c390c244c879 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/ExpressionConverter.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/ExpressionConverter.java @@ -67,24 +67,24 @@ import org.apache.beam.sdk.extensions.sql.impl.ZetaSqlUserDefinedSQLNativeTableValuedFunction; import org.apache.beam.sdk.extensions.sql.impl.utils.TVFStreamingUtils; import org.apache.beam.sdk.extensions.sql.zetasql.ZetaSqlCalciteTranslationUtils; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.avatica.util.TimeUnit; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataTypeField; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataTypeFieldImpl; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelRecordType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexBuilder; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexInputRef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexLiteral; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlIdentifier; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlIntervalQualifier; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlOperator; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.fun.SqlRowOperator; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.parser.SqlParserPos; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.avatica.util.TimeUnit; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataTypeField; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataTypeFieldImpl; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelRecordType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexBuilder; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexInputRef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexLiteral; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlIdentifier; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlIntervalQualifier; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlOperator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.fun.SqlRowOperator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.parser.SqlParserPos; import org.checkerframework.checker.nullness.qual.Nullable; /** diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/FilterScanConverter.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/FilterScanConverter.java index bf72c2c91aab..b1cd3d1de04e 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/FilterScanConverter.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/FilterScanConverter.java @@ -21,9 +21,9 @@ import com.google.zetasql.resolvedast.ResolvedNodes.ResolvedFilterScan; import java.util.Collections; import java.util.List; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalFilter; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalFilter; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; /** Converts filter. */ class FilterScanConverter extends RelConverter { diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/JoinScanConverter.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/JoinScanConverter.java index 0f942067d05f..7c3570944e98 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/JoinScanConverter.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/JoinScanConverter.java @@ -22,11 +22,11 @@ import com.google.zetasql.resolvedast.ResolvedNode; import com.google.zetasql.resolvedast.ResolvedNodes.ResolvedJoinScan; import java.util.List; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.JoinRelType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalJoin; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataTypeField; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.JoinRelType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalJoin; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataTypeField; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableSet; @@ -92,6 +92,7 @@ public RelNode convert(ResolvedJoinScan zetaNode, List inputs) { return LogicalJoin.create( convertedLeftInput, convertedRightInput, + ImmutableList.of(), condition, ImmutableSet.of(), convertResolvedJoinType(zetaNode.getJoinType())); diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/LimitOffsetScanToLimitConverter.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/LimitOffsetScanToLimitConverter.java index 679d6789df27..50cc96e8cdd0 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/LimitOffsetScanToLimitConverter.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/LimitOffsetScanToLimitConverter.java @@ -22,13 +22,13 @@ import com.google.zetasql.resolvedast.ResolvedNodes.ResolvedOrderByScan; import java.util.Collections; import java.util.List; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelCollation; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelCollations; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalSort; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexDynamicParam; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexLiteral; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelCollation; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelCollations; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalSort; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexDynamicParam; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexLiteral; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/LimitOffsetScanToOrderByLimitConverter.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/LimitOffsetScanToOrderByLimitConverter.java index ad40241985b1..c0a47d025f68 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/LimitOffsetScanToOrderByLimitConverter.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/LimitOffsetScanToOrderByLimitConverter.java @@ -18,8 +18,8 @@ package org.apache.beam.sdk.extensions.sql.zetasql.translation; import static java.util.stream.Collectors.toList; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelFieldCollation.Direction.ASCENDING; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelFieldCollation.Direction.DESCENDING; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelFieldCollation.Direction.ASCENDING; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelFieldCollation.Direction.DESCENDING; import com.google.zetasql.resolvedast.ResolvedNode; import com.google.zetasql.resolvedast.ResolvedNodes.ResolvedLimitOffsetScan; @@ -27,15 +27,16 @@ import com.google.zetasql.resolvedast.ResolvedNodes.ResolvedOrderByScan; import java.util.Collections; import java.util.List; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelCollation; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelCollationImpl; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelFieldCollation; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelFieldCollation.Direction; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalProject; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalSort; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexLiteral; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelCollation; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelCollationImpl; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelFieldCollation; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelFieldCollation.Direction; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalProject; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalSort; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexLiteral; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; /** Converts ORDER BY LIMIT. */ @@ -109,6 +110,6 @@ private RelNode convertOrderByScanToLogicalScan(ResolvedOrderByScan node, RelNod .retrieveRexNodeFromOrderByScan(getCluster(), node, input.getRowType().getFieldList()); List fieldNames = getTrait().retrieveFieldNames(node.getColumnList()); - return LogicalProject.create(input, projects, fieldNames); + return LogicalProject.create(input, ImmutableList.of(), projects, fieldNames); } } diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/OrderByScanUnsupportedConverter.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/OrderByScanUnsupportedConverter.java index 878b2b2c6ddd..d564a1a4aa49 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/OrderByScanUnsupportedConverter.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/OrderByScanUnsupportedConverter.java @@ -19,7 +19,7 @@ import com.google.zetasql.resolvedast.ResolvedNodes.ResolvedOrderByScan; import java.util.List; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; /** * Always throws exception, represents the case when order by is used without limit. diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/ProjectScanConverter.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/ProjectScanConverter.java index d19b765d6f49..81fa76904744 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/ProjectScanConverter.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/ProjectScanConverter.java @@ -21,9 +21,10 @@ import com.google.zetasql.resolvedast.ResolvedNodes.ResolvedProjectScan; import java.util.Collections; import java.util.List; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalProject; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalProject; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; /** Converts projection. */ class ProjectScanConverter extends RelConverter { @@ -44,6 +45,6 @@ public RelNode convert(ResolvedProjectScan zetaNode, List inputs) { List projects = getExpressionConverter().retrieveRexNode(zetaNode, input.getRowType().getFieldList()); List fieldNames = getTrait().retrieveFieldNames(zetaNode.getColumnList()); - return LogicalProject.create(input, projects, fieldNames); + return LogicalProject.create(input, ImmutableList.of(), projects, fieldNames); } } diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/QueryStatementConverter.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/QueryStatementConverter.java index 45ece98ce0b5..57bf88926311 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/QueryStatementConverter.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/QueryStatementConverter.java @@ -37,7 +37,7 @@ import com.google.zetasql.resolvedast.ResolvedNodes.ResolvedQueryStmt; import java.util.Collections; import java.util.List; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMultimap; /** diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/RelConverter.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/RelConverter.java index 55e3f39b8a96..503c69905ee4 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/RelConverter.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/RelConverter.java @@ -22,14 +22,14 @@ import java.util.Collections; import java.util.List; import org.apache.beam.sdk.extensions.sql.zetasql.QueryTrait; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalValues; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexLiteral; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.SqlTypeName; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.FrameworkConfig; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalValues; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexLiteral; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.SqlTypeName; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.FrameworkConfig; /** A rule that converts Zeta SQL resolved relational node to corresponding Calcite rel node. */ abstract class RelConverter { diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SetOperationScanConverter.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SetOperationScanConverter.java index 375021b3f201..b09f3dd50913 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SetOperationScanConverter.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SetOperationScanConverter.java @@ -32,10 +32,10 @@ import java.util.List; import java.util.function.BiFunction; import java.util.function.Function; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalIntersect; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalMinus; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalUnion; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalIntersect; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalMinus; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalUnion; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SingleRowScanConverter.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SingleRowScanConverter.java index e05edc8f13e1..04e882505fb5 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SingleRowScanConverter.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SingleRowScanConverter.java @@ -19,7 +19,7 @@ import com.google.zetasql.resolvedast.ResolvedNodes.ResolvedSingleRowScan; import java.util.List; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; /** Converts a single row value. */ class SingleRowScanConverter extends RelConverter { diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlCaseWithValueOperatorRewriter.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlCaseWithValueOperatorRewriter.java index c48175038b4a..a8afbe1b94d7 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlCaseWithValueOperatorRewriter.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlCaseWithValueOperatorRewriter.java @@ -19,10 +19,10 @@ import java.util.ArrayList; import java.util.List; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexBuilder; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlOperator; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.fun.SqlStdOperatorTable; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexBuilder; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlOperator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.fun.SqlStdOperatorTable; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlCoalesceOperatorRewriter.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlCoalesceOperatorRewriter.java index e8044337f6be..0301bfc799b6 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlCoalesceOperatorRewriter.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlCoalesceOperatorRewriter.java @@ -19,11 +19,11 @@ import java.util.ArrayList; import java.util.List; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexBuilder; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlOperator; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.fun.SqlStdOperatorTable; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.Util; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexBuilder; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlOperator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.fun.SqlStdOperatorTable; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.Util; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlIfNullOperatorRewriter.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlIfNullOperatorRewriter.java index 4c7db12d6995..63292d4dddd4 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlIfNullOperatorRewriter.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlIfNullOperatorRewriter.java @@ -18,10 +18,10 @@ package org.apache.beam.sdk.extensions.sql.zetasql.translation; import java.util.List; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexBuilder; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlOperator; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.fun.SqlStdOperatorTable; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexBuilder; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlOperator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.fun.SqlStdOperatorTable; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlNullIfOperatorRewriter.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlNullIfOperatorRewriter.java index d07bfcbb7480..8cf62aaafc38 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlNullIfOperatorRewriter.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlNullIfOperatorRewriter.java @@ -18,10 +18,10 @@ package org.apache.beam.sdk.extensions.sql.zetasql.translation; import java.util.List; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexBuilder; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlOperator; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.fun.SqlStdOperatorTable; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexBuilder; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlOperator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.fun.SqlStdOperatorTable; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlOperatorMappingTable.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlOperatorMappingTable.java index 58e6f812bf3b..3df2f0e1c98f 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlOperatorMappingTable.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlOperatorMappingTable.java @@ -18,8 +18,8 @@ package org.apache.beam.sdk.extensions.sql.zetasql.translation; import java.util.Map; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlOperator; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.fun.SqlStdOperatorTable; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlOperator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.fun.SqlStdOperatorTable; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; /** SqlOperatorMappingTable. */ diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlOperatorRewriter.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlOperatorRewriter.java index ae31ffa854d6..f64a334e8a9b 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlOperatorRewriter.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlOperatorRewriter.java @@ -18,8 +18,8 @@ package org.apache.beam.sdk.extensions.sql.zetasql.translation; import java.util.List; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexBuilder; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexBuilder; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; /** Interface for rewriting calls a specific ZetaSQL operator. */ interface SqlOperatorRewriter { diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlOperators.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlOperators.java index 1c0835c4d96d..16551ce1acb4 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlOperators.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlOperators.java @@ -28,32 +28,32 @@ import org.apache.beam.sdk.extensions.sql.zetasql.DateTimeUtils; import org.apache.beam.sdk.extensions.sql.zetasql.translation.impl.BeamBuiltinMethods; import org.apache.beam.sdk.extensions.sql.zetasql.translation.impl.CastFunctionImpl; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.JavaTypeFactoryImpl; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataTypeFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataTypeFactoryImpl; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.AggregateFunction; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.Function; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.FunctionParameter; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.ScalarFunction; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlFunction; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlFunctionCategory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlIdentifier; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlOperator; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlSyntax; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.parser.SqlParserPos; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.FamilyOperandTypeChecker; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.InferTypes; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.OperandTypes; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.SqlReturnTypeInference; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.SqlTypeFactoryImpl; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.SqlTypeFamily; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.SqlTypeName; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.validate.SqlUserDefinedAggFunction; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.validate.SqlUserDefinedFunction; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.Optionality; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.util.Util; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.JavaTypeFactoryImpl; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataTypeFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataTypeFactoryImpl; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.AggregateFunction; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.Function; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.FunctionParameter; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.ScalarFunction; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlFunction; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlFunctionCategory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlIdentifier; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlOperator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlSyntax; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.parser.SqlParserPos; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.FamilyOperandTypeChecker; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.InferTypes; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.OperandTypes; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.SqlReturnTypeInference; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.SqlTypeFactoryImpl; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.SqlTypeFamily; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.SqlTypeName; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.validate.SqlUserDefinedAggFunction; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.validate.SqlUserDefinedFunction; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.Optionality; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.util.Util; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Lists; @@ -138,7 +138,7 @@ public class SqlOperators { public static final SqlUserDefinedFunction CAST_OP = new SqlUserDefinedFunction( new SqlIdentifier("CAST", SqlParserPos.ZERO), - null, + SqlKind.OTHER_FUNCTION, null, null, null, diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlWindowTableFunction.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlWindowTableFunction.java index 423c41283d83..d693080b8be7 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlWindowTableFunction.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/SqlWindowTableFunction.java @@ -20,20 +20,20 @@ import java.util.ArrayList; import java.util.List; import org.apache.beam.sdk.extensions.sql.impl.utils.TVFStreamingUtils; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataTypeField; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataTypeFieldImpl; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelRecordType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlCallBinding; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlFunction; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlFunctionCategory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlKind; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlOperandCountRange; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.SqlOperandCountRanges; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.SqlReturnTypeInference; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.SqlTypeName; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.validate.SqlValidator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataTypeField; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataTypeFieldImpl; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelRecordType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlCallBinding; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlFunction; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlFunctionCategory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlKind; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlOperandCountRange; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.SqlOperandCountRanges; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.SqlReturnTypeInference; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.SqlTypeName; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.validate.SqlValidator; /** Base class for table-valued function windowing operator (TUMBLE, HOP and SESSION). */ @SuppressWarnings({ diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/TVFScanConverter.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/TVFScanConverter.java index 01a1df2455a3..965c7f0b96bd 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/TVFScanConverter.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/TVFScanConverter.java @@ -28,9 +28,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalTableFunctionScan; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalTableFunctionScan; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexCall; /** Converts TVFScan. */ @SuppressWarnings({ diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/TableScanConverter.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/TableScanConverter.java index 9137b94681a5..dc0568cbcbe8 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/TableScanConverter.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/TableScanConverter.java @@ -17,25 +17,26 @@ */ package org.apache.beam.sdk.extensions.sql.zetasql.translation; -import static org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Preconditions.checkNotNull; +import static org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Preconditions.checkNotNull; import com.google.zetasql.resolvedast.ResolvedNodes.ResolvedTableScan; import java.util.List; import java.util.Properties; import org.apache.beam.sdk.extensions.sql.zetasql.TableResolution; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.config.CalciteConnectionConfigImpl; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.jdbc.CalciteSchema; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptTable; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.prepare.CalciteCatalogReader; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.prepare.RelOptTableImpl; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelRoot; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.SchemaPlus; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.Table; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.TranslatableTable; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.config.CalciteConnectionConfigImpl; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.jdbc.CalciteSchema; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptTable; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.prepare.CalciteCatalogReader; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.prepare.RelOptTableImpl; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelRoot; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.hint.RelHint; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.SchemaPlus; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.Table; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.TranslatableTable; /** Converts table scan. */ class TableScanConverter extends RelConverter { @@ -105,6 +106,11 @@ public RelRoot expandView( public RelOptCluster getCluster() { return TableScanConverter.this.getCluster(); } + + @Override + public List getTableHints() { + return ImmutableList.of(); + } }; } } diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/UserFunctionDefinitions.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/UserFunctionDefinitions.java index a4544e70fdad..9c51d1487e94 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/UserFunctionDefinitions.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/UserFunctionDefinitions.java @@ -20,7 +20,7 @@ import com.google.zetasql.resolvedast.ResolvedNode; import com.google.zetasql.resolvedast.ResolvedNodes; import java.util.List; -import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableMap; /** Holds user defined function definitions. */ public class UserFunctionDefinitions { diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/WithRefScanConverter.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/WithRefScanConverter.java index d1ed3cf64d05..66677323cfed 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/WithRefScanConverter.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/WithRefScanConverter.java @@ -21,7 +21,7 @@ import com.google.zetasql.resolvedast.ResolvedNodes.ResolvedWithRefScan; import java.util.Collections; import java.util.List; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; /** Converts a call-site reference to a named WITH subquery. */ @SuppressWarnings({ diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/WithScanConverter.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/WithScanConverter.java index 7159356e3b12..b88674e57237 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/WithScanConverter.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/WithScanConverter.java @@ -21,7 +21,7 @@ import com.google.zetasql.resolvedast.ResolvedNodes.ResolvedWithScan; import java.util.Collections; import java.util.List; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; /** Converts a named WITH. */ class WithScanConverter extends RelConverter { diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/impl/BeamBuiltinMethods.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/impl/BeamBuiltinMethods.java index 223469b9bd4e..cbb2e2c54a90 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/impl/BeamBuiltinMethods.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/impl/BeamBuiltinMethods.java @@ -19,7 +19,7 @@ import java.lang.reflect.Method; import org.apache.beam.sdk.annotations.Internal; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.tree.Types; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.tree.Types; /** BeamBuiltinMethods. */ @Internal diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/impl/CastFunctionImpl.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/impl/CastFunctionImpl.java index c15bdab5779f..c68b7716cbb6 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/impl/CastFunctionImpl.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/impl/CastFunctionImpl.java @@ -17,22 +17,22 @@ */ package org.apache.beam.sdk.extensions.sql.zetasql.translation.impl; -import static org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.enumerable.RexImpTable.createImplementor; +import static org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.enumerable.RexImpTable.createImplementor; import java.util.Collections; import java.util.List; import org.apache.beam.sdk.annotations.Internal; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.enumerable.CallImplementor; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.enumerable.NotNullImplementor; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.enumerable.NullPolicy; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.enumerable.RexImpTable; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.adapter.enumerable.RexToLixTranslator; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.tree.Expression; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.tree.Expressions; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.FunctionParameter; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.ImplementableFunction; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.SqlTypeName; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.enumerable.CallImplementor; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.enumerable.NotNullImplementor; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.enumerable.NullPolicy; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.enumerable.RexImpTable; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.adapter.enumerable.RexToLixTranslator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.tree.Expression; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.tree.Expressions; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.FunctionParameter; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.ImplementableFunction; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.SqlTypeName; /** ZetaSQLCastFunctionImpl. */ @Internal diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/impl/StringFunctions.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/impl/StringFunctions.java index 213b5770f91d..451d8a684376 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/impl/StringFunctions.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/impl/StringFunctions.java @@ -19,8 +19,8 @@ import java.util.regex.Pattern; import org.apache.beam.sdk.annotations.Internal; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.function.Strict; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.runtime.SqlFunctions; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.function.Strict; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.runtime.SqlFunctions; /** StringFunctions. */ @Internal diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/impl/TimestampFunctions.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/impl/TimestampFunctions.java index 721e22662379..1718976d43fe 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/impl/TimestampFunctions.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/impl/TimestampFunctions.java @@ -20,7 +20,7 @@ import java.util.TimeZone; import org.apache.beam.sdk.annotations.Internal; import org.apache.beam.sdk.extensions.sql.zetasql.DateTimeUtils; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.linq4j.function.Strict; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.linq4j.function.Strict; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/unnest/BeamZetaSqlUncollectRel.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/unnest/BeamZetaSqlUncollectRel.java index fce4c3d86575..f252e1acc34c 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/unnest/BeamZetaSqlUncollectRel.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/unnest/BeamZetaSqlUncollectRel.java @@ -17,7 +17,7 @@ */ package org.apache.beam.sdk.extensions.sql.zetasql.unnest; -import static org.apache.beam.vendor.calcite.v1_20_0.com.google.common.base.Preconditions.checkArgument; +import static org.apache.beam.vendor.calcite.v1_26_0.com.google.common.base.Preconditions.checkArgument; import org.apache.beam.sdk.extensions.sql.impl.planner.BeamCostModel; import org.apache.beam.sdk.extensions.sql.impl.planner.NodeStats; @@ -31,11 +31,11 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionList; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptPlanner; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptPlanner; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataQuery; /** * {@link BeamRelNode} to implement an uncorrelated {@link ZetaSqlUnnest}, aka UNNEST. diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/unnest/BeamZetaSqlUncollectRule.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/unnest/BeamZetaSqlUncollectRule.java index 76449521168b..e985f74ebfa6 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/unnest/BeamZetaSqlUncollectRule.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/unnest/BeamZetaSqlUncollectRule.java @@ -18,9 +18,9 @@ package org.apache.beam.sdk.extensions.sql.zetasql.unnest; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.Convention; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.convert.ConverterRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.Convention; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.convert.ConverterRule; /** * A {@code ConverterRule} to replace {@link ZetaSqlUnnest} with {@link BeamZetaSqlUncollectRel}. diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/unnest/BeamZetaSqlUnnestRel.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/unnest/BeamZetaSqlUnnestRel.java index 4fc60883c6d4..ae44c447a019 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/unnest/BeamZetaSqlUnnestRel.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/unnest/BeamZetaSqlUnnestRel.java @@ -31,17 +31,17 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionList; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptPlanner; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelWriter; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Correlate; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.JoinRelType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.metadata.RelMetadataQuery; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.validate.SqlValidatorUtil; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptPlanner; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelWriter; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Correlate; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.JoinRelType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.validate.SqlValidatorUtil; import org.checkerframework.checker.nullness.qual.Nullable; /** diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/unnest/BeamZetaSqlUnnestRule.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/unnest/BeamZetaSqlUnnestRule.java index a4e80d9c436a..24552b18458e 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/unnest/BeamZetaSqlUnnestRule.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/unnest/BeamZetaSqlUnnestRule.java @@ -18,17 +18,17 @@ package org.apache.beam.sdk.extensions.sql.zetasql.unnest; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRule; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptRuleCall; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.volcano.RelSubset; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.SingleRel; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.Correlate; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.core.JoinRelType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalCorrelate; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.logical.LogicalProject; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexFieldAccess; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rex.RexNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRule; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptRuleCall; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.volcano.RelSubset; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.SingleRel; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.Correlate; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.core.JoinRelType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalCorrelate; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.logical.LogicalProject; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexFieldAccess; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rex.RexNode; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; /** diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/unnest/ZetaSqlUnnest.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/unnest/ZetaSqlUnnest.java index e2d6fad5b18b..871a9f8c1dd1 100644 --- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/unnest/ZetaSqlUnnest.java +++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/unnest/ZetaSqlUnnest.java @@ -18,20 +18,20 @@ package org.apache.beam.sdk.extensions.sql.zetasql.unnest; import java.util.List; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.Convention; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelOptCluster; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitSet; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelInput; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelNode; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.RelWriter; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.SingleRel; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataTypeFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.rel.type.RelDataTypeField; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlUnnestOperator; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.SqlUtil; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.MapSqlType; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.sql.type.SqlTypeName; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.Convention; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelOptCluster; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelInput; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelNode; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.RelWriter; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.SingleRel; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataTypeFactory; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.rel.type.RelDataTypeField; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlUnnestOperator; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.SqlUtil; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.MapSqlType; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.sql.type.SqlTypeName; /** * This class is a copy of Uncollect.java in Calcite: diff --git a/sdks/java/extensions/sql/zetasql/src/test/java/org/apache/beam/sdk/extensions/sql/zetasql/TableResolutionTest.java b/sdks/java/extensions/sql/zetasql/src/test/java/org/apache/beam/sdk/extensions/sql/zetasql/TableResolutionTest.java index 444b49c92a66..416a4852e18a 100644 --- a/sdks/java/extensions/sql/zetasql/src/test/java/org/apache/beam/sdk/extensions/sql/zetasql/TableResolutionTest.java +++ b/sdks/java/extensions/sql/zetasql/src/test/java/org/apache/beam/sdk/extensions/sql/zetasql/TableResolutionTest.java @@ -20,8 +20,8 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.SchemaPlus; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.Table; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.SchemaPlus; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.Table; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.hamcrest.Matchers; import org.junit.Assert; diff --git a/sdks/java/extensions/sql/zetasql/src/test/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSQLPushDownTest.java b/sdks/java/extensions/sql/zetasql/src/test/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSQLPushDownTest.java index b02b2c75dbce..21b78fe33ef9 100644 --- a/sdks/java/extensions/sql/zetasql/src/test/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSQLPushDownTest.java +++ b/sdks/java/extensions/sql/zetasql/src/test/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSQLPushDownTest.java @@ -36,14 +36,14 @@ import org.apache.beam.sdk.schemas.Schema; import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.Context; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.Contexts; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.ConventionTraitDef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.RelTraitDef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.SchemaPlus; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.FrameworkConfig; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.Frameworks; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.RuleSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.Context; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.Contexts; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.ConventionTraitDef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.RelTraitDef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.schema.SchemaPlus; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.FrameworkConfig; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.Frameworks; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.RuleSet; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.joda.time.Duration; import org.junit.BeforeClass; diff --git a/sdks/java/extensions/sql/zetasql/src/test/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSqlTestBase.java b/sdks/java/extensions/sql/zetasql/src/test/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSqlTestBase.java index 741aa0128805..3d70a480cbc9 100644 --- a/sdks/java/extensions/sql/zetasql/src/test/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSqlTestBase.java +++ b/sdks/java/extensions/sql/zetasql/src/test/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSqlTestBase.java @@ -26,11 +26,11 @@ import org.apache.beam.sdk.extensions.sql.meta.provider.ReadOnlyTableProvider; import org.apache.beam.sdk.extensions.sql.meta.provider.TableProvider; import org.apache.beam.sdk.options.PipelineOptionsFactory; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.Contexts; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.plan.ConventionTraitDef; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.FrameworkConfig; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.Frameworks; -import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.tools.RuleSet; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.Contexts; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.plan.ConventionTraitDef; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.FrameworkConfig; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.Frameworks; +import org.apache.beam.vendor.calcite.v1_26_0.org.apache.calcite.tools.RuleSet; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; /** Common setup for ZetaSQL tests. */ diff --git a/sdks/java/extensions/sql/zetasql/src/test/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSqlTimeFunctionsTest.java b/sdks/java/extensions/sql/zetasql/src/test/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSqlTimeFunctionsTest.java index 260f12ef5979..45634670546e 100644 --- a/sdks/java/extensions/sql/zetasql/src/test/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSqlTimeFunctionsTest.java +++ b/sdks/java/extensions/sql/zetasql/src/test/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSqlTimeFunctionsTest.java @@ -84,7 +84,8 @@ public void testDateLiteral() { @Test public void testDateColumn() { - String sql = "SELECT FORMAT_DATE('%b-%d-%Y', date_field) FROM table_with_date"; + // NOTE: Do not use textual format parameters (%b or %h: The abbreviated month name) as these are locale dependent. + String sql = "SELECT FORMAT_DATE('%m-%d-%Y', date_field) FROM table_with_date"; ZetaSQLQueryPlanner zetaSQLQueryPlanner = new ZetaSQLQueryPlanner(config); BeamRelNode beamRelNode = zetaSQLQueryPlanner.convertToBeamRel(sql); @@ -93,10 +94,10 @@ public void testDateColumn() { PAssert.that(stream) .containsInAnyOrder( Row.withSchema(Schema.builder().addStringField("f_date_str").build()) - .addValues("Dec-25-2008") + .addValues("12-25-2008") .build(), Row.withSchema(Schema.builder().addStringField("f_date_str").build()) - .addValues("Apr-07-2020") + .addValues("04-07-2020") .build()); pipeline.run().waitUntilFinish(Duration.standardMinutes(PIPELINE_EXECUTION_WAITTIME_MINUTES)); } @@ -393,7 +394,8 @@ public void testDateTrunc() { @Test public void testFormatDate() { - String sql = "SELECT FORMAT_DATE('%b-%d-%Y', DATE '2008-12-25')"; + // NOTE: Do not use textual format parameters (%b or %h: The abbreviated month name) as these are locale dependent. + String sql = "SELECT FORMAT_DATE('%m-%d-%Y', DATE '2008-12-25')"; ZetaSQLQueryPlanner zetaSQLQueryPlanner = new ZetaSQLQueryPlanner(config); BeamRelNode beamRelNode = zetaSQLQueryPlanner.convertToBeamRel(sql); @@ -402,7 +404,7 @@ public void testFormatDate() { PAssert.that(stream) .containsInAnyOrder( Row.withSchema(Schema.builder().addStringField("f_date_str").build()) - .addValues("Dec-25-2008") + .addValues("12-25-2008") .build()); pipeline.run().waitUntilFinish(Duration.standardMinutes(PIPELINE_EXECUTION_WAITTIME_MINUTES)); } diff --git a/sdks/java/testing/tpcds/build.gradle b/sdks/java/testing/tpcds/build.gradle index c52ec7adb31e..4518f8078709 100644 --- a/sdks/java/testing/tpcds/build.gradle +++ b/sdks/java/testing/tpcds/build.gradle @@ -27,6 +27,7 @@ version '2.24.0-SNAPSHOT' sourceCompatibility = 1.8 repositories { + mavenLocal() mavenCentral() } diff --git a/sdks/java/testing/tpcds/src/main/java/org/apache/beam/sdk/tpcds/TpcdsOptionsRegistrar.java b/sdks/java/testing/tpcds/src/main/java/org/apache/beam/sdk/tpcds/TpcdsOptionsRegistrar.java index d1ddc9ddb794..ef5f365ff55d 100644 --- a/sdks/java/testing/tpcds/src/main/java/org/apache/beam/sdk/tpcds/TpcdsOptionsRegistrar.java +++ b/sdks/java/testing/tpcds/src/main/java/org/apache/beam/sdk/tpcds/TpcdsOptionsRegistrar.java @@ -20,7 +20,7 @@ import com.google.auto.service.AutoService; import org.apache.beam.sdk.options.PipelineOptions; import org.apache.beam.sdk.options.PipelineOptionsRegistrar; -import org.apache.beam.vendor.calcite.v1_20_0.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.calcite.v1_26_0.com.google.common.collect.ImmutableList; /** {@link AutoService} registrar for {@link TpcdsOptions}. */ @AutoService(PipelineOptionsRegistrar.class) diff --git a/settings.gradle b/settings.gradle index 8ccf0bc54676..0290c9ae58f4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -207,7 +207,7 @@ include ":sdks:python:test-suites:tox:py37" include ":sdks:python:test-suites:tox:py38" include ":vendor:grpc-1_26_0" include ":vendor:bytebuddy-1_10_8" -include ":vendor:calcite-1_20_0" +include ":vendor:calcite-1_26_0" include ":vendor:guava-26_0-jre" include ":vendor:sdks-java-extensions-protobuf" include ":website" diff --git a/vendor/calcite-1_20_0/build.gradle b/vendor/calcite-1_26_0/build.gradle similarity index 63% rename from vendor/calcite-1_20_0/build.gradle rename to vendor/calcite-1_26_0/build.gradle index 085d822eebf3..1a8eeeddf8e5 100644 --- a/vendor/calcite-1_20_0/build.gradle +++ b/vendor/calcite-1_26_0/build.gradle @@ -18,29 +18,35 @@ plugins { id 'org.apache.beam.vendor-java' } -description = "Apache Beam :: Vendored Dependencies :: Calcite 1.20.0" +description = "Apache Beam :: Vendored Dependencies :: Calcite 1.26.0" group = "org.apache.beam" -version = "0.2" +version = "0.1" -def calcite_version = "1.20.0" -def avatica_version = "1.16.0" -def prefix = "org.apache.beam.vendor.calcite.v1_20_0" +def calcite_version = "1.26.0" +def avatica_version = "1.17.0" +def prefix = "org.apache.beam.vendor.calcite.v1_26_0" List packagesToRelocate = [ "com.esri", + "com.fasterxml", "com.google.common", - "com.google.thirdparty", "com.google.protobuf", - "com.fasterxml", + "com.google.thirdparty", + "com.google.uzaygezen", "com.jayway", "com.yahoo", + "javax.annotation", + "net.minidev", + "org.apache.avalon", "org.apache.calcite", "org.apache.commons", "org.apache.http", + "org.apiguardian.api", "org.codehaus", + "org.objectweb", "org.pentaho", - "org.yaml" + "org.yaml", ] vendorJava( @@ -51,14 +57,31 @@ vendorJava( library.java.protobuf_java, library.java.slf4j_api ], + runtimeDependencies: [ + library.java.slf4j_api, + "org.apache.logging.log4j:log4j-api:2.13.3", + "commons-logging:commons-logging:1.2", + "avalon-framework:avalon-framework:4.1.5", + ], relocations: packagesToRelocate.collectEntries { [ (it): "${prefix}.${it}" ] + [ "jdbc:calcite:": "jdbc:beam-vendor-calcite:"] }, exclusions: [ + // Code quality / Building annotations + "com/google/errorprone/**", + "com/google/j2objc/annotations/**", + "org/checkerframework/**", + "org/jmlspecs/**", + + // Logging "org/slf4j/**", - "**/module-info.class" + "org/apache/log4j/**", + "org/apache/logging/log4j/**", + "META-INF/versions/9/org/apache/logging/log4j/**", + + "**/module-info.class", ], groupId: group, - artifactId: "beam-vendor-calcite-1_20_0", + artifactId: "beam-vendor-calcite-1_26_0", version: version, )