feat: add field in HivePartitioningOptions

README.md

@@ -53,7 +53,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.13.0')
+implementation platform('com.google.cloud:libraries-bom:26.14.0')
 
 implementation 'com.google.cloud:google-cloud-bigquery'
 ```

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

@@ -17,6 +17,7 @@
 package com.google.cloud.bigquery;
 
 import com.google.common.base.MoreObjects;
+import java.util.List;
 import java.util.Objects;
 
 /** HivePartitioningOptions currently supported types include: AVRO, CSV, JSON, ORC and Parquet. */
@@ -25,19 +26,22 @@ public final class HivePartitioningOptions {
   private final String mode;
   private final Boolean requirePartitionFilter;
   private final String sourceUriPrefix;
+  private final List<String> fields;
 
   public static final class Builder {
 
     private String mode;
     private Boolean requirePartitionFilter;
     private String sourceUriPrefix;
+    private List<String> fields;
 
     private Builder() {}
 
     private Builder(HivePartitioningOptions options) {
       this.mode = options.mode;
       this.requirePartitionFilter = options.requirePartitionFilter;
       this.sourceUriPrefix = options.sourceUriPrefix;
+      this.fields = options.fields;
     }
 
     /**
@@ -78,6 +82,19 @@ public Builder setSourceUriPrefix(String sourceUriPrefix) {
       return this;
     }
 
+    /**
+     * [Output-only] For permanent external tables, this field is populated with the hive partition
+     * keys in the order they were inferred.
+     *
+     * <p>The types of the partition keys can be deduced by checking the table schema (which will
+     * include the partition keys). Not every API will populate this field in the output. For
+     * example, Tables.Get will populate it, but Tables.List will not contain this field.
+     */
+    public Builder setFields(List<String> fields) {
+      this.fields = fields;
+      return this;
+    }
+
     /** Creates a {@link HivePartitioningOptions} object. */
     public HivePartitioningOptions build() {
       return new HivePartitioningOptions(this);
@@ -88,6 +105,7 @@ private HivePartitioningOptions(Builder builder) {
     this.mode = builder.mode;
     this.requirePartitionFilter = builder.requirePartitionFilter;
     this.sourceUriPrefix = builder.sourceUriPrefix;
+    this.fields = builder.fields;
   }
 
   /* Returns the mode of hive partitioning */
@@ -108,6 +126,11 @@ public String getSourceUriPrefix() {
     return sourceUriPrefix;
   }
 
+  /* Returns the fields of hive partitioning */
+  public List<String> getFields() {
+    return fields;
+  }
+
   /** Returns a builder for the {@link HivePartitioningOptions} object. */
   public Builder toBuilder() {
     return new Builder(this);
@@ -135,13 +158,13 @@ public boolean equals(Object obj) {
             && Objects.equals(mode, ((HivePartitioningOptions) obj).getMode())
             && Objects.equals(
                 requirePartitionFilter, ((HivePartitioningOptions) obj).getRequirePartitionFilter())
-            && Objects.equals(
-                sourceUriPrefix, ((HivePartitioningOptions) obj).getSourceUriPrefix());
+            && Objects.equals(sourceUriPrefix, ((HivePartitioningOptions) obj).getSourceUriPrefix())
+            && Objects.equals(fields, ((HivePartitioningOptions) obj).getFields());
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(mode, sourceUriPrefix);
+    return Objects.hash(mode, sourceUriPrefix, fields);
   }
 
   com.google.api.services.bigquery.model.HivePartitioningOptions toPb() {
@@ -150,6 +173,7 @@ com.google.api.services.bigquery.model.HivePartitioningOptions toPb() {
     options.setMode(mode);
     options.setRequirePartitionFilter(requirePartitionFilter);
     options.setSourceUriPrefix(sourceUriPrefix);
+    options.setFields(fields);
     return options;
   }
 
@@ -165,6 +189,9 @@ static HivePartitioningOptions fromPb(
     if (options.getSourceUriPrefix() != null) {
       builder.setSourceUriPrefix(options.getSourceUriPrefix());
     }
+    if (options.getFields() != null) {
+      builder.setFields(options.getFields());
+    }
     return builder.build();
   }
 }

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

@@ -18,18 +18,22 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import java.util.Arrays;
+import java.util.List;
 import org.junit.Test;
 
 public class HivePartitioningOptionsTest {
 
   private static final String MODE = "STRING";
   private static final String SOURCE_URI_PREFIX = "gs://bucket/path_to_table";
   private static final Boolean REQUIRE_PARTITION_FILTER = true;
+  private static final List<String> FIELDS = Arrays.asList("FIELD1", "FIELD2");
   private static final HivePartitioningOptions HIVE_PARTITIONING_OPTIONS =
       HivePartitioningOptions.newBuilder()
           .setMode(MODE)
           .setRequirePartitionFilter(REQUIRE_PARTITION_FILTER)
           .setSourceUriPrefix(SOURCE_URI_PREFIX)
+          .setFields(FIELDS)
           .build();
 
   @Test

google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java

@@ -5233,4 +5233,48 @@ public void testCloneTableCopyJob() throws InterruptedException {
     assertTrue(remoteTable.delete());
     assertTrue(cloneTable.delete());
   }
+
+  @Test
+  public void testHivePartitioningOptionsFieldsFieldExistence() throws InterruptedException {
+    String tableName = "hive_partitioned_external_table";
+
+    // Create data on GCS
+    String sourceDirectory = "bigquery/hive-partitioning-table/example";
+    BlobInfo blobInfo = BlobInfo.newBuilder(BUCKET, sourceDirectory + "/key=foo/data.json").build();
+    assertNotNull(
+        "Failed to upload JSON to GCS",
+        storage.create(blobInfo, "{\"name\":\"bar\"}".getBytes(StandardCharsets.UTF_8)));
+    String sourceUri = "gs://" + BUCKET + "/" + sourceDirectory + "/*";
+    String sourceUriPrefix = "gs://" + BUCKET + "/" + sourceDirectory + "/";
+
+    // Create the external table
+    HivePartitioningOptions hivePartitioningOptions =
+        HivePartitioningOptions.newBuilder()
+            .setMode("AUTO")
+            .setRequirePartitionFilter(true)
+            .setSourceUriPrefix(sourceUriPrefix)
+            .build();
+
+    TableId tableId = TableId.of(DATASET, tableName);
+    ExternalTableDefinition customTable =
+        ExternalTableDefinition.newBuilder(sourceUri, FormatOptions.json())
+            .setAutodetect(true)
+            .setHivePartitioningOptions(hivePartitioningOptions)
+            .build();
+    bigquery.create(TableInfo.of(tableId, customTable));
+
+    // Validate the existence of the field HivePartitioningOptions.fields
+    Table table = bigquery.getTable(tableId);
+    assertThat(table).isNotNull();
+    HivePartitioningOptions options =
+        ((ExternalTableDefinition) table.getDefinition()).getHivePartitioningOptions();
+    List<String> fields = options.getFields();
+    assertThat(fields).isNotNull();
+    assertThat(fields).hasSize(1);
+    assertThat(fields).contains("key");
+
+    // Clean up
+    assertTrue(table.delete());
+    assertTrue(storage.delete(blobInfo.getBlobId()));
+  }
 }

pom.xml

@@ -54,7 +54,7 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <github.global.server>github</github.global.server>
     <site.installationModule>google-cloud-bigquery-parent</site.installationModule>
-    <google-api-services-bigquery.version>v2-rev20230408-2.0.0</google-api-services-bigquery.version>
+    <google-api-services-bigquery.version>v2-rev20230422-2.0.0</google-api-services-bigquery.version>
     <google.cloud.shared-dependencies.version>3.8.0</google.cloud.shared-dependencies.version>
     <arrow.version>11.0.0</arrow.version>
   </properties>