Apply review comments

apache · Sep 24, 2024 · ae4d089 · ae4d089
1 parent d251f07
commit ae4d089
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 22 deletions.
diff --git a/...e-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQuerySourceDef.java b/...e-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQuerySourceDef.java
@@ -21,7 +21,6 @@
 import java.io.Serializable;
 import org.apache.beam.sdk.coders.Coder;
 import org.apache.beam.sdk.extensions.avro.io.AvroSource;
-import org.apache.beam.sdk.schemas.Schema;
 import org.apache.beam.sdk.transforms.SerializableFunction;
 
 /**
@@ -53,15 +52,4 @@ <T> BigQuerySourceBase<T> toSource(
    * @throws BigQuerySchemaRetrievalException if schema retrieval fails
    */
   TableSchema getTableSchema(BigQueryOptions bqOptions);
-
-  /**
-   * Extract the Beam {@link Schema} corresponding to this source.
-   *
-   * @param bqOptions BigQueryOptions
-   * @return Beam schema of the source
-   * @throws BigQuerySchemaRetrievalException if schema retrieval fails
-   */
-  default Schema getBeamSchema(BigQueryOptions bqOptions) {
-    return BigQueryUtils.fromTableSchema(getTableSchema(bqOptions));
-  }
 }
diff --git a/...latform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOStorageQueryTest.java b/...latform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOStorageQueryTest.java
@@ -382,7 +382,7 @@ private void doQuerySourceInitialSplit(
             .setReadSession(
                 ReadSession.newBuilder()
                     .setTable(BigQueryHelpers.toTableResourceName(tempTableReference))
-                    .setReadOptions(ReadSession.TableReadOptions.newBuilder().build()))
+                    .setReadOptions(ReadSession.TableReadOptions.newBuilder()))
             .setMaxStreamCount(requestedStreamCount)
             .build();
 
@@ -484,7 +484,7 @@ public void testQuerySourceInitialSplit_NoReferencedTables() throws Exception {
             .setReadSession(
                 ReadSession.newBuilder()
                     .setTable(BigQueryHelpers.toTableResourceName(tempTableReference))
-                    .setReadOptions(ReadSession.TableReadOptions.newBuilder().build()))
+                    .setReadOptions(ReadSession.TableReadOptions.newBuilder()))
             .setMaxStreamCount(1024)
             .build();
 
@@ -655,7 +655,7 @@ public void testQuerySourceInitialSplitWithBigQueryProject_EmptyResult() throws
                 ReadSession.newBuilder()
                     .setTable(BigQueryHelpers.toTableResourceName(tempTableReference))
                     .setDataFormat(DataFormat.AVRO)
-                    .setReadOptions(ReadSession.TableReadOptions.newBuilder().build()))
+                    .setReadOptions(ReadSession.TableReadOptions.newBuilder()))
             .setMaxStreamCount(10)
             .build();
 
@@ -728,7 +728,7 @@ public void testQuerySourceInitialSplit_EmptyResult() throws Exception {
             .setReadSession(
                 ReadSession.newBuilder()
                     .setTable(BigQueryHelpers.toTableResourceName(tempTableReference))
-                    .setReadOptions(ReadSession.TableReadOptions.newBuilder().build()))
+                    .setReadOptions(ReadSession.TableReadOptions.newBuilder()))
             .setMaxStreamCount(10)
             .build();
 

diff --git a/...platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOStorageReadTest.java b/...platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOStorageReadTest.java
@@ -459,7 +459,7 @@ private void doTableSourceInitialSplitTest(long bundleSize, int streamCount) thr
             .setReadSession(
                 ReadSession.newBuilder()
                     .setTable("projects/foo.com:project/datasets/dataset/tables/table")
-                    .setReadOptions(ReadSession.TableReadOptions.newBuilder().build()))
+                    .setReadOptions(ReadSession.TableReadOptions.newBuilder()))
             .setMaxStreamCount(streamCount)
             .build();
 
@@ -553,7 +553,7 @@ public void testTableSourceInitialSplit_WithDefaultProject() throws Exception {
             .setReadSession(
                 ReadSession.newBuilder()
                     .setTable("projects/project-id/datasets/dataset/tables/table")
-                    .setReadOptions(ReadSession.TableReadOptions.newBuilder().build()))
+                    .setReadOptions(ReadSession.TableReadOptions.newBuilder()))
             .setMaxStreamCount(1024)
             .build();
 
@@ -602,7 +602,7 @@ public void testTableSourceInitialSplit_EmptyTable() throws Exception {
             .setReadSession(
                 ReadSession.newBuilder()
                     .setTable("projects/foo.com:project/datasets/dataset/tables/table")
-                    .setReadOptions(ReadSession.TableReadOptions.newBuilder().build()))
+                    .setReadOptions(ReadSession.TableReadOptions.newBuilder()))
             .setMaxStreamCount(1024)
             .build();
 
@@ -1486,7 +1486,7 @@ public void testReadFromBigQueryIO() throws Exception {
                 ReadSession.newBuilder()
                     .setTable("projects/foo.com:project/datasets/dataset/tables/table")
                     .setDataFormat(DataFormat.AVRO)
-                    .setReadOptions(ReadSession.TableReadOptions.newBuilder().build()))
+                    .setReadOptions(ReadSession.TableReadOptions.newBuilder()))
             .setMaxStreamCount(10)
             .build();
 
@@ -1698,7 +1698,7 @@ public void testReadFromBigQueryIOArrow() throws Exception {
                 ReadSession.newBuilder()
                     .setTable("projects/foo.com:project/datasets/dataset/tables/table")
                     .setDataFormat(DataFormat.ARROW)
-                    .setReadOptions(ReadSession.TableReadOptions.newBuilder().build()))
+                    .setReadOptions(ReadSession.TableReadOptions.newBuilder()))
             .setMaxStreamCount(10)
             .build();
 

diff --git a/...che/beam/sdk/io/gcp/bigquery/providers/BigQueryDirectReadSchemaTransformProviderTest.java b/...che/beam/sdk/io/gcp/bigquery/providers/BigQueryDirectReadSchemaTransformProviderTest.java
@@ -235,7 +235,7 @@ public void testDirectRead() throws Exception {
                 ReadSession.newBuilder()
                     .setTable("projects/my-project/datasets/dataset/tables/table")
                     .setDataFormat(DataFormat.AVRO)
-                    .setReadOptions(ReadSession.TableReadOptions.newBuilder().build()))
+                    .setReadOptions(ReadSession.TableReadOptions.newBuilder()))
             .setMaxStreamCount(10)
             .build();