Skip to content

[CherryPick][#23062] Fix Java Examples_Flink in 2.42.0 release. #23605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lostluck merged 2 commits into from
Oct 12, 2022
Merged

[CherryPick][#23062] Fix Java Examples_Flink in 2.42.0 release. #23605

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0077a8
set table destination coder for multi partition writes
ahmedabu98 Oct 12, 2022
3a64fac
spotless
ahmedabu98 Oct 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions ...o/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BatchLoads.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ class BatchLoads<DestinationT, ElementT>
private final Coder<ElementT> elementCoder;
private final RowWriterFactory<ElementT, DestinationT> rowWriterFactory;
private final @Nullable String kmsKey;
private final boolean clusteringEnabled;
private final String tempDataset;
private Coder<TableDestination> tableDestinationCoder;

// The maximum number of times to retry failed load or copy jobs.
private int maxRetryJobs = DEFAULT_MAX_RETRY_JOBS;
Expand Down Expand Up @@ -186,9 +186,10 @@ class BatchLoads<DestinationT, ElementT>
this.elementCoder = elementCoder;
this.kmsKey = kmsKey;
this.rowWriterFactory = rowWriterFactory;
this.clusteringEnabled = clusteringEnabled;
schemaUpdateOptions = Collections.emptySet();
this.tempDataset = tempDataset;
this.tableDestinationCoder =
clusteringEnabled ? TableDestinationCoderV3.of() : TableDestinationCoderV2.of();
}

void setSchemaUpdateOptions(Set<SchemaUpdateOption> schemaUpdateOptions) {
Expand Down Expand Up @@ -493,7 +494,8 @@ public WriteResult expandUntriggered(PCollection<KV<DestinationT, ElementT>> inp
maxRetryJobs,
kmsKey,
loadJobProjectId))
.withSideInputs(copyJobIdPrefixView));
.withSideInputs(copyJobIdPrefixView))
.setCoder(tableDestinationCoder);

PCollectionList<TableDestination> allSuccessfulWrites =
PCollectionList.of(successfulSinglePartitionWrites).and(successfulMultiPartitionWrites);
Expand Down Expand Up @@ -755,9 +757,6 @@ PCollection<TableDestination> writeSinglePartition(
List<PCollectionView<?>> sideInputs = Lists.newArrayList(loadJobIdPrefixView);
sideInputs.addAll(dynamicDestinations.getSideInputs());

Coder<TableDestination> tableDestinationCoder =
clusteringEnabled ? TableDestinationCoderV3.of() : TableDestinationCoderV2.of();

Coder<KV<ShardedKey<DestinationT>, WritePartition.Result>> partitionsCoder =
KvCoder.of(
ShardedKeyCoder.of(NullableCoder.of(destinationCoder)),
Expand Down