You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by mm...@apache.org on 2018/02/01 17:17:05 UTC
[incubator-pulsar] branch master updated: Remove deprecation
warnings related to access of PoolArenaMetric (#1161)
This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new fb72f72 Remove deprecation warnings related to access of PoolArenaMetric (#1161)
fb72f72 is described below
commit fb72f72e5a3eb53728b35f464fc9f0ae18cf8f65
Author: Dave Rusek <da...@gmail.com>
AuthorDate: Thu Feb 1 10:17:02 2018 -0700
Remove deprecation warnings related to access of PoolArenaMetric (#1161)
---
.../broker/stats/AllocatorStatsGenerator.java | 33 ++++++++++++++--------
.../stats/metrics/ManagedLedgerCacheMetrics.java | 2 +-
2 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/AllocatorStatsGenerator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/AllocatorStatsGenerator.java
index 4640927..998145b 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/AllocatorStatsGenerator.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/AllocatorStatsGenerator.java
@@ -47,16 +47,19 @@ public class AllocatorStatsGenerator {
}
AllocatorStats stats = new AllocatorStats();
- stats.directArenas = allocator.directArenas().stream().map(x -> newPoolArenaStats(x))
- .collect(Collectors.toList());
- stats.heapArenas = allocator.heapArenas().stream().map(x -> newPoolArenaStats(x)).collect(Collectors.toList());
+ stats.directArenas = allocator.metric().directArenas().stream()
+ .map(AllocatorStatsGenerator::newPoolArenaStats)
+ .collect(Collectors.toList());
+ stats.heapArenas = allocator.metric().heapArenas().stream()
+ .map(AllocatorStatsGenerator::newPoolArenaStats)
+ .collect(Collectors.toList());
- stats.numDirectArenas = allocator.numDirectArenas();
- stats.numHeapArenas = allocator.numHeapArenas();
- stats.numThreadLocalCaches = allocator.numThreadLocalCaches();
- stats.normalCacheSize = allocator.normalCacheSize();
- stats.smallCacheSize = allocator.smallCacheSize();
- stats.tinyCacheSize = allocator.tinyCacheSize();
+ stats.numDirectArenas = allocator.metric().numDirectArenas();
+ stats.numHeapArenas = allocator.metric().numHeapArenas();
+ stats.numThreadLocalCaches = allocator.metric().numThreadLocalCaches();
+ stats.normalCacheSize = allocator.metric().normalCacheSize();
+ stats.smallCacheSize = allocator.metric().smallCacheSize();
+ stats.tinyCacheSize = allocator.metric().tinyCacheSize();
return stats;
}
@@ -66,9 +69,15 @@ public class AllocatorStatsGenerator {
stats.numSmallSubpages = m.numSmallSubpages();
stats.numChunkLists = m.numChunkLists();
- stats.tinySubpages = m.tinySubpages().stream().map(x -> newPoolSubpageStats(x)).collect(Collectors.toList());
- stats.smallSubpages = m.smallSubpages().stream().map(x -> newPoolSubpageStats(x)).collect(Collectors.toList());
- stats.chunkLists = m.chunkLists().stream().map(x -> newPoolChunkListStats(x)).collect(Collectors.toList());
+ stats.tinySubpages = m.tinySubpages().stream()
+ .map(AllocatorStatsGenerator::newPoolSubpageStats)
+ .collect(Collectors.toList());
+ stats.smallSubpages = m.smallSubpages().stream()
+ .map(AllocatorStatsGenerator::newPoolSubpageStats)
+ .collect(Collectors.toList());
+ stats.chunkLists = m.chunkLists().stream()
+ .map(AllocatorStatsGenerator::newPoolChunkListStats)
+ .collect(Collectors.toList());
stats.numAllocations = m.numAllocations();
stats.numTinyAllocations = m.numTinyAllocations();
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedLedgerCacheMetrics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedLedgerCacheMetrics.java
index 95b828c..e16dfd1 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedLedgerCacheMetrics.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedLedgerCacheMetrics.java
@@ -66,7 +66,7 @@ public class ManagedLedgerCacheMetrics extends AbstractMetrics {
long totalAllocated = 0;
long totalUsed = 0;
- for (PoolArenaMetric arena : allocator.directArenas()) {
+ for (PoolArenaMetric arena : allocator.metric().directArenas()) {
activeAllocations += arena.numActiveAllocations();
activeAllocationsTiny += arena.numActiveTinyAllocations();
activeAllocationsSmall += arena.numActiveSmallAllocations();
--
To stop receiving notification emails like this one, please contact
mmerli@apache.org.