You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2012/10/30 23:11:20 UTC
svn commit: r1403898 - in
/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver:
TestCompaction.java TestStore.java
Author: tedyu
Date: Tue Oct 30 22:11:19 2012
New Revision: 1403898
URL: http://svn.apache.org/viewvc?rev=1403898&view=rev
Log:
HBASE-7055 Revert - part 2
Modified:
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java?rev=1403898&r1=1403897&r2=1403898&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java Tue Oct 30 22:11:19 2012
@@ -303,8 +303,6 @@ public class TestCompaction extends HBas
conf.setFloat("hbase.hregion.majorcompaction.jitter", jitterPct);
HStore s = ((HStore) r.getStore(COLUMN_FAMILY));
- // TODO: temporary call, until HBASE-3909 is committed in some form.
- s.updateConfiguration();
try {
createStoreFile(r);
createStoreFile(r);
@@ -316,10 +314,9 @@ public class TestCompaction extends HBas
assertEquals(2, s.getStorefilesCount());
// ensure that major compaction time is deterministic
- CompactionManager c = s.compactionManager;
- long mcTime = c.getNextMajorCompactTime();
+ long mcTime = s.getNextMajorCompactTime();
for (int i = 0; i < 10; ++i) {
- assertEquals(mcTime, c.getNextMajorCompactTime());
+ assertEquals(mcTime, s.getNextMajorCompactTime());
}
// ensure that the major compaction time is within the variance
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java?rev=1403898&r1=1403897&r2=1403898&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java Tue Oct 30 22:11:19 2012
@@ -216,15 +216,17 @@ public class TestStore extends TestCase
flush(i);
}
// after flush; check the lowest time stamp
- long lowestTimeStampFromManager = CompactionManager.getLowestTimestamp(store.getStorefiles());
- long lowestTimeStampFromFS = getLowestTimeStampFromFS(fs, store.getStorefiles());
- assertEquals(lowestTimeStampFromManager,lowestTimeStampFromFS);
-
+ long lowestTimeStampFromStore =
+ HStore.getLowestTimestamp(store.getStorefiles());
+ long lowestTimeStampFromFS =
+ getLowestTimeStampFromFS(fs,store.getStorefiles());
+ assertEquals(lowestTimeStampFromStore,lowestTimeStampFromFS);
+
// after compact; check the lowest time stamp
store.compact(store.requestCompaction());
- lowestTimeStampFromManager = CompactionManager.getLowestTimestamp(store.getStorefiles());
- lowestTimeStampFromFS = getLowestTimeStampFromFS(fs, store.getStorefiles());
- assertEquals(lowestTimeStampFromManager, lowestTimeStampFromFS);
+ lowestTimeStampFromStore = HStore.getLowestTimestamp(store.getStorefiles());
+ lowestTimeStampFromFS = getLowestTimeStampFromFS(fs,store.getStorefiles());
+ assertEquals(lowestTimeStampFromStore,lowestTimeStampFromFS);
}
private static long getLowestTimeStampFromFS(FileSystem fs,