Skip to content

Commit 06b622c

Browse files
authored
Merge pull request #35662 from Abacn/remove-zetasql
Remove ZetaSQL
2 parents ef04862 + 93c0f1b commit 06b622c

File tree

100 files changed

+14
-19311
lines changed

Some content is hidden

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

100 files changed

+14
-19311
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"https://github.com/apache/beam/pull/32648": "testing Flink 1.19 support",
3-
"modification": 2
3+
"modification": 3
44
}
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
{
2-
"https://github.com/apache/beam/pull/32440": "testing datastream optimizations",
3-
"https://github.com/apache/beam/pull/32648": "testing addition of Flink 1.19 support"
2+
"modification": 1
43
}

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
## Breaking Changes
7878

7979
* X behavior was changed ([#X](https://github.com/apache/beam/issues/X)).
80+
* Previously deprecated Beam ZetaSQL component has been removed from new releases ([#34423](https://github.com/apache/beam/issues/34423)).
8081

8182
## Deprecations
8283

build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,6 @@ tasks.register("sqlPreCommit") {
385385
dependsOn(":sdks:java:extensions:sql:perf-tests:build")
386386
dependsOn(":sdks:java:extensions:sql:udf-test-provider:build")
387387
dependsOn(":sdks:java:extensions:sql:udf:build")
388-
dependsOn(":sdks:java:extensions:sql:zetasql:build")
389388
}
390389

391390
tasks.register("javaPreCommitPortabilityApi") {

sdks/go/examples/xlang/sql/sql.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func main() {
9898

9999
// Options for the sql transform have to be defined before the Transform call.
100100
var opts []sql.Option
101-
// Dialect options are "calcite" and "zetasql"
101+
// Dialect options is always "calcite"
102102
opts = append(opts, sql.Dialect("calcite"))
103103
// The expansion address can be specified per-call here or overwritten for all
104104
// calls using xlangx.RegisterOverrideForUrn(sqlx.Urn, *expansionAddr).

sdks/go/pkg/beam/transforms/sql/sql.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func OutputType(t reflect.Type, components ...typex.FullType) Option {
6565
}
6666
}
6767

68-
// Dialect specifies the SQL dialect, e.g. use 'zetasql' for ZetaSQL.
68+
// Dialect specifies the SQL dialect. It is always Calcite
6969
func Dialect(dialect string) Option {
7070
return func(o sqlx.Options) {
7171
o.(*options).dialect = dialect

sdks/go/pkg/beam/transforms/sql/sql_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@ func TestMultipleOptions(t *testing.T) {
190190
{
191191
name: "all_options",
192192
inputName: "test",
193-
dialect: "zetasql",
194193
expansionAddr: "localhost:8080",
195194
typ: reflect.TypeOf(int64(0)),
196195
customOpt: sqlx.Option{Urn: "test"},

sdks/java/build-tools/src/main/resources/beam/checkstyle/suppressions.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@
4343
<suppress id="ForbidNonVendoredGuava" files=".*bigtable.*BigtableServiceImplTest\.java" />
4444
<suppress id="ForbidNonVendoredGuava" files=".*sql.*BeamValuesRel\.java" />
4545
<suppress id="ForbidNonVendoredGuava" files=".*sql.*BeamEnumerableConverterTest\.java" />
46-
<suppress id="ForbidNonVendoredGuava" files=".*zetasql.*TableScanConverter\.java" />
47-
<suppress id="ForbidNonVendoredGuava" files=".*zetasql.*ExpressionConverter\.java" />
48-
<suppress id="ForbidNonVendoredGuava" files=".*zetasql.*BeamZetaSqlCatalog\.java" />
4946
<suppress id="ForbidNonVendoredGuava" files=".*pubsublite.*BufferingPullSubscriberTest\.java" />
5047
<suppress id="ForbidNonVendoredGuava" files=".*cdap.*Plugin\.java" />
5148
<suppress id="ForbidNonVendoredGuava" files=".*cdap.*PluginConfigInstantiationUtils\.java" />
@@ -69,13 +66,6 @@
6966
<suppress id="ForbidNonVendoredGrpcProtobuf" files=".*extensions.*sql.*pubsublite.RowHandler.*" />
7067
<suppress id="ForbidNonVendoredGrpcProtobuf" files=".*extensions.*sql.*ProtoPayloadSerializerProvider.*" />
7168
<suppress id="ForbidNonVendoredGrpcProtobuf" files=".*datacatalog.*DataCatalogTableProvider\.java" />
72-
<suppress id="ForbidNonVendoredGrpcProtobuf" files=".*zetasql.*DateTimeUtils\.java" />
73-
<suppress id="ForbidNonVendoredGrpcProtobuf" files=".*zetasql.*ZetaSqlBeamTranslationUtils\.java" />
74-
<suppress id="ForbidNonVendoredGrpcProtobuf" files=".*zetasql.*ZetaSqlDialectSpecTest\.java" />
75-
<suppress id="ForbidNonVendoredGrpcProtobuf" files=".*zetasql.*ZetaSqlTimeFunctionsTest\.java" />
76-
<suppress id="ForbidNonVendoredGrpcProtobuf" files=".*zetasql.*ZetaSqlBeamTranslationUtilsTest\.java" />
77-
<suppress id="ForbidNonVendoredGrpcProtobuf" files=".*zetasql.*TableResolutionTest\.java" />
78-
<suppress id="ForbidNonVendoredGrpcProtobuf" files=".*zetasql.*ZetaSQLPushDownTest\.java" />
7969
<suppress id="ForbidNonVendoredGrpcProtobuf" files=".*examples.*datatokenization.*BigTableIO\.java" />
8070
<suppress id="ForbidNonVendoredGrpcProtobuf" files=".*aws2.*kinesis.*RecordsAggregator\.java" />
8171
<suppress id="ForbidNonVendoredGrpcProtobuf" files=".*testinfra.*pipelines.*" />

sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/logicaltypes/SqlTypes.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ public class SqlTypes {
2929

3030
private SqlTypes() {}
3131

32-
/** Beam LogicalType corresponding to ZetaSQL/CalciteSQL DATE type. */
32+
/** Beam LogicalType corresponding to CalciteSQL DATE type. */
3333
public static final LogicalType<LocalDate, Long> DATE = new Date();
3434

35-
/** Beam LogicalType corresponding to ZetaSQL/CalciteSQL TIME type. */
35+
/** Beam LogicalType corresponding to CalciteSQL TIME type. */
3636
public static final LogicalType<LocalTime, Long> TIME = new Time();
3737

38-
/** Beam LogicalType corresponding to ZetaSQL DATETIME type. */
38+
/** Beam LogicalType corresponding to DATETIME type. */
3939
public static final LogicalType<LocalDateTime, Row> DATETIME = new DateTime();
4040

41-
/** Beam LogicalType corresponding to ZetaSQL TIMESTAMP type. */
41+
/** Beam LogicalType corresponding to TIMESTAMP type. */
4242
public static final LogicalType<Instant, Row> TIMESTAMP = new MicrosInstant();
4343
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ dependencies {
4646
implementation library.java.slf4j_api
4747

4848
testImplementation project(":sdks:java:extensions:sql")
49-
testImplementation project(":sdks:java:extensions:sql:zetasql")
5049
testImplementation project(":runners:direct-java")
5150
testImplementation project(":sdks:java:io:google-cloud-platform")
5251
testImplementation library.java.google_api_services_bigquery

0 commit comments

Comments
 (0)