feat(bigquery): transition format options (#13422)

shollyman · web-flow · commit 59efe3238807 · 2025-12-03T09:06:04.000-08:00
This PR is minimal, and updates all callsites that use the older
UseInt64Timestamp boolean for controlling output to instead use the
newer TimestampOutputFormat option and specify it using INT64.

Followup PRs will update this to use the new ISO string for output.

Towards internal b/447623020
diff --git a/bigquery/iterator.go b/bigquery/iterator.go
@@ -25,6 +25,10 @@ import (
 	"google.golang.org/api/iterator"
 )
 
+const (
+	defaultTimestampWireFormat string = "INT64"
+)
+
 // Construct a RowIterator.
 func newRowIterator(ctx context.Context, src *rowSource, pf pageFetcher) *RowIterator {
 	it := &RowIterator{
@@ -290,7 +294,7 @@ func fetchTableResultPage(ctx context.Context, src *rowSource, schema Schema, st
 		}()
 	}
 	call := src.t.c.bqs.Tabledata.List(src.t.ProjectID, src.t.DatasetID, src.t.TableID)
-	call = call.FormatOptionsUseInt64Timestamp(true)
+	call = call.FormatOptionsTimestampOutputFormat(defaultTimestampWireFormat)
 	setClientHeader(call.Header())
 	if pageToken != "" {
 		call.PageToken(pageToken)
@@ -328,7 +332,7 @@ func fetchJobResultPage(ctx context.Context, src *rowSource, schema Schema, star
 	// reduce data transferred by leveraging api projections
 	projectedFields := []googleapi.Field{"rows", "pageToken", "totalRows"}
 	call := src.j.c.bqs.Jobs.GetQueryResults(src.j.projectID, src.j.jobID).Location(src.j.location).Context(ctx)
-	call = call.FormatOptionsUseInt64Timestamp(true)
+	call = call.FormatOptionsTimestampOutputFormat(defaultTimestampWireFormat)
 	if schema == nil {
 		// only project schema if we weren't supplied one.
 		projectedFields = append(projectedFields, "schema")
diff --git a/bigquery/job.go b/bigquery/job.go
@@ -353,7 +353,7 @@ func (j *Job) read(ctx context.Context, waitForQuery func(context.Context, strin
 func (j *Job) waitForQuery(ctx context.Context, projectID string) (Schema, uint64, error) {
 	// Use GetQueryResults only to wait for completion, not to read results.
 	call := j.c.bqs.Jobs.GetQueryResults(projectID, j.jobID).Location(j.location).Context(ctx).MaxResults(0)
-	call = call.FormatOptionsUseInt64Timestamp(true)
+	call = call.FormatOptionsTimestampOutputFormat(defaultTimestampWireFormat)
 	setClientHeader(call.Header())
 	backoff := gax.Backoff{
 		Initial:    50 * time.Millisecond,
diff --git a/bigquery/query.go b/bigquery/query.go
@@ -500,7 +500,7 @@ func (q *Query) probeFastPath() (*bq.QueryRequest, error) {
 		MaxSlots:           int64(q.MaxSlots),
 		Labels:             q.Labels,
 		FormatOptions: &bq.DataFormatOptions{
-			UseInt64Timestamp: true,
+			TimestampOutputFormat: defaultTimestampWireFormat,
 		},
 	}
 	if q.QueryConfig.DisableQueryCache {
diff --git a/bigquery/query_test.go b/bigquery/query_test.go
@@ -470,7 +470,7 @@ func TestProbeFastPath(t *testing.T) {
 				Query:        "foo",
 				UseLegacySql: &pfalse,
 				FormatOptions: &bq.DataFormatOptions{
-					UseInt64Timestamp: true,
+					TimestampOutputFormat: defaultTimestampWireFormat,
 				},
 			},
 		},
@@ -509,7 +509,7 @@ func TestProbeFastPath(t *testing.T) {
 				},
 				UseQueryCache: &pfalse,
 				FormatOptions: &bq.DataFormatOptions{
-					UseInt64Timestamp: true,
+					TimestampOutputFormat: defaultTimestampWireFormat,
 				},
 				Reservation: "reservation/1",
 				MaxSlots:    222,

Original file line number	Diff line number	Diff line change
`@@ -500,7 +500,7 @@ func (q Query) probeFastPath() (bq.QueryRequest, error) {`
`500`	`500`	`MaxSlots: int64(q.MaxSlots),`
`501`	`501`	`Labels: q.Labels,`
`502`	`502`	`FormatOptions: &bq.DataFormatOptions{`
`503`		`- UseInt64Timestamp: true,`
	`503`	`+ TimestampOutputFormat: defaultTimestampWireFormat,`
`504`	`504`	`},`
`505`	`505`	`}`
`506`	`506`	`if q.QueryConfig.DisableQueryCache {`