Merge branch 'main' into PR #2663 to update

Author: lqiu96

google-cloud-bigtable/pom.xml

@@ -204,6 +204,10 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-netty-shaded</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.grpc</groupId>
+      <artifactId>grpc-alts</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-protobuf</artifactId>

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java

@@ -2091,8 +2091,7 @@ public List<String> apply(List<com.google.bigtable.admin.v2.SchemaBundle> protos
   }
 
   /**
-   * Deletes an schema bundle with the specified schema bundle ID in the specified table. Note that
-   * the deletion is prohibited if the schema bundle has deletion_protection field set to true.
+   * Deletes an schema bundle with the specified schema bundle ID in the specified table.
    *
    * <p>Sample code:
    *
@@ -2106,8 +2105,7 @@ public void deleteSchemaBundle(String tableId, String schemaBundleId) {
 
   /**
    * Asynchronously deletes an schema bundle with the specified schema bundle ID in the specified
-   * table. Note that the deletion is prohibited if the schema bundle has deletion_protection field
-   * set to true.
+   * table.
    *
    * <p>Sample code:
    *

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/CreateSchemaBundleRequest.java

@@ -68,8 +68,7 @@ public CreateSchemaBundleRequest setProtoSchemaFile(@Nonnull String protoSchemaF
   }
 
   /** Sets the proto schema for this schema bundle. */
-  public CreateSchemaBundleRequest setProtoSchema(@Nonnull ByteString protoSchema)
-      throws IOException {
+  public CreateSchemaBundleRequest setProtoSchema(@Nonnull ByteString protoSchema) {
     Preconditions.checkNotNull(protoSchema, "protoSchema must be set");
     requestBuilder.setSchemaBundle(
         com.google.bigtable.admin.v2.SchemaBundle.newBuilder()

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/grpc/BigtableChannelPool.java

@@ -30,6 +30,7 @@
 import io.grpc.Metadata;
 import io.grpc.MethodDescriptor;
 import io.grpc.Status;
+import io.grpc.alts.AltsContextUtil;
 import java.io.IOException;
 import java.time.Clock;
 import java.util.ArrayList;
@@ -565,9 +566,8 @@ static class Entry implements BigtableChannelObserver {
     }
 
     void checkAndSetIsAlts(ClientCall<?, ?> call) {
-      // TODO(populate ALTS holder)
-      boolean result = false;
-      isAltsHolder.compareAndSet(null, result);
+      boolean currentIsAlts = AltsContextUtil.check(call);
+      isAltsHolder.set(currentIsAlts);
     }
 
     ManagedChannel getManagedChannel() {

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/ExecuteQueryIT.java

@@ -20,6 +20,7 @@
 import static org.junit.Assert.assertThrows;
 
 import com.google.cloud.Date;
+import com.google.cloud.bigtable.admin.v2.models.CreateSchemaBundleRequest;
 import com.google.cloud.bigtable.data.v2.BigtableDataClient;
 import com.google.cloud.bigtable.data.v2.models.RowMutation;
 import com.google.cloud.bigtable.data.v2.models.TableId;
@@ -28,10 +29,14 @@
 import com.google.cloud.bigtable.data.v2.models.sql.ResultSet;
 import com.google.cloud.bigtable.data.v2.models.sql.SqlType;
 import com.google.cloud.bigtable.data.v2.models.sql.Struct;
+import com.google.cloud.bigtable.data.v2.test.AlbumProto.Album;
+import com.google.cloud.bigtable.data.v2.test.SingerProto.Genre;
+import com.google.cloud.bigtable.data.v2.test.SingerProto.Singer;
 import com.google.cloud.bigtable.test_helpers.env.AbstractTestEnv;
 import com.google.cloud.bigtable.test_helpers.env.EmulatorEnv;
 import com.google.cloud.bigtable.test_helpers.env.TestEnvRule;
 import com.google.protobuf.ByteString;
+import com.google.protobuf.DescriptorProtos.FileDescriptorSet;
 import java.io.IOException;
 import java.time.Instant;
 import java.util.Arrays;
@@ -48,6 +53,8 @@
 @RunWith(JUnit4.class)
 public class ExecuteQueryIT {
 
+  public static String SCHEMA_BUNDLE_ID = "my_bundle";
+
   @ClassRule public static TestEnvRule testEnvRule = new TestEnvRule();
   private static BigtableDataClient dataClient;
   private static String tableId;
@@ -155,14 +162,21 @@ public void withHistoryQuery() {
   @SuppressWarnings("DoubleBraceInitialization")
   @Test
   public void allTypes() {
+    createTestSchemaBundle();
+    Album album = Album.newBuilder().setTitle("Lover").build();
     PreparedStatement preparedStatement =
         dataClient.prepareStatement(
             "SELECT 'stringVal' AS strCol, b'foo' as bytesCol, 1 AS intCol, CAST(1.2 AS FLOAT32) as"
                 + " f32Col, CAST(1.3 AS FLOAT64) as f64Col, true as boolCol,"
                 + " TIMESTAMP_FROM_UNIX_MILLIS(1000) AS tsCol, DATE(2024, 06, 01) as dateCol,"
                 + " STRUCT(1 as a, \"foo\" as b) AS structCol, [1,2,3] AS arrCol, "
                 + cf
-                + " as mapCol FROM `"
+                + " as mapCol, "
+                + " CAST(b'\022\005Lover' AS "
+                + SCHEMA_BUNDLE_ID
+                + ".com.google.cloud.bigtable.data.v2.test.Album) as protoCol, CAST('JAZZ' AS "
+                + SCHEMA_BUNDLE_ID
+                + ".com.google.cloud.bigtable.data.v2.test.Genre) as enumCol FROM `"
                 + tableId
                 + "` WHERE _key='"
                 + uniquePrefix
@@ -213,9 +227,13 @@ public void allTypes() {
                   put(ByteString.copyFromUtf8("qual3"), ByteString.copyFromUtf8("val3"));
                 }
               });
-
+      assertThat(rs.getProtoMessage("protoCol", Album.getDefaultInstance())).isEqualTo(album);
+      assertThat(rs.getProtoMessage(11, Album.getDefaultInstance())).isEqualTo(album);
+      assertThat(rs.getProtoEnum("enumCol", Genre::forNumber)).isEqualTo(Genre.JAZZ);
+      assertThat(rs.getProtoEnum(12, Genre::forNumber)).isEqualTo(Genre.JAZZ);
       assertThat(rs.next()).isFalse();
     }
+    deleteTestSchemaBundle();
   }
 
   @Test
@@ -380,4 +398,20 @@ public void testNullColumns() {
       assertThat(rs.next()).isFalse();
     }
   }
+
+  private static void deleteTestSchemaBundle() {
+    testEnvRule.env().getTableAdminClient().deleteSchemaBundle(tableId, SCHEMA_BUNDLE_ID);
+  }
+
+  private static void createTestSchemaBundle() {
+    FileDescriptorSet fileDescriptorSet =
+        FileDescriptorSet.newBuilder()
+            .addFile(Singer.getDescriptor().getFile().toProto())
+            .addFile(Album.getDescriptor().getFile().toProto())
+            .build();
+    CreateSchemaBundleRequest request =
+        CreateSchemaBundleRequest.of(tableId, SCHEMA_BUNDLE_ID)
+            .setProtoSchema(fileDescriptorSet.toByteString());
+    testEnvRule.env().getTableAdminClient().createSchemaBundle(request);
+  }
 }

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/grpc/BigtableChannelPoolTest.java

@@ -21,6 +21,7 @@
 
 import com.google.api.gax.grpc.ChannelFactory;
 import com.google.common.collect.Iterables;
+import io.grpc.Attributes;
 import io.grpc.CallOptions;
 import io.grpc.ClientCall;
 import io.grpc.ManagedChannel;
@@ -112,6 +113,8 @@ public void setUp() throws IOException {
     // Capture the listener when start is called
     // Configure mockClientCall.start to capture the listener
     doNothing().when(mockClientCall).start(listenerCaptor.capture(), any(Metadata.class));
+    // Default to no ALTS context
+    when(mockClientCall.getAttributes()).thenReturn(Attributes.EMPTY);
   }
 
   private BigtableChannelPool.Entry getSingleEntry() {
@@ -233,4 +236,16 @@ public void testMixedRpcs() {
     assertThat(entry.getAndResetErrorCount()).isEqualTo(1); // The last failure
     assertThat(entry.totalOutstandingRpcs()).isEqualTo(0);
   }
+
+  @Test
+  public void testNonAltsChannelReturnsFalse() {
+    // empty attributes
+    // cannot test true value as logic is complicated.
+    // alts check looks at  attributes.get(AltsProtocolNegotiator.AUTH_CONTEXT_KEY);
+    when(mockClientCall.getAttributes()).thenReturn(Attributes.EMPTY);
+    BigtableChannelPool.Entry entry = getSingleEntry();
+    assertThat(entry.isAltsHolder.get()).isNull();
+    startCall(unaryMethodDescriptor);
+    assertThat(entry.isAltsChannel()).isFalse();
+  }
 }