This is an automated email from the ASF dual-hosted git repository.
tvalentyn pushed a commit to branch release-2.35.0
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/release-2.35.0 by this push:
new 3a5714e [BEAM-13352] Cherry-pick #16090 onto the release branch.
(#16100)
3a5714e is described below
commit 3a5714eef2308c63d0dc2690e68cbc50dbf69b4e
Author: tvalentyn <tvalen...@users.noreply.github.com>
AuthorDate: Wed Dec 1 14:24:33 2021 -0800
[BEAM-13352] Cherry-pick #16090 onto the release branch. (#16100)
Co-authored-by: Reuven Lax <re...@google.com>
---
.../apache/beam/sdk/io/gcp/bigquery/StorageApiFinalizeWritesDoFn.java | 2 +-
.../beam/sdk/io/gcp/bigquery/StorageApiFlushAndFinalizeDoFn.java | 2 +-
.../beam/sdk/io/gcp/bigquery/StorageApiWriteUnshardedRecords.java | 4 ++--
.../beam/sdk/io/gcp/bigquery/StorageApiWritesShardedRecords.java | 2 +-
.../main/java/org/apache/beam/sdk/io/gcp/bigquery/WriteRename.java | 2 +-
.../main/java/org/apache/beam/sdk/io/gcp/bigquery/WriteTables.java | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/StorageApiFinalizeWritesDoFn.java
b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/StorageApiFinalizeWritesDoFn.java
index f935a63..7dd3485 100644
---
a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/StorageApiFinalizeWritesDoFn.java
+++
b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/StorageApiFinalizeWritesDoFn.java
@@ -61,7 +61,7 @@ class StorageApiFinalizeWritesDoFn extends DoFn<KV<String,
String>, Void> {
private Map<String, Collection<String>> commitStreams;
private final BigQueryServices bqServices;
- @Nullable private DatasetService datasetService;
+ private transient @Nullable DatasetService datasetService;
public StorageApiFinalizeWritesDoFn(BigQueryServices bqServices) {
this.bqServices = bqServices;
diff --git
a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/StorageApiFlushAndFinalizeDoFn.java
b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/StorageApiFlushAndFinalizeDoFn.java
index 4cf312e..e614ede 100644
---
a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/StorageApiFlushAndFinalizeDoFn.java
+++
b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/StorageApiFlushAndFinalizeDoFn.java
@@ -49,7 +49,7 @@ public class StorageApiFlushAndFinalizeDoFn extends
DoFn<KV<String, Operation>,
private static final Logger LOG =
LoggerFactory.getLogger(StorageApiFlushAndFinalizeDoFn.class);
private final BigQueryServices bqServices;
- @Nullable private DatasetService datasetService = null;
+ private transient @Nullable DatasetService datasetService = null;
private final Counter flushOperationsSent =
Metrics.counter(StorageApiFlushAndFinalizeDoFn.class,
"flushOperationsSent");
private final Counter flushOperationsSucceeded =
diff --git
a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/StorageApiWriteUnshardedRecords.java
b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/StorageApiWriteUnshardedRecords.java
index 0d775a6..2217a51 100644
---
a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/StorageApiWriteUnshardedRecords.java
+++
b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/StorageApiWriteUnshardedRecords.java
@@ -154,7 +154,7 @@ public class StorageApiWriteUnshardedRecords<DestinationT,
ElementT>
private @Nullable StreamAppendClient streamAppendClient = null;
private long currentOffset = 0;
private List<ByteString> pendingMessages;
- private @Nullable DatasetService datasetService;
+ private transient @Nullable DatasetService datasetService;
private final Counter recordsAppended =
Metrics.counter(WriteRecordsDoFn.class, "recordsAppended");
private final Counter appendFailures =
@@ -273,7 +273,7 @@ public class StorageApiWriteUnshardedRecords<DestinationT,
ElementT>
private Map<DestinationT, DestinationState> destinations =
Maps.newHashMap();
private final TwoLevelMessageConverterCache<DestinationT, ElementT>
messageConverters;
- private @Nullable DatasetService datasetService;
+ private transient @Nullable DatasetService datasetService;
private int numPendingRecords = 0;
private int numPendingRecordBytes = 0;
private static final int FLUSH_THRESHOLD_RECORDS = 100;
diff --git
a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/StorageApiWritesShardedRecords.java
b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/StorageApiWritesShardedRecords.java
index c0009df..aacab97 100644
---
a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/StorageApiWritesShardedRecords.java
+++
b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/StorageApiWritesShardedRecords.java
@@ -199,7 +199,7 @@ public class StorageApiWritesShardedRecords<DestinationT,
ElementT>
private Map<DestinationT, TableDestination> destinations =
Maps.newHashMap();
- private @Nullable DatasetService datasetServiceInternal = null;
+ private transient @Nullable DatasetService datasetServiceInternal = null;
// Stores the current stream for this key.
@StateId("streamName")
diff --git
a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/WriteRename.java
b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/WriteRename.java
index c58f967..b9965fa 100644
---
a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/WriteRename.java
+++
b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/WriteRename.java
@@ -67,7 +67,7 @@ class WriteRename extends DoFn<Iterable<KV<TableDestination,
WriteTables.Result>
private final int maxRetryJobs;
private final String kmsKey;
private final ValueProvider<String> loadJobProjectId;
- private @Nullable DatasetService datasetService;
+ private transient @Nullable DatasetService datasetService;
private static class PendingJobData {
final BigQueryHelpers.PendingJob retryJob;
diff --git
a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/WriteTables.java
b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/WriteTables.java
index 1a2365b..1637f13 100644
---
a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/WriteTables.java
+++
b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/WriteTables.java
@@ -145,7 +145,7 @@ class WriteTables<DestinationT>
private final @Nullable String kmsKey;
private final String sourceFormat;
private final boolean useAvroLogicalTypes;
- private @Nullable DatasetService datasetService;
+ private transient @Nullable DatasetService datasetService;
private @Nullable JobService jobService;
private class WriteTablesDoFn
