You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ke...@apache.org on 2019/01/30 19:08:26 UTC
[beam] branch master updated: [BEAM-6545] Remove useless allowance
of null constructor in ByteArrayShufflePosition
This is an automated email from the ASF dual-hosted git repository.
kenn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new bc5e18b [BEAM-6545] Remove useless allowance of null constructor in ByteArrayShufflePosition
new bb49247 Merge pull request #7667: [BEAM-6545] Remove useless allowance of null constructor in ByteArrayShufflePosition
bc5e18b is described below
commit bc5e18b35d2ec7dbd1abe0eb9eeaf5bf030f8a7c
Author: Kenneth Knowles <kl...@google.com>
AuthorDate: Tue Jan 29 20:51:58 2019 -0800
[BEAM-6545] Remove useless allowance of null constructor in ByteArrayShufflePosition
---
.../beam/runners/dataflow/worker/GroupingShuffleReader.java | 8 ++++++--
.../beam/runners/dataflow/worker/PartitioningShuffleReader.java | 8 ++++++--
.../beam/runners/dataflow/worker/UngroupedShuffleReader.java | 8 ++++++--
.../worker/util/common/worker/ByteArrayShufflePosition.java | 4 ++--
4 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/GroupingShuffleReader.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/GroupingShuffleReader.java
index d4a2551..676a9d5 100644
--- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/GroupingShuffleReader.java
+++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/GroupingShuffleReader.java
@@ -235,8 +235,12 @@ public class GroupingShuffleReader<K, V> extends NativeReader<WindowedValue<KV<K
this.groups =
new GroupingShuffleEntryIterator(
entryReader,
- ByteArrayShufflePosition.fromBase64(parentReader.startShufflePosition),
- ByteArrayShufflePosition.fromBase64(parentReader.stopShufflePosition)) {
+ parentReader.startShufflePosition == null
+ ? null
+ : ByteArrayShufflePosition.fromBase64(parentReader.startShufflePosition),
+ parentReader.stopShufflePosition == null
+ ? null
+ : ByteArrayShufflePosition.fromBase64(parentReader.stopShufflePosition)) {
@Override
protected void notifyElementRead(long byteSize) {
// We accumulate the sum of bytes read in a local variable. This sum will be counted
diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/PartitioningShuffleReader.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/PartitioningShuffleReader.java
index ad92be4..7bbbdd2 100644
--- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/PartitioningShuffleReader.java
+++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/PartitioningShuffleReader.java
@@ -119,8 +119,12 @@ public class PartitioningShuffleReader<K, V> extends NativeReader<WindowedValue<
PartitioningShuffleReader<K, V> shuffleReader, ShuffleEntryReader entryReader) {
this.iterator =
entryReader.read(
- ByteArrayShufflePosition.fromBase64(shuffleReader.startShufflePosition),
- ByteArrayShufflePosition.fromBase64(shuffleReader.stopShufflePosition));
+ shuffleReader.startShufflePosition == null
+ ? null
+ : ByteArrayShufflePosition.fromBase64(shuffleReader.startShufflePosition),
+ shuffleReader.stopShufflePosition == null
+ ? null
+ : ByteArrayShufflePosition.fromBase64(shuffleReader.stopShufflePosition));
this.shuffleReader = shuffleReader;
this.entryReader = entryReader;
}
diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/UngroupedShuffleReader.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/UngroupedShuffleReader.java
index d43c1cd..77d5ae1 100644
--- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/UngroupedShuffleReader.java
+++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/UngroupedShuffleReader.java
@@ -88,8 +88,12 @@ public class UngroupedShuffleReader<T> extends NativeReader<T> {
UngroupedShuffleReader<T> shuffleReader, ShuffleEntryReader entryReader) {
this.iterator =
entryReader.read(
- ByteArrayShufflePosition.fromBase64(shuffleReader.startShufflePosition),
- ByteArrayShufflePosition.fromBase64(shuffleReader.stopShufflePosition));
+ shuffleReader.startShufflePosition == null
+ ? null
+ : ByteArrayShufflePosition.fromBase64(shuffleReader.startShufflePosition),
+ shuffleReader.stopShufflePosition == null
+ ? null
+ : ByteArrayShufflePosition.fromBase64(shuffleReader.stopShufflePosition));
this.shuffleReader = shuffleReader;
this.entryReader = entryReader;
}
diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/util/common/worker/ByteArrayShufflePosition.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/util/common/worker/ByteArrayShufflePosition.java
index 6cd4122..718a3e9 100644
--- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/util/common/worker/ByteArrayShufflePosition.java
+++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/util/common/worker/ByteArrayShufflePosition.java
@@ -38,11 +38,11 @@ public class ByteArrayShufflePosition implements Comparable<ShufflePosition>, Sh
this.position = position;
}
- public static ByteArrayShufflePosition fromBase64(@Nullable String position) {
+ public static ByteArrayShufflePosition fromBase64(String position) {
return ByteArrayShufflePosition.of(decodeBase64(position));
}
- public static ByteArrayShufflePosition of(@Nullable byte[] position) {
+ public static ByteArrayShufflePosition of(byte[] position) {
if (position == null) {
return null;
}