From 32ba959aac0dbab9bf4cc2ce52959aca456b4567 Mon Sep 17 00:00:00 2001
From: Sri Harsha CH <sriharshach@google.com>
Date: Mon, 19 Feb 2024 10:13:13 +0000
Subject: [PATCH 1/2] fix(spanner): add ensureDecoded to proto type
---
.../java/com/google/cloud/spanner/GrpcStruct.java | 1 +
.../google/cloud/spanner/it/ITProtoColumnTest.java | 14 +++++++++++---
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/GrpcStruct.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/GrpcStruct.java
index e4951d7bee4..e3aa2e8b668 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/GrpcStruct.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/GrpcStruct.java
@@ -373,6 +373,7 @@ protected <T extends AbstractMessage> T getProtoMessageInternal(int columnIndex,
Preconditions.checkNotNull(
message,
"Proto message may not be null. Use MyProtoClass.getDefaultInstance() as a parameter value.");
+ ensureDecoded(columnIndex);
try {
return (T)
message
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITProtoColumnTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITProtoColumnTest.java
index 3657ef2109e..88b72b33baa 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITProtoColumnTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITProtoColumnTest.java
@@ -54,14 +54,12 @@
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.ClassRule;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
// Integration Tests to test DDL, DML and DQL for Proto Columns and Enums
-@Ignore("Feature is not yet enabled in production")
@Category(ParallelIntegrationTest.class)
@RunWith(JUnit4.class)
public class ITProtoColumnTest {
@@ -71,10 +69,17 @@ public class ITProtoColumnTest {
private static DatabaseAdminClient dbAdminClient;
private static DatabaseClient databaseClient;
+ public static boolean isNotUsingAllowlistedProject() {
+ String projectId = System.getProperty("spanner.gce.config.project_id", "");
+ return !(projectId.equalsIgnoreCase("gcloud-devel")
+ || projectId.equalsIgnoreCase("span-cloud-testing"));
+ }
+
@BeforeClass
public static void setUpDatabase() throws Exception {
assumeFalse(
"Proto Column is not supported in the emulator", EmulatorSpannerHelper.isUsingEmulator());
+ assumeFalse("Proto Column is not yet enabled in production", isNotUsingAllowlistedProject());
RemoteSpannerHelper testHelper = env.getTestHelper();
databaseID = DatabaseId.of(testHelper.getInstanceId(), testHelper.getUniqueDatabaseId());
dbAdminClient = testHelper.getClient().getDatabaseAdminClient();
@@ -133,7 +138,7 @@ public static void createDatabase() throws Exception {
@AfterClass
public static void afterClass() throws Exception {
try {
- if (!isUsingEmulator()) {
+ if (!isUsingEmulator() && !isNotUsingAllowlistedProject()) {
dbAdminClient.dropDatabase(
databaseID.getInstanceId().getInstance(), databaseID.getDatabase());
}
@@ -163,6 +168,7 @@ public void after() throws Exception {
public void testProtoColumnsUpdateAndRead() {
assumeFalse(
"Proto Column is not supported in the emulator", EmulatorSpannerHelper.isUsingEmulator());
+ assumeFalse("Proto Column is not yet enabled in production", isNotUsingAllowlistedProject());
SingerInfo singerInfo =
SingerInfo.newBuilder().setSingerId(1).setNationality("Country1").build();
ByteArray singerInfoBytes = ByteArray.copyFrom(singerInfo.toByteArray());
@@ -270,6 +276,7 @@ public void testProtoColumnsUpdateAndRead() {
public void testProtoColumnsDMLParameterizedQueriesPKAndIndexes() {
assumeFalse(
"Proto Column is not supported in the emulator", EmulatorSpannerHelper.isUsingEmulator());
+ assumeFalse("Proto Column is not yet enabled in production", isNotUsingAllowlistedProject());
SingerInfo singerInfo1 =
SingerInfo.newBuilder().setSingerId(1).setNationality("Country1").build();
@@ -376,6 +383,7 @@ public void testProtoColumnsDMLParameterizedQueriesPKAndIndexes() {
public void testProtoMessageDeserializationError() {
assumeFalse(
"Proto Column is not supported in the emulator", EmulatorSpannerHelper.isUsingEmulator());
+ assumeFalse("Proto Column is not yet enabled in production", isNotUsingAllowlistedProject());
SingerInfo singerInfo =
SingerInfo.newBuilder().setSingerId(1).setNationality("Country1").build();
From 8e949050a14afe803b65ccfc105c07a94aba10b3 Mon Sep 17 00:00:00 2001
From: Sri Harsha CH <sriharshach@google.com>
Date: Tue, 20 Feb 2024 09:54:07 +0000
Subject: [PATCH 2/2] fix(spanner): negate condition and name
---
.../cloud/spanner/it/ITProtoColumnTest.java | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITProtoColumnTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITProtoColumnTest.java
index 88b72b33baa..57d4d465aeb 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITProtoColumnTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITProtoColumnTest.java
@@ -21,6 +21,7 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThrows;
import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
import com.google.cloud.ByteArray;
import com.google.cloud.spanner.Database;
@@ -69,17 +70,17 @@ public class ITProtoColumnTest {
private static DatabaseAdminClient dbAdminClient;
private static DatabaseClient databaseClient;
- public static boolean isNotUsingAllowlistedProject() {
+ public static boolean isUsingAllowlistedProject() {
String projectId = System.getProperty("spanner.gce.config.project_id", "");
- return !(projectId.equalsIgnoreCase("gcloud-devel")
- || projectId.equalsIgnoreCase("span-cloud-testing"));
+ return projectId.equalsIgnoreCase("gcloud-devel")
+ || projectId.equalsIgnoreCase("span-cloud-testing");
}
@BeforeClass
public static void setUpDatabase() throws Exception {
assumeFalse(
"Proto Column is not supported in the emulator", EmulatorSpannerHelper.isUsingEmulator());
- assumeFalse("Proto Column is not yet enabled in production", isNotUsingAllowlistedProject());
+ assumeTrue("Proto Column is not yet enabled in production", isUsingAllowlistedProject());
RemoteSpannerHelper testHelper = env.getTestHelper();
databaseID = DatabaseId.of(testHelper.getInstanceId(), testHelper.getUniqueDatabaseId());
dbAdminClient = testHelper.getClient().getDatabaseAdminClient();
@@ -138,7 +139,7 @@ public static void createDatabase() throws Exception {
@AfterClass
public static void afterClass() throws Exception {
try {
- if (!isUsingEmulator() && !isNotUsingAllowlistedProject()) {
+ if (!isUsingEmulator() && isUsingAllowlistedProject()) {
dbAdminClient.dropDatabase(
databaseID.getInstanceId().getInstance(), databaseID.getDatabase());
}
@@ -168,7 +169,7 @@ public void after() throws Exception {
public void testProtoColumnsUpdateAndRead() {
assumeFalse(
"Proto Column is not supported in the emulator", EmulatorSpannerHelper.isUsingEmulator());
- assumeFalse("Proto Column is not yet enabled in production", isNotUsingAllowlistedProject());
+ assumeTrue("Proto Column is not yet enabled in production", isUsingAllowlistedProject());
SingerInfo singerInfo =
SingerInfo.newBuilder().setSingerId(1).setNationality("Country1").build();
ByteArray singerInfoBytes = ByteArray.copyFrom(singerInfo.toByteArray());
@@ -276,7 +277,7 @@ public void testProtoColumnsUpdateAndRead() {
public void testProtoColumnsDMLParameterizedQueriesPKAndIndexes() {
assumeFalse(
"Proto Column is not supported in the emulator", EmulatorSpannerHelper.isUsingEmulator());
- assumeFalse("Proto Column is not yet enabled in production", isNotUsingAllowlistedProject());
+ assumeTrue("Proto Column is not yet enabled in production", isUsingAllowlistedProject());
SingerInfo singerInfo1 =
SingerInfo.newBuilder().setSingerId(1).setNationality("Country1").build();
@@ -383,7 +384,7 @@ public void testProtoColumnsDMLParameterizedQueriesPKAndIndexes() {
public void testProtoMessageDeserializationError() {
assumeFalse(
"Proto Column is not supported in the emulator", EmulatorSpannerHelper.isUsingEmulator());
- assumeFalse("Proto Column is not yet enabled in production", isNotUsingAllowlistedProject());
+ assumeTrue("Proto Column is not yet enabled in production", isUsingAllowlistedProject());
SingerInfo singerInfo =
SingerInfo.newBuilder().setSingerId(1).setNationality("Country1").build();