You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by lc...@apache.org on 2018/10/25 01:47:13 UTC
[beam] branch master updated: Use Collections isEmpty() instead of
size() == 0 (#6720)
This is an automated email from the ASF dual-hosted git repository.
lcwik 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 92ea4b1 Use Collections isEmpty() instead of size() == 0 (#6720)
92ea4b1 is described below
commit 92ea4b1c462d7f87a2aec902d937bd7b2f748df4
Author: Colm O hEigeartaigh <co...@users.noreply.github.com>
AuthorDate: Thu Oct 25 02:47:05 2018 +0100
Use Collections isEmpty() instead of size() == 0 (#6720)
---
.../wrappers/streaming/io/UnboundedSourceWrapper.java | 2 +-
.../dataflow/worker/GroupAlsoByWindowParDoFnFactory.java | 4 ++--
.../apache/beam/runners/dataflow/worker/OrderedCode.java | 14 +++++++-------
.../runners/dataflow/worker/StreamingDataflowWorker.java | 2 +-
.../samza/translation/FlattenPCollectionsTranslator.java | 2 +-
.../java/org/apache/beam/sdk/RequiresStableInputIT.java | 2 +-
.../collection/BeamSqlSingleElementExpression.java | 2 +-
.../beam/sdk/extensions/sql/impl/rel/BeamSortRel.java | 4 ++--
.../org/apache/beam/sdk/io/aws/sqs/SqsUnboundedReader.java | 2 +-
9 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/io/UnboundedSourceWrapper.java b/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/io/UnboundedSourceWrapper.java
index a909892..7be626d 100644
--- a/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/io/UnboundedSourceWrapper.java
+++ b/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/io/UnboundedSourceWrapper.java
@@ -202,7 +202,7 @@ public class UnboundedSourceWrapper<OutputT, CheckpointMarkT extends UnboundedSo
ReaderInvocationUtil<OutputT, UnboundedSource.UnboundedReader<OutputT>> readerInvoker =
new ReaderInvocationUtil<>(stepName, serializedOptions.get(), metricContainer);
- if (localReaders.size() == 0) {
+ if (localReaders.isEmpty()) {
// It can happen when value of parallelism is greater than number of IO readers (for example,
// parallelism is 2 and number of Kafka topic partitions is 1). In this case, we just fall
// through to idle this executor.
diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/GroupAlsoByWindowParDoFnFactory.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/GroupAlsoByWindowParDoFnFactory.java
index 234bff1..d8cc554 100644
--- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/GroupAlsoByWindowParDoFnFactory.java
+++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/GroupAlsoByWindowParDoFnFactory.java
@@ -299,7 +299,7 @@ class GroupAlsoByWindowParDoFnFactory implements ParDoFnFactory {
@Override
public AccumT extractOutput(List<AccumT> accumulator) {
- if (accumulator.size() == 0) {
+ if (accumulator.isEmpty()) {
return combineFn.createAccumulator();
} else {
return combineFn.mergeAccumulators(accumulator);
@@ -360,7 +360,7 @@ class GroupAlsoByWindowParDoFnFactory implements ParDoFnFactory {
@Override
public AccumT extractOutput(List<AccumT> accumulator, Context c) {
- if (accumulator.size() == 0) {
+ if (accumulator.isEmpty()) {
return combineFnWithContext.createAccumulator(c);
} else {
return combineFnWithContext.mergeAccumulators(accumulator, c);
diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/OrderedCode.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/OrderedCode.java
index 7a1d8b2..070f563 100644
--- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/OrderedCode.java
+++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/OrderedCode.java
@@ -316,7 +316,7 @@ public class OrderedCode {
*/
public byte[] readBytes() {
if ((encodedArrays == null)
- || (encodedArrays.size() == 0)
+ || (encodedArrays.isEmpty())
|| ((encodedArrays.get(0)).length - firstArrayPosition <= 0)) {
throw new IllegalArgumentException("Invalid encoded byte array");
}
@@ -404,7 +404,7 @@ public class OrderedCode {
*/
public long readNumIncreasing() {
if ((encodedArrays == null)
- || (encodedArrays.size() == 0)
+ || (encodedArrays.isEmpty())
|| ((encodedArrays.get(0)).length - firstArrayPosition < 1)) {
throw new IllegalArgumentException("Invalid encoded byte array");
}
@@ -441,7 +441,7 @@ public class OrderedCode {
*/
public long readSignedNumIncreasing() {
if ((encodedArrays == null)
- || (encodedArrays.size() == 0)
+ || (encodedArrays.isEmpty())
|| ((encodedArrays.get(0)).length - firstArrayPosition < 1)) {
throw new IllegalArgumentException("Invalid encoded byte array");
}
@@ -518,7 +518,7 @@ public class OrderedCode {
*/
public boolean readInfinity() {
if ((encodedArrays == null)
- || (encodedArrays.size() == 0)
+ || (encodedArrays.isEmpty())
|| ((encodedArrays.get(0)).length - firstArrayPosition < 1)) {
throw new IllegalArgumentException("Invalid encoded byte array");
}
@@ -554,7 +554,7 @@ public class OrderedCode {
byte[] store = encodedArrays.get(0);
encodedArrays.remove(0);
- assert encodedArrays.size() == 0;
+ assert encodedArrays.isEmpty();
return Arrays.copyOfRange(store, firstArrayPosition, store.length);
}
@@ -565,7 +565,7 @@ public class OrderedCode {
*/
public byte[] readBytes(int len) {
if ((encodedArrays == null)
- || (encodedArrays.size() == 0)
+ || (encodedArrays.isEmpty())
|| ((encodedArrays.get(0)).length - firstArrayPosition < len)) {
throw new IllegalArgumentException("Invalid encoded byte array");
}
@@ -592,7 +592,7 @@ public class OrderedCode {
* performance. Therefore the returned array should not be modified.</b>
*/
public byte[] getEncodedBytes() {
- if (encodedArrays.size() == 0) {
+ if (encodedArrays.isEmpty()) {
return new byte[0];
}
if ((encodedArrays.size() == 1) && (firstArrayPosition == 0)) {
diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorker.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorker.java
index 2e72056..dd0ee5e 100644
--- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorker.java
+++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorker.java
@@ -690,7 +690,7 @@ public class StreamingDataflowWorker {
@VisibleForTesting
public boolean workExecutorIsEmpty() {
- return workUnitExecutor.getQueue().size() == 0;
+ return workUnitExecutor.getQueue().isEmpty();
}
public void start() {
diff --git a/runners/samza/src/main/java/org/apache/beam/runners/samza/translation/FlattenPCollectionsTranslator.java b/runners/samza/src/main/java/org/apache/beam/runners/samza/translation/FlattenPCollectionsTranslator.java
index a7d9720..74c68a1 100644
--- a/runners/samza/src/main/java/org/apache/beam/runners/samza/translation/FlattenPCollectionsTranslator.java
+++ b/runners/samza/src/main/java/org/apache/beam/runners/samza/translation/FlattenPCollectionsTranslator.java
@@ -57,7 +57,7 @@ class FlattenPCollectionsTranslator<T> implements TransformTranslator<Flatten.PC
inputStreams.add(ctx.getMessageStream(input));
}
- if (inputStreams.size() == 0) {
+ if (inputStreams.isEmpty()) {
final MessageStream<OpMessage<T>> noOpStream =
ctx.getDummyStream()
.flatMap(OpAdapter.adapt((Op<String, T, Void>) (inputElement, emitter) -> {}));
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/RequiresStableInputIT.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/RequiresStableInputIT.java
index 617a7b1..ceaa774 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/RequiresStableInputIT.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/RequiresStableInputIT.java
@@ -77,7 +77,7 @@ public class RequiresStableInputIT {
@ProcessElement
public void processElement(ProcessContext c) throws Exception {
MatchResult matchResult = FileSystems.match(outputPrefix + "*");
- boolean firstTime = (matchResult.metadata().size() == 0);
+ boolean firstTime = matchResult.metadata().isEmpty();
KV<String, String> kv = c.element();
writeTextToFileSideEffect(kv.getValue(), outputPrefix + kv.getKey());
diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/collection/BeamSqlSingleElementExpression.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/collection/BeamSqlSingleElementExpression.java
index b6007ad..496f0cb 100644
--- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/collection/BeamSqlSingleElementExpression.java
+++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/collection/BeamSqlSingleElementExpression.java
@@ -49,7 +49,7 @@ public class BeamSqlSingleElementExpression extends BeamSqlExpression {
Collection<Object> collection = (Collection) opValueEvaluated(0, inputRow, window, env);
if (collection.size() <= 1) {
- return (collection.size() == 0)
+ return collection.isEmpty()
? BeamSqlPrimitive.of(outputType, null)
: BeamSqlPrimitive.of(outputType, collection.iterator().next());
}
diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSortRel.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSortRel.java
index 77aea36..4cca72b 100644
--- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSortRel.java
+++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/rel/BeamSortRel.java
@@ -133,7 +133,7 @@ public class BeamSortRel extends Sort implements BeamRelNode {
}
public boolean isLimitOnly() {
- return fieldIndices.size() == 0;
+ return fieldIndices.isEmpty();
}
public int getCount() {
@@ -160,7 +160,7 @@ public class BeamSortRel extends Sort implements BeamRelNode {
// - GroupByKey (used in Top) is not allowed on unbounded data in global window so ORDER BY ... LIMIT
// works only on bounded data.
// - Just LIMIT operates on unbounded data, but across windows.
- if (fieldIndices.size() == 0) {
+ if (fieldIndices.isEmpty()) {
// TODO(https://issues.apache.org/jira/projects/BEAM/issues/BEAM-4702)
// Figure out which operations are per-window and which are not.
return upstream
diff --git a/sdks/java/io/amazon-web-services/src/main/java/org/apache/beam/sdk/io/aws/sqs/SqsUnboundedReader.java b/sdks/java/io/amazon-web-services/src/main/java/org/apache/beam/sdk/io/aws/sqs/SqsUnboundedReader.java
index 24bef19..29d2106 100644
--- a/sdks/java/io/amazon-web-services/src/main/java/org/apache/beam/sdk/io/aws/sqs/SqsUnboundedReader.java
+++ b/sdks/java/io/amazon-web-services/src/main/java/org/apache/beam/sdk/io/aws/sqs/SqsUnboundedReader.java
@@ -149,7 +149,7 @@ class SqsUnboundedReader extends UnboundedSource.UnboundedReader<Message> implem
final List<Message> messages = receiveMessageResult.getMessages();
- if (messages == null || messages.size() == 0) {
+ if (messages == null || messages.isEmpty()) {
return;
}