You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2014/08/30 02:14:39 UTC
[2/4] HBASE-11822 Convert EnvironmentEdge#getCurrentTimeMillis to
getCurrentTime
http://git-wip-us.apache.org/repos/asf/hbase/blob/3bfbd062/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestZKSecretWatcher.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestZKSecretWatcher.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestZKSecretWatcher.java
index d471c39..b22a713 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestZKSecretWatcher.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestZKSecretWatcher.java
@@ -155,7 +155,7 @@ public class TestZKSecretWatcher {
LOG.debug("Master new current key: "+key3.getKeyId());
// force expire the original key
- key1.setExpiration(EnvironmentEdgeManager.currentTimeMillis() - 1000);
+ key1.setExpiration(EnvironmentEdgeManager.currentTime() - 1000);
KEY_MASTER.removeExpiredKeys();
// verify removed from master
assertNull(KEY_MASTER.getKey(key1.getKeyId()));
http://git-wip-us.apache.org/repos/asf/hbase/blob/3bfbd062/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorScanPolicy.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorScanPolicy.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorScanPolicy.java
index dd2bfd4..dba1bba 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorScanPolicy.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorScanPolicy.java
@@ -115,7 +115,7 @@ public class TestCoprocessorScanPolicy {
p.add(F, tableName.getName(), Bytes.toBytes(2));
t.put(p);
- long now = EnvironmentEdgeManager.currentTimeMillis();
+ long now = EnvironmentEdgeManager.currentTime();
// insert 2 versions
p = new Put(R);
@@ -165,7 +165,7 @@ public class TestCoprocessorScanPolicy {
desc.addFamily(hcd);
TEST_UTIL.getHBaseAdmin().createTable(desc);
HTable t = new HTable(new Configuration(TEST_UTIL.getConfiguration()), tableName);
- long now = EnvironmentEdgeManager.currentTimeMillis();
+ long now = EnvironmentEdgeManager.currentTime();
ManualEnvironmentEdge me = new ManualEnvironmentEdge();
me.setValue(now);
EnvironmentEdgeManagerTestHelper.injectEdge(me);
http://git-wip-us.apache.org/repos/asf/hbase/blob/3bfbd062/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestDefaultEnvironmentEdge.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestDefaultEnvironmentEdge.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestDefaultEnvironmentEdge.java
index 2be502e..b7243ab 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestDefaultEnvironmentEdge.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestDefaultEnvironmentEdge.java
@@ -36,7 +36,7 @@ public class TestDefaultEnvironmentEdge {
public void testGetCurrentTimeUsesSystemClock() {
DefaultEnvironmentEdge edge = new DefaultEnvironmentEdge();
long systemTime = System.currentTimeMillis();
- long edgeTime = edge.currentTimeMillis();
+ long edgeTime = edge.currentTime();
assertTrue("System time must be either the same or less than the edge time",
systemTime < edgeTime || systemTime == edgeTime);
try {
@@ -44,11 +44,8 @@ public class TestDefaultEnvironmentEdge {
} catch (InterruptedException e) {
fail(e.getMessage());
}
- long secondEdgeTime = edge.currentTimeMillis();
+ long secondEdgeTime = edge.currentTime();
assertTrue("Second time must be greater than the first",
secondEdgeTime > edgeTime);
}
-
-
-}
-
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hbase/blob/3bfbd062/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSHDFSUtils.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSHDFSUtils.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSHDFSUtils.java
index 5c9208a..d82db0d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSHDFSUtils.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSHDFSUtils.java
@@ -53,7 +53,7 @@ public class TestFSHDFSUtils {
@Before
public void setup() {
- this.startTime = EnvironmentEdgeManager.currentTimeMillis();
+ this.startTime = EnvironmentEdgeManager.currentTime();
}
/**
@@ -73,7 +73,7 @@ public class TestFSHDFSUtils {
Mockito.verify(dfs, Mockito.times(5)).recoverLease(FILE);
// Make sure we waited at least hbase.lease.recovery.dfs.timeout * 3 (the first two
// invocations will happen pretty fast... the we fall into the longer wait loop).
- assertTrue((EnvironmentEdgeManager.currentTimeMillis() - this.startTime) >
+ assertTrue((EnvironmentEdgeManager.currentTime() - this.startTime) >
(3 * HTU.getConfiguration().getInt("hbase.lease.recovery.dfs.timeout", 61000)));
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/3bfbd062/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestIncrementingEnvironmentEdge.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestIncrementingEnvironmentEdge.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestIncrementingEnvironmentEdge.java
index 89450b2..67718d6 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestIncrementingEnvironmentEdge.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestIncrementingEnvironmentEdge.java
@@ -18,13 +18,12 @@
*/
package org.apache.hadoop.hbase.util;
-import org.apache.hadoop.hbase.MediumTests;
+import static junit.framework.Assert.assertEquals;
+
import org.apache.hadoop.hbase.SmallTests;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import static junit.framework.Assert.assertEquals;
-
/**
* Tests that the incrementing environment edge increments time instead of using
* the default.
@@ -35,11 +34,9 @@ public class TestIncrementingEnvironmentEdge {
@Test
public void testGetCurrentTimeUsesSystemClock() {
IncrementingEnvironmentEdge edge = new IncrementingEnvironmentEdge(1);
- assertEquals(1, edge.currentTimeMillis());
- assertEquals(2, edge.currentTimeMillis());
- assertEquals(3, edge.currentTimeMillis());
- assertEquals(4, edge.currentTimeMillis());
+ assertEquals(1, edge.currentTime());
+ assertEquals(2, edge.currentTime());
+ assertEquals(3, edge.currentTime());
+ assertEquals(4, edge.currentTime());
}
-
-}
-
+}
\ No newline at end of file