Fix: accept default stream name

googleapis · Mar 7, 2024 · cc02238 · cc02238
1 parent feeaf04
commit cc02238
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/...-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/Exceptions.java b/...-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/Exceptions.java
@@ -150,6 +150,9 @@ private static StorageError toStorageError(com.google.rpc.Status rpcStatus) {
   @Nullable
   public static StorageException toStorageException(
       com.google.rpc.Status rpcStatus, Throwable exception) {
+    if (rpcStatus == null) {
+      return null;
+    }
     StorageError error = toStorageError(rpcStatus);
     Status grpcStatus =
         Status.fromCodeValue(rpcStatus.getCode()).withDescription(rpcStatus.getMessage());

diff --git a/...rystorage/src/main/java/com/google/cloud/bigquery/storage/v1/SchemaAwareStreamWriter.java b/...rystorage/src/main/java/com/google/cloud/bigquery/storage/v1/SchemaAwareStreamWriter.java
@@ -467,6 +467,8 @@ private Builder(
 
         if (!tableMatcher.matches() && !defaultStreamMatcher.matches()) {
           throw new IllegalArgumentException("Invalid  name: " + streamOrTableName);
+        } else if (!tableMatcher.matches() && defaultStreamMatcher.matches()) {
+          this.streamName = streamOrTableName;
         } else {
           this.streamName = streamOrTableName + "/_default";
         }

diff --git a/...querystorage/src/test/java/com/google/cloud/bigquery/storage/v1/JsonStreamWriterTest.java b/...querystorage/src/test/java/com/google/cloud/bigquery/storage/v1/JsonStreamWriterTest.java
@@ -72,6 +72,7 @@ public class JsonStreamWriterTest {
   private static final String TEST_STREAM = "projects/p/datasets/d/tables/t/streams/_default";
   private static final String TEST_STREAM_2 = "projects/p/datasets/d2/tables/t2/streams/_default";
   private static final String TEST_TABLE = "projects/p/datasets/d/tables/t";
+  private static final String TEST_TABLE_DEFAULT = "projects/p/datasets/d/tables/t/_default";
   private static LocalChannelProvider channelProvider;
   private FakeScheduledExecutorService fakeExecutor;
   private FakeBigQueryWrite testBigQueryWrite;
@@ -198,6 +199,14 @@ public void testTwoParamNewBuilder()
     assertEquals(TEST_STREAM, writer.getStreamName());
   }
 
+  @Test
+  public void testTwoParamNewBuilderDefault()
+      throws DescriptorValidationException, IOException, InterruptedException {
+    JsonStreamWriter writer =
+        getTestJsonStreamWriterBuilder(TEST_TABLE_DEFAULT, TABLE_SCHEMA).build();
+    assertEquals(TEST_TABLE_DEFAULT, writer.getStreamName());
+  }
+
   @Test
   public void testSingleAppendSimpleJson() throws Exception {
     FooType expectedProto = FooType.newBuilder().setFoo("allen").build();