You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2014/09/21 12:00:48 UTC
svn commit: r1626557 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/CHANGES.txt lucene/core/
lucene/core/src/java/org/apache/lucene/store/RateLimiter.java
lucene/core/src/test/org/apache/lucene/store/TestRateLimiter.java
Author: mikemccand
Date: Sun Sep 21 10:00:48 2014
New Revision: 1626557
URL: http://svn.apache.org/r1626557
Log:
LUCENE-5948: RateLimiter now fully inits itself on init
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/lucene/core/ (props changed)
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/RateLimiter.java
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/store/TestRateLimiter.java
Modified: lucene/dev/branches/branch_5x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/CHANGES.txt?rev=1626557&r1=1626556&r2=1626557&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/lucene/CHANGES.txt Sun Sep 21 10:00:48 2014
@@ -149,6 +149,9 @@ Bug Fixes
to enforce here); use simple string tokenizer. (Ryan Ernst, Uwe Schindler,
Robert Muir, Mike McCandless)
+* LUCENE-5948: RateLimiter now fully inits itself on init. (Varun
+ Thacker via Mike McCandless)
+
Documentation
* LUCENE-5392: Add/improve analysis package documentation to reflect
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/RateLimiter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/RateLimiter.java?rev=1626557&r1=1626556&r2=1626557&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/RateLimiter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/RateLimiter.java Sun Sep 21 10:00:48 2014
@@ -66,6 +66,7 @@ public abstract class RateLimiter {
/** mbPerSec is the MB/sec max IO rate */
public SimpleRateLimiter(double mbPerSec) {
setMbPerSec(mbPerSec);
+ lastNS = System.nanoTime();
}
/**
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/store/TestRateLimiter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/store/TestRateLimiter.java?rev=1626557&r1=1626556&r2=1626557&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/store/TestRateLimiter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/store/TestRateLimiter.java Sun Sep 21 10:00:48 2014
@@ -17,10 +17,8 @@ package org.apache.lucene.store;
* limitations under the License.
*/
-import java.util.Locale;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.lucene.store.RateLimiter.SimpleRateLimiter;
@@ -35,7 +33,6 @@ public final class TestRateLimiter exten
public void testPause() {
SimpleRateLimiter limiter = new SimpleRateLimiter(10); // 10 MB / Sec
- limiter.pause(2);//init
long pause = 0;
for (int i = 0; i < 3; i++) {
pause += limiter.pause(4 * 1024 * 1024); // fire up 3 * 4 MB