BOOKKEEPER-1010: Moving Guava to 20.0

This patch updates Guava to version 20.0 and shades it Author: arvindkandhare <arvind.kandhare@emc.com> Author: eolivelli <eolivelli@apache.org> Reviewers: Sijie Guo, Enrico Olivelli Closes apache#166 from eolivelli/guava_version
reddycharan · Apr 6, 2018 · 12e9110 · 12e9110
1 parent 60032b1
commit 12e9110
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 14 deletions.
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java
@@ -792,8 +792,8 @@ public void run() {
         ZeroBuffer.put(paddingBuff);
         JournalChannel logFile = null;
         forceWriteThread.start();
-        Stopwatch journalCreationWatcher = new Stopwatch();
-        Stopwatch journalFlushWatcher = new Stopwatch();
+        Stopwatch journalCreationWatcher = Stopwatch.createUnstarted();
+        Stopwatch journalFlushWatcher = Stopwatch.createUnstarted();
         long batchSize = 0;
         try {
             List<Long> journalIds = listJournalIds(journalDirectory, null);
@@ -822,7 +822,7 @@ public void run() {
                                         removePagesFromCache,
                                         conf.getJournalFormatVersionToWrite());
                     journalCreationStats.registerSuccessfulEvent(
-                            journalCreationWatcher.stop().elapsedTime(TimeUnit.NANOSECONDS), TimeUnit.NANOSECONDS);
+                            journalCreationWatcher.stop().elapsed(TimeUnit.NANOSECONDS), TimeUnit.NANOSECONDS);
 
                     bc = logFile.getBufferedChannel();
 
@@ -890,7 +890,7 @@ public void run() {
                             bc.flush(false);
                             lastFlushPosition = bc.position();
                             journalFlushStats.registerSuccessfulEvent(
-                                    journalFlushWatcher.stop().elapsedTime(TimeUnit.NANOSECONDS), TimeUnit.NANOSECONDS);
+                                    journalFlushWatcher.stop().elapsed(TimeUnit.NANOSECONDS), TimeUnit.NANOSECONDS);
 
                             // Trace the lifetime of entries through persistence
                             if (LOG.isDebugEnabled()) {

diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/Value.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/Value.java
@@ -22,6 +22,7 @@
 import com.google.common.hash.HashFunction;
 import com.google.common.hash.Hashing;
 
+import java.nio.charset.Charset;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
@@ -92,7 +93,7 @@ public int hashCode() {
         HashFunction hf = Hashing.murmur3_32();
         Hasher hc = hf.newHasher();
         for (String key : fields.keySet()) {
-            hc.putString(key);
+            hc.putString(key, Charset.defaultCharset());
         }
         return hc.hash().asInt();
     }

diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java
@@ -356,10 +356,9 @@ public void doCheckAllLedgers() {
                     return;
                 }
 
-                Stopwatch stopwatch = new Stopwatch().start();
+                Stopwatch stopwatch = Stopwatch.createStarted();
                 checkAllLedgers();
-                checkAllLedgersTime.registerSuccessfulEvent(stopwatch.stop().elapsedMillis(),
-                                                            TimeUnit.MILLISECONDS);
+                checkAllLedgersTime.registerSuccessfulEvent(stopwatch.stop().elapsed(TimeUnit.MILLISECONDS), TimeUnit.MILLISECONDS);
             } catch (KeeperException ke) {
                 LOG.error("Exception while running periodic check", ke);
             } catch (InterruptedException ie) {
@@ -504,7 +503,7 @@ private void auditBookies()
             return;
         }
 
-        Stopwatch stopwatch = new Stopwatch().start();
+        Stopwatch stopwatch = Stopwatch.createStarted();
         // put exit cases here
         Map<String, Set<Long>> ledgerDetails = generateBookie2LedgersIndex();
         try {
@@ -519,16 +518,17 @@ private void auditBookies()
                       + "Will retry after a period");
             return;
         }
+
         try {
             List<String> availableBookies = getAvailableBookies();
             // find lost bookies
             Set<String> knownBookies = ledgerDetails.keySet();
             Collection<String> lostBookies = CollectionUtils.subtract(knownBookies, availableBookies);
 
-            bookieToLedgersMapCreationTime.registerSuccessfulEvent(stopwatch.elapsedMillis(), TimeUnit.MILLISECONDS);
+            bookieToLedgersMapCreationTime.registerSuccessfulEvent(stopwatch.elapsed(TimeUnit.MILLISECONDS), TimeUnit.MILLISECONDS);
             if (lostBookies.size() > 0) {
                 handleLostBookies(lostBookies, ledgerDetails);
-                uRLPublishTimeForLostBookies.registerSuccessfulEvent(stopwatch.stop().elapsedMillis(),
+                uRLPublishTimeForLostBookies.registerSuccessfulEvent(stopwatch.stop().elapsed(TimeUnit.MILLISECONDS),
                         TimeUnit.MILLISECONDS);
             }
         } finally {

diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/ReplicationWorker.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/ReplicationWorker.java
@@ -210,12 +210,12 @@ void rereplicate() throws InterruptedException, BKException,
         long ledgerIdToReplicate = underreplicationManager
                 .getLedgerToRereplicate();
 
-        Stopwatch stopwatch = new Stopwatch().start();
+        Stopwatch stopwatch = Stopwatch.createStarted();
         boolean success = false;
         try {
             success = rereplicate(ledgerIdToReplicate);
         } finally {
-            long latencyMillis = stopwatch.stop().elapsedMillis();
+            long latencyMillis = stopwatch.stop().elapsed(TimeUnit.MILLISECONDS);
             if (success) {
                 rereplicateOpStats.registerSuccessfulEvent(latencyMillis, TimeUnit.MILLISECONDS);
             } else {

diff --git a/...e-metrics-provider/src/main/java/org/apache/bookkeeper/stats/CodahaleMetricsProvider.java b/...e-metrics-provider/src/main/java/org/apache/bookkeeper/stats/CodahaleMetricsProvider.java
@@ -48,6 +48,7 @@
 import com.google.common.net.HostAndPort;
 
 
+@SuppressWarnings("deprecation")
 public class CodahaleMetricsProvider implements StatsProvider {
 
     static final Logger LOG = LoggerFactory.getLogger(CodahaleMetricsProvider.class);

diff --git a/compat-deps/bookkeeper-server-compat-4.0.0/pom.xml b/compat-deps/bookkeeper-server-compat-4.0.0/pom.xml
@@ -78,6 +78,7 @@
                   <include>com.google.protobuf:protobuf-java</include>
                   <include>org.apache.*:*</include>
                   <include>org.jboss.*:*</include>
+                  <include>com.google.guava:guava</include>
                   <include>commons-*:*</include>
                 </includes>
                 <excludes>
@@ -100,6 +101,10 @@
                   <pattern>org.jboss</pattern>
                   <shadedPattern>org.jboss.bk_v4_0_0</shadedPattern>
                 </relocation>
+                 <relocation>
+                  <pattern>com.google</pattern>
+                  <shadedPattern>com.google.bk_v4_0_0</shadedPattern>
+                </relocation>
               </relocations>
             </configuration>
           </execution>

diff --git a/compat-deps/bookkeeper-server-compat-4.1.0/pom.xml b/compat-deps/bookkeeper-server-compat-4.1.0/pom.xml
@@ -78,6 +78,7 @@
                   <include>com.google.protobuf:protobuf-java</include>
                   <include>org.apache.*:*</include>
                   <include>org.jboss.*:*</include>
+                  <include>com.google.guava:guava</include>
                   <include>commons-*:*</include>
                 </includes>
                 <excludes>
@@ -109,6 +110,10 @@
                   <pattern>org.jboss</pattern>
                   <shadedPattern>org.jboss.bk_v4_1_0</shadedPattern>
                 </relocation>
+                 <relocation>
+                  <pattern>com.google</pattern>
+                  <shadedPattern>com.google.bk_v4_1_0</shadedPattern>
+                </relocation>
               </relocations>
             </configuration>
           </execution>

diff --git a/compat-deps/bookkeeper-server-compat-4.2.0/pom.xml b/compat-deps/bookkeeper-server-compat-4.2.0/pom.xml
@@ -78,6 +78,7 @@
                   <include>com.google.protobuf:protobuf-java</include>
                   <include>org.apache.*:*</include>
                   <include>org.jboss.*:*</include>
+                  <include>com.google.guava:guava</include>
                   <include>commons-*:*</include>
                 </includes>
                 <excludes>
@@ -109,6 +110,10 @@
                   <pattern>org.jboss</pattern>
                   <shadedPattern>org.jboss.bk_v4_2_0</shadedPattern>
                 </relocation>
+                <relocation>
+                  <pattern>com.google</pattern>
+                  <shadedPattern>com.google.bk_v4_2_0</shadedPattern>
+                </relocation>
               </relocations>
             </configuration>
           </execution>

diff --git a/pom.xml b/pom.xml
@@ -46,7 +46,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <protobuf.version>2.6.1</protobuf.version>
-    <guava.version>13.0.1</guava.version>
+    <guava.version>20.0</guava.version>
     <slf4j.version>1.7.25</slf4j.version>
     <log4j.version>2.10.0</log4j.version>
     <disruptor.version>3.3.6</disruptor.version>