This is an automated email from the ASF dual-hosted git repository.
sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new df24f67 Use bulk operation instead of iteration
df24f67 is described below
commit df24f672ae7d0f9503980cd0a8f782470f6e663b
Author: vzhikserg <[email protected]>
AuthorDate: Sat Jul 20 03:15:30 2019 +0200
Use bulk operation instead of iteration
### Changes
* Use the `addAll` method instead of iteration
Reviewers: Sijie Guo <None>
This closes #2122 from vzhikserg/bulk-call-instead-of-iteration
---
.../apache/bookkeeper/meta/MetadataDrivers.java | 9 +++-----
.../apache/bookkeeper/bookie/CompactionTest.java | 4 +---
.../discover/MockRegistrationClient.java | 17 +++++----------
.../apache/bookkeeper/proto/MockBookieClient.java | 5 ++---
.../distributedlog/ReadAheadEntryReader.java | 8 ++------
.../distributedlog/bk/LedgerAllocatorPool.java | 24 ++++++----------------
.../namespace/NamespaceDriverManager.java | 5 ++---
7 files changed, 21 insertions(+), 51 deletions(-)
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/MetadataDrivers.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/MetadataDrivers.java
index 44c25df..cf5daf1 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/MetadataDrivers.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/MetadataDrivers.java
@@ -25,6 +25,7 @@ import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Sets;
import com.google.common.util.concurrent.UncheckedExecutionException;
import java.net.URI;
+import java.util.Collections;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -123,9 +124,7 @@ public final class MetadataDrivers {
String driversStr =
System.getProperty(BK_METADATA_CLIENT_DRIVERS_PROPERTY);
if (null != driversStr) {
String[] driversArray = StringUtils.split(driversStr, ':');
- for (String driver : driversArray) {
- driverList.add(driver);
- }
+ Collections.addAll(driverList, driversArray);
}
// initialize the drivers
@@ -152,9 +151,7 @@ public final class MetadataDrivers {
String driversStr =
System.getProperty(BK_METADATA_BOOKIE_DRIVERS_PROPERTY);
if (null != driversStr) {
String[] driversArray = StringUtils.split(driversStr, ':');
- for (String driver : driversArray) {
- driverList.add(driver);
- }
+ Collections.addAll(driverList, driversArray);
}
// initialize the drivers
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java
index adef116..8fd9c3a 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java
@@ -1380,9 +1380,7 @@ public abstract class CompactionTest extends
BookKeeperClusterTestCase {
File[] files =
Bookie.getCurrentDirectory(ledgerDirectory).listFiles(
file -> file.getName().endsWith(COMPACTED_SUFFIX));
if (files != null) {
- for (File file : files) {
- compactedLogFiles.add(file);
- }
+ Collections.addAll(compactedLogFiles, files);
}
}
return compactedLogFiles;
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/discover/MockRegistrationClient.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/discover/MockRegistrationClient.java
index 9ba5ae4..2004a0a 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/discover/MockRegistrationClient.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/discover/MockRegistrationClient.java
@@ -18,6 +18,7 @@
package org.apache.bookkeeper.discover;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -60,9 +61,7 @@ public class MockRegistrationClient implements
RegistrationClient {
CompletableFuture<Void> promise = new CompletableFuture<>();
executor.submit(() -> {
currentVersion++;
- for (BookieSocketAddress b : bookies) {
- this.bookies.add(b);
- }
+ Collections.addAll(this.bookies, bookies);
bookieWatchers.forEach(w ->
w.onBookiesChanged(versioned(this.bookies, currentVersion)));
promise.complete(null);
});
@@ -73,9 +72,7 @@ public class MockRegistrationClient implements
RegistrationClient {
CompletableFuture<Void> promise = new CompletableFuture<>();
executor.submit(() -> {
currentVersion++;
- for (BookieSocketAddress b : bookies) {
- this.bookies.add(b);
- }
+ this.bookies.addAll(Arrays.asList(bookies));
bookieWatchers.forEach(w ->
w.onBookiesChanged(versioned(this.bookies, currentVersion)));
promise.complete(null);
});
@@ -86,9 +83,7 @@ public class MockRegistrationClient implements
RegistrationClient {
CompletableFuture<Void> promise = new CompletableFuture<>();
executor.submit(() -> {
currentVersion++;
- for (BookieSocketAddress b : bookies) {
- this.readOnlyBookies.add(b);
- }
+ this.readOnlyBookies.addAll(Arrays.asList(bookies));
readOnlyBookieWatchers.forEach(w ->
w.onBookiesChanged(versioned(readOnlyBookies, currentVersion)));
promise.complete(null);
});
@@ -99,9 +94,7 @@ public class MockRegistrationClient implements
RegistrationClient {
CompletableFuture<Void> promise = new CompletableFuture<>();
executor.submit(() -> {
currentVersion++;
- for (BookieSocketAddress b : bookies) {
- this.readOnlyBookies.add(b);
- }
+ this.readOnlyBookies.addAll(Arrays.asList(bookies));
readOnlyBookieWatchers.forEach(w ->
w.onBookiesChanged(versioned(readOnlyBookies, currentVersion)));
promise.complete(null);
});
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/MockBookieClient.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/MockBookieClient.java
index 1cbddd3..1178a99 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/MockBookieClient.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/MockBookieClient.java
@@ -26,6 +26,7 @@ import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.buffer.UnpooledByteBufAllocator;
+import java.util.Arrays;
import java.util.Collections;
import java.util.EnumSet;
import java.util.List;
@@ -100,9 +101,7 @@ public class MockBookieClient implements BookieClient {
}
public void errorBookies(BookieSocketAddress... bookies) {
- for (BookieSocketAddress b : bookies) {
- errorBookies.add(b);
- }
+ errorBookies.addAll(Arrays.asList(bookies));
}
public void removeErrors(BookieSocketAddress... bookies) {
diff --git
a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/ReadAheadEntryReader.java
b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/ReadAheadEntryReader.java
index ccd42eb..424615a 100644
---
a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/ReadAheadEntryReader.java
+++
b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/ReadAheadEntryReader.java
@@ -482,9 +482,7 @@ class ReadAheadEntryReader implements
if (null != nextSegmentReader) {
segmentReadersToClose.add(nextSegmentReader);
}
- for (SegmentReader reader : segmentReaders) {
- segmentReadersToClose.add(reader);
- }
+ segmentReadersToClose.addAll(segmentReaders);
segmentReaders.clear();
for (SegmentReader reader : segmentReadersToClose) {
closeFutures.add(reader.close());
@@ -586,9 +584,7 @@ class ReadAheadEntryReader implements
}
lastEntryAddedTime.reset().start();
- for (Entry.Reader entry : entries) {
- entryQueue.add(entry);
- }
+ entryQueue.addAll(entries);
if (!entries.isEmpty()) {
Entry.Reader lastEntry = entries.get(entries.size() - 1);
nextEntryPosition.advance(lastEntry.getLSSN(),
lastEntry.getEntryId() + 1);
diff --git
a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/bk/LedgerAllocatorPool.java
b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/bk/LedgerAllocatorPool.java
index 2f654bb..048ce9f 100644
---
a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/bk/LedgerAllocatorPool.java
+++
b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/bk/LedgerAllocatorPool.java
@@ -407,15 +407,9 @@ public class LedgerAllocatorPool implements
LedgerAllocator {
synchronized (this) {
allocatorsToClose = Lists.newArrayListWithExpectedSize(
pendingList.size() + allocatingList.size() +
obtainMap.size());
- for (LedgerAllocator allocator : pendingList) {
- allocatorsToClose.add(allocator);
- }
- for (LedgerAllocator allocator : allocatingList) {
- allocatorsToClose.add(allocator);
- }
- for (LedgerAllocator allocator : obtainMap.values()) {
- allocatorsToClose.add(allocator);
- }
+ allocatorsToClose.addAll(pendingList);
+ allocatorsToClose.addAll(allocatingList);
+ allocatorsToClose.addAll(obtainMap.values());
}
return FutureUtils.processList(
allocatorsToClose,
@@ -430,15 +424,9 @@ public class LedgerAllocatorPool implements
LedgerAllocator {
synchronized (this) {
allocatorsToDelete = Lists.newArrayListWithExpectedSize(
pendingList.size() + allocatingList.size() +
obtainMap.size());
- for (LedgerAllocator allocator : pendingList) {
- allocatorsToDelete.add(allocator);
- }
- for (LedgerAllocator allocator : allocatingList) {
- allocatorsToDelete.add(allocator);
- }
- for (LedgerAllocator allocator : obtainMap.values()) {
- allocatorsToDelete.add(allocator);
- }
+ allocatorsToDelete.addAll(pendingList);
+ allocatorsToDelete.addAll(allocatingList);
+ allocatorsToDelete.addAll(obtainMap.values());
}
return FutureUtils.processList(
allocatorsToDelete,
diff --git
a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/namespace/NamespaceDriverManager.java
b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/namespace/NamespaceDriverManager.java
index 67b54a9..9446cd6 100644
---
a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/namespace/NamespaceDriverManager.java
+++
b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/namespace/NamespaceDriverManager.java
@@ -23,6 +23,7 @@ import static
com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.Objects;
import com.google.common.collect.Sets;
import java.net.URI;
+import java.util.Arrays;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -87,9 +88,7 @@ public class NamespaceDriverManager {
String driversStr =
System.getProperty("distributedlog.namespace.drivers");
if (null != driversStr) {
String[] driversArray = StringUtils.split(driversStr, ':');
- for (String driver : driversArray) {
- driverList.add(driver);
- }
+ driverList.addAll(Arrays.asList(driversArray));
}
// initialize the drivers
for (String driverClsName : driverList) {
