Skip to content

Commit da168b8

Browse files
lqiu96lqiu96
authored
Merge branch 'main' into protobuf-v4x
2 parents 10d7b86 + 4cb9fab commit da168b8

File tree

31 files changed

+1137
-134
lines changed

31 files changed

+1137
-134
lines changed

‎.github/workflows/hermetic_library_generation.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
with:
3838
fetch-depth: 0
3939
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
40-
- uses: googleapis/sdk-platform-java/.github/scripts@v2.61.0
40+
- uses: googleapis/sdk-platform-java/.github/scripts@v2.62.1
4141
if: env.SHOULD_RUN == 'true'
4242
with:
4343
base_ref: ${{ github.base_ref }}

‎.github/workflows/unmanaged_dependency_check.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ jobs:
1717
# repository
1818
.kokoro/build.sh
1919
- name: Unmanaged dependency check
20-
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.52.0
20+
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.52.1
2121
with:
2222
bom-path: google-cloud-bigquerystorage-bom/pom.xml

‎.kokoro/continuous/graalvm-native-a.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.52.0" # {x-version-update:google-cloud-shared-dependencies:current}
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.52.1" # {x-version-update:google-cloud-shared-dependencies:current}
77
}
88

99
env_vars: {

‎.kokoro/continuous/graalvm-native-b.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.52.0" # {x-version-update:google-cloud-shared-dependencies:current}
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.52.1" # {x-version-update:google-cloud-shared-dependencies:current}
77
}
88

99
env_vars: {

‎.kokoro/continuous/graalvm-native-c.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.52.0" # {x-version-update:google-cloud-shared-dependencies:current}
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.52.1" # {x-version-update:google-cloud-shared-dependencies:current}
77
}
88

99
env_vars: {

‎CHANGELOG.md‎

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

3+
## [3.16.3](https://github.com/googleapis/java-bigquerystorage/compare/v3.16.2...v3.16.3) (2025-08-26)
4+
5+
6+
### Dependencies
7+
8+
* Update dependency com.google.cloud:sdk-platform-java-config to v3.52.0 ([#3076](https://github.com/googleapis/java-bigquerystorage/issues/3076)) ([a99d3f3](https://github.com/googleapis/java-bigquerystorage/commit/a99d3f32b7f732c276f5a57e317f3173044c7a8d))
9+
310
## [3.16.2](https://github.com/googleapis/java-bigquerystorage/compare/v3.16.1...v3.16.2) (2025-08-05)
411

512

‎README.md‎

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

6565
```Groovy
66-
implementation 'com.google.cloud:google-cloud-bigquerystorage:3.16.2'
66+
implementation 'com.google.cloud:google-cloud-bigquerystorage:3.16.3'
6767
```
6868

6969
If you are using SBT, add this to your dependencies:
7070

7171
```Scala
72-
libraryDependencies += "com.google.cloud" % "google-cloud-bigquerystorage" % "3.16.2"
72+
libraryDependencies += "com.google.cloud" % "google-cloud-bigquerystorage" % "3.16.3"
7373
```
7474

7575
## Authentication
@@ -256,7 +256,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
256256
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-bigquerystorage/java11.html
257257
[stability-image]: https://img.shields.io/badge/stability-stable-green
258258
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-bigquerystorage.svg
259-
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-bigquerystorage/3.16.2
259+
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-bigquerystorage/3.16.3
260260
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
261261
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
262262
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-bigquerystorage-bom</artifactId>
6-
<version>3.16.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquerystorage:current} -->
6+
<version>3.16.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquerystorage:current} -->
77
<packaging>pom</packaging>
88
<parent>
99
<groupId>com.google.cloud</groupId>
1010
<artifactId>sdk-platform-java-config</artifactId>
11-
<version>3.52.0</version>
11+
<version>3.52.1</version>
1212
</parent>
1313

1414
<name>Google Cloud bigquerystorage BOM</name>
@@ -52,57 +52,57 @@
5252
<dependency>
5353
<groupId>com.google.cloud</groupId>
5454
<artifactId>google-cloud-bigquerystorage</artifactId>
55-
<version>3.16.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquerystorage:current} -->
55+
<version>3.16.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquerystorage:current} -->
5656
</dependency>
5757
<dependency>
5858
<groupId>com.google.api.grpc</groupId>
5959
<artifactId>grpc-google-cloud-bigquerystorage-v1beta1</artifactId>
60-
<version>0.188.3-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigquerystorage-v1beta1:current} -->
60+
<version>0.188.4-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigquerystorage-v1beta1:current} -->
6161
</dependency>
6262
<dependency>
6363
<groupId>com.google.api.grpc</groupId>
6464
<artifactId>grpc-google-cloud-bigquerystorage-v1beta2</artifactId>
65-
<version>0.188.3-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigquerystorage-v1beta2:current} -->
65+
<version>0.188.4-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigquerystorage-v1beta2:current} -->
6666
</dependency>
6767
<dependency>
6868
<groupId>com.google.api.grpc</groupId>
6969
<artifactId>grpc-google-cloud-bigquerystorage-v1</artifactId>
70-
<version>3.16.3-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigquerystorage-v1:current} -->
70+
<version>3.16.4-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigquerystorage-v1:current} -->
7171
</dependency>
7272
<dependency>
7373
<groupId>com.google.api.grpc</groupId>
7474
<artifactId>grpc-google-cloud-bigquerystorage-v1alpha</artifactId>
75-
<version>3.16.3-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigquerystorage-v1alpha:current} -->
75+
<version>3.16.4-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigquerystorage-v1alpha:current} -->
7676
</dependency>
7777
<dependency>
7878
<groupId>com.google.api.grpc</groupId>
7979
<artifactId>grpc-google-cloud-bigquerystorage-v1beta</artifactId>
80-
<version>3.16.3-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigquerystorage-v1beta:current} -->
80+
<version>3.16.4-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigquerystorage-v1beta:current} -->
8181
</dependency>
8282
<dependency>
8383
<groupId>com.google.api.grpc</groupId>
8484
<artifactId>proto-google-cloud-bigquerystorage-v1beta1</artifactId>
85-
<version>0.188.3-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigquerystorage-v1beta1:current} -->
85+
<version>0.188.4-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigquerystorage-v1beta1:current} -->
8686
</dependency>
8787
<dependency>
8888
<groupId>com.google.api.grpc</groupId>
8989
<artifactId>proto-google-cloud-bigquerystorage-v1beta2</artifactId>
90-
<version>0.188.3-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigquerystorage-v1beta2:current} -->
90+
<version>0.188.4-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigquerystorage-v1beta2:current} -->
9191
</dependency>
9292
<dependency>
9393
<groupId>com.google.api.grpc</groupId>
9494
<artifactId>proto-google-cloud-bigquerystorage-v1</artifactId>
95-
<version>3.16.3-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigquerystorage-v1:current} -->
95+
<version>3.16.4-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigquerystorage-v1:current} -->
9696
</dependency>
9797
<dependency>
9898
<groupId>com.google.api.grpc</groupId>
9999
<artifactId>proto-google-cloud-bigquerystorage-v1alpha</artifactId>
100-
<version>3.16.3-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigquerystorage-v1alpha:current} -->
100+
<version>3.16.4-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigquerystorage-v1alpha:current} -->
101101
</dependency>
102102
<dependency>
103103
<groupId>com.google.api.grpc</groupId>
104104
<artifactId>proto-google-cloud-bigquerystorage-v1beta</artifactId>
105-
<version>3.16.3-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigquerystorage-v1beta:current} -->
105+
<version>3.16.4-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigquerystorage-v1beta:current} -->
106106
</dependency>
107107
</dependencies>
108108
</dependencyManagement>

‎google-cloud-bigquerystorage/pom.xml‎

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,33 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-bigquerystorage</artifactId>
6-
<version>3.16.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquerystorage:current} -->
6+
<version>3.16.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquerystorage:current} -->
77
<packaging>jar</packaging>
88
<name>BigQuery Storage</name>
99
<url>https://github.com/googleapis/java-bigquerystorage</url>
1010
<description>BigQuery Storage</description>
1111
<parent>
1212
<groupId>com.google.cloud</groupId>
1313
<artifactId>google-cloud-bigquerystorage-parent</artifactId>
14-
<version>3.16.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquerystorage:current} -->
14+
<version>3.16.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquerystorage:current} -->
1515
</parent>
1616
<properties>
1717
<site.installationModule>google-cloud-bigquerystorage</site.installationModule>
1818
</properties>
19+
<dependencyManagement>
20+
<dependencies>
21+
<dependency>
22+
<groupId>org.apache.arrow</groupId>
23+
<artifactId>arrow-vector</artifactId>
24+
<version>17.0.0</version>
25+
</dependency>
26+
<dependency>
27+
<groupId>org.apache.arrow</groupId>
28+
<artifactId>arrow-memory-core</artifactId>
29+
<version>17.0.0</version>
30+
</dependency>
31+
</dependencies>
32+
</dependencyManagement>
1933
<build>
2034
<extensions>
2135
<extension>
@@ -63,10 +77,6 @@
6377
<groupId>io.grpc</groupId>
6478
<artifactId>grpc-util</artifactId>
6579
</dependency>
66-
<dependency>
67-
<groupId>io.grpc</groupId>
68-
<artifactId>grpc-util</artifactId>
69-
</dependency>
7080
<dependency>
7181
<groupId>com.google.api</groupId>
7282
<artifactId>api-common</artifactId>
@@ -148,11 +158,11 @@
148158
<dependency>
149159
<groupId>org.json</groupId>
150160
<artifactId>json</artifactId>
151-
</dependency>
152-
<dependency>
153-
<groupId>com.google.auth</groupId>
154-
<artifactId>google-auth-library-credentials</artifactId>
155-
</dependency>
161+
</dependency>
162+
<dependency>
163+
<groupId>com.google.auth</groupId>
164+
<artifactId>google-auth-library-credentials</artifactId>
165+
</dependency>
156166
<dependency>
157167
<groupId>io.opentelemetry</groupId>
158168
<artifactId>opentelemetry-api</artifactId>
@@ -161,6 +171,10 @@
161171
<groupId>io.opentelemetry</groupId>
162172
<artifactId>opentelemetry-context</artifactId>
163173
</dependency>
174+
<dependency>
175+
<groupId>org.apache.arrow</groupId>
176+
<artifactId>arrow-vector</artifactId>
177+
</dependency>
164178

165179
<!-- Test dependencies -->
166180
<dependency>
@@ -195,10 +209,10 @@
195209
<version>1.4.4</version>
196210
<scope>test</scope>
197211
<exclusions>
198-
<exclusion>
199-
<groupId>org.checkerframework</groupId>
200-
<artifactId>checker-qual</artifactId>
201-
</exclusion>
212+
<exclusion>
213+
<groupId>org.checkerframework</groupId>
214+
<artifactId>checker-qual</artifactId>
215+
</exclusion>
202216
</exclusions>
203217
</dependency>
204218
<dependency>
@@ -213,11 +227,6 @@
213227
<version>1.11.4</version>
214228
<scope>test</scope>
215229
</dependency>
216-
<dependency>
217-
<groupId>org.apache.arrow</groupId>
218-
<artifactId>arrow-vector</artifactId>
219-
<scope>test</scope>
220-
</dependency>
221230
<dependency>
222231
<groupId>org.apache.arrow</groupId>
223232
<artifactId>arrow-memory-core</artifactId>
@@ -243,6 +252,10 @@
243252
<groupId>com.google.code.findbugs</groupId>
244253
<artifactId>jsr305</artifactId>
245254
</dependency>
255+
<dependency>
256+
<groupId>com.google.errorprone</groupId>
257+
<artifactId>error_prone_annotations</artifactId>
258+
</dependency>
246259
<dependency>
247260
<groupId>com.google.cloud</groupId>
248261
<artifactId>google-cloud-core</artifactId>

‎google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/AppendFormats.java‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
/*
2+
* Copyright 2025 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package com.google.cloud.bigquery.storage.v1;
17+
18+
import com.google.auto.value.AutoValue;
19+
import javax.annotation.Nullable;
20+
21+
/** Adapter class for data formats used in the AppendRows. */
22+
final class AppendFormats {
23+
/** Enum for the data format used in the AppendRows. */
24+
enum DataFormat {
25+
UNKNOWN,
26+
PROTO,
27+
ARROW
28+
}
29+
30+
/** Container class for the schema used in the AppendRows request. */
31+
@AutoValue
32+
abstract static class AppendRowsSchema {
33+
abstract DataFormat format();
34+
35+
@Nullable
36+
abstract ProtoSchema protoSchema();
37+
38+
@Nullable
39+
abstract ArrowSchema arrowSchema();
40+
41+
static AppendRowsSchema of(ProtoSchema protoSchema) {
42+
return new AutoValue_AppendFormats_AppendRowsSchema(
43+
DataFormat.PROTO, protoSchema, /* arrowSchema= */ null);
44+
}
45+
46+
static AppendRowsSchema of(ArrowSchema arrowSchema) {
47+
return new AutoValue_AppendFormats_AppendRowsSchema(
48+
DataFormat.ARROW, /* protoSchema= */ null, arrowSchema);
49+
}
50+
}
51+
52+
/** Container class for the data used in the AppendRows request. */
53+
@AutoValue
54+
abstract static class AppendRowsData {
55+
abstract DataFormat format();
56+
57+
@Nullable
58+
abstract ProtoRows protoRows();
59+
60+
@Nullable
61+
abstract ArrowRecordBatch arrowRecordBatch();
62+
63+
// Row count for arrowRecordBatch. It is defaulted to -1 of not set.
64+
abstract long recordBatchRowCount();
65+
66+
static AppendRowsData of(ProtoRows protoRows) {
67+
return new AutoValue_AppendFormats_AppendRowsData(
68+
DataFormat.PROTO, protoRows, /* arrowRecordBatch= */ null, /* recordBatchRowCount= */ -1);
69+
}
70+
71+
static AppendRowsData of(ArrowRecordBatch arrowRecordBatch) {
72+
return new AutoValue_AppendFormats_AppendRowsData(
73+
DataFormat.ARROW, /* protoRows= */ null, arrowRecordBatch, /* recordBatchRowCount= */ -1);
74+
}
75+
76+
static AppendRowsData of(ArrowRecordBatch arrowRecordBatch, long recordBatchRowCount) {
77+
return new AutoValue_AppendFormats_AppendRowsData(
78+
DataFormat.ARROW, /* protoRows= */ null, arrowRecordBatch, recordBatchRowCount);
79+
}
80+
}
81+
82+
private AppendFormats() {}
83+
}

0 commit comments

Comments
 (0)