Minstant

.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": 1
 }

sdks/python/apache_beam/io/external/xlang_jdbcio_it_test.py

@@ -36,6 +36,7 @@
 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.utils.timestamp import MillisTimestamp
 from apache_beam.utils.timestamp import Timestamp
 
 # pylint: disable=wrong-import-order, wrong-import-position, ungrouped-imports
@@ -76,7 +77,7 @@
         ("renamed_varchar", str),
         ("renamed_bytes", bytes),
         ("renamed_varbytes", bytes),
-        ("renamed_timestamp", Timestamp),
+        ("renamed_timestamp", MillisTimestamp),
         ("renamed_decimal", Decimal),
         ("renamed_date", datetime.date),
         ("renamed_time", datetime.time),

sdks/python/apache_beam/typehints/schemas.py

@@ -100,6 +100,7 @@
 from apache_beam.typehints.schema_registry import SchemaTypeRegistry
 from apache_beam.utils import proto_utils
 from apache_beam.utils.python_callable import PythonCallableWithSource
+from apache_beam.utils.timestamp import MillisTimestamp
 from apache_beam.utils.timestamp import Timestamp
 
 PYTHON_ANY_URN = "beam:logical:pythonsdk_any:v1"
@@ -864,7 +865,7 @@ def _from_typing(cls, typ):
 
 
 @LogicalType.register_logical_type
-class MillisInstant(NoArgumentLogicalType[Timestamp, np.int64]):
+class MillisInstant(NoArgumentLogicalType[MillisTimestamp, np.int64]):
   """Millisecond-precision instant logical type handles values consistent with
   that encoded by ``InstantCoder`` in the Java SDK.
 
@@ -890,7 +891,7 @@ def urn(cls):
 
   @classmethod
   def language_type(cls):
-    return Timestamp
+    return MillisTimestamp
 
   def to_language_type(self, value):
     # type: (np.int64) -> Timestamp

sdks/python/apache_beam/utils/timestamp.py

@@ -419,6 +419,13 @@ def __mod__(self, other: DurationTypes) -> 'Duration':
     return Duration(micros=self.micros % other.micros)
 
 
+class MillisTimestamp():
+  """A stub type used during registration to allow multiple logical types to
+  use the same Timestamp language type but with different to_language_type.
+  """
+  pass
+
+
 # The minimum granularity / interval expressible in a Timestamp / Duration
 # object.
 TIME_GRANULARITY = Duration(micros=1)