fix: external table definition parquet format options (#2535)

jbeluch · gcf-owl-bot[bot] · Neenu1995 · web-flow · commit eb4597314fad · 2023-03-07T14:28:58.000-05:00
* fix: set parquet format options for external tables * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * fix: set parquet format options for external tables * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * fix: set parquet format options for external tables --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Neenu Shaji <Neenu1995@users.noreply.github.com>
diff --git a/README.md b/README.md
@@ -59,13 +59,13 @@ implementation 'com.google.cloud:google-cloud-bigquery'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-bigquery:2.23.0'
+implementation 'com.google.cloud:google-cloud-bigquery:2.23.1'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-bigquery" % "2.23.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-bigquery" % "2.23.1"
 ```
 
 ## Authentication
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/ExternalTableDefinition.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/ExternalTableDefinition.java
@@ -311,6 +311,9 @@ com.google.api.services.bigquery.model.ExternalDataConfiguration toExternalDataC
     if (getDecimalTargetTypes() != null) {
       externalConfigurationPb.setDecimalTargetTypes(getDecimalTargetTypes());
     }
+    if (getFormatOptions() != null && FormatOptions.PARQUET.equals(getFormatOptions().getType())) {
+      externalConfigurationPb.setParquetOptions(((ParquetOptions) getFormatOptions()).toPb());
+    }
     if (getFormatOptions() != null && FormatOptions.AVRO.equals(getFormatOptions().getType())) {
       externalConfigurationPb.setAvroOptions(((AvroOptions) getFormatOptions()).toPb());
     }
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FormatOptions.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FormatOptions.java
@@ -107,7 +107,7 @@ public static FormatOptions googleSheets() {
 
   /** Default options for PARQUET format. */
   public static FormatOptions parquet() {
-    return new FormatOptions(PARQUET);
+    return ParquetOptions.newBuilder().build();
   }
 
   /** Default options for the ORC format. */
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/ExternalTableDefinitionTest.java b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/ExternalTableDefinitionTest.java
@@ -52,6 +52,7 @@ public class ExternalTableDefinitionTest {
   private static final Boolean AUTODETECT = true;
   private static final AvroOptions AVRO_OPTIONS = AvroOptions.newBuilder().build();
   private static final CsvOptions CSV_OPTIONS = CsvOptions.newBuilder().build();
+  private static final ParquetOptions PARQUET_OPTIONS = ParquetOptions.newBuilder().build();
   private static final HivePartitioningOptions HIVE_PARTITIONING_OPTIONS =
       HivePartitioningOptions.newBuilder()
           .setMode("AUTO")
@@ -71,6 +72,9 @@ public class ExternalTableDefinitionTest {
   private static final ExternalTableDefinition EXTERNAL_TABLE_DEFINITION_AVRO =
       ExternalTableDefinition.newBuilder(SOURCE_URIS, TABLE_SCHEMA, AVRO_OPTIONS).build();
 
+  private static final ExternalTableDefinition EXTERNAL_TABLE_DEFINITION_PARQUET =
+      ExternalTableDefinition.newBuilder(SOURCE_URIS, TABLE_SCHEMA, PARQUET_OPTIONS).build();
+
   @Test
   public void testToBuilder() {
     compareExternalTableDefinition(
@@ -136,6 +140,17 @@ public void testToAndFromPb() {
         externalTableDefinition, ExternalTableDefinition.fromPb(externalTableDefinition.toPb()));
   }
 
+  @Test
+  public void testToAndFromPbParquet() {
+    compareExternalTableDefinition(
+        EXTERNAL_TABLE_DEFINITION_PARQUET,
+        ExternalTableDefinition.fromPb(EXTERNAL_TABLE_DEFINITION_PARQUET.toPb()));
+    ExternalTableDefinition externalTableDefinition =
+        ExternalTableDefinition.newBuilder(SOURCE_URIS, TABLE_SCHEMA, PARQUET_OPTIONS).build();
+    compareExternalTableDefinition(
+        externalTableDefinition, ExternalTableDefinition.fromPb(externalTableDefinition.toPb()));
+  }
+
   private void compareExternalTableDefinition(
       ExternalTableDefinition expected, ExternalTableDefinition value) {
     assertEquals(expected, value);

Original file line number	Diff line number	Diff line change
`@@ -311,6 +311,9 @@ com.google.api.services.bigquery.model.ExternalDataConfiguration toExternalDataC`
`311`	`311`	`if (getDecimalTargetTypes() != null) {`
`312`	`312`	`externalConfigurationPb.setDecimalTargetTypes(getDecimalTargetTypes());`
`313`	`313`	`}`
	`314`	`+ if (getFormatOptions() != null && FormatOptions.PARQUET.equals(getFormatOptions().getType())) {`
	`315`	`+ externalConfigurationPb.setParquetOptions(((ParquetOptions) getFormatOptions()).toPb());`
	`316`	`+ }`
`314`	`317`	`if (getFormatOptions() != null && FormatOptions.AVRO.equals(getFormatOptions().getType())) {`
`315`	`318`	`externalConfigurationPb.setAvroOptions(((AvroOptions) getFormatOptions()).toPb());`
`316`	`319`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public static FormatOptions googleSheets() {`
`107`	`107`
`108`	`108`	`/** Default options for PARQUET format. */`
`109`	`109`	`public static FormatOptions parquet() {`
`110`		`- return new FormatOptions(PARQUET);`
	`110`	`+ return ParquetOptions.newBuilder().build();`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`/** Default options for the ORC format. */`