feat: add ICEBERG format options (#2662)

emkornfield · web-flow · commit 55048caf6b30 · 2023-04-27T18:26:13.000Z
Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:
- [x] Ensure the tests and linter pass
- [x] Code coverage does not decrease (if any source code was changed)
- [x] Appropriate docs were updated (if necessary)
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
@@ -43,6 +43,7 @@ public class FormatOptions implements Serializable {
   static final String GOOGLE_SHEETS = "GOOGLE_SHEETS";
   static final String PARQUET = "PARQUET";
   static final String ORC = "ORC";
+  static final String ICEBERG = "ICEBERG";
 
   private static final long serialVersionUID = -443376052020423691L;
 
@@ -115,6 +116,11 @@ public static FormatOptions orc() {
     return new FormatOptions(ORC);
   }
 
+  /** Default options for the Apache Iceberg table format. */
+  public static FormatOptions iceberg() {
+    return new FormatOptions(ICEBERG);
+  }
+
   /** Default options for the provided format. */
   public static FormatOptions of(String format) {
     checkArgument(!isNullOrEmpty(format), "Provided format is null or empty");
@@ -130,6 +136,8 @@ public static FormatOptions of(String format) {
       return bigtable();
     } else if (format.equals(PARQUET)) {
       return parquet();
+    } else if (format.equals(ICEBERG)) {
+      return iceberg();
     }
     return new FormatOptions(format);
   }
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FormatOptionsTest.java b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FormatOptionsTest.java
@@ -41,6 +41,7 @@ public void testFactoryMethods() {
     assertEquals(FormatOptions.DATASTORE_BACKUP, FormatOptions.datastoreBackup().getType());
     assertEquals(FormatOptions.AVRO, FormatOptions.avro().getType());
     assertEquals(FormatOptions.GOOGLE_SHEETS, FormatOptions.googleSheets().getType());
+    assertEquals(FormatOptions.ICEBERG, FormatOptions.iceberg().getType());
   }
 
   @Test
@@ -53,5 +54,6 @@ public void testEquals() {
     assertEquals(
         FormatOptions.datastoreBackup().hashCode(), FormatOptions.datastoreBackup().hashCode());
     assertEquals(FormatOptions.googleSheets(), FormatOptions.googleSheets());
+    assertEquals(FormatOptions.iceberg(), FormatOptions.iceberg());
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ public void testFactoryMethods() {`
`41`	`41`	`assertEquals(FormatOptions.DATASTORE_BACKUP, FormatOptions.datastoreBackup().getType());`
`42`	`42`	`assertEquals(FormatOptions.AVRO, FormatOptions.avro().getType());`
`43`	`43`	`assertEquals(FormatOptions.GOOGLE_SHEETS, FormatOptions.googleSheets().getType());`
	`44`	`+ assertEquals(FormatOptions.ICEBERG, FormatOptions.iceberg().getType());`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`@Test`
`@@ -53,5 +54,6 @@ public void testEquals() {`
`53`	`54`	`assertEquals(`
`54`	`55`	`FormatOptions.datastoreBackup().hashCode(), FormatOptions.datastoreBackup().hashCode());`
`55`	`56`	`assertEquals(FormatOptions.googleSheets(), FormatOptions.googleSheets());`
	`57`	`+ assertEquals(FormatOptions.iceberg(), FormatOptions.iceberg());`
`56`	`58`	`}`
`57`	`59`	`}`