Skip to content

Commit b70478e

Browse files
jfcongjfcong
committed
fix naming and use standard Timeunit library
1 parent 749faf7 commit b70478e

File tree

4 files changed

+40
-38
lines changed

4 files changed

+40
-38
lines changed

‎firebase-perf/src/main/java/com/google/firebase/perf/transport/RateLimiter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,14 +264,14 @@ synchronized boolean check(@NonNull PerfMetric metric) {
264264
0,
265265
(long)
266266
(lastTimeTokenReplenished.getDurationMicros(now)
267-
* rate.getTokenPerSeconds()
267+
* rate.getTokensPerSeconds()
268268
/ MICROS_IN_A_SECOND));
269269
tokenCount = Math.min(tokenCount + newTokens, capacity);
270270
if (newTokens > 0) {
271271
lastTimeTokenReplenished =
272272
new Timer(
273273
lastTimeTokenReplenished.getMicros()
274-
+ (long) (newTokens * MICROS_IN_A_SECOND / rate.getTokenPerSeconds()));
274+
+ (long) (newTokens * MICROS_IN_A_SECOND / rate.getTokensPerSeconds()));
275275
}
276276
if (tokenCount > 0) {
277277
tokenCount--;

‎firebase-perf/src/main/java/com/google/firebase/perf/util/Rate.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@
1414

1515
package com.google.firebase.perf.util;
1616

17+
import static java.util.concurrent.TimeUnit.SECONDS;
18+
1719
import java.util.concurrent.TimeUnit;
1820

1921
/** A Rate object representing the number of tokens per total specified time unit. */
2022
public class Rate {
2123

22-
private static final long NANO_IN_SECOND = 1000 * 1000 * 1000;
23-
private static final long MICRO_IN_SECOND = 1000 * 1000;
24-
private static final long MILLI_IN_SECOND = 1000;
24+
private static final long NANO_IN_SECOND = SECONDS.toNanos(1);
25+
private static final long MICRO_IN_SECOND = SECONDS.toMicros(1);
26+
private static final long MILLI_IN_SECOND = SECONDS.toMillis(1);
2527

2628
private long numTokensPerTotalTimeUnit;
2729
private long numTimeUnits;
@@ -49,7 +51,7 @@ public Rate(long numTokensPerTotalTimeUnit, long numTimeUnits, TimeUnit timeUnit
4951
*
5052
* @return rate in tokens per second
5153
*/
52-
public double getTokenPerSeconds() {
54+
public double getTokensPerSeconds() {
5355
switch (timeUnit) {
5456
case NANOSECONDS:
5557
return ((double) numTokensPerTotalTimeUnit / numTimeUnits) * NANO_IN_SECOND;

‎firebase-perf/src/test/java/com/google/firebase/perf/transport/RateLimiterTest.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -515,10 +515,10 @@ public void getRateFromNetworkParams_nonDefaultValues_worksCorrectly() {
515515
NETWORK,
516516
/* isLogcatEnabled= */ false);
517517

518-
assertThat(limiter.getRate().getTokenPerSeconds()).isEqualTo(2.0);
519-
assertThat(limiter.getForegroundRate().getTokenPerSeconds()).isEqualTo(700.0d / 60L);
518+
assertThat(limiter.getRate().getTokensPerSeconds()).isEqualTo(2.0);
519+
assertThat(limiter.getForegroundRate().getTokensPerSeconds()).isEqualTo(700.0d / 60L);
520520
assertThat(limiter.getForegroundCapacity()).isEqualTo(700L);
521-
assertThat(limiter.getBackgroundRate().getTokenPerSeconds()).isEqualTo(60.0d / 60L);
521+
assertThat(limiter.getBackgroundRate().getTokensPerSeconds()).isEqualTo(60.0d / 60L);
522522
assertThat(limiter.getBackgroundCapacity()).isEqualTo(60L);
523523
}
524524

@@ -535,11 +535,11 @@ public void getRateFromNetworkParams_defaultValues_worksCorrectly() {
535535
NETWORK,
536536
/* isLogcatEnabled= */ false);
537537

538-
assertThat(limiter.getRate().getTokenPerSeconds()).isEqualTo(2.0);
538+
assertThat(limiter.getRate().getTokensPerSeconds()).isEqualTo(2.0);
539539

540-
assertThat(limiter.getForegroundRate().getTokenPerSeconds()).isEqualTo(700.0d / 600);
540+
assertThat(limiter.getForegroundRate().getTokensPerSeconds()).isEqualTo(700.0d / 600);
541541
assertThat(limiter.getForegroundCapacity()).isEqualTo(700L);
542-
assertThat(limiter.getBackgroundRate().getTokenPerSeconds()).isEqualTo(70.0d / 600);
542+
assertThat(limiter.getBackgroundRate().getTokensPerSeconds()).isEqualTo(70.0d / 600);
543543
assertThat(limiter.getBackgroundCapacity()).isEqualTo(70L);
544544
}
545545

@@ -560,10 +560,10 @@ public void getRateFromTraceParams_nonDefaultValues_worksCorrectly() {
560560
TRACE,
561561
/* isLogcatEnabled= */ false);
562562

563-
assertThat(limiter.getRate().getTokenPerSeconds()).isEqualTo(2.0);
564-
assertThat(limiter.getForegroundRate().getTokenPerSeconds()).isEqualTo(600.0d / 60L);
563+
assertThat(limiter.getRate().getTokensPerSeconds()).isEqualTo(2.0);
564+
assertThat(limiter.getForegroundRate().getTokensPerSeconds()).isEqualTo(600.0d / 60L);
565565
assertThat(limiter.getForegroundCapacity()).isEqualTo(600L);
566-
assertThat(limiter.getBackgroundRate().getTokenPerSeconds()).isEqualTo(60.0d / 60L);
566+
assertThat(limiter.getBackgroundRate().getTokensPerSeconds()).isEqualTo(60.0d / 60L);
567567
assertThat(limiter.getBackgroundCapacity()).isEqualTo(60L);
568568
}
569569

@@ -580,11 +580,11 @@ public void getRateFromTraceParams_defaultValues_worksCorrectly() {
580580
TRACE,
581581
/* isLogcatEnabled= */ false);
582582

583-
assertThat(limiter.getRate().getTokenPerSeconds()).isEqualTo(2.0);
583+
assertThat(limiter.getRate().getTokensPerSeconds()).isEqualTo(2.0);
584584

585-
assertThat(limiter.getForegroundRate().getTokenPerSeconds()).isEqualTo(300.0d / 600);
585+
assertThat(limiter.getForegroundRate().getTokensPerSeconds()).isEqualTo(300.0d / 600);
586586
assertThat(limiter.getForegroundCapacity()).isEqualTo(300L);
587-
assertThat(limiter.getBackgroundRate().getTokenPerSeconds()).isEqualTo(30.0d / 600);
587+
assertThat(limiter.getBackgroundRate().getTokensPerSeconds()).isEqualTo(30.0d / 600);
588588
assertThat(limiter.getBackgroundCapacity()).isEqualTo(30L);
589589
}
590590

‎firebase-perf/src/test/java/com/google/firebase/perf/util/RateTest.java

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,61 +26,61 @@
2626
public class RateTest {
2727

2828
@Test
29-
public void ratePerMinute() throws InterruptedException {
29+
public void ratePerMinute() throws Exception {
3030
Rate twoTokensPerMinute = new Rate(2, 1, TimeUnit.MINUTES);
3131
Rate twentyTokensPerTenMinutes = new Rate(5, 10, TimeUnit.MINUTES);
3232
Rate twoTokensPerTenMinutes = new Rate(2, 10, TimeUnit.MINUTES);
3333

34-
assertThat(twoTokensPerMinute.getTokenPerSeconds()).isEqualTo(2.0 / 60);
35-
assertThat(twentyTokensPerTenMinutes.getTokenPerSeconds()).isEqualTo((5.0 / 10) / 60);
36-
assertThat(twoTokensPerTenMinutes.getTokenPerSeconds()).isEqualTo((2.0 / 10) / 60);
34+
assertThat(twoTokensPerMinute.getTokensPerSeconds()).isEqualTo(2.0 / 60);
35+
assertThat(twentyTokensPerTenMinutes.getTokensPerSeconds()).isEqualTo((5.0 / 10) / 60);
36+
assertThat(twoTokensPerTenMinutes.getTokensPerSeconds()).isEqualTo((2.0 / 10) / 60);
3737
}
3838

3939
@Test
40-
public void ratePerSecond() throws InterruptedException {
40+
public void ratePerSecond() throws Exception {
4141
Rate twoTokensPerSecond = new Rate(2, 1, TimeUnit.SECONDS);
4242
Rate twoTokensPerThirtySeconds = new Rate(2, 30, TimeUnit.SECONDS);
4343
Rate seventyTokensPerThirtySeconds = new Rate(70, 30, TimeUnit.SECONDS);
4444

45-
assertThat(twoTokensPerSecond.getTokenPerSeconds()).isEqualTo(2.0);
46-
assertThat(twoTokensPerThirtySeconds.getTokenPerSeconds()).isEqualTo(2.0 / 30);
47-
assertThat(seventyTokensPerThirtySeconds.getTokenPerSeconds()).isEqualTo(70.0 / 30);
45+
assertThat(twoTokensPerSecond.getTokensPerSeconds()).isEqualTo(2.0);
46+
assertThat(twoTokensPerThirtySeconds.getTokensPerSeconds()).isEqualTo(2.0 / 30);
47+
assertThat(seventyTokensPerThirtySeconds.getTokensPerSeconds()).isEqualTo(70.0 / 30);
4848
}
4949

5050
@Test
51-
public void ratePerMillisecond() throws InterruptedException {
51+
public void ratePerMillisecond() throws Exception {
5252
Rate twoTokensPerMillisecond = new Rate(2, 1, TimeUnit.MILLISECONDS);
5353
Rate sevenTokensPerTenMillisecond = new Rate(7, 10, TimeUnit.MILLISECONDS);
5454
Rate thirtyOneTokensPerTenMillisecond = new Rate(31, 10, TimeUnit.MILLISECONDS);
5555

56-
assertThat(twoTokensPerMillisecond.getTokenPerSeconds()).isEqualTo(2.0 * 1000);
57-
assertThat(sevenTokensPerTenMillisecond.getTokenPerSeconds()).isEqualTo((7.0 / 10) * 1000);
58-
assertThat(thirtyOneTokensPerTenMillisecond.getTokenPerSeconds()).isEqualTo((31.0 / 10) * 1000);
56+
assertThat(twoTokensPerMillisecond.getTokensPerSeconds()).isEqualTo(2.0 * 1000);
57+
assertThat(sevenTokensPerTenMillisecond.getTokensPerSeconds()).isEqualTo((7.0 / 10) * 1000);
58+
assertThat(thirtyOneTokensPerTenMillisecond.getTokensPerSeconds()).isEqualTo((31.0 / 10) * 1000);
5959
}
6060

6161
@Test
62-
public void ratePerMicrosecond() throws InterruptedException {
62+
public void ratePerMicrosecond() throws Exception {
6363
Rate twoTokensPerMicrosecond = new Rate(2, 1, TimeUnit.MICROSECONDS);
6464
Rate sevenTokensPerTenMicroseconds = new Rate(7, 10, TimeUnit.MICROSECONDS);
6565
Rate thirtyOneTokensPerTenMicroseconds = new Rate(31, 10, TimeUnit.MICROSECONDS);
6666

67-
assertThat(twoTokensPerMicrosecond.getTokenPerSeconds()).isEqualTo(2.0 * 1000 * 1000);
68-
assertThat(sevenTokensPerTenMicroseconds.getTokenPerSeconds())
67+
assertThat(twoTokensPerMicrosecond.getTokensPerSeconds()).isEqualTo(2.0 * 1000 * 1000);
68+
assertThat(sevenTokensPerTenMicroseconds.getTokensPerSeconds())
6969
.isEqualTo((7.0 / 10) * 1000 * 1000);
70-
assertThat(thirtyOneTokensPerTenMicroseconds.getTokenPerSeconds())
70+
assertThat(thirtyOneTokensPerTenMicroseconds.getTokensPerSeconds())
7171
.isEqualTo((31.0 / 10) * 1000 * 1000);
7272
}
7373

7474
@Test
75-
public void ratePerNanosecond() throws InterruptedException {
75+
public void ratePerNanosecond() throws Exception {
7676
Rate twoTokensPerNanosecond = new Rate(2, 1, TimeUnit.NANOSECONDS);
7777
Rate sevenTokensPerTenNanoseconds = new Rate(7, 10, TimeUnit.NANOSECONDS);
7878
Rate thirtyOneTokensPerTenNanoseconds = new Rate(31, 10, TimeUnit.NANOSECONDS);
7979

80-
assertThat(twoTokensPerNanosecond.getTokenPerSeconds()).isEqualTo(2.0 * 1000 * 1000 * 1000);
81-
assertThat(sevenTokensPerTenNanoseconds.getTokenPerSeconds())
80+
assertThat(twoTokensPerNanosecond.getTokensPerSeconds()).isEqualTo(2.0 * 1000 * 1000 * 1000);
81+
assertThat(sevenTokensPerTenNanoseconds.getTokensPerSeconds())
8282
.isEqualTo((7.0 / 10) * 1000 * 1000 * 1000);
83-
assertThat(thirtyOneTokensPerTenNanoseconds.getTokenPerSeconds())
83+
assertThat(thirtyOneTokensPerTenNanoseconds.getTokensPerSeconds())
8484
.isEqualTo((31.0 / 10) * 1000 * 1000 * 1000);
8585
}
8686
}

0 commit comments

Comments
 (0)