Skip to content

Minor changes on Managed JDBCIO #36339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shunping merged 5 commits into from
Oct 8, 2025
Merged

Minor changes on Managed JDBCIO #36339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
22b2ce2
Add missing SQL_SERVER mappings in python. Use SCHEMAIO jar for JDBCI…
shunping Sep 30, 2025
3a6d555
Update parameter check for managed io for postgres so it is consisten…
shunping Sep 30, 2025
adfd431
Address feedback from reviewers
shunping Oct 8, 2025
cc5ed6f
Fix lints.
shunping Oct 8, 2025
3a8cede
Merge branch 'master' into managed-jdbcio-5
shunping Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion sdks/java/expansion-service/container/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ WORKDIR /opt/apache/beam
COPY target/avro.jar jars/
COPY target/beam-sdks-java-io-expansion-service.jar jars/
COPY target/beam-sdks-java-io-google-cloud-platform-expansion-service.jar jars/
COPY target/beam-sdks-java-extensions-schemaio-expansion-service.jar jars/

# Copy licenses
COPY target/LICENSE /opt/apache/beam/
Expand Down
6 changes: 6 additions & 0 deletions sdks/java/extensions/schemaio-expansion-service/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,9 @@ task runExpansionService (type: JavaExec) {
classpath = sourceSets.test.runtimeClasspath
args = [project.findProperty("constructionService.port") ?: "8097"]
}

shadowJar {
manifest {
attributes(["Multi-Release": true])
}
}
10 changes: 7 additions & 3 deletions ...n/java/org/apache/beam/sdk/io/jdbc/providers/ReadFromPostgresSchemaTransformProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,18 @@ protected String jdbcType() {
JdbcReadSchemaTransformConfiguration configuration) {
String jdbcType = configuration.getJdbcType();
if (jdbcType != null && !jdbcType.isEmpty() && !jdbcType.equals(jdbcType())) {
throw new IllegalArgumentException(
String.format("Wrong JDBC type. Expected '%s' but got '%s'", jdbcType(), jdbcType));
LOG.warn(
"Wrong JDBC type. Expected '{}' but got '{}'. Overriding with '{}'.",
jdbcType(),
jdbcType,
jdbcType());
configuration = configuration.toBuilder().setJdbcType(jdbcType()).build();
}

List<@org.checkerframework.checker.nullness.qual.Nullable String> connectionInitSql =
configuration.getConnectionInitSql();
if (connectionInitSql != null && !connectionInitSql.isEmpty()) {
LOG.warn("Postgres does not support connectionInitSql, ignoring.");
throw new IllegalArgumentException("Postgres does not support connectionInitSql.");
}

Boolean disableAutoCommit = configuration.getDisableAutoCommit();
Expand Down
10 changes: 7 additions & 3 deletions ...in/java/org/apache/beam/sdk/io/jdbc/providers/WriteToPostgresSchemaTransformProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,18 @@ protected String jdbcType() {
JdbcWriteSchemaTransformConfiguration configuration) {
String jdbcType = configuration.getJdbcType();
if (jdbcType != null && !jdbcType.isEmpty() && !jdbcType.equals(jdbcType())) {
throw new IllegalArgumentException(
String.format("Wrong JDBC type. Expected '%s' but got '%s'", jdbcType(), jdbcType));
LOG.warn(
"Wrong JDBC type. Expected '{}' but got '{}'. Overriding with '{}'.",
jdbcType(),
jdbcType,
jdbcType());
configuration = configuration.toBuilder().setJdbcType(jdbcType()).build();
}

List<@org.checkerframework.checker.nullness.qual.Nullable String> connectionInitSql =
configuration.getConnectionInitSql();
if (connectionInitSql != null && !connectionInitSql.isEmpty()) {
LOG.warn("Postgres does not support connectionInitSql, ignoring.");
throw new IllegalArgumentException("Postgres does not support connectionInitSql.");
}

// Override "connectionInitSql" for postgres
Expand Down
2 changes: 2 additions & 0 deletions sdks/python/apache_beam/transforms/external.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@
ManagedTransforms.Urns.POSTGRES_WRITE.urn: _GCP_EXPANSION_SERVICE_JAR_TARGET, # pylint: disable=line-too-long
ManagedTransforms.Urns.MYSQL_READ.urn: _GCP_EXPANSION_SERVICE_JAR_TARGET,
ManagedTransforms.Urns.MYSQL_WRITE.urn: _GCP_EXPANSION_SERVICE_JAR_TARGET,
ManagedTransforms.Urns.SQL_SERVER_READ.urn: _GCP_EXPANSION_SERVICE_JAR_TARGET, # pylint: disable=line-too-long
ManagedTransforms.Urns.SQL_SERVER_WRITE.urn: _GCP_EXPANSION_SERVICE_JAR_TARGET, # pylint: disable=line-too-long
}


Expand Down
Loading