feat(bigquery): update Arrow serialization options with enums and defaults

Author: jinseopkim0

java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/ArrowSerializationOptions.java

@@ -58,10 +58,9 @@ public String toString() {
   /** <b>[Beta]</b> Timestamp precision for Apache Arrow timestamp types. */
   @BetaApi
   public enum TimestampPrecision {
-    PRECISION_MILLIS("PRECISION_MILLIS"),
-    PRECISION_MICROS("PRECISION_MICROS"),
-    PRECISION_NANOS("PRECISION_NANOS"),
-    PRECISION_PICOS("PRECISION_PICOS");
+    MICROS("PRECISION_MICROS"),
+    NANOS("PRECISION_NANOS"),
+    PICOS("PRECISION_PICOS");
 
     private final String value;
 
@@ -155,7 +154,7 @@ static ArrowSerializationOptions fromPb(
   @BetaApi
   public static final class Builder {
     private CompressionCodec bufferCompression = CompressionCodec.UNCOMPRESSED;
-    private TimestampPrecision picosTimestampPrecision = TimestampPrecision.PRECISION_MICROS;
+    private TimestampPrecision picosTimestampPrecision = TimestampPrecision.MICROS;
 
     private Builder() {}
 

java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryJobConfiguration.java

@@ -147,7 +147,7 @@ public static final class Builder
     private Long maxResults;
     private JobCreationMode jobCreationMode;
     private String reservation;
-    private QueryResultsFormat queryResultsFormat;
+    private QueryResultsFormat queryResultsFormat = QueryResultsFormat.STRUCT_ENCODING;
     private ArrowSerializationOptions arrowSerializationOptions;
 
     private Builder() {

java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryJobConfigurationTest.java

@@ -248,8 +248,7 @@ public void testArrowConfigurations() {
     ArrowSerializationOptions options =
         ArrowSerializationOptions.newBuilder()
             .setBufferCompression(ArrowSerializationOptions.CompressionCodec.LZ4_FRAME)
-            .setPicosTimestampPrecision(
-                ArrowSerializationOptions.TimestampPrecision.PRECISION_MILLIS)
+            .setPicosTimestampPrecision(ArrowSerializationOptions.TimestampPrecision.NANOS)
             .build();
     QueryJobConfiguration job =
         QueryJobConfiguration.newBuilder(QUERY)
@@ -268,7 +267,7 @@ public void testArrowConfigurations() {
 
     // Test toPb/fromPb (not preserved)
     QueryJobConfiguration jobFromPb = QueryJobConfiguration.fromPb(job.toPb());
-    assertNull(jobFromPb.getQueryResultsFormat());
+    assertEquals(QueryResultsFormat.STRUCT_ENCODING, jobFromPb.getQueryResultsFormat());
     assertNull(jobFromPb.getArrowSerializationOptions());
   }
 
@@ -279,7 +278,7 @@ public void testArrowSerializationOptionsNullChecks() {
         ArrowSerializationOptions.CompressionCodec.UNCOMPRESSED,
         builder.build().getBufferCompression());
     assertEquals(
-        ArrowSerializationOptions.TimestampPrecision.PRECISION_MICROS,
+        ArrowSerializationOptions.TimestampPrecision.MICROS,
         builder.build().getPicosTimestampPrecision());
 
     NullPointerException ex1 =
@@ -291,6 +290,36 @@ public void testArrowSerializationOptionsNullChecks() {
     assertEquals("picosTimestampPrecision cannot be null", ex2.getMessage());
   }
 
+  @Test
+  public void testQueryJobConfigurationDefaults() {
+    QueryJobConfiguration defaultJob = QueryJobConfiguration.newBuilder(QUERY).build();
+
+    // Default query format is STRUCT_ENCODING; Arrow options are null by default
+    assertEquals(QueryResultsFormat.STRUCT_ENCODING, defaultJob.getQueryResultsFormat());
+    assertNull(defaultJob.getArrowSerializationOptions());
+
+    // Verify toBuilder preserves defaults
+    QueryJobConfiguration copiedJob = defaultJob.toBuilder().build();
+    assertEquals(QueryResultsFormat.STRUCT_ENCODING, copiedJob.getQueryResultsFormat());
+    assertNull(copiedJob.getArrowSerializationOptions());
+  }
+
+  @Test
+  public void testArrowFormatWithNullSerializationOptions() {
+    QueryJobConfiguration job =
+        QueryJobConfiguration.newBuilder(QUERY)
+            .setQueryResultsFormat(QueryResultsFormat.ARROW)
+            .build();
+
+    assertEquals(QueryResultsFormat.ARROW, job.getQueryResultsFormat());
+    assertNull(job.getArrowSerializationOptions());
+
+    // Verify toBuilder preserves ARROW format with null options
+    QueryJobConfiguration copiedJob = job.toBuilder().build();
+    assertEquals(QueryResultsFormat.ARROW, copiedJob.getQueryResultsFormat());
+    assertNull(copiedJob.getArrowSerializationOptions());
+  }
+
   @Test
   public void testQueryJobConfigurationArrowNullChecks() {
     QueryJobConfiguration.Builder builder = QueryJobConfiguration.newBuilder(QUERY);
@@ -338,5 +367,7 @@ private void compareQueryJobConfiguration(
     assertEquals(expected.getPositionalParameters(), value.getPositionalParameters());
     assertEquals(expected.getNamedParameters(), value.getNamedParameters());
     assertEquals(expected.getReservation(), value.getReservation());
+    assertEquals(expected.getQueryResultsFormat(), value.getQueryResultsFormat());
+    assertEquals(expected.getArrowSerializationOptions(), value.getArrowSerializationOptions());
   }
 }