Fix code review issues

googleapis · Jun 21, 2018 · 9cca46e · 9cca46e
1 parent 82efad2
commit 9cca46e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/...loud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java b/...loud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java
@@ -1179,11 +1179,7 @@ CloseableIterator<PartialResultSet> startStream(@Nullable ByteString resumeToken
                           : request.toBuilder().setResumeToken(resumeToken).build(),
                       stream.consumer(),
                       session.options);
-              // StreamController does not auto-request 1 message. Kick it off mannually
-              call.request(1);
-              if (prefetchChunks > 1) {
-                call.request(prefetchChunks - 1);
-              }
+              call.request(prefetchChunks);
               stream.setCall(call);
               return stream;
             }

diff --git a/...s/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java b/...s/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java
@@ -110,6 +110,7 @@ public class GapicSpannerRpc implements SpannerRpc {
       PathTemplate.create("projects/{project}");
   private static final int MAX_MESSAGE_SIZE = 100 * 1024 * 1024;
 
+  // TODO(hzyi): change the stub names to be more intuitive
   private final SpannerStub stub;
   private final InstanceAdminStub instanceStub;
   private final DatabaseAdminStub databaseStub;

diff --git a/...ud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/SpannerMetadataProviderTest.java b/...ud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/SpannerMetadataProviderTest.java
@@ -15,11 +15,14 @@
  */
 package com.google.cloud.spanner.spi.v1;
 
+import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertEquals;
 
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.grpc.Metadata;
 import io.grpc.Metadata.Key;
+import java.util.List;
 import java.util.Map;
 import org.junit.Test;
 
@@ -67,6 +70,16 @@ public void testGetResourceHeaderValue() {
         getResourceHeaderValue(metadataProvider, "projects/p/instances/i/databases/d/operations"));
   }
 
+  @Test
+  public void testNewExtraHeaders() {
+    SpannerMetadataProvider metadataProvider =
+        SpannerMetadataProvider.create(ImmutableMap.<String, String>of(), "header1");
+    Map<String, List<String>> extraHeaders = metadataProvider.newExtraHeaders(null, "value1");
+    assertThat(extraHeaders)
+        .containsExactlyEntriesIn(
+            ImmutableMap.<String, List<String>>of("header1", ImmutableList.<String>of("value1")));
+  }
+
   private String getResourceHeaderValue(
       SpannerMetadataProvider headerProvider, String resourceTokenTemplate) {
     Metadata metadata = headerProvider.newMetadata(resourceTokenTemplate, "projects/p");