nuance timestamp conversion; use if-block

Ahmed Abualsaud · Ahmed Abualsaud · commit 6db0d836fb01 · 2026-07-18T09:32:50.000-04:00
diff --git a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryUtils.java b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryUtils.java
@@ -932,14 +932,13 @@ public static Row toBeamRow(Schema rowSchema, TableSchema bqSchema, TableRow jso
           return java.time.Instant.parse(jsonBQString);
         }
       } else if (fieldType.isLogicalType(Timestamp.IDENTIFIER)) {
-        try {
+        if (!jsonBQString.contains("UTC")) {
           BigDecimal bd = new BigDecimal(jsonBQString);
           long seconds = bd.longValue();
           long nanos = bd.subtract(BigDecimal.valueOf(seconds)).movePointRight(9).longValue();
           return java.time.Instant.ofEpochSecond(seconds, nanos);
-        } catch (NumberFormatException e) {
-          return VAR_PRECISION_FORMATTER.parse(jsonBQString, java.time.Instant::from);
         }
+        return VAR_PRECISION_FORMATTER.parse(jsonBQString, java.time.Instant::from);
       }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -932,14 +932,13 @@ public static Row toBeamRow(Schema rowSchema, TableSchema bqSchema, TableRow jso`
`932`	`932`	`return java.time.Instant.parse(jsonBQString);`
`933`	`933`	`}`
`934`	`934`	`} else if (fieldType.isLogicalType(Timestamp.IDENTIFIER)) {`
`935`		`- try {`
	`935`	`+ if (!jsonBQString.contains("UTC")) {`
`936`	`936`	`BigDecimal bd = new BigDecimal(jsonBQString);`
`937`	`937`	`long seconds = bd.longValue();`
`938`	`938`	`long nanos = bd.subtract(BigDecimal.valueOf(seconds)).movePointRight(9).longValue();`
`939`	`939`	`return java.time.Instant.ofEpochSecond(seconds, nanos);`
`940`		`- } catch (NumberFormatException e) {`
`941`		`- return VAR_PRECISION_FORMATTER.parse(jsonBQString, java.time.Instant::from);`
`942`	`940`	`}`
	`941`	`+ return VAR_PRECISION_FORMATTER.parse(jsonBQString, java.time.Instant::from);`
`943`	`942`	`}`
`944`	`943`	`}`
`945`	`944`