treewide: update "guava" package

build.xml

@@ -363,11 +363,10 @@
           <dependency groupId="org.xerial.snappy" artifactId="snappy-java" version="1.1.10.4"/>
           <dependency groupId="net.jpountz.lz4" artifactId="lz4" version="1.3.0"/>
           <dependency groupId="com.ning" artifactId="compress-lzf" version="0.8.4"/>
-          <dependency groupId="com.google.guava" artifactId="guava" version="18.0">
+          <dependency groupId="com.google.guava" artifactId="guava" version="32.1.3-jre">
             <exclusion groupId="com.google.code.findbugs" artifactId="jsr305" />
             <exclusion groupId="org.codehaus.mojo" artifactId="animal-sniffer-annotations" />
             <exclusion groupId="com.google.guava" artifactId="listenablefuture" />
-            <exclusion groupId="com.google.guava" artifactId="failureaccess" />
             <exclusion groupId="org.checkerframework" artifactId="checker-qual" />
             <exclusion groupId="com.google.errorprone" artifactId="error_prone_annotations" />
           </dependency>

src/java/org/apache/cassandra/io/sstable/Descriptor.java

@@ -270,7 +270,7 @@ public static Pair<Descriptor, String> fromFilename(File directory, String name,
         nexttok = tokenStack.pop();
         // generation OR format type
         SSTableFormat.Type fmt = SSTableFormat.Type.LEGACY;
-        if (!CharMatcher.DIGIT.matchesAllOf(nexttok))
+        if (!CharMatcher.inRange('0', '9').matchesAllOf(nexttok))
         {
             fmt = SSTableFormat.Type.validate(nexttok);
             nexttok = tokenStack.pop();

src/java/org/apache/cassandra/io/sstable/format/SSTableFormat.java

@@ -60,7 +60,7 @@ private Type(String name, SSTableFormat info)
         {
             //Since format comes right after generation
             //we disallow formats with numeric names
-            assert !CharMatcher.DIGIT.matchesAllOf(name);
+            assert !CharMatcher.inRange('0', '9').matchesAllOf(name);
 
             this.name = name;
             this.info = info;

src/java/org/apache/cassandra/locator/InetAddressAndPort.java

@@ -154,7 +154,7 @@ public static InetAddressAndPort getByNameOverrideDefaults(String name, Integer
         {
             port = hap.getPort();
         }
-        return getByAddressOverrideDefaults(InetAddress.getByName(hap.getHostText()), port);
+        return getByAddressOverrideDefaults(InetAddress.getByName(hap.getHost()), port);
     }
 
     public static InetAddressAndPort getByAddress(byte[] address) throws UnknownHostException

src/java/org/apache/cassandra/repair/RepairJob.java

@@ -87,7 +87,7 @@ public void run()
             }
             // When all snapshot complete, send validation requests
             ListenableFuture<List<InetAddress>> allSnapshotTasks = Futures.allAsList(snapshotTasks);
-            validations = Futures.transform(allSnapshotTasks, new AsyncFunction<List<InetAddress>, List<TreeResponse>>()
+            validations = Futures.transformAsync(allSnapshotTasks, new AsyncFunction<List<InetAddress>, List<TreeResponse>>()
             {
                 public ListenableFuture<List<TreeResponse>> apply(List<InetAddress> endpoints)
                 {
@@ -105,7 +105,7 @@ public ListenableFuture<List<TreeResponse>> apply(List<InetAddress> endpoints)
         }
 
         // When all validations complete, submit sync tasks
-        ListenableFuture<List<SyncStat>> syncResults = Futures.transform(validations, new AsyncFunction<List<TreeResponse>, List<SyncStat>>()
+        ListenableFuture<List<SyncStat>> syncResults = Futures.transformAsync(validations, new AsyncFunction<List<TreeResponse>, List<SyncStat>>()
         {
             public ListenableFuture<List<SyncStat>> apply(List<TreeResponse> trees)
             {
@@ -228,7 +228,7 @@ public void onSuccess(TreeResponse result)
 
                 // failure is handled at root of job chain
                 public void onFailure(Throwable t) {}
-            });
+            }, taskExecutor);
             currentTask = nextTask;
         }
         // start running tasks
@@ -285,7 +285,7 @@ public void onSuccess(TreeResponse result)
 
                     // failure is handled at root of job chain
                     public void onFailure(Throwable t) {}
-                });
+                }, taskExecutor);
                 currentTask = nextTask;
             }
             // start running tasks

src/java/org/apache/cassandra/repair/RepairRunnable.java

@@ -309,7 +309,7 @@ public void onFailure(Throwable t)
                                                              totalProgress,
                                                              message));
                 }
-            });
+            }, executor);
             futures.add(session);
         }
 
@@ -318,7 +318,7 @@ public void onFailure(Throwable t)
         final Collection<Range<Token>> successfulRanges = new ArrayList<>();
         final AtomicBoolean hasFailure = new AtomicBoolean();
         final ListenableFuture<List<RepairSessionResult>> allSessions = Futures.successfulAsList(futures);
-        ListenableFuture anticompactionResult = Futures.transform(allSessions, new AsyncFunction<List<RepairSessionResult>, Object>()
+        ListenableFuture anticompactionResult = Futures.transformAsync(allSessions, new AsyncFunction<List<RepairSessionResult>, Object>()
         {
             @SuppressWarnings("unchecked")
             public ListenableFuture apply(List<RepairSessionResult> results)
@@ -337,7 +337,7 @@ public ListenableFuture apply(List<RepairSessionResult> results)
                 }
                 return ActiveRepairService.instance.finishParentSession(parentSession, allNeighbors, successfulRanges);
             }
-        });
+        }, executor);
         Futures.addCallback(anticompactionResult, new FutureCallback<Object>()
         {
             public void onSuccess(Object result)
@@ -385,7 +385,7 @@ private void repairComplete()
                 }
                 executor.shutdownNow();
             }
-        });
+        }, executor);
     }
 
     private void addRangeToNeighbors(List<Pair<Set<InetAddress>, ? extends Collection<Range<Token>>>> neighborRangeList, Range<Token> range, Set<InetAddress> neighbors)

src/java/org/apache/cassandra/repair/RepairSession.java

@@ -296,7 +296,7 @@ public void onFailure(Throwable t)
                 Tracing.traceRepair("Session completed with the following error: {}", t);
                 forceShutdown(t);
             }
-        });
+        }, taskExecutor);
     }
 
     public void terminate()

src/java/org/apache/cassandra/service/ActiveRepairService.java

@@ -183,7 +183,7 @@ public void run()
                 failureDetector.unregisterFailureDetectionEventListener(task);
                 gossiper.unregister(task);
             }
-        }, MoreExecutors.sameThreadExecutor());
+        }, MoreExecutors.directExecutor());
     }
 
     public synchronized void terminateSessions()

src/java/org/apache/cassandra/service/StorageService.java

@@ -41,6 +41,7 @@
 import com.google.common.base.Predicate;
 import com.google.common.collect.*;
 import com.google.common.util.concurrent.*;
+import com.google.common.util.concurrent.MoreExecutors;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -1726,7 +1727,7 @@ public void onFailure(Throwable e)
                     progressSupport.progress("bootstrap", new ProgressEvent(ProgressEventType.ERROR, 1, 1, message));
                     progressSupport.progress("bootstrap", new ProgressEvent(ProgressEventType.COMPLETE, 1, 1, "Resume bootstrap complete"));
                 }
-            });
+            }, MoreExecutors.directExecutor());
             return true;
         }
         else
@@ -2847,7 +2848,7 @@ public void onFailure(Throwable t)
                 // We still want to send the notification
                 sendReplicationNotification(notifyEndpoint);
             }
-        });
+        }, MoreExecutors.directExecutor());
     }
 
     // needs to be modified to accept either a keyspace or ARS.

src/java/org/apache/cassandra/streaming/StreamResultFuture.java

@@ -24,6 +24,7 @@
 
 import com.google.common.util.concurrent.AbstractFuture;
 import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.MoreExecutors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -140,7 +141,7 @@ private void attachConnection(InetAddress from, int sessionIndex, IncomingStream
 
     public void addEventListener(StreamEventHandler listener)
     {
-        Futures.addCallback(this, listener);
+        Futures.addCallback(this, listener, MoreExecutors.directExecutor());
         eventListeners.add(listener);
     }
 

test/unit/org/apache/cassandra/hints/HintsServiceTest.java

@@ -27,6 +27,7 @@
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -125,7 +126,7 @@ public void onSuccess(@Nullable Boolean aBoolean)
             {
                 HintsService.instance.resumeDispatch();
             }
-        });
+        }, MoreExecutors.directExecutor());
 
         Futures.allAsList(
                 noMessagesWhilePaused,

test/unit/org/apache/cassandra/net/MockMessagingSpy.java

@@ -54,7 +54,7 @@ public class MockMessagingSpy
      */
     public ListenableFuture<MessageIn<?>> captureMockedMessageIn()
     {
-        return Futures.transform(captureMockedMessageInN(1), (List<MessageIn<?>> result) -> result.isEmpty() ? null : result.get(0));
+        return Futures.transform(captureMockedMessageInN(1), (List<MessageIn<?>> result) -> result.isEmpty() ? null : result.get(0), executor);
     }
 
     /**
@@ -90,7 +90,7 @@ public ListenableFuture<Boolean> expectMockedMessageIn(int noOfMessages)
      */
     public ListenableFuture<MessageOut<?>> captureMessageOut()
     {
-        return Futures.transform(captureMessageOut(1), (List<MessageOut<?>> result) -> result.isEmpty() ? null : result.get(0));
+        return Futures.transform(captureMessageOut(1), (List<MessageOut<?>> result) -> result.isEmpty() ? null : result.get(0), executor);
     }
 
     /**

test/unit/org/apache/cassandra/repair/RepairJobTest.java

@@ -237,7 +237,7 @@ public void testNoTreesRetainedAfterDifference() throws Throwable
         // SyncTasks themselves should not contain significant memory
         assertTrue(ObjectSizes.measureDeep(syncTasks) < 0.8 * singleTreeSize);
 
-        ListenableFuture<List<SyncStat>> syncResults = Futures.transform(Futures.immediateFuture(mockTreeResponses), new AsyncFunction<List<TreeResponse>, List<SyncStat>>()
+        ListenableFuture<List<SyncStat>> syncResults = Futures.transformAsync(Futures.immediateFuture(mockTreeResponses), new AsyncFunction<List<TreeResponse>, List<SyncStat>>()
         {
             public ListenableFuture<List<SyncStat>> apply(List<TreeResponse> treeResponses)
             {

test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java

@@ -25,6 +25,7 @@
 import com.google.common.collect.Iterables;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.MoreExecutors;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -125,7 +126,7 @@ public void onFailure(Throwable t)
             {
                 fail();
             }
-        });
+        }, MoreExecutors.directExecutor());
         // should be complete immediately
         futureResult.get(100, TimeUnit.MILLISECONDS);
     }