From e509e703a504d74da778ce16541d3ee6f918a646 Mon Sep 17 00:00:00 2001 From: Damon Date: Thu, 5 Dec 2024 13:00:54 -0800 Subject: [PATCH] Synchronize JdbcSchemaIO provider and Python transform configuration field order (#33288) * Move order of write_batch_size * Reorder Java schema instead * Revert jdbc.py changes --- .github/trigger_files/beam_PostCommit_Python.json | 2 +- .../java/org/apache/beam/sdk/io/jdbc/JdbcSchemaIOProvider.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/trigger_files/beam_PostCommit_Python.json b/.github/trigger_files/beam_PostCommit_Python.json index 2d7af65a3815..00bd9e035648 100644 --- a/.github/trigger_files/beam_PostCommit_Python.json +++ b/.github/trigger_files/beam_PostCommit_Python.json @@ -1,5 +1,5 @@ { "comment": "Modify this file in a trivial way to cause this test suite to run.", - "modification": 5 + "modification": 6 } diff --git a/sdks/java/io/jdbc/src/main/java/org/apache/beam/sdk/io/jdbc/JdbcSchemaIOProvider.java b/sdks/java/io/jdbc/src/main/java/org/apache/beam/sdk/io/jdbc/JdbcSchemaIOProvider.java index 11034aee1cdf..23221042938b 100644 --- a/sdks/java/io/jdbc/src/main/java/org/apache/beam/sdk/io/jdbc/JdbcSchemaIOProvider.java +++ b/sdks/java/io/jdbc/src/main/java/org/apache/beam/sdk/io/jdbc/JdbcSchemaIOProvider.java @@ -68,13 +68,13 @@ public Schema configurationSchema() { .addNullableField("disableAutoCommit", FieldType.BOOLEAN) .addNullableField("outputParallelization", FieldType.BOOLEAN) .addNullableField("autosharding", FieldType.BOOLEAN) - .addNullableField("writeBatchSize", FieldType.INT64) // Partitioning support. If you specify a partition column we will use that instead of // readQuery .addNullableField("partitionColumn", FieldType.STRING) .addNullableField("partitions", FieldType.INT16) .addNullableField("maxConnections", FieldType.INT16) .addNullableField("driverJars", FieldType.STRING) + .addNullableField("writeBatchSize", FieldType.INT64) .build(); }