From c27374362b6c3b4a58619bd1f3e35bad7392bb5a Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Thu, 19 Nov 2026 19:41:59 +0000 Subject: [PATCH] fix(bigquery): propagate DataFormatOptions to getQueryResults and avoid BigInteger in getTimestampValue --- .../com/google/cloud/bigquery/FieldValue.java | 4 +-- .../bigquery/spi/v2/HttpBigQueryRpc.java | 9 +++++- .../bigquery/spi/v2/HttpBigQueryRpcTest.java | 28 +++++++++++++++++++ 3 files changed, 38 insertions(+), 3 deletions(-) diff --git a/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FieldValue.java b/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FieldValue.java index b19514d106a0..a0cff9e04878 100644 --- a/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FieldValue.java +++ b/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FieldValue.java @@ -25,7 +25,6 @@ import com.google.common.io.BaseEncoding; import java.io.Serializable; import java.math.BigDecimal; -import java.math.BigInteger; import java.math.RoundingMode; import java.time.Duration; import java.time.Instant; @@ -224,7 +223,8 @@ public boolean getBooleanValue() { @SuppressWarnings("unchecked") public long getTimestampValue() { if (useInt64Timestamps) { - return new BigInteger(getStringValue()).longValue(); + // INT64 timestamps are signed 64-bit microseconds since epoch; parse without BigInteger. + return Long.parseLong(getStringValue()); } // timestamps are encoded in the format 1408452095.22 where the integer part is seconds since // epoch (e.g. 1408452095.22 == 2014-08-19 07:41:35.220 -05:00) diff --git a/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java b/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java index 526e24140408..cbb96088a597 100644 --- a/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java +++ b/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java @@ -1831,6 +1831,8 @@ public GetQueryResultsResponse getQueryResults( public GetQueryResultsResponse getQueryResultsSkipExceptionTranslation( String projectId, String jobId, String location, Map options) throws IOException { validateRPC(); + DataFormatOptions formatOptions = this.options.getDataFormatOptions(); + TimestampFormatOptions timestampFormat = formatOptions.timestampFormatOptions(); Bigquery.Jobs.GetQueryResults queryRequest = bigquery .jobs() @@ -1843,7 +1845,12 @@ public GetQueryResultsResponse getQueryResultsSkipExceptionTranslation( Option.START_INDEX.getLong(options) != null ? BigInteger.valueOf(Option.START_INDEX.getLong(options)) : null) - .setTimeoutMs(Option.TIMEOUT.getLong(options)); + .setTimeoutMs(Option.TIMEOUT.getLong(options)) + .setFormatOptionsUseInt64Timestamp(formatOptions.useInt64Timestamp() ? true : null) + .setFormatOptionsTimestampOutputFormat( + timestampFormat != TimestampFormatOptions.TIMESTAMP_OUTPUT_FORMAT_UNSPECIFIED + ? timestampFormat.toString() + : null); queryRequest .getRequestHeaders() diff --git a/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java b/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java index 34f32e594203..69057bd5813c 100644 --- a/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java +++ b/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java @@ -1713,9 +1713,37 @@ public void testGetQueryResultsNoTelemetry() throws Exception { rpc.getQueryResultsSkipExceptionTranslation(PROJECT_ID, JOB_ID, LOCATION, new HashMap<>()); verifyRequest("GET", "/projects/" + PROJECT_ID + "/queries/" + JOB_ID); + assertThat(lastRequestUrl).doesNotContain("formatOptions"); verifyNoSpans(); } + @Test + public void testGetQueryResultsWithDataFormatOptions() throws Exception { + setMockResponse("{\"kind\":\"bigquery#getQueryResultsResponse\"}"); + + BigQueryOptions customOptions = + BigQueryOptions.newBuilder() + .setProjectId(PROJECT_ID) + .setCredentials(NoCredentials.getInstance()) + .setTransportOptions( + BigQueryOptions.getDefaultHttpTransportOptions().toBuilder() + .setHttpTransportFactory(() -> mockTransport) + .build()) + .setDataFormatOptions( + DataFormatOptions.newBuilder() + .useInt64Timestamp(true) + .timestampFormatOptions(TimestampFormatOptions.ISO8601_STRING) + .build()) + .build(); + HttpBigQueryRpc customRpc = new HttpBigQueryRpc(customOptions); + + customRpc.getQueryResultsSkipExceptionTranslation( + PROJECT_ID, JOB_ID, LOCATION, new HashMap<>()); + + assertThat(lastRequestUrl).contains("formatOptions.useInt64Timestamp=true"); + assertThat(lastRequestUrl).contains("formatOptions.timestampOutputFormat=ISO8601_STRING"); + } + @Test public void testGetQueryResultsWithRowLimitNoTelemetry() throws Exception { setMockResponse("{\"kind\":\"bigquery#getQueryResultsResponse\"}");