diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml
index 4ad6c660649..5e0aa64f725 100644
--- a/.github/blunderbuss.yml
+++ b/.github/blunderbuss.yml
@@ -1,7 +1,7 @@
# Configuration for the Blunderbuss GitHub app. For more info see
# https://github.com/googleapis/repo-automation-bots/tree/main/packages/blunderbuss
assign_issues:
- - ansh0l
+ - rajatbhatta
assign_prs_by:
- labels:
- samples
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a4fec26845..33ea63dc893 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
# Changelog
+## [6.38.1](https://github.com/googleapis/java-spanner/compare/v6.38.0...v6.38.1) (2023-03-29)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.6.0 ([#2352](https://github.com/googleapis/java-spanner/issues/2352)) ([19175ce](https://github.com/googleapis/java-spanner/commit/19175ce22777ac68f8c825a438c0a2503234aa42))
+
## [6.38.0](https://github.com/googleapis/java-spanner/compare/v6.37.0...v6.38.0) (2023-03-20)
diff --git a/README.md b/README.md
index dc1c2463bef..12ecb580f1b 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies:
com.google.cloud
google-cloud-spanner
- 6.37.0
+ 6.38.0
```
@@ -49,20 +49,20 @@ If you are using Maven without BOM, add this to your dependencies:
If you are using Gradle 5.x or later, add this to your dependencies:
```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.10.0')
+implementation platform('com.google.cloud:libraries-bom:26.11.0')
implementation 'com.google.cloud:google-cloud-spanner'
```
If you are using Gradle without BOM, add this to your dependencies:
```Groovy
-implementation 'com.google.cloud:google-cloud-spanner:6.37.0'
+implementation 'com.google.cloud:google-cloud-spanner:6.38.0'
```
If you are using SBT, add this to your dependencies:
```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "6.37.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "6.38.0"
```
## Authentication
@@ -409,7 +409,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-spanner/java11.html
[stability-image]: https://img.shields.io/badge/stability-stable-green
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-spanner.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-spanner/6.37.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-spanner/6.38.0
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/google-cloud-spanner-bom/pom.xml b/google-cloud-spanner-bom/pom.xml
index fa8ee6300dc..4e471152d5a 100644
--- a/google-cloud-spanner-bom/pom.xml
+++ b/google-cloud-spanner-bom/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-spanner-bom
- 6.38.0
+ 6.38.1
pom
com.google.cloud
@@ -53,48 +53,48 @@
com.google.cloud
google-cloud-spanner
- 6.38.0
+ 6.38.1
com.google.cloud
google-cloud-spanner-executor
- 6.38.0
+ 6.38.1
com.google.cloud
google-cloud-spanner
test-jar
- 6.38.0
+ 6.38.1
com.google.api.grpc
grpc-google-cloud-spanner-v1
- 6.38.0
+ 6.38.1
com.google.api.grpc
grpc-google-cloud-spanner-admin-instance-v1
- 6.38.0
+ 6.38.1
com.google.api.grpc
grpc-google-cloud-spanner-admin-database-v1
- 6.38.0
+ 6.38.1
com.google.api.grpc
proto-google-cloud-spanner-admin-instance-v1
- 6.38.0
+ 6.38.1
com.google.api.grpc
proto-google-cloud-spanner-v1
- 6.38.0
+ 6.38.1
com.google.api.grpc
proto-google-cloud-spanner-admin-database-v1
- 6.38.0
+ 6.38.1
diff --git a/google-cloud-spanner-executor/pom.xml b/google-cloud-spanner-executor/pom.xml
index 1ab2a9c2d79..f01c53b2f1b 100644
--- a/google-cloud-spanner-executor/pom.xml
+++ b/google-cloud-spanner-executor/pom.xml
@@ -5,14 +5,14 @@
4.0.0
com.google.cloud
google-cloud-spanner-executor
- 6.38.0
+ 6.38.1
jar
Google Cloud Spanner Executor
com.google.cloud
google-cloud-spanner-parent
- 6.38.0
+ 6.38.1
diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml
index c56ac36ad74..f0783095352 100644
--- a/google-cloud-spanner/pom.xml
+++ b/google-cloud-spanner/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-spanner
- 6.38.0
+ 6.38.1
jar
Google Cloud Spanner
https://github.com/googleapis/java-spanner
@@ -11,7 +11,7 @@
com.google.cloud
google-cloud-spanner-parent
- 6.38.0
+ 6.38.1
google-cloud-spanner
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java
index ac0f0a98d29..9885e4f83d5 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java
@@ -21,6 +21,7 @@
import static com.google.cloud.spanner.MockSpannerTestUtil.READ_ONE_KEY_VALUE_STATEMENT;
import static com.google.cloud.spanner.MockSpannerTestUtil.READ_TABLE_NAME;
import static com.google.cloud.spanner.MockSpannerTestUtil.SELECT1;
+import static com.google.cloud.spanner.MockSpannerTestUtil.SELECT1_RESULTSET;
import static com.google.cloud.spanner.SpannerApiFutures.get;
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertEquals;
@@ -2943,6 +2944,24 @@ public void testMetadataUnknownTypes() {
}
}
+ @Test
+ public void testStatementWithBytesArrayParameter() {
+ Statement statement =
+ Statement.newBuilder("select id from test where b=@p1")
+ .bind("p1")
+ .toBytesArray(
+ ImmutableList.of(ByteArray.copyFrom("test1"), ByteArray.copyFrom("test2")))
+ .build();
+ mockSpanner.putStatementResult(StatementResult.query(statement, SELECT1_RESULTSET));
+ DatabaseClient client =
+ spanner.getDatabaseClient(DatabaseId.of(TEST_PROJECT, TEST_INSTANCE, TEST_DATABASE));
+ try (ResultSet resultSet = client.singleUse().executeQuery(statement)) {
+ assertTrue(resultSet.next());
+ assertEquals(1L, resultSet.getLong(0));
+ assertFalse(resultSet.next());
+ }
+ }
+
static void assertAsString(String expected, ResultSet resultSet, int col) {
assertEquals(expected, resultSet.getValue(col).getAsString());
assertEquals(ImmutableList.of(expected), resultSet.getValue(col).getAsStringList());
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MockSpannerServiceImpl.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MockSpannerServiceImpl.java
index 29ab79450b5..567279c511c 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MockSpannerServiceImpl.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MockSpannerServiceImpl.java
@@ -20,6 +20,7 @@
import com.google.cloud.ByteArray;
import com.google.cloud.Date;
import com.google.cloud.spanner.AbstractResultSet.GrpcStruct;
+import com.google.cloud.spanner.AbstractResultSet.LazyByteArray;
import com.google.cloud.spanner.SessionPool.SessionPoolTransactionContext;
import com.google.cloud.spanner.TransactionRunnerImpl.TransactionContextImpl;
import com.google.common.base.Optional;
@@ -1362,9 +1363,11 @@ private Statement buildStatement(
builder
.bind(fieldName)
.toBytesArray(
- (Iterable)
- GrpcStruct.decodeArrayValue(
- com.google.cloud.spanner.Type.bytes(), value.getListValue()));
+ Iterables.transform(
+ (Iterable)
+ GrpcStruct.decodeArrayValue(
+ com.google.cloud.spanner.Type.bytes(), value.getListValue()),
+ LazyByteArray::getByteArray));
break;
case DATE:
builder
diff --git a/grpc-google-cloud-spanner-admin-database-v1/pom.xml b/grpc-google-cloud-spanner-admin-database-v1/pom.xml
index a0385df22c8..b275076fcec 100644
--- a/grpc-google-cloud-spanner-admin-database-v1/pom.xml
+++ b/grpc-google-cloud-spanner-admin-database-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-spanner-admin-database-v1
- 6.38.0
+ 6.38.1
grpc-google-cloud-spanner-admin-database-v1
GRPC library for grpc-google-cloud-spanner-admin-database-v1
com.google.cloud
google-cloud-spanner-parent
- 6.38.0
+ 6.38.1
diff --git a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
index 507451fdbe0..877fbb2b77f 100644
--- a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
+++ b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-spanner-admin-instance-v1
- 6.38.0
+ 6.38.1
grpc-google-cloud-spanner-admin-instance-v1
GRPC library for grpc-google-cloud-spanner-admin-instance-v1
com.google.cloud
google-cloud-spanner-parent
- 6.38.0
+ 6.38.1
diff --git a/grpc-google-cloud-spanner-v1/pom.xml b/grpc-google-cloud-spanner-v1/pom.xml
index 0bcd48802fa..a5f7e1c0b83 100644
--- a/grpc-google-cloud-spanner-v1/pom.xml
+++ b/grpc-google-cloud-spanner-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-spanner-v1
- 6.38.0
+ 6.38.1
grpc-google-cloud-spanner-v1
GRPC library for grpc-google-cloud-spanner-v1
com.google.cloud
google-cloud-spanner-parent
- 6.38.0
+ 6.38.1
diff --git a/pom.xml b/pom.xml
index 0c67a9c9969..09793221d8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-spanner-parent
pom
- 6.38.0
+ 6.38.1
Google Cloud Spanner Parent
https://github.com/googleapis/java-spanner
@@ -54,7 +54,7 @@
UTF-8
github
google-cloud-spanner-parent
- 3.5.0
+ 3.6.0
@@ -62,37 +62,37 @@
com.google.api.grpc
proto-google-cloud-spanner-admin-instance-v1
- 6.38.0
+ 6.38.1
com.google.api.grpc
proto-google-cloud-spanner-v1
- 6.38.0
+ 6.38.1
com.google.api.grpc
proto-google-cloud-spanner-admin-database-v1
- 6.38.0
+ 6.38.1
com.google.api.grpc
grpc-google-cloud-spanner-v1
- 6.38.0
+ 6.38.1
com.google.api.grpc
grpc-google-cloud-spanner-admin-instance-v1
- 6.38.0
+ 6.38.1
com.google.api.grpc
grpc-google-cloud-spanner-admin-database-v1
- 6.38.0
+ 6.38.1
com.google.cloud
google-cloud-spanner
- 6.38.0
+ 6.38.1
diff --git a/proto-google-cloud-spanner-admin-database-v1/pom.xml b/proto-google-cloud-spanner-admin-database-v1/pom.xml
index bc79a56686a..3dde1c06fe5 100644
--- a/proto-google-cloud-spanner-admin-database-v1/pom.xml
+++ b/proto-google-cloud-spanner-admin-database-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-spanner-admin-database-v1
- 6.38.0
+ 6.38.1
proto-google-cloud-spanner-admin-database-v1
PROTO library for proto-google-cloud-spanner-admin-database-v1
com.google.cloud
google-cloud-spanner-parent
- 6.38.0
+ 6.38.1
diff --git a/proto-google-cloud-spanner-admin-instance-v1/pom.xml b/proto-google-cloud-spanner-admin-instance-v1/pom.xml
index 159383dc3b0..bc8907a1c04 100644
--- a/proto-google-cloud-spanner-admin-instance-v1/pom.xml
+++ b/proto-google-cloud-spanner-admin-instance-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-spanner-admin-instance-v1
- 6.38.0
+ 6.38.1
proto-google-cloud-spanner-admin-instance-v1
PROTO library for proto-google-cloud-spanner-admin-instance-v1
com.google.cloud
google-cloud-spanner-parent
- 6.38.0
+ 6.38.1
diff --git a/proto-google-cloud-spanner-v1/pom.xml b/proto-google-cloud-spanner-v1/pom.xml
index a8dd529868b..15003eb6bf4 100644
--- a/proto-google-cloud-spanner-v1/pom.xml
+++ b/proto-google-cloud-spanner-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-spanner-v1
- 6.38.0
+ 6.38.1
proto-google-cloud-spanner-v1
PROTO library for proto-google-cloud-spanner-v1
com.google.cloud
google-cloud-spanner-parent
- 6.38.0
+ 6.38.1
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 31dbf17dbaa..934446212a2 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -32,7 +32,7 @@
com.google.cloud
google-cloud-spanner
- 6.37.0
+ 6.38.0
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 317db433916..191a0f2869e 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -31,7 +31,7 @@
com.google.cloud
google-cloud-spanner
- 6.38.0
+ 6.38.1
diff --git a/versions.txt b/versions.txt
index abef9a4fd51..aece5189028 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,11 +1,11 @@
# Format:
# module:released-version:current-version
-proto-google-cloud-spanner-admin-instance-v1:6.38.0:6.38.0
-proto-google-cloud-spanner-v1:6.38.0:6.38.0
-proto-google-cloud-spanner-admin-database-v1:6.38.0:6.38.0
-grpc-google-cloud-spanner-v1:6.38.0:6.38.0
-grpc-google-cloud-spanner-admin-instance-v1:6.38.0:6.38.0
-grpc-google-cloud-spanner-admin-database-v1:6.38.0:6.38.0
-google-cloud-spanner:6.38.0:6.38.0
-google-cloud-spanner-executor:6.38.0:6.38.0
+proto-google-cloud-spanner-admin-instance-v1:6.38.1:6.38.1
+proto-google-cloud-spanner-v1:6.38.1:6.38.1
+proto-google-cloud-spanner-admin-database-v1:6.38.1:6.38.1
+grpc-google-cloud-spanner-v1:6.38.1:6.38.1
+grpc-google-cloud-spanner-admin-instance-v1:6.38.1:6.38.1
+grpc-google-cloud-spanner-admin-database-v1:6.38.1:6.38.1
+google-cloud-spanner:6.38.1:6.38.1
+google-cloud-spanner-executor:6.38.1:6.38.1