Repository: bookkeeper Updated Branches: refs/heads/master 6698912e4 -> fd3331a27
BOOKKEEPER-1010: Moving Guava to 20.0 This patch updates Guava to version 20.0 and shades it Author: arvindkandhare <[email protected]> Author: eolivelli <[email protected]> Reviewers: Sijie Guo, Enrico Olivelli Closes #166 from eolivelli/guava_version Project: http://git-wip-us.apache.org/repos/asf/bookkeeper/repo Commit: http://git-wip-us.apache.org/repos/asf/bookkeeper/commit/fd3331a2 Tree: http://git-wip-us.apache.org/repos/asf/bookkeeper/tree/fd3331a2 Diff: http://git-wip-us.apache.org/repos/asf/bookkeeper/diff/fd3331a2 Branch: refs/heads/master Commit: fd3331a2769a29c379ed63e21ed2dc3c0f85ba25 Parents: 6698912 Author: arvindkandhare <[email protected]> Authored: Fri May 26 16:52:57 2017 +0200 Committer: Enrico Olivelli <[email protected]> Committed: Fri May 26 16:52:57 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/bookkeeper/bookie/Journal.java | 8 ++++---- .../java/org/apache/bookkeeper/metastore/Value.java | 3 ++- .../org/apache/bookkeeper/replication/Auditor.java | 15 +++++++++------ .../bookkeeper/replication/ReplicationWorker.java | 4 ++-- .../bookkeeper/stats/CodahaleMetricsProvider.java | 1 + compat-deps/bookkeeper-server-compat-4.0.0/pom.xml | 5 +++++ compat-deps/bookkeeper-server-compat-4.1.0/pom.xml | 5 +++++ compat-deps/bookkeeper-server-compat-4.2.0/pom.xml | 5 +++++ pom.xml | 2 +- 9 files changed, 34 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/fd3331a2/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java ---------------------------------------------------------------------- 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 index c679ee9..6334d40 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java @@ -806,8 +806,8 @@ class Journal extends BookieCriticalThread implements CheckpointSource { final int journalAlignmentSize = conf.getJournalAlignmentSize(); 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); @@ -836,7 +836,7 @@ class Journal extends BookieCriticalThread implements CheckpointSource { removePagesFromCache, journalFormatVersionToWrite); journalCreationStats.registerSuccessfulEvent( - journalCreationWatcher.stop().elapsedTime(TimeUnit.NANOSECONDS), TimeUnit.NANOSECONDS); + journalCreationWatcher.stop().elapsed(TimeUnit.NANOSECONDS), TimeUnit.NANOSECONDS); bc = logFile.getBufferedChannel(); @@ -904,7 +904,7 @@ class Journal extends BookieCriticalThread implements CheckpointSource { 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()) { http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/fd3331a2/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/Value.java ---------------------------------------------------------------------- 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 index ef89245..ae2423c 100644 --- 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.Hasher; 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 class Value { 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(); } http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/fd3331a2/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java ---------------------------------------------------------------------- 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 index 037987b..8b679d6 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java @@ -286,10 +286,11 @@ public class Auditor implements BookiesListener { 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) { @@ -398,7 +399,7 @@ public class Auditor implements BookiesListener { return; } - Stopwatch stopwatch = new Stopwatch().start(); + Stopwatch stopwatch = Stopwatch.createStarted(); // put exit cases here Map<String, Set<Long>> ledgerDetails = generateBookie2LedgersIndex(); try { @@ -420,10 +421,12 @@ public class Auditor implements BookiesListener { 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(), TimeUnit.MILLISECONDS); + uRLPublishTimeForLostBookies.registerSuccessfulEvent(stopwatch.stop().elapsed(TimeUnit.MILLISECONDS), + TimeUnit.MILLISECONDS); } } http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/fd3331a2/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/ReplicationWorker.java ---------------------------------------------------------------------- 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 index e6e986f..da76546 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/ReplicationWorker.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/ReplicationWorker.java @@ -208,12 +208,12 @@ public class ReplicationWorker implements Runnable { 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 { http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/fd3331a2/bookkeeper-stats-providers/codahale-metrics-provider/src/main/java/org/apache/bookkeeper/stats/CodahaleMetricsProvider.java ---------------------------------------------------------------------- diff --git a/bookkeeper-stats-providers/codahale-metrics-provider/src/main/java/org/apache/bookkeeper/stats/CodahaleMetricsProvider.java b/bookkeeper-stats-providers/codahale-metrics-provider/src/main/java/org/apache/bookkeeper/stats/CodahaleMetricsProvider.java index 934076f..57890e9 100644 --- a/bookkeeper-stats-providers/codahale-metrics-provider/src/main/java/org/apache/bookkeeper/stats/CodahaleMetricsProvider.java +++ b/bookkeeper-stats-providers/codahale-metrics-provider/src/main/java/org/apache/bookkeeper/stats/CodahaleMetricsProvider.java @@ -46,6 +46,7 @@ import java.io.File; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@SuppressWarnings("deprecation") public class CodahaleMetricsProvider implements StatsProvider { static final Logger LOG = LoggerFactory.getLogger(CodahaleMetricsProvider.class); http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/fd3331a2/compat-deps/bookkeeper-server-compat-4.0.0/pom.xml ---------------------------------------------------------------------- diff --git a/compat-deps/bookkeeper-server-compat-4.0.0/pom.xml b/compat-deps/bookkeeper-server-compat-4.0.0/pom.xml index 82356f0..3a269ca 100644 --- a/compat-deps/bookkeeper-server-compat-4.0.0/pom.xml +++ b/compat-deps/bookkeeper-server-compat-4.0.0/pom.xml @@ -61,6 +61,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> @@ -83,6 +84,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> http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/fd3331a2/compat-deps/bookkeeper-server-compat-4.1.0/pom.xml ---------------------------------------------------------------------- diff --git a/compat-deps/bookkeeper-server-compat-4.1.0/pom.xml b/compat-deps/bookkeeper-server-compat-4.1.0/pom.xml index 72b3f51..23496d3 100644 --- a/compat-deps/bookkeeper-server-compat-4.1.0/pom.xml +++ b/compat-deps/bookkeeper-server-compat-4.1.0/pom.xml @@ -61,6 +61,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> @@ -92,6 +93,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> http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/fd3331a2/compat-deps/bookkeeper-server-compat-4.2.0/pom.xml ---------------------------------------------------------------------- diff --git a/compat-deps/bookkeeper-server-compat-4.2.0/pom.xml b/compat-deps/bookkeeper-server-compat-4.2.0/pom.xml index 5e761ff..741c504 100644 --- a/compat-deps/bookkeeper-server-compat-4.2.0/pom.xml +++ b/compat-deps/bookkeeper-server-compat-4.2.0/pom.xml @@ -61,6 +61,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> @@ -92,6 +93,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> http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/fd3331a2/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 76b4d24..e0f09b9 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,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> <netty.version>4.1.10.Final</netty.version> <zookeeper.version>3.5.1-alpha</zookeeper.version> <slf4j.version>1.7.25</slf4j.version>
