[FLINK-27465] Handle conversion of negative long to timestamp in Avro…

…RowDeserializationSchema
nicusX · May 4, 2022 · 4c8f323 · 4c8f323
1 parent a112465
commit 4c8f323
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/.../flink-avro/src/main/java/org/apache/flink/formats/avro/AvroRowDeserializationSchema.java b/.../flink-avro/src/main/java/org/apache/flink/formats/avro/AvroRowDeserializationSchema.java
@@ -349,6 +349,11 @@ private Timestamp convertToTimestamp(Object object, boolean isMicros) {
                 long seconds = micros / MICROS_PER_SECOND - offsetMillis / 1000;
                 int nanos =
                         ((int) (micros % MICROS_PER_SECOND)) * 1000 - offsetMillis % 1000 * 1000;
+                if (nanos < 0) {
+                    // can't set negative nanos on timestamp
+                    seconds--;
+                    nanos = (int) (MICROS_PER_SECOND * 1000 + nanos);
+                }
                 Timestamp timestamp = new Timestamp(seconds * 1000L);
                 timestamp.setNanos(nanos);
                 return timestamp;