You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2021/12/30 03:22:04 UTC
[pulsar] 10/18: fix: bug when allAll bucket (#13467)
This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 5637742489cb775d9c71ab8d7983f843f579ce91
Author: Lei Zhiyuan <le...@gmail.com>
AuthorDate: Tue Dec 28 19:33:01 2021 +0800
fix: bug when allAll bucket (#13467)
(cherry picked from commit 1235162cbe91fe04d0014d7ccd9672a7c68f4c36)
---
.../org/apache/bookkeeper/mledger/util/StatsBuckets.java | 2 +-
.../apache/bookkeeper/mledger/util/TestStatsBuckets.java | 13 +++++++++++++
.../org/apache/pulsar/websocket/stats/StatsBuckets.java | 2 +-
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/StatsBuckets.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/StatsBuckets.java
index 6d08bf4..dd77988 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/StatsBuckets.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/StatsBuckets.java
@@ -110,7 +110,7 @@ public class StatsBuckets {
buckets[i].add(other.values[i]);
}
- sumCounter.add(other.count);
+ sumCounter.add(other.sum);
}
private boolean isSorted(long[] array) {
diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/util/TestStatsBuckets.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/util/TestStatsBuckets.java
index 0236663..12efbb0 100644
--- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/util/TestStatsBuckets.java
+++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/util/TestStatsBuckets.java
@@ -99,4 +99,17 @@ public class TestStatsBuckets {
assertEquals(stats.getCount(), 3);
assertEquals(stats.getBuckets(), new long[] { 1, 0, 1, 1 });
}
+
+ @Test
+ public void testAddAll() {
+ StatsBuckets stats = new StatsBuckets(10, 20, 30);
+ stats.addValue(1);
+ stats.addValue(2);
+ stats.refresh();
+ StatsBuckets stats2 = new StatsBuckets(10, 20, 30);
+ stats2.addAll(stats);
+ stats2.refresh();
+ assertEquals(stats2.getSum(),3);
+ assertEquals(stats2.getCount(),2);
+ }
}
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/stats/StatsBuckets.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/stats/StatsBuckets.java
index 82f34d1..8625146 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/stats/StatsBuckets.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/stats/StatsBuckets.java
@@ -61,7 +61,7 @@ public class StatsBuckets {
for (int i = 0; i < buckets.length; i++) {
buckets[i].add(other.values[i]);
}
- sumCounter.add(other.count);
+ sumCounter.add(other.sum);
}