From ac0a58ba5010bd1f44445891c8e98e324d2a8ebd Mon Sep 17 00:00:00 2001 From: Yi Hu Date: Fri, 28 Apr 2023 17:09:17 -0400 Subject: [PATCH 1/3] Fix jdbc xlang schema type mismatch --- sdks/python/apache_beam/io/jdbc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdks/python/apache_beam/io/jdbc.py b/sdks/python/apache_beam/io/jdbc.py index 3d41544a5dad..149f63acc1c5 100644 --- a/sdks/python/apache_beam/io/jdbc.py +++ b/sdks/python/apache_beam/io/jdbc.py @@ -125,7 +125,7 @@ def default_io_expansion_service(classpath=None): ('autosharding', typing.Optional[bool]), ('partition_column', typing.Optional[str]), ('partitions', typing.Optional[np.int16]), - ('max_connections', typing.Optional[int]), + ('max_connections', typing.Optional[np.int16]), ('driver_jars', typing.Optional[str])], ) From 1c3303aa0f4d38faed2d19addf10f38ba1e32021 Mon Sep 17 00:00:00 2001 From: Yi Hu Date: Fri, 28 Apr 2023 17:17:21 -0400 Subject: [PATCH 2/3] Also fix fetch_size type mismatch --- sdks/python/apache_beam/io/jdbc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdks/python/apache_beam/io/jdbc.py b/sdks/python/apache_beam/io/jdbc.py index 149f63acc1c5..f8f24ddeb8d2 100644 --- a/sdks/python/apache_beam/io/jdbc.py +++ b/sdks/python/apache_beam/io/jdbc.py @@ -120,7 +120,7 @@ def default_io_expansion_service(classpath=None): ('connection_init_sqls', typing.Optional[typing.List[str]]), ('read_query', typing.Optional[str]), ('write_statement', typing.Optional[str]), - ('fetch_size', typing.Optional[int]), + ('fetch_size', typing.Optional[np.int16]), ('output_parallelization', typing.Optional[bool]), ('autosharding', typing.Optional[bool]), ('partition_column', typing.Optional[str]), From fa620ae8ebeebbba117eb0d08de4a30f8e9ad6b2 Mon Sep 17 00:00:00 2001 From: Yi Hu Date: Fri, 28 Apr 2023 18:04:56 -0400 Subject: [PATCH 3/3] Add new fields in the end --- .../org/apache/beam/sdk/io/jdbc/JdbcSchemaIOProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 0025d8bcde85..c37ddf26abac 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 @@ -67,12 +67,12 @@ public Schema configurationSchema() { .addNullableField("fetchSize", FieldType.INT16) .addNullableField("outputParallelization", FieldType.BOOLEAN) .addNullableField("autosharding", FieldType.BOOLEAN) - .addNullableField("maxConnections", FieldType.INT16) - .addNullableField("driverJars", FieldType.STRING) // 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) .build(); }