Skip to content

Commit e527720

Browse files
lqiu96lqiu96
authored
Merge branch 'main' into protobuf-ci-4.29.x
2 parents 4c1ab27 + a46793a commit e527720

File tree

95 files changed

+6395
-1482
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+6395
-1482
lines changed

‎.kokoro/presubmit/integration-dp.cfg

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Configure the docker image for kokoro-trampoline.
4+
env_vars: {
5+
key: "TRAMPOLINE_IMAGE"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
7+
}
8+
9+
env_vars: {
10+
key: "INTEGRATION_TEST_ARGS"
11+
value: "-P bigtable-directpath-it,enable-verbose-grpc-logs -Dbigtable.project=gcloud-devel -Dbigtable.instance=google-cloud-bigtable -Dbigtable.table=integration-tests"
12+
}
13+
14+
env_vars: {
15+
key: "JOB_TYPE"
16+
value: "integration"
17+
}
18+
19+
# TODO: remove this after we've migrated all tests and scripts
20+
env_vars: {
21+
key: "GCLOUD_PROJECT"
22+
value: "gcloud-devel"
23+
}
24+
25+
env_vars: {
26+
key: "GOOGLE_CLOUD_PROJECT"
27+
value: "gcloud-devel"
28+
}
29+
30+
env_vars: {
31+
key: "GOOGLE_APPLICATION_CREDENTIALS"
32+
value: "secret_manager/java-it-service-account"
33+
}
34+
35+
env_vars: {
36+
key: "SECRET_MANAGER_KEYS"
37+
value: "java-it-service-account"
38+
}

‎CHANGELOG.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,33 @@
11
# Changelog
22

3+
## [2.57.3](https://github.com/googleapis/java-bigtable/compare/v2.57.2...v2.57.3) (2025-04-01)
4+
5+
6+
### Bug Fixes
7+
8+
* Remove debug messages ([#2552](https://github.com/googleapis/java-bigtable/issues/2552)) ([6359834](https://github.com/googleapis/java-bigtable/commit/63598346ca39767d59d254fce2c718d1258e27d5))
9+
10+
## [2.57.2](https://github.com/googleapis/java-bigtable/compare/v2.57.1...v2.57.2) (2025-03-31)
11+
12+
13+
### Bug Fixes
14+
15+
* Library should released as 2.57.2 ([#2549](https://github.com/googleapis/java-bigtable/issues/2549)) ([58d0bbd](https://github.com/googleapis/java-bigtable/commit/58d0bbdcb983e3b5ee403edf45c4e98a6eb8dc16))
16+
17+
## [2.57.1](https://github.com/googleapis/java-bigtable/compare/v2.57.0...v2.57.1) (2025-03-24)
18+
19+
20+
### Bug Fixes
21+
22+
* Handling of totalTimeout on sql plan refresh ([#2541](https://github.com/googleapis/java-bigtable/issues/2541)) ([bf49cf9](https://github.com/googleapis/java-bigtable/commit/bf49cf93f9a3b9cbdb155bb6cbb7a9f763b6f738))
23+
24+
## [2.57.0](https://github.com/googleapis/java-bigtable/compare/v2.56.0...v2.57.0) (2025-03-24)
25+
26+
27+
### Features
28+
29+
* Add PreparedStatement and update ExecuteQuery API to use it ([#2534](https://github.com/googleapis/java-bigtable/issues/2534)) ([49d4d09](https://github.com/googleapis/java-bigtable/commit/49d4d09fd16a1eb4eb566227a049bca2aaaa61e3))
30+
331
## [2.56.0](https://github.com/googleapis/java-bigtable/compare/v2.55.0...v2.56.0) (2025-03-18)
432

533

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-bigtable'
5656
If you are using Gradle without BOM, add this to your dependencies:
5757

5858
```Groovy
59-
implementation 'com.google.cloud:google-cloud-bigtable:2.56.0'
59+
implementation 'com.google.cloud:google-cloud-bigtable:2.57.3'
6060
```
6161

6262
If you are using SBT, add this to your dependencies:
6363

6464
```Scala
65-
libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.56.0"
65+
libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.57.3"
6666
```
6767

6868
## Authentication
@@ -543,7 +543,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
543543
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-bigtable/java11.html
544544
[stability-image]: https://img.shields.io/badge/stability-stable-green
545545
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-bigtable.svg
546-
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-bigtable/2.56.0
546+
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-bigtable/2.57.3
547547
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
548548
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
549549
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

‎google-cloud-bigtable-bom/pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-bigtable-bom</artifactId>
6-
<version>2.56.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
6+
<version>2.57.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
77
<packaging>pom</packaging>
88
<parent>
99
<groupId>com.google.cloud</groupId>
@@ -63,37 +63,37 @@
6363
<dependency>
6464
<groupId>com.google.cloud</groupId>
6565
<artifactId>google-cloud-bigtable</artifactId>
66-
<version>2.56.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
66+
<version>2.57.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
6767
</dependency>
6868
<dependency>
6969
<groupId>com.google.cloud</groupId>
7070
<artifactId>google-cloud-bigtable-emulator</artifactId>
71-
<version>0.193.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
71+
<version>0.194.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
7272
</dependency>
7373
<dependency>
7474
<groupId>com.google.cloud</groupId>
7575
<artifactId>google-cloud-bigtable-emulator-core</artifactId>
76-
<version>0.193.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
76+
<version>0.194.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
7777
</dependency>
7878
<dependency>
7979
<groupId>com.google.api.grpc</groupId>
8080
<artifactId>grpc-google-cloud-bigtable-admin-v2</artifactId>
81-
<version>2.56.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
81+
<version>2.57.4-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
8282
</dependency>
8383
<dependency>
8484
<groupId>com.google.api.grpc</groupId>
8585
<artifactId>grpc-google-cloud-bigtable-v2</artifactId>
86-
<version>2.56.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
86+
<version>2.57.4-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
8787
</dependency>
8888
<dependency>
8989
<groupId>com.google.api.grpc</groupId>
9090
<artifactId>proto-google-cloud-bigtable-admin-v2</artifactId>
91-
<version>2.56.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
91+
<version>2.57.4-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
9292
</dependency>
9393
<dependency>
9494
<groupId>com.google.api.grpc</groupId>
9595
<artifactId>proto-google-cloud-bigtable-v2</artifactId>
96-
<version>2.56.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
96+
<version>2.57.4-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
9797
</dependency>
9898
</dependencies>
9999
</dependencyManagement>

‎google-cloud-bigtable-deps-bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<groupId>com.google.cloud</groupId>
1515
<artifactId>google-cloud-bigtable-deps-bom</artifactId>
16-
<version>2.56.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
16+
<version>2.57.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
1717

1818
<packaging>pom</packaging>
1919
<description>

‎google-cloud-bigtable-emulator-core/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<artifactId>google-cloud-bigtable-parent</artifactId>
99
<groupId>com.google.cloud</groupId>
10-
<version>2.56.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
10+
<version>2.57.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
1111
</parent>
1212

1313
<artifactId>google-cloud-bigtable-emulator-core</artifactId>
14-
<version>0.193.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
14+
<version>0.194.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
1515

1616
<description>
1717
A Java wrapper for the Cloud Bigtable emulator.

‎google-cloud-bigtable-emulator/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<artifactId>google-cloud-bigtable-emulator</artifactId>
8-
<version>0.193.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
8+
<version>0.194.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
99
<name>Google Cloud Java - Bigtable Emulator</name>
1010
<url>https://github.com/googleapis/java-bigtable</url>
1111
<description>
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>com.google.cloud</groupId>
1616
<artifactId>google-cloud-bigtable-parent</artifactId>
17-
<version>2.56.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
17+
<version>2.57.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
1818
</parent>
1919
<scm>
2020
<connection>scm:git:[email protected]:googleapis/java-bigtable.git</connection>
@@ -81,14 +81,14 @@
8181
<dependency>
8282
<groupId>com.google.cloud</groupId>
8383
<artifactId>google-cloud-bigtable-deps-bom</artifactId>
84-
<version>2.56.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
84+
<version>2.57.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
8585
<type>pom</type>
8686
<scope>import</scope>
8787
</dependency>
8888
<dependency>
8989
<groupId>com.google.cloud</groupId>
9090
<artifactId>google-cloud-bigtable-bom</artifactId>
91-
<version>2.56.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
91+
<version>2.57.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
9292
<type>pom</type>
9393
<scope>import</scope>
9494
</dependency>
@@ -99,7 +99,7 @@
9999
<dependency>
100100
<groupId>com.google.cloud</groupId>
101101
<artifactId>google-cloud-bigtable-emulator-core</artifactId>
102-
<version>0.193.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
102+
<version>0.194.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
103103
</dependency>
104104

105105
<dependency>

‎google-cloud-bigtable/clirr-ignored-differences.xml

Lines changed: 76 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -282,20 +282,6 @@
282282
<method>*getTimestamp(*)</method>
283283
<to>java.time.Instant</to>
284284
</difference>
285-
<difference>
286-
<!-- BetaApi was updated -->
287-
<differenceType>7006</differenceType>
288-
<className>com/google/cloud/bigtable/data/v2/models/sql/StructReader</className>
289-
<method>*getTimestamp(*)</method>
290-
<to>java.time.Instant</to>
291-
</difference>
292-
<difference>
293-
<!-- BetaApi was updated -->
294-
<differenceType>7005</differenceType>
295-
<className>com/google/cloud/bigtable/data/v2/models/sql/Statement$Builder</className>
296-
<method>*setTimestampParam(java.lang.String, org.threeten.bp.Instant)</method>
297-
<to>*setTimestampParam(java.lang.String, java.time.Instant)</to>
298-
</difference>
299285
<difference>
300286
<!-- ChangeStream api is internal, only used by apache/beam-->
301287
<differenceType>7013</differenceType>
@@ -320,4 +306,80 @@
320306
<className>com/google/cloud/bigtable/data/v2/stub/metrics/BigtableCloudMonitoringExporter</className>
321307
<method>*</method>
322308
</difference>
309+
<difference>
310+
<!-- BetaApi was updated -->
311+
<differenceType>7005</differenceType>
312+
<className>com/google/cloud/bigtable/data/v2/BigtableDataClient</className>
313+
<method>*executeQuery*</method>
314+
<to>*</to>
315+
</difference>
316+
<difference>
317+
<!-- BetaApi was renamed -->
318+
<differenceType>8001</differenceType>
319+
<className>com/google/cloud/bigtable/data/v2/models/sql/Statement</className>
320+
<method>*</method>
321+
</difference>
322+
<difference>
323+
<!-- BetaApi was renamed -->
324+
<differenceType>8001</differenceType>
325+
<className>com/google/cloud/bigtable/data/v2/models/sql/Statement$Builder</className>
326+
<method>*</method>
327+
</difference>
328+
<difference>
329+
<!-- BetaApi was renamed -->
330+
<differenceType>8001</differenceType>
331+
<className>com/google/cloud/bigtable/data/v2/models/sql/Statement$Builder</className>
332+
<method>*</method>
333+
</difference>
334+
<difference>
335+
<!-- InternalApi was updated -->
336+
<differenceType>7004</differenceType>
337+
<className>com/google/cloud/bigtable/data/v2/internal/SqlRowMergerUtil</className>
338+
<method>*</method>
339+
</difference>
340+
<difference>
341+
<!-- InternalApi was updated -->
342+
<differenceType>7004</differenceType>
343+
<className>com/google/cloud/bigtable/data/v2/stub/sql/ExecuteQueryCallContext</className>
344+
<method>*ExecuteQueryCallContext*</method>
345+
</difference>
346+
<difference>
347+
<!-- InternalApi was updated -->
348+
<differenceType>7009</differenceType>
349+
<className>com/google/cloud/bigtable/data/v2/stub/sql/ExecuteQueryCallContext</className>
350+
<method>*ExecuteQueryCallContext*</method>
351+
</difference>
352+
<difference>
353+
<!-- InternalApi was updated -->
354+
<differenceType>7005</differenceType>
355+
<className>com/google/cloud/bigtable/data/v2/stub/sql/ExecuteQueryCallContext</className>
356+
<method>*create*</method>
357+
<to>*</to>
358+
</difference>
359+
<difference>
360+
<!-- InternalApi was updated -->
361+
<differenceType>7004</differenceType>
362+
<className>com/google/cloud/bigtable/data/v2/stub/sql/ExecuteQueryCallable</className>
363+
<method>*ExecuteQueryCallable*</method>
364+
<to>*</to>
365+
</difference>
366+
<difference>
367+
<!-- InternalApi was updated -->
368+
<differenceType>7005</differenceType>
369+
<className>com/google/cloud/bigtable/data/v2/stub/sql/ExecuteQueryCallable</className>
370+
<method>*call*</method>
371+
<to>*</to>
372+
</difference>
373+
<difference>
374+
<!-- InternalApi was updated -->
375+
<differenceType>8001</differenceType>
376+
<className>com/google/cloud/bigtable/data/v2/stub/sql/MetadataResolvingCallable</className>
377+
</difference>
378+
<difference>
379+
<!-- InternalApi was updated -->
380+
<differenceType>7004</differenceType>
381+
<className>com/google/cloud/bigtable/data/v2/stub/sql/SqlRowMerger</className>
382+
<method>*</method>
383+
<to>*</to>
384+
</difference>
323385
</differences>

‎google-cloud-bigtable/pom.xml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<artifactId>google-cloud-bigtable</artifactId>
5-
<version>2.56.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
5+
<version>2.57.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
66
<packaging>jar</packaging>
77
<name>Google Cloud Bigtable</name>
88
<url>https://github.com/googleapis/java-bigtable</url>
@@ -12,11 +12,11 @@
1212
<parent>
1313
<groupId>com.google.cloud</groupId>
1414
<artifactId>google-cloud-bigtable-parent</artifactId>
15-
<version>2.56.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
15+
<version>2.57.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
1616
</parent>
1717
<properties>
1818
<!-- The version that will be embedded in the published jar via maven-resources-plugin -->
19-
<java-bigtable.version>2.56.1-SNAPSHOT</java-bigtable.version><!-- {x-version-update:google-cloud-bigtable:current} -->
19+
<java-bigtable.version>2.57.4-SNAPSHOT</java-bigtable.version><!-- {x-version-update:google-cloud-bigtable:current} -->
2020

2121
<site.installationModule>google-cloud-bigtable</site.installationModule>
2222

@@ -52,14 +52,14 @@
5252
<dependency>
5353
<groupId>com.google.cloud</groupId>
5454
<artifactId>google-cloud-bigtable-deps-bom</artifactId>
55-
<version>2.56.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
55+
<version>2.57.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
5656
<type>pom</type>
5757
<scope>import</scope>
5858
</dependency>
5959
<dependency>
6060
<groupId>com.google.cloud</groupId>
6161
<artifactId>google-cloud-bigtable-bom</artifactId>
62-
<version>2.56.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
62+
<version>2.57.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
6363
<type>pom</type>
6464
<scope>import</scope>
6565
</dependency>
@@ -134,6 +134,10 @@
134134
<groupId>com.google.protobuf</groupId>
135135
<artifactId>protobuf-java-util</artifactId>
136136
</dependency>
137+
<dependency>
138+
<groupId>com.google.code.gson</groupId>
139+
<artifactId>gson</artifactId>
140+
</dependency>
137141
<dependency>
138142
<groupId>io.opencensus</groupId>
139143
<artifactId>opencensus-api</artifactId>
@@ -202,6 +206,10 @@
202206
<groupId>io.grpc</groupId>
203207
<artifactId>grpc-protobuf</artifactId>
204208
</dependency>
209+
<dependency>
210+
<groupId>io.grpc</groupId>
211+
<artifactId>grpc-opentelemetry</artifactId>
212+
</dependency>
205213
<dependency>
206214
<groupId>org.threeten</groupId>
207215
<artifactId>threetenbp</artifactId>

‎google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
@InternalApi("For internal use only")
2121
public final class Version {
2222
// {x-version-update-start:google-cloud-bigtable:current}
23-
public static String VERSION = "2.56.1-SNAPSHOT";
23+
public static String VERSION = "2.57.4-SNAPSHOT";
2424
// {x-version-update-end}
2525
}

0 commit comments

Comments
 (0)