(beam) branch master updated: Fix post commit xlang jdbcio test failure (#35428)

[shunping]

This is an automated email from the ASF dual-hosted git repository.

shunping pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 6ac5009dbfd Fix post commit xlang jdbcio test failure (#35428)
6ac5009dbfd is described below

commit 6ac5009dbfdfb32f558d90c8824e7e3ade04d618
Author: Shunping Huang <shunp...@google.com>
AuthorDate: Wed Jun 25 12:51:45 2025 -0400

    Fix post commit xlang jdbcio test failure (#35428)
    
    * Temporary get the workaround back for TIMESTAMP field in jdbc.
    
    * Trigger the post commit tests.
---
 .github/trigger_files/beam_PostCommit_Python.json              |  2 +-
 .../trigger_files/beam_PostCommit_Python_Xlang_Gcp_Direct.json |  2 +-
 sdks/python/apache_beam/io/external/xlang_jdbcio_it_test.py    | 10 ++++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/trigger_files/beam_PostCommit_Python.json 
b/.github/trigger_files/beam_PostCommit_Python.json
index 62905b12a70..ca5f501f38d 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": 13
+  "modification": 14
 }
 
diff --git a/.github/trigger_files/beam_PostCommit_Python_Xlang_Gcp_Direct.json 
b/.github/trigger_files/beam_PostCommit_Python_Xlang_Gcp_Direct.json
index 455144f02a3..d6a91b7e2e8 100644
--- a/.github/trigger_files/beam_PostCommit_Python_Xlang_Gcp_Direct.json
+++ b/.github/trigger_files/beam_PostCommit_Python_Xlang_Gcp_Direct.json
@@ -1,4 +1,4 @@
 {
   "comment": "Modify this file in a trivial way to cause this test suite to 
run",
-  "modification": 6
+  "modification": 7
 }
diff --git a/sdks/python/apache_beam/io/external/xlang_jdbcio_it_test.py 
b/sdks/python/apache_beam/io/external/xlang_jdbcio_it_test.py
index 9f90a44d9a0..9ea02d04245 100644
--- a/sdks/python/apache_beam/io/external/xlang_jdbcio_it_test.py
+++ b/sdks/python/apache_beam/io/external/xlang_jdbcio_it_test.py
@@ -36,6 +36,8 @@ from apache_beam.options.pipeline_options import 
StandardOptions
 from apache_beam.testing.test_pipeline import TestPipeline
 from apache_beam.testing.util import assert_that
 from apache_beam.testing.util import equal_to
+from apache_beam.typehints.schemas import LogicalType
+from apache_beam.typehints.schemas import MillisInstant
 from apache_beam.utils.timestamp import Timestamp
 
 # pylint: disable=wrong-import-order, wrong-import-position, ungrouped-imports
@@ -239,6 +241,10 @@ class CrossLanguageJdbcIOTest(unittest.TestCase):
 
     config = self.jdbc_configs[database]
 
+    # Register MillisInstant logical type to override the mapping from 
Timestamp
+    # originally handled by MicrosInstant.
+    LogicalType.register_logical_type(MillisInstant)
+
     with TestPipeline() as p:
       p.not_use_test_runner_api = True
       _ = (
@@ -349,6 +355,10 @@ class CrossLanguageJdbcIOTest(unittest.TestCase):
               classpath=config['classpath'],
           ))
 
+    # Register MillisInstant logical type to override the mapping from 
Timestamp
+    # originally handled by MicrosInstant.
+    LogicalType.register_logical_type(MillisInstant)
+
     # Run read pipeline with custom schema
     with TestPipeline() as p:
       p.not_use_test_runner_api = True