Skip to content

(fix #34038) Use CivilTimeEncoder to encode Time values in AvroGenericRecordToStorageApiProto #34059

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Abacn merged 3 commits into from
Feb 28, 2025
+23 −11
Merged

(fix #34038) Use CivilTimeEncoder to encode Time values in AvroGenericRecordToStorageApiProto #34059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf49b80
(fix #34038) Use CivilTimeEncoder to encode Time values in AvroGeneri…
clairemcginty Feb 24, 2025
1fc0109
Update CHANGES
clairemcginty Feb 24, 2025
5b992a0
Don't throw away precision
clairemcginty Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
## Bugfixes

* (Python) Fixed occasional pipeline stuckness that was affecting Python 3.11 users ([#33966](https://github.com/apache/beam/issues/33966)).
* (Java) Fixed TIME field encodings for BigQuery Storage API writes on GenericRecords ([#34059](https://github.com/apache/beam/pull/34059)).

## Security Fixes
* Fixed (CVE-YYYY-NNNN)[https://www.cve.org/CVERecord?id=CVE-YYYY-NNNN] (Java/Python/Go) ([#X](https://github.com/apache/beam/issues/X)).
Expand Down
13 changes: 8 additions & 5 deletions ...src/main/java/org/apache/beam/sdk/io/gcp/bigquery/AvroGenericRecordToStorageApiProto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import java.util.Map;
import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -174,19 +175,21 @@ static Integer convertDate(Object value) {

static Long convertTime(Object value, boolean micros) {
if (value instanceof org.joda.time.LocalTime) {
return 1_000L * (long) ((org.joda.time.LocalTime) value).getMillisOfDay();
return CivilTimeEncoder.encodePacked64TimeMicros((org.joda.time.LocalTime) value);
} else if (value instanceof java.time.LocalTime) {
return java.util.concurrent.TimeUnit.NANOSECONDS.toMicros(
((java.time.LocalTime) value).toNanoOfDay());
return CivilTimeEncoder.encodePacked64TimeMicros((java.time.LocalTime) value);
} else {
if (micros) {
Preconditions.checkArgument(
value instanceof Long, "Expecting a value as Long type (time).");
return (Long) value;
return CivilTimeEncoder.encodePacked64TimeMicros(
java.time.LocalTime.ofNanoOfDay((TimeUnit.MICROSECONDS.toNanos((long) value))));
} else {
Preconditions.checkArgument(
value instanceof Integer, "Expecting a value as Integer type (time).");
return 1_000L * (Integer) value;
return CivilTimeEncoder.encodePacked64TimeMicros(
java.time.LocalTime.ofNanoOfDay(
(TimeUnit.MILLISECONDS).toNanos(((Integer) value).longValue())));
}
}
}
Expand Down
20 changes: 14 additions & 6 deletions ...test/java/org/apache/beam/sdk/io/gcp/bigquery/AvroGenericRecordToStorageApiProtoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import org.apache.avro.Conversions;
import org.apache.avro.LogicalTypes;
Expand Down Expand Up @@ -400,13 +401,14 @@ enum TestEnum {
.set("uuidValue", uuid.toString())
.build();

org.joda.time.LocalTime localTime = org.joda.time.LocalTime.fromMillisOfDay(42_000L);
jodaTimeLogicalTypesRecord =
new GenericRecordBuilder(LOGICAL_TYPES_SCHEMA)
.set("numericValue", numeric)
.set("bigNumericValue", bigNumeric)
.set("dateValue", new org.joda.time.LocalDate(1970, 1, 1).plusDays(42))
.set("timeMicrosValue", org.joda.time.LocalTime.fromMillisOfDay(42_000L))
.set("timeMillisValue", org.joda.time.LocalTime.fromMillisOfDay(42_000L))
.set("timeMicrosValue", localTime)
.set("timeMillisValue", localTime)
.set("timestampMicrosValue", org.joda.time.Instant.ofEpochSecond(42L))
.set("timestampMillisValue", org.joda.time.Instant.ofEpochSecond(42L))
.set(
Expand All @@ -423,8 +425,14 @@ enum TestEnum {
.set("numericValue", numeric)
.set("bigNumericValue", bigNumeric)
.set("dateValue", java.time.LocalDate.ofEpochDay(42L))
.set("timeMicrosValue", java.time.LocalTime.ofSecondOfDay(42L))
.set("timeMillisValue", java.time.LocalTime.ofSecondOfDay(42L))
.set(
"timeMicrosValue",
java.time.LocalTime.ofNanoOfDay(
TimeUnit.MILLISECONDS.toNanos(localTime.getMillisOfDay())))
.set(
"timeMillisValue",
java.time.LocalTime.ofNanoOfDay(
TimeUnit.MILLISECONDS.toNanos(localTime.getMillisOfDay())))
.set("timestampMicrosValue", java.time.Instant.ofEpochSecond(42L))
.set("timestampMillisValue", java.time.Instant.ofEpochSecond(42L))
.set(
Expand Down Expand Up @@ -456,8 +464,8 @@ enum TestEnum {
.put("numericvalue", numericBytes)
.put("bignumericvalue", bigNumericBytes)
.put("datevalue", 42)
.put("timemicrosvalue", 42_000_000L)
.put("timemillisvalue", 42_000_000L)
.put("timemicrosvalue", CivilTimeEncoder.encodePacked64TimeMicros(localTime))
Copy link
Contributor Author

@clairemcginty clairemcginty Feb 24, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was curious so I checked the difference here. CivilTimeEncoder translates this value to 44,040,192 compared to the original 42,000,000. I do not know why but doing a test write to BQ shows seemingly correct values now 😅

.put("timemillisvalue", CivilTimeEncoder.encodePacked64TimeMicros(localTime))
.put("timestampmicrosvalue", 42_000_000L)
.put("timestampmillisvalue", 42_000_000L)
.put("localtimestampmicrosvalue", 42_000_000L)
Expand Down
Loading