Repository: flink Updated Branches: refs/heads/master dd4c8469b -> da37daa8b
[FLINK-9666] Use short-circuit logic in boolean contexts This closes #6212. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/da37daa8 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/da37daa8 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/da37daa8 Branch: refs/heads/master Commit: da37daa8ba387435abf6a3bc5629ce7d21a6b017 Parents: dd4c846 Author: lamber-ken <!@#123zxcQ> Authored: Wed Jun 20 12:26:10 2018 +0800 Committer: Till Rohrmann <[email protected]> Committed: Thu Jun 28 13:34:36 2018 +0200 ---------------------------------------------------------------------- .../flink/api/java/typeutils/runtime/PojoComparator.java | 2 +- .../src/main/java/org/apache/flink/types/StringValue.java | 2 +- .../main/java/org/apache/flink/optimizer/dag/TwoInputNode.java | 6 +++--- .../flink/optimizer/operators/CartesianProductDescriptor.java | 2 +- .../flink/runtime/instance/SlotSharingGroupAssignment.java | 2 +- .../runtime/operators/hash/ReOpenableMutableHashTable.java | 2 +- .../flink/runtime/operators/sort/NormalizedKeySorter.java | 2 +- .../flink/runtime/operators/sort/UnilateralSortMerger.java | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/da37daa8/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java index ece790e..2278489 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java @@ -286,7 +286,7 @@ public final class PojoComparator<T> extends CompositeTypeComparator<T> implemen @Override public void putNormalizedKey(T value, MemorySegment target, int offset, int numBytes) { int i = 0; - for (; i < this.numLeadingNormalizableKeys & numBytes > 0; i++) + for (; i < this.numLeadingNormalizableKeys && numBytes > 0; i++) { int len = this.normalizedKeyLengths[i]; len = numBytes >= len ? len : numBytes; http://git-wip-us.apache.org/repos/asf/flink/blob/da37daa8/flink-core/src/main/java/org/apache/flink/types/StringValue.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/types/StringValue.java b/flink-core/src/main/java/org/apache/flink/types/StringValue.java index feeec2a..1d1e80d 100644 --- a/flink-core/src/main/java/org/apache/flink/types/StringValue.java +++ b/flink-core/src/main/java/org/apache/flink/types/StringValue.java @@ -242,7 +242,7 @@ public class StringValue implements NormalizableKey<StringValue>, CharSequence, if (bytes == null) { throw new NullPointerException("Bytes must not be null"); } - if (len < 0 | offset < 0 | offset > bytes.length - len) { + if (len < 0 || offset < 0 || offset > bytes.length - len) { throw new IndexOutOfBoundsException(); } http://git-wip-us.apache.org/repos/asf/flink/blob/da37daa8/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/TwoInputNode.java ---------------------------------------------------------------------- diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/TwoInputNode.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/TwoInputNode.java index 48815dc..e7c02b0 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/TwoInputNode.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/dag/TwoInputNode.java @@ -685,15 +685,15 @@ public abstract class TwoInputNode extends OptimizerNode { } // okay combinations are both all dam or both no dam - if ( (damOnAllLeftPaths & damOnAllRightPaths) | (!someDamOnLeftPaths & !someDamOnRightPaths) ) { + if ( (damOnAllLeftPaths && damOnAllRightPaths) || (!someDamOnLeftPaths && !someDamOnRightPaths) ) { // good, either both materialize already on the way, or both fully pipeline } else { - if (someDamOnLeftPaths & !damOnAllRightPaths) { + if (someDamOnLeftPaths && !damOnAllRightPaths) { // right needs a pipeline breaker in2.setTempMode(in2.getTempMode().makePipelineBreaker()); } - if (someDamOnRightPaths & !damOnAllLeftPaths) { + if (someDamOnRightPaths && !damOnAllLeftPaths) { // right needs a pipeline breaker in1.setTempMode(in1.getTempMode().makePipelineBreaker()); } http://git-wip-us.apache.org/repos/asf/flink/blob/da37daa8/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CartesianProductDescriptor.java ---------------------------------------------------------------------- diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CartesianProductDescriptor.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CartesianProductDescriptor.java index d50c9b4..b552173 100644 --- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CartesianProductDescriptor.java +++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CartesianProductDescriptor.java @@ -40,7 +40,7 @@ public abstract class CartesianProductDescriptor extends OperatorDescriptorDual protected CartesianProductDescriptor(boolean allowBroadcastFirst, boolean allowBroadcastSecond) { - if (!(allowBroadcastFirst | allowBroadcastSecond)) { + if (!(allowBroadcastFirst || allowBroadcastSecond)) { throw new IllegalArgumentException(); } http://git-wip-us.apache.org/repos/asf/flink/blob/da37daa8/flink-runtime/src/main/java/org/apache/flink/runtime/instance/SlotSharingGroupAssignment.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/instance/SlotSharingGroupAssignment.java b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/SlotSharingGroupAssignment.java index e61ba58..562c3c7 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/instance/SlotSharingGroupAssignment.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/SlotSharingGroupAssignment.java @@ -540,7 +540,7 @@ public class SlotSharingGroupAssignment { */ private void internalDisposeEmptySharedSlot(SharedSlot sharedSlot) { // sanity check - if (sharedSlot.isAlive() | !sharedSlot.getSubSlots().isEmpty()) { + if (sharedSlot.isAlive() || !sharedSlot.getSubSlots().isEmpty()) { throw new IllegalArgumentException(); } http://git-wip-us.apache.org/repos/asf/flink/blob/da37daa8/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReOpenableMutableHashTable.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReOpenableMutableHashTable.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReOpenableMutableHashTable.java index b9ddff8..e20222e 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReOpenableMutableHashTable.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReOpenableMutableHashTable.java @@ -166,7 +166,7 @@ public class ReOpenableMutableHashTable<BT, PT> extends MutableHashTable<BT, PT> @Override protected void releaseTable() { - if(furtherPartitioning | this.currentRecursionDepth > 0) { + if(furtherPartitioning || this.currentRecursionDepth > 0) { super.releaseTable(); } } http://git-wip-us.apache.org/repos/asf/flink/blob/da37daa8/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/NormalizedKeySorter.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/NormalizedKeySorter.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/NormalizedKeySorter.java index 0fd6f38..512e73e 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/NormalizedKeySorter.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/NormalizedKeySorter.java @@ -310,7 +310,7 @@ public final class NormalizedKeySorter<T> implements InMemorySorter<T> { // ------------------------------------------------------------------------ private long readPointer(int logicalPosition) { - if (logicalPosition < 0 | logicalPosition >= this.numRecords) { + if (logicalPosition < 0 || logicalPosition >= this.numRecords) { throw new IndexOutOfBoundsException(); } http://git-wip-us.apache.org/repos/asf/flink/blob/da37daa8/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/UnilateralSortMerger.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/UnilateralSortMerger.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/UnilateralSortMerger.java index f70be29..934eeb7 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/UnilateralSortMerger.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/UnilateralSortMerger.java @@ -216,7 +216,7 @@ public class UnilateralSortMerger<E> implements Sorter<E> { throws IOException { // sanity checks - if (memoryManager == null | (ioManager == null && !noSpillingMemory) | serializerFactory == null | comparator == null) { + if (memoryManager == null || (ioManager == null && !noSpillingMemory) || serializerFactory == null || comparator == null) { throw new NullPointerException(); } if (parentTask == null) {
