Skip to content

Commit 204c0a1

Browse files
AbacnAbacn
committed
use vendor calcite 1.40
1 parent db9354c commit 204c0a1

234 files changed

Lines changed: 1486 additions & 1501 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -909,6 +909,7 @@ class BeamModulePlugin implements Plugin<Project> {
909909
vendored_grpc_1_69_0 : "org.apache.beam:beam-vendor-grpc-1_69_0:0.1",
910910
vendored_guava_32_1_2_jre : "org.apache.beam:beam-vendor-guava-32_1_2-jre:0.1",
911911
vendored_calcite_1_28_0 : "org.apache.beam:beam-vendor-calcite-1_28_0:0.2",
912+
vendored_calcite_1_40_0 : "org.apache.beam:beam-vendor-calcite-1_40_0:0.1-SNAPSHOT",
912913
woodstox_core_asl : "org.codehaus.woodstox:woodstox-core-asl:4.4.1",
913914
zstd_jni : "com.github.luben:zstd-jni:1.5.6-3",
914915
quickcheck_core : "com.pholser:junit-quickcheck-core:$quickcheck_version",
@@ -1833,21 +1834,20 @@ class BeamModulePlugin implements Plugin<Project> {
18331834
project.ext.includeInJavaBom = configuration.publish
18341835
project.ext.exportJavadoc = configuration.exportJavadoc
18351836

1836-
boolean publishEnabledByCommand = isRelease(project) || project.hasProperty('publishing')
18371837
if (forkJavaVersion == '') {
18381838
// project needs newer version and not served.
18391839
// If not publishing ,disable the project. Otherwise, fail the build
18401840
def msg = "project ${project.name} needs newer Java version to compile. Consider set -Pjava${project.javaVersion}Home"
1841-
if (publishEnabledByCommand) {
1842-
throw new GradleException("Publish enabled but " + msg + ".")
1841+
if (isRelease(project)) {
1842+
throw new GradleException("Release enabled but " + msg + ".")
18431843
} else {
18441844
logger.config(msg + " if needed.")
18451845
project.tasks.each {
18461846
it.enabled = false
18471847
}
18481848
}
18491849
}
1850-
if (publishEnabledByCommand && configuration.publish) {
1850+
if ((isRelease(project) || project.hasProperty('publishing')) && configuration.publish) {
18511851
project.apply plugin: "maven-publish"
18521852

18531853
// plugin to support repository authentication via ~/.m2/settings.xml

‎buildSrc/src/main/groovy/org/apache/beam/gradle/Repositories.groovy‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,10 @@ class Repositories {
5555
snapshotsOnly()
5656
}
5757
}
58-
58+
maven {
59+
url "${project.rootDir}/tempLib"
60+
content { includeGroup "org.apache.beam" }
61+
}
5962
// Apache release snapshots
6063
maven { url "https://repository.apache.org/content/repositories/releases" }
6164
}

‎sdks/java/extensions/sql/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ dependencies {
7272
javacc "net.java.dev.javacc:javacc:4.0"
7373
fmppTask "com.googlecode.fmpp-maven-plugin:fmpp-maven-plugin:1.0"
7474
fmppTask "org.freemarker:freemarker:2.3.31"
75-
fmppTemplates library.java.vendored_calcite_1_28_0
75+
fmppTemplates library.java.vendored_calcite_1_40_0
7676
implementation project(path: ":sdks:java:core", configuration: "shadow")
7777
implementation project(":sdks:java:managed")
7878
implementation project(":sdks:java:io:iceberg")
@@ -87,7 +87,7 @@ dependencies {
8787
implementation library.java.commons_csv
8888
implementation library.java.jackson_databind
8989
implementation library.java.joda_time
90-
implementation library.java.vendored_calcite_1_28_0
90+
implementation library.java.vendored_calcite_1_40_0
9191
implementation "org.codehaus.janino:janino:3.0.11"
9292
implementation "org.codehaus.janino:commons-compiler:3.0.11"
9393
implementation library.java.jackson_core
@@ -117,7 +117,7 @@ dependencies {
117117

118118
testImplementation "org.apache.iceberg:iceberg-api:1.6.1"
119119
testImplementation "org.apache.iceberg:iceberg-core:1.6.1"
120-
testImplementation library.java.vendored_calcite_1_28_0
120+
testImplementation library.java.vendored_calcite_1_40_0
121121
testImplementation library.java.vendored_guava_32_1_2_jre
122122
testImplementation library.java.junit
123123
testImplementation library.java.quickcheck_core
@@ -164,11 +164,11 @@ task copyFmppTemplatesFromCalciteCore(type: Copy) {
164164
into "${project.buildDir}/templates-fmpp"
165165
filter{
166166
line ->
167-
line.replace('import org.apache.calcite.', 'import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.')
167+
line.replace('import org.apache.calcite.', 'import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.')
168168
}
169169
filter{
170170
line ->
171-
line.replace('import static org.apache.calcite.', 'import static org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.')
171+
line.replace('import static org.apache.calcite.', 'import static org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.')
172172
}
173173
}
174174

‎sdks/java/extensions/sql/jdbc/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ dependencies {
3838
implementation "jline:jline:2.14.6"
3939
permitUnusedDeclared "jline:jline:2.14.6" // BEAM-11761
4040
implementation "sqlline:sqlline:1.4.0"
41-
implementation library.java.vendored_calcite_1_28_0
42-
permitUnusedDeclared library.java.vendored_calcite_1_28_0
41+
implementation library.java.vendored_calcite_1_40_0
42+
permitUnusedDeclared library.java.vendored_calcite_1_40_0
4343
testImplementation project(path: ":sdks:java:core", configuration: "shadow")
4444
testImplementation project(path: ":sdks:java:io:google-cloud-platform")
4545
testImplementation project(path: ":sdks:java:extensions:google-cloud-platform-core")

‎sdks/java/extensions/sql/perf-tests/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigquery/BigQueryIOPushDownIT.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
import org.apache.beam.sdk.testutils.metrics.TimeMonitor;
4646
import org.apache.beam.sdk.testutils.publishing.InfluxDBSettings;
4747
import org.apache.beam.sdk.transforms.ParDo;
48-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.plan.RelOptRule;
49-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.tools.RuleSet;
50-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.tools.RuleSets;
48+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.plan.RelOptRule;
49+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.tools.RuleSet;
50+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.tools.RuleSets;
5151
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
5252
import org.junit.Before;
5353
import org.junit.BeforeClass;

‎sdks/java/extensions/sql/src/main/codegen/config.fmpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ data: {
2121

2222
# List of import statements.
2323
imports: [
24-
"org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.schema.ColumnStrategy"
25-
"org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.sql.SqlCreate"
26-
"org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.sql.SqlDrop"
27-
"org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.sql.type.SqlTypeName"
24+
"org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.schema.ColumnStrategy"
25+
"org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlCreate"
26+
"org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlDrop"
27+
"org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.type.SqlTypeName"
2828
"org.apache.beam.sdk.extensions.sql.impl.parser.SqlCreateCatalog"
2929
"org.apache.beam.sdk.extensions.sql.impl.parser.SqlCreateExternalTable"
3030
"org.apache.beam.sdk.extensions.sql.impl.parser.SqlCreateFunction"

‎sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/TableNameExtractionUtils.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
import java.util.Collections;
2424
import java.util.List;
2525
import org.apache.beam.sdk.extensions.sql.impl.TableName;
26-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.sql.SqlAsOperator;
27-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.sql.SqlCall;
28-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.sql.SqlIdentifier;
29-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.sql.SqlJoin;
30-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.sql.SqlNode;
31-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.sql.SqlSelect;
32-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.sql.SqlSetOperator;
26+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlAsOperator;
27+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlCall;
28+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlIdentifier;
29+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlJoin;
30+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlNode;
31+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlSelect;
32+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlSetOperator;
3333
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
3434
import org.checkerframework.checker.nullness.qual.Nullable;
3535

‎sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamCalciteSchema.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828
import org.apache.beam.sdk.extensions.sql.meta.catalog.Catalog;
2929
import org.apache.beam.sdk.extensions.sql.meta.catalog.CatalogManager;
3030
import org.apache.beam.sdk.extensions.sql.meta.provider.TableProvider;
31-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.linq4j.tree.Expression;
32-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.rel.type.RelProtoDataType;
33-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.schema.Function;
34-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.schema.Schema;
35-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.schema.SchemaPlus;
36-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.schema.SchemaVersion;
37-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.schema.Schemas;
31+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.linq4j.tree.Expression;
32+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.rel.type.RelProtoDataType;
33+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.schema.Function;
34+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.schema.Schema;
35+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.schema.SchemaPlus;
36+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.schema.SchemaVersion;
37+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.schema.Schemas;
3838
import org.checkerframework.checker.nullness.qual.Nullable;
3939

4040
/** Adapter from {@link TableProvider} to {@link Schema}. */
@@ -120,7 +120,7 @@ public Set<String> getTypeNames() {
120120
}
121121

122122
@Override
123-
public org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.schema.Table getTable(
123+
public org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.schema.Table getTable(
124124
String name) {
125125
Table table = resolveMetastore().getTable(name);
126126
if (table == null) {

‎sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamCalciteSchemaFactory.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@
3030
import org.apache.beam.sdk.extensions.sql.meta.provider.TableProvider;
3131
import org.apache.beam.sdk.extensions.sql.meta.store.InMemoryMetaStore;
3232
import org.apache.beam.sdk.extensions.sql.meta.store.MetaStore;
33-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.jdbc.CalciteConnection;
34-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.linq4j.tree.Expression;
35-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.rel.type.RelProtoDataType;
36-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.schema.Function;
37-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.schema.Schema;
38-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.schema.SchemaFactory;
39-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.schema.SchemaPlus;
40-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.schema.SchemaVersion;
41-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.schema.Table;
33+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.jdbc.CalciteConnection;
34+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.linq4j.tree.Expression;
35+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.rel.type.RelProtoDataType;
36+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.schema.Function;
37+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.schema.Schema;
38+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.schema.SchemaFactory;
39+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.schema.SchemaPlus;
40+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.schema.SchemaVersion;
41+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.schema.Table;
4242
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableMap;
4343

4444
/**

‎sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamCalciteTable.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,20 @@
2727
import org.apache.beam.sdk.extensions.sql.impl.utils.CalciteUtils;
2828
import org.apache.beam.sdk.extensions.sql.meta.BeamSqlTable;
2929
import org.apache.beam.sdk.options.PipelineOptions;
30-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.adapter.java.AbstractQueryableTable;
31-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.linq4j.QueryProvider;
32-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.linq4j.Queryable;
33-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.plan.RelOptCluster;
34-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.plan.RelOptTable;
35-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.prepare.Prepare;
36-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.rel.RelNode;
37-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.rel.core.TableModify;
38-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.rel.type.RelDataType;
39-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.rel.type.RelDataTypeFactory;
40-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.rex.RexNode;
41-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.schema.ModifiableTable;
42-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.schema.SchemaPlus;
43-
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.schema.TranslatableTable;
30+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.adapter.java.AbstractQueryableTable;
31+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.linq4j.QueryProvider;
32+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.linq4j.Queryable;
33+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.plan.RelOptCluster;
34+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.plan.RelOptTable;
35+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.prepare.Prepare;
36+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.rel.RelNode;
37+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.rel.core.TableModify;
38+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.rel.type.RelDataType;
39+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.rel.type.RelDataTypeFactory;
40+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.rex.RexNode;
41+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.schema.ModifiableTable;
42+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.schema.SchemaPlus;
43+
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.schema.TranslatableTable;
4444
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableMap;
4545

4646
/** Adapter from {@link BeamSqlTable} to a calcite Table. */

0 commit comments

Comments
 (0)