This is an automated email from the ASF dual-hosted git repository.
aleksey pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 2ab6e14aea69aad61eaa44bfc7390083f1cfa3af
Merge: 28882ec 03e83f2
Author: Aleksey Yeschenko <alek...@apache.org>
AuthorDate: Fri Nov 12 14:41:57 2021 +0000
Merge branch 'cassandra-4.0' into trunk
CHANGES.txt | 1 +
.../apache/cassandra/batchlog/BatchlogManager.java | 46 ++++++++++++++--------
.../org/apache/cassandra/hints/HintsService.java | 4 +-
3 files changed, 33 insertions(+), 18 deletions(-)
diff --cc src/java/org/apache/cassandra/batchlog/BatchlogManager.java
index 432858c,0f22b4b..147e7e9
--- a/src/java/org/apache/cassandra/batchlog/BatchlogManager.java
+++ b/src/java/org/apache/cassandra/batchlog/BatchlogManager.java
@@@ -32,11 -35,8 +32,10 @@@ import java.util.concurrent.TimeUnit
import java.util.concurrent.TimeoutException;
import com.google.common.annotations.VisibleForTesting;
- import com.google.common.collect.Collections2;
import com.google.common.collect.Iterables;
import com.google.common.util.concurrent.RateLimiter;
+import org.apache.cassandra.concurrent.ScheduledExecutorPlus;
+import org.apache.cassandra.utils.concurrent.Future;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@@ -76,9 -77,7 +75,8 @@@ import org.apache.cassandra.utils.FBUti
import org.apache.cassandra.utils.MBeanWrapper;
import org.apache.cassandra.utils.UUIDGen;
- import static com.google.common.collect.Iterables.transform;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static
org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory;
import static org.apache.cassandra.cql3.QueryProcessor.executeInternal;
import static
org.apache.cassandra.cql3.QueryProcessor.executeInternalWithPaging;
import static org.apache.cassandra.net.Verb.MUTATION_REQ;
diff --cc src/java/org/apache/cassandra/hints/HintsService.java
index f3957a1,a02367f..e80865b
--- a/src/java/org/apache/cassandra/hints/HintsService.java
+++ b/src/java/org/apache/cassandra/hints/HintsService.java
@@@ -21,11 -22,9 +21,12 @@@ import java.net.UnknownHostException
import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
+ import java.util.Objects;
import java.util.UUID;
-import java.util.concurrent.*;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Supplier;
import java.util.stream.Collectors;
@@@ -53,8 -49,8 +54,9 @@@ import org.apache.cassandra.dht.Token
import org.apache.cassandra.service.StorageProxy;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.MBeanWrapper;
+import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException;
+ import static com.google.common.collect.Iterables.filter;
import static com.google.common.collect.Iterables.transform;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
