This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-collections.git
The following commit(s) were added to refs/heads/master by this push:
new b43d8a1 Use the scale in the var name.
b43d8a1 is described below
commit b43d8a1733f6439d8a57850c413de99750144e45
Author: Gary Gregory <[email protected]>
AuthorDate: Tue Feb 2 16:16:13 2021 -0500
Use the scale in the var name.
---
.../collections4/map/PassiveExpiringMap.java | 14 +++++------
.../commons/collections4/MapPerformance.java | 8 +++----
.../commons/collections4/list/TreeListTest.java | 28 +++++++++++-----------
3 files changed, 25 insertions(+), 25 deletions(-)
diff --git
a/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java
b/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java
index d81d76b..d5432f8 100644
--- a/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java
@@ -136,15 +136,15 @@ public class PassiveExpiringMap<K, V>
public long expirationTime(final K key, final V value) {
if (timeToLiveMillis >= 0L) {
// avoid numerical overflow
- final long now = System.currentTimeMillis();
- if (now > Long.MAX_VALUE - timeToLiveMillis) {
+ final long nowMillis = System.currentTimeMillis();
+ if (nowMillis > Long.MAX_VALUE - timeToLiveMillis) {
// expiration would be greater than Long.MAX_VALUE
// never expire
return -1;
}
// timeToLiveMillis in the future
- return now + timeToLiveMillis;
+ return nowMillis + timeToLiveMillis;
}
// never expire
@@ -461,11 +461,11 @@ public class PassiveExpiringMap<K, V>
*
* @see #isExpired(long, Long)
*/
- private void removeAllExpired(final long now) {
+ private void removeAllExpired(final long nowMillis) {
final Iterator<Map.Entry<Object, Long>> iter =
expirationMap.entrySet().iterator();
while (iter.hasNext()) {
final Map.Entry<Object, Long> expirationEntry = iter.next();
- if (isExpired(now, expirationEntry.getValue())) {
+ if (isExpired(nowMillis, expirationEntry.getValue())) {
// remove entry from collection
super.remove(expirationEntry.getKey());
// remove entry from expiration map
@@ -479,9 +479,9 @@ public class PassiveExpiringMap<K, V>
* less than {@code now}. If the entry has a negative expiration time,
* the entry is never removed.
*/
- private void removeIfExpired(final Object key, final long now) {
+ private void removeIfExpired(final Object key, final long nowMillis) {
final Long expirationTimeObject = expirationMap.get(key);
- if (isExpired(now, expirationTimeObject)) {
+ if (isExpired(nowMillis, expirationTimeObject)) {
remove(key);
}
}
diff --git a/src/test/java/org/apache/commons/collections4/MapPerformance.java
b/src/test/java/org/apache/commons/collections4/MapPerformance.java
index 0e12b58..f19ba1f 100644
--- a/src/test/java/org/apache/commons/collections4/MapPerformance.java
+++ b/src/test/java/org/apache/commons/collections4/MapPerformance.java
@@ -107,9 +107,9 @@ public class MapPerformance {
}
private static void test(final Map<String, String> map, final String name)
{
- long start = 0, end = 0;
+ long startMillis = 0, endMillis = 0;
// int total = 0;
- start = System.currentTimeMillis();
+ startMillis = System.currentTimeMillis();
for (int i = RUNS; i > 0; i--) {
// if (map.get("Alpha") != null) total++;
// if (map.get("Beta") != null) total++;
@@ -124,8 +124,8 @@ public class MapPerformance {
map.put("Delta", "E");
map.clear();
}
- end = System.currentTimeMillis();
- System.out.println(name + (end - start));
+ endMillis = System.currentTimeMillis();
+ System.out.println(name + (endMillis - startMillis));
}
// ----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/collections4/list/TreeListTest.java
b/src/test/java/org/apache/commons/collections4/list/TreeListTest.java
index 5b0dba9..9156072 100644
--- a/src/test/java/org/apache/commons/collections4/list/TreeListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/TreeListTest.java
@@ -53,54 +53,54 @@ public class TreeListTest<E> extends AbstractListTest<E> {
}
public static void benchmark(final List<? super Integer> l) {
- long start = System.currentTimeMillis();
+ long startMillis = System.currentTimeMillis();
for (int i = 0; i < 100000; i++) {
l.add(Integer.valueOf(i));
}
- System.out.print(System.currentTimeMillis() - start + ";");
+ System.out.print(System.currentTimeMillis() - startMillis + ";");
- start = System.currentTimeMillis();
+ startMillis = System.currentTimeMillis();
for (int i = 0; i < 200; i++) {
l.toArray();
}
- System.out.print(System.currentTimeMillis() - start + ";");
+ System.out.print(System.currentTimeMillis() - startMillis + ";");
- start = System.currentTimeMillis();
+ startMillis = System.currentTimeMillis();
for (int i = 0; i < 100; i++) {
final java.util.Iterator<? super Integer> it = l.iterator();
while (it.hasNext()) {
it.next();
}
}
- System.out.print(System.currentTimeMillis() - start + ";");
+ System.out.print(System.currentTimeMillis() - startMillis + ";");
- start = System.currentTimeMillis();
+ startMillis = System.currentTimeMillis();
for (int i = 0; i < 10000; i++) {
final int j = (int) (Math.random() * 100000);
l.add(j, Integer.valueOf(-j));
}
- System.out.print(System.currentTimeMillis() - start + ";");
+ System.out.print(System.currentTimeMillis() - startMillis + ";");
- start = System.currentTimeMillis();
+ startMillis = System.currentTimeMillis();
for (int i = 0; i < 50000; i++) {
final int j = (int) (Math.random() * 110000);
l.get(j);
}
- System.out.print(System.currentTimeMillis() - start + ";");
+ System.out.print(System.currentTimeMillis() - startMillis + ";");
- start = System.currentTimeMillis();
+ startMillis = System.currentTimeMillis();
for (int i = 0; i < 200; i++) {
final int j = (int) (Math.random() * 100000);
l.indexOf(Integer.valueOf(j));
}
- System.out.print(System.currentTimeMillis() - start + ";");
+ System.out.print(System.currentTimeMillis() - startMillis + ";");
- start = System.currentTimeMillis();
+ startMillis = System.currentTimeMillis();
for (int i = 0; i < 10000; i++) {
final int j = (int) (Math.random() * 100000);
l.remove(j);
}
- System.out.print(System.currentTimeMillis() - start + ";");
+ System.out.print(System.currentTimeMillis() - startMillis + ";");
}
//-----------------------------------------------------------------------