feat!: use table name create default write stream issue fix (#2119)

* no block table default stream name * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * change default stream name * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
googleapis · Jan 2, 2024 · 91a2bec · 91a2bec
1 parent f150780
commit 91a2bec
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
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
@@ -449,9 +449,11 @@ public static final class Builder<T> {
     private static final String streamPatternString =
         "(projects/[^/]+/datasets/[^/]+/tables/[^/]+)/streams/[^/]+";
     private static final String tablePatternString = "(projects/[^/]+/datasets/[^/]+/tables/[^/]+)";
+    private static final String defaultStreamPatternString = tablePatternString + "/_default";
 
     private static final Pattern streamPattern = Pattern.compile(streamPatternString);
     private static final Pattern tablePattern = Pattern.compile(tablePatternString);
+    private static final Pattern defaultStreamPattern = Pattern.compile(defaultStreamPatternString);
 
     /**
      * Constructor for SchemaAwareStreamWriter's Builder
@@ -471,7 +473,9 @@ private Builder(
       Matcher streamMatcher = streamPattern.matcher(streamOrTableName);
       if (!streamMatcher.matches()) {
         Matcher tableMatcher = tablePattern.matcher(streamOrTableName);
-        if (!tableMatcher.matches()) {
+        Matcher defaultStreamMatcher = defaultStreamPattern.matcher(streamOrTableName);
+
+        if (!tableMatcher.matches() && !defaultStreamMatcher.matches()) {
           throw new IllegalArgumentException("Invalid  name: " + 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
@@ -641,6 +641,14 @@ public void testCreateDefaultStream_withNoClientPassedIn() throws Exception {
             .build()) {
       assertEquals("projects/p/datasets/d/tables/t/_default", writer.getStreamName());
       assertEquals("aa", writer.getLocation());
+
+      JsonStreamWriter recreate =
+          JsonStreamWriter.newBuilder(writer.getStreamName(), tableSchema)
+              .setChannelProvider(channelProvider)
+              .setCredentialsProvider(NoCredentialsProvider.create())
+              .setExecutorProvider(InstantiatingExecutorProvider.newBuilder().build())
+              .setEnableConnectionPool(true)
+              .build();
     }
   }