You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by do...@apache.org on 2022/08/23 14:24:38 UTC
[accumulo] branch main updated: Replace use of Guava in ScanAttemptsImpl (#2880)
This is an automated email from the ASF dual-hosted git repository.
domgarguilo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/main by this push:
new 8caa41f917 Replace use of Guava in ScanAttemptsImpl (#2880)
8caa41f917 is described below
commit 8caa41f917ac5dc8e6220b736e682f1afd4dd288
Author: Dom G <do...@gmail.com>
AuthorDate: Tue Aug 23 10:24:33 2022 -0400
Replace use of Guava in ScanAttemptsImpl (#2880)
* Replace use of guava and add javadoc for ScanAttemptsImpl.snapshot()
---
.../accumulo/core/clientImpl/ScanAttemptsImpl.java | 35 +++++++++++++++-------
1 file changed, 25 insertions(+), 10 deletions(-)
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/ScanAttemptsImpl.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/ScanAttemptsImpl.java
index 3755c038a1..8ca3a44720 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ScanAttemptsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ScanAttemptsImpl.java
@@ -19,18 +19,17 @@
package org.apache.accumulo.core.clientImpl;
import java.util.Collection;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
import org.apache.accumulo.core.data.TabletId;
import org.apache.accumulo.core.spi.scan.ScanServerSelector.ScanAttempt;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.Maps;
-
/**
* This class is used to track scan attempts for the ScanServerSelector. Its designed to accept
* updates concurrently (useful for the batch scanner) and offers a snapshot. When a snapshot is
@@ -79,7 +78,7 @@ public class ScanAttemptsImpl {
}
}
- private Map<TabletId,Collection<ScanAttemptImpl>> attempts = new ConcurrentHashMap<>();
+ private final Map<TabletId,Collection<ScanAttemptImpl>> attempts = new ConcurrentHashMap<>();
private long mutationCounter = 0;
private void add(TabletId tablet, ScanAttempt.Result result, String server, long endTime) {
@@ -110,17 +109,33 @@ public class ScanAttemptsImpl {
};
}
+ /**
+ * Creates and returns a snapshot of ScanAttempt objects that were added before this call
+ *
+ * @return a map of TabletId to a collection ScanAttempt objects associated with that TabletId
+ */
Map<TabletId,Collection<ScanAttemptImpl>> snapshot() {
- // allows only seeing scan attempt objs that were added before this call
- long snapMC;
+ final long mutationCounterSnapshot;
synchronized (ScanAttemptsImpl.this) {
- snapMC = mutationCounter;
+ mutationCounterSnapshot = mutationCounter;
}
- var tmp = Maps.transformValues(attempts, tabletAttemptList -> Collections2
- .filter(tabletAttemptList, sai -> sai.getMutationCount() < snapMC));
- return Maps.filterEntries(tmp, entry -> !entry.getValue().isEmpty());
+ Map<TabletId,Collection<ScanAttemptImpl>> result = new ConcurrentHashMap<>();
+
+ attempts.forEach((tabletId, scanAttempts) -> {
+
+ // filter out ScanAttempt objects that were added after this call
+ List<ScanAttemptImpl> filteredScanAttempts = scanAttempts.stream()
+ .filter(scanAttempt -> scanAttempt.getMutationCount() < mutationCounterSnapshot)
+ .collect(Collectors.toList());
+
+ // only add an entry to the map if there are ScanAttempt objects for the current TabletId
+ if (!filteredScanAttempts.isEmpty())
+ result.put(tabletId, filteredScanAttempts);
+
+ });
+ return result;
}
}