Use calculateTimeIdx to calculate array idx in LeapArray#getPreviousW…

…indow (#723) * also some code cleanup
alibaba · Jun 5, 2019 · 0176f0e · 0176f0e
1 parent ee38587
commit 0176f0e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/sentinel-core/src/main/java/com/alibaba/csp/sentinel/node/StatisticNode.java b/sentinel-core/src/main/java/com/alibaba/csp/sentinel/node/StatisticNode.java
@@ -147,8 +147,7 @@ public void reset() {
 
     @Override
     public long totalRequest() {
-        long totalRequest = rollingCounterInMinute.pass() + rollingCounterInMinute.block();
-        return totalRequest;
+        return rollingCounterInMinute.pass() + rollingCounterInMinute.block();
     }
 
     @Override

diff --git a/sentinel-core/src/main/java/com/alibaba/csp/sentinel/slots/statistic/base/LeapArray.java b/sentinel-core/src/main/java/com/alibaba/csp/sentinel/slots/statistic/base/LeapArray.java
@@ -209,8 +209,7 @@ public WindowWrap<T> getPreviousWindow(long timeMillis) {
         if (timeMillis < 0) {
             return null;
         }
-        long timeId = (timeMillis - windowLengthInMs) / windowLengthInMs;
-        int idx = (int)(timeId % array.length());
+        int idx = calculateTimeIdx(timeMillis - windowLengthInMs);
         timeMillis = timeMillis - windowLengthInMs;
         WindowWrap<T> wrap = array.get(idx);
 

diff --git a/sentinel-core/src/main/java/com/alibaba/csp/sentinel/slots/statistic/metric/ArrayMetric.java b/sentinel-core/src/main/java/com/alibaba/csp/sentinel/slots/statistic/metric/ArrayMetric.java
@@ -234,8 +234,8 @@ public void debug() {
 
     @Override
     public long previousWindowBlock() {
-        WindowWrap<MetricBucket> wrap = data.currentWindow();
-        wrap = data.getPreviousWindow();
+        data.currentWindow();
+        WindowWrap<MetricBucket> wrap = data.getPreviousWindow();
         if (wrap == null) {
             return 0;
         }
@@ -244,8 +244,8 @@ public long previousWindowBlock() {
 
     @Override
     public long previousWindowPass() {
-        WindowWrap<MetricBucket> wrap = data.currentWindow();
-        wrap = data.getPreviousWindow();
+        data.currentWindow();
+        WindowWrap<MetricBucket> wrap = data.getPreviousWindow();
         if (wrap == null) {
             return 0;
         }