Repository: hbase Updated Branches: refs/heads/branch-2 8c6ed571b -> e047f518e
http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPerColumnFamilyFlush.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPerColumnFamilyFlush.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPerColumnFamilyFlush.java index a0d953e..e4f7663 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPerColumnFamilyFlush.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPerColumnFamilyFlush.java @@ -46,7 +46,6 @@ import org.apache.hadoop.hbase.util.JVMClusterUtil; import org.apache.hadoop.hbase.util.Pair; import org.apache.hadoop.hbase.wal.AbstractFSWALProvider; import org.apache.hadoop.hbase.wal.WAL; -import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -144,7 +143,7 @@ public class TestPerColumnFamilyFlush { } } - long totalMemstoreSize = region.getMemstoreSize(); + long totalMemstoreSize = region.getMemStoreSize(); // Find the smallest LSNs for edits wrt to each CF. long smallestSeqCF1 = region.getOldestSeqIdOfStore(FAMILY1); @@ -152,13 +151,13 @@ public class TestPerColumnFamilyFlush { long smallestSeqCF3 = region.getOldestSeqIdOfStore(FAMILY3); // Find the sizes of the memstores of each CF. - MemstoreSize cf1MemstoreSize = region.getStore(FAMILY1).getMemStoreSize(); - MemstoreSize cf2MemstoreSize = region.getStore(FAMILY2).getMemStoreSize(); - MemstoreSize cf3MemstoreSize = region.getStore(FAMILY3).getMemStoreSize(); + MemStoreSize cf1MemstoreSize = region.getStore(FAMILY1).getMemStoreSize(); + MemStoreSize cf2MemstoreSize = region.getStore(FAMILY2).getMemStoreSize(); + MemStoreSize cf3MemstoreSize = region.getStore(FAMILY3).getMemStoreSize(); // Get the overall smallest LSN in the region's memstores. long smallestSeqInRegionCurrentMemstore = getWAL(region) - .getEarliestMemstoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); + .getEarliestMemStoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); // The overall smallest LSN in the region's memstores should be the same as // the LSN of the smallest edit in CF1 @@ -180,16 +179,16 @@ public class TestPerColumnFamilyFlush { region.flush(false); // Will use these to check if anything changed. - MemstoreSize oldCF2MemstoreSize = cf2MemstoreSize; - MemstoreSize oldCF3MemstoreSize = cf3MemstoreSize; + MemStoreSize oldCF2MemstoreSize = cf2MemstoreSize; + MemStoreSize oldCF3MemstoreSize = cf3MemstoreSize; // Recalculate everything cf1MemstoreSize = region.getStore(FAMILY1).getMemStoreSize(); cf2MemstoreSize = region.getStore(FAMILY2).getMemStoreSize(); cf3MemstoreSize = region.getStore(FAMILY3).getMemStoreSize(); - totalMemstoreSize = region.getMemstoreSize(); + totalMemstoreSize = region.getMemStoreSize(); smallestSeqInRegionCurrentMemstore = getWAL(region) - .getEarliestMemstoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); + .getEarliestMemStoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); // We should have cleared out only CF1, since we chose the flush thresholds // and number of puts accordingly. @@ -225,9 +224,9 @@ public class TestPerColumnFamilyFlush { cf1MemstoreSize = region.getStore(FAMILY1).getMemStoreSize(); cf2MemstoreSize = region.getStore(FAMILY2).getMemStoreSize(); cf3MemstoreSize = region.getStore(FAMILY3).getMemStoreSize(); - totalMemstoreSize = region.getMemstoreSize(); + totalMemstoreSize = region.getMemStoreSize(); smallestSeqInRegionCurrentMemstore = getWAL(region) - .getEarliestMemstoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); + .getEarliestMemStoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); // CF1 and CF2, both should be absent. assertEquals(0, cf1MemstoreSize.getDataSize()); @@ -261,7 +260,7 @@ public class TestPerColumnFamilyFlush { // Since we won't find any CF above the threshold, and hence no specific // store to flush, we should flush all the memstores. - assertEquals(0, region.getMemstoreSize()); + assertEquals(0, region.getMemStoreSize()); HBaseTestingUtility.closeRegionAndWAL(region); } @@ -285,12 +284,12 @@ public class TestPerColumnFamilyFlush { } } - long totalMemstoreSize = region.getMemstoreSize(); + long totalMemstoreSize = region.getMemStoreSize(); // Find the sizes of the memstores of each CF. - MemstoreSize cf1MemstoreSize = region.getStore(FAMILY1).getMemStoreSize(); - MemstoreSize cf2MemstoreSize = region.getStore(FAMILY2).getMemStoreSize(); - MemstoreSize cf3MemstoreSize = region.getStore(FAMILY3).getMemStoreSize(); + MemStoreSize cf1MemstoreSize = region.getStore(FAMILY1).getMemStoreSize(); + MemStoreSize cf2MemstoreSize = region.getStore(FAMILY2).getMemStoreSize(); + MemStoreSize cf3MemstoreSize = region.getStore(FAMILY3).getMemStoreSize(); // Some other sanity checks. assertTrue(cf1MemstoreSize.getDataSize() > 0); @@ -308,9 +307,9 @@ public class TestPerColumnFamilyFlush { cf1MemstoreSize = region.getStore(FAMILY1).getMemStoreSize(); cf2MemstoreSize = region.getStore(FAMILY2).getMemStoreSize(); cf3MemstoreSize = region.getStore(FAMILY3).getMemStoreSize(); - totalMemstoreSize = region.getMemstoreSize(); + totalMemstoreSize = region.getMemStoreSize(); long smallestSeqInRegionCurrentMemstore = - region.getWAL().getEarliestMemstoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); + region.getWAL().getEarliestMemStoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); // Everything should have been cleared assertEquals(0, cf1MemstoreSize.getDataSize()); @@ -377,7 +376,7 @@ public class TestPerColumnFamilyFlush { long totalMemstoreSize; long cf1MemstoreSize, cf2MemstoreSize, cf3MemstoreSize; - totalMemstoreSize = desiredRegion.getMemstoreSize(); + totalMemstoreSize = desiredRegion.getMemStoreSize(); // Find the sizes of the memstores of each CF. cf1MemstoreSize = desiredRegion.getStore(FAMILY1).getMemStoreSize().getDataSize(); @@ -511,12 +510,12 @@ public class TestPerColumnFamilyFlush { @Override public boolean evaluate() throws Exception { - return desiredRegion.getMemstoreSize() == 0; + return desiredRegion.getMemStoreSize() == 0; } @Override public String explainFailure() throws Exception { - long memstoreSize = desiredRegion.getMemstoreSize(); + long memstoreSize = desiredRegion.getMemStoreSize(); if (memstoreSize > 0) { return "Still have unflushed entries in memstore, memstore size is " + memstoreSize; } @@ -558,7 +557,7 @@ public class TestPerColumnFamilyFlush { put.addColumn(FAMILY3, qf, value3); table.put(put); // slow down to let regionserver flush region. - while (region.getMemstoreSize() > memstoreFlushSize) { + while (region.getMemStoreSize() > memstoreFlushSize) { Thread.sleep(100); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerAccounting.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerAccounting.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerAccounting.java index fd45a12..0122674 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerAccounting.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerAccounting.java @@ -36,9 +36,9 @@ public class TestRegionServerAccounting { conf.setFloat(MemorySizeUtil.MEMSTORE_SIZE_KEY, 0.2f); // try for default cases RegionServerAccounting regionServerAccounting = new RegionServerAccounting(conf); - MemstoreSize memstoreSize = - new MemstoreSize((long) (3l * 1024l * 1024l * 1024l), (long) (1l * 1024l * 1024l * 1024l)); - regionServerAccounting.incGlobalMemstoreSize(memstoreSize); + MemStoreSize memstoreSize = + new MemStoreSize((long) (3l * 1024l * 1024l * 1024l), (long) (1l * 1024l * 1024l * 1024l)); + regionServerAccounting.incGlobalMemStoreSize(memstoreSize); assertEquals(FlushType.ABOVE_ONHEAP_HIGHER_MARK, regionServerAccounting.isAboveHighWaterMark()); } @@ -49,9 +49,9 @@ public class TestRegionServerAccounting { conf.setFloat(MemorySizeUtil.MEMSTORE_SIZE_KEY, 0.2f); // try for default cases RegionServerAccounting regionServerAccounting = new RegionServerAccounting(conf); - MemstoreSize memstoreSize = - new MemstoreSize((long) (3l * 1024l * 1024l * 1024l), (long) (1l * 1024l * 1024l * 1024l)); - regionServerAccounting.incGlobalMemstoreSize(memstoreSize); + MemStoreSize memstoreSize = + new MemStoreSize((long) (3l * 1024l * 1024l * 1024l), (long) (1l * 1024l * 1024l * 1024l)); + regionServerAccounting.incGlobalMemStoreSize(memstoreSize); assertEquals(FlushType.ABOVE_ONHEAP_LOWER_MARK, regionServerAccounting.isAboveLowWaterMark()); } @@ -64,9 +64,9 @@ public class TestRegionServerAccounting { // try for default cases RegionServerAccounting regionServerAccounting = new RegionServerAccounting(conf); // this will breach offheap limit as data size is higher and not due to heap size - MemstoreSize memstoreSize = - new MemstoreSize((long) (3l * 1024l * 1024l * 1024l), (long) (1l * 1024l * 1024l * 1024l)); - regionServerAccounting.incGlobalMemstoreSize(memstoreSize); + MemStoreSize memstoreSize = + new MemStoreSize((long) (3l * 1024l * 1024l * 1024l), (long) (1l * 1024l * 1024l * 1024l)); + regionServerAccounting.incGlobalMemStoreSize(memstoreSize); assertEquals(FlushType.ABOVE_OFFHEAP_HIGHER_MARK, regionServerAccounting.isAboveHighWaterMark()); } @@ -80,9 +80,9 @@ public class TestRegionServerAccounting { // try for default cases RegionServerAccounting regionServerAccounting = new RegionServerAccounting(conf); // this will breach higher limit as heap size is higher and not due to offheap size - MemstoreSize memstoreSize = - new MemstoreSize((long) (3l * 1024l * 1024l), (long) (2l * 1024l * 1024l * 1024l)); - regionServerAccounting.incGlobalMemstoreSize(memstoreSize); + MemStoreSize memstoreSize = + new MemStoreSize((long) (3l * 1024l * 1024l), (long) (2l * 1024l * 1024l * 1024l)); + regionServerAccounting.incGlobalMemStoreSize(memstoreSize); assertEquals(FlushType.ABOVE_ONHEAP_HIGHER_MARK, regionServerAccounting.isAboveHighWaterMark()); } @@ -95,9 +95,9 @@ public class TestRegionServerAccounting { // try for default cases RegionServerAccounting regionServerAccounting = new RegionServerAccounting(conf); // this will breach offheap limit as data size is higher and not due to heap size - MemstoreSize memstoreSize = - new MemstoreSize((long) (3l * 1024l * 1024l * 1024l), (long) (1l * 1024l * 1024l * 1024l)); - regionServerAccounting.incGlobalMemstoreSize(memstoreSize); + MemStoreSize memstoreSize = + new MemStoreSize((long) (3l * 1024l * 1024l * 1024l), (long) (1l * 1024l * 1024l * 1024l)); + regionServerAccounting.incGlobalMemStoreSize(memstoreSize); assertEquals(FlushType.ABOVE_OFFHEAP_LOWER_MARK, regionServerAccounting.isAboveLowWaterMark()); } @@ -111,9 +111,9 @@ public class TestRegionServerAccounting { // try for default cases RegionServerAccounting regionServerAccounting = new RegionServerAccounting(conf); // this will breach higher limit as heap size is higher and not due to offheap size - MemstoreSize memstoreSize = - new MemstoreSize((long) (3l * 1024l * 1024l), (long) (2l * 1024l * 1024l * 1024l)); - regionServerAccounting.incGlobalMemstoreSize(memstoreSize); + MemStoreSize memstoreSize = + new MemStoreSize((long) (3l * 1024l * 1024l), (long) (2l * 1024l * 1024l * 1024l)); + regionServerAccounting.incGlobalMemStoreSize(memstoreSize); assertEquals(FlushType.ABOVE_ONHEAP_LOWER_MARK, regionServerAccounting.isAboveLowWaterMark()); } http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java index d692a9a..a8a60ab 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java @@ -258,8 +258,8 @@ public class TestWALLockup { Thread t = new Thread ("Flusher") { public void run() { try { - if (region.getMemstoreSize() <= 0) { - throw new IOException("memstore size=" + region.getMemstoreSize()); + if (region.getMemStoreSize() <= 0) { + throw new IOException("memstore size=" + region.getMemStoreSize()); } region.flush(false); } catch (IOException e) { @@ -272,7 +272,7 @@ public class TestWALLockup { }; t.setDaemon(true); t.start(); - // Wait until + // Wait until while (dodgyWAL.latch.getCount() > 0) Threads.sleep(1); // Now assert I got a new WAL file put in place even though loads of errors above. assertTrue(originalWAL != dodgyWAL.getCurrentFileName()); http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWalAndCompactingMemStoreFlush.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWalAndCompactingMemStoreFlush.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWalAndCompactingMemStoreFlush.java index 6dc1a1b..4d0a168 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWalAndCompactingMemStoreFlush.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWalAndCompactingMemStoreFlush.java @@ -161,7 +161,7 @@ public class TestWalAndCompactingMemStoreFlush { region.put(createPut(2, i)); } - long totalMemstoreSize = region.getMemstoreSize(); + long totalMemstoreSize = region.getMemStoreSize(); // Find the smallest LSNs for edits wrt to each CF. long smallestSeqCF1PhaseI = region.getOldestSeqIdOfStore(FAMILY1); @@ -169,22 +169,22 @@ public class TestWalAndCompactingMemStoreFlush { long smallestSeqCF3PhaseI = region.getOldestSeqIdOfStore(FAMILY3); // Find the sizes of the memstores of each CF. - MemstoreSize cf1MemstoreSizePhaseI = region.getStore(FAMILY1).getMemStoreSize(); - MemstoreSize cf2MemstoreSizePhaseI = region.getStore(FAMILY2).getMemStoreSize(); - MemstoreSize cf3MemstoreSizePhaseI = region.getStore(FAMILY3).getMemStoreSize(); + MemStoreSize cf1MemstoreSizePhaseI = region.getStore(FAMILY1).getMemStoreSize(); + MemStoreSize cf2MemstoreSizePhaseI = region.getStore(FAMILY2).getMemStoreSize(); + MemStoreSize cf3MemstoreSizePhaseI = region.getStore(FAMILY3).getMemStoreSize(); // Get the overall smallest LSN in the region's memstores. long smallestSeqInRegionCurrentMemstorePhaseI = getWAL(region) - .getEarliestMemstoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); + .getEarliestMemStoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); String s = "\n\n----------------------------------\n" + "Upon initial insert and before any flush, size of CF1 is:" + cf1MemstoreSizePhaseI + ", is CF1 compacted memstore?:" - + region.getStore(FAMILY1).isSloppyMemstore() + ". Size of CF2 is:" + + region.getStore(FAMILY1).isSloppyMemStore() + ". Size of CF2 is:" + cf2MemstoreSizePhaseI + ", is CF2 compacted memstore?:" - + region.getStore(FAMILY2).isSloppyMemstore() + ". Size of CF3 is:" + + region.getStore(FAMILY2).isSloppyMemStore() + ". Size of CF3 is:" + cf3MemstoreSizePhaseI + ", is CF3 compacted memstore?:" - + region.getStore(FAMILY3).isSloppyMemstore() + "\n"; + + region.getStore(FAMILY3).isSloppyMemStore() + "\n"; // The overall smallest LSN in the region's memstores should be the same as // the LSN of the smallest edit in CF1 @@ -220,12 +220,12 @@ public class TestWalAndCompactingMemStoreFlush { region.flush(false); // Recalculate everything - MemstoreSize cf1MemstoreSizePhaseII = region.getStore(FAMILY1).getMemStoreSize(); - MemstoreSize cf2MemstoreSizePhaseII = region.getStore(FAMILY2).getMemStoreSize(); - MemstoreSize cf3MemstoreSizePhaseII = region.getStore(FAMILY3).getMemStoreSize(); + MemStoreSize cf1MemstoreSizePhaseII = region.getStore(FAMILY1).getMemStoreSize(); + MemStoreSize cf2MemstoreSizePhaseII = region.getStore(FAMILY2).getMemStoreSize(); + MemStoreSize cf3MemstoreSizePhaseII = region.getStore(FAMILY3).getMemStoreSize(); long smallestSeqInRegionCurrentMemstorePhaseII = getWAL(region) - .getEarliestMemstoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); + .getEarliestMemStoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); // Find the smallest LSNs for edits wrt to each CF. long smallestSeqCF1PhaseII = region.getOldestSeqIdOfStore(FAMILY1); long smallestSeqCF2PhaseII = region.getOldestSeqIdOfStore(FAMILY2); @@ -264,7 +264,7 @@ public class TestWalAndCompactingMemStoreFlush { + smallestSeqCF2PhaseII +", the smallest sequence in CF3:" + smallestSeqCF3PhaseII + "\n"; // How much does the CF1 memstore occupy? Will be used later. - MemstoreSize cf1MemstoreSizePhaseIII = region.getStore(FAMILY1).getMemStoreSize(); + MemStoreSize cf1MemstoreSizePhaseIII = region.getStore(FAMILY1).getMemStoreSize(); long smallestSeqCF1PhaseIII = region.getOldestSeqIdOfStore(FAMILY1); s = s + "----After more puts into CF1 its size is:" + cf1MemstoreSizePhaseIII @@ -278,12 +278,12 @@ public class TestWalAndCompactingMemStoreFlush { region.flush(false); // Recalculate everything - MemstoreSize cf1MemstoreSizePhaseIV = region.getStore(FAMILY1).getMemStoreSize(); - MemstoreSize cf2MemstoreSizePhaseIV = region.getStore(FAMILY2).getMemStoreSize(); - MemstoreSize cf3MemstoreSizePhaseIV = region.getStore(FAMILY3).getMemStoreSize(); + MemStoreSize cf1MemstoreSizePhaseIV = region.getStore(FAMILY1).getMemStoreSize(); + MemStoreSize cf2MemstoreSizePhaseIV = region.getStore(FAMILY2).getMemStoreSize(); + MemStoreSize cf3MemstoreSizePhaseIV = region.getStore(FAMILY3).getMemStoreSize(); long smallestSeqInRegionCurrentMemstorePhaseIV = getWAL(region) - .getEarliestMemstoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); + .getEarliestMemStoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); long smallestSeqCF1PhaseIV = region.getOldestSeqIdOfStore(FAMILY1); long smallestSeqCF2PhaseIV = region.getOldestSeqIdOfStore(FAMILY2); long smallestSeqCF3PhaseIV = region.getOldestSeqIdOfStore(FAMILY3); @@ -319,11 +319,11 @@ public class TestWalAndCompactingMemStoreFlush { region.flush(true); // Recalculate everything - MemstoreSize cf1MemstoreSizePhaseV = region.getStore(FAMILY1).getMemStoreSize(); - MemstoreSize cf2MemstoreSizePhaseV = region.getStore(FAMILY2).getMemStoreSize(); - MemstoreSize cf3MemstoreSizePhaseV = region.getStore(FAMILY3).getMemStoreSize(); + MemStoreSize cf1MemstoreSizePhaseV = region.getStore(FAMILY1).getMemStoreSize(); + MemStoreSize cf2MemstoreSizePhaseV = region.getStore(FAMILY2).getMemStoreSize(); + MemStoreSize cf3MemstoreSizePhaseV = region.getStore(FAMILY3).getMemStoreSize(); long smallestSeqInRegionCurrentMemstorePhaseV = getWAL(region) - .getEarliestMemstoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); + .getEarliestMemStoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); assertEquals(0, cf1MemstoreSizePhaseV.getDataSize()); assertEquals(MutableSegment.DEEP_OVERHEAD, cf1MemstoreSizePhaseV.getHeapSize()); @@ -352,13 +352,13 @@ public class TestWalAndCompactingMemStoreFlush { s = s + "----AFTER THIRD AND FORTH FLUSH, The smallest sequence in region WAL is: " + smallestSeqInRegionCurrentMemstorePhaseV + ". After additional inserts and last flush, the entire region size is:" + region - .getMemstoreSize() + .getMemStoreSize() + "\n----------------------------------\n"; // Since we won't find any CF above the threshold, and hence no specific // store to flush, we should flush all the memstores // Also compacted memstores are flushed to disk. - assertEquals(0, region.getMemstoreSize()); + assertEquals(0, region.getMemStoreSize()); System.out.println(s); HBaseTestingUtility.closeRegionAndWAL(region); } @@ -404,18 +404,18 @@ public class TestWalAndCompactingMemStoreFlush { /*------------------------------------------------------------------------------*/ /*------------------------------------------------------------------------------*/ /* PHASE I - collect sizes */ - long totalMemstoreSizePhaseI = region.getMemstoreSize(); + long totalMemstoreSizePhaseI = region.getMemStoreSize(); // Find the smallest LSNs for edits wrt to each CF. long smallestSeqCF1PhaseI = region.getOldestSeqIdOfStore(FAMILY1); long smallestSeqCF2PhaseI = region.getOldestSeqIdOfStore(FAMILY2); long smallestSeqCF3PhaseI = region.getOldestSeqIdOfStore(FAMILY3); // Find the sizes of the memstores of each CF. - MemstoreSize cf1MemstoreSizePhaseI = region.getStore(FAMILY1).getMemStoreSize(); - MemstoreSize cf2MemstoreSizePhaseI = region.getStore(FAMILY2).getMemStoreSize(); - MemstoreSize cf3MemstoreSizePhaseI = region.getStore(FAMILY3).getMemStoreSize(); + MemStoreSize cf1MemstoreSizePhaseI = region.getStore(FAMILY1).getMemStoreSize(); + MemStoreSize cf2MemstoreSizePhaseI = region.getStore(FAMILY2).getMemStoreSize(); + MemStoreSize cf3MemstoreSizePhaseI = region.getStore(FAMILY3).getMemStoreSize(); // Get the overall smallest LSN in the region's memstores. long smallestSeqInRegionCurrentMemstorePhaseI = getWAL(region) - .getEarliestMemstoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); + .getEarliestMemStoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); /*------------------------------------------------------------------------------*/ /* PHASE I - validation */ @@ -460,14 +460,14 @@ public class TestWalAndCompactingMemStoreFlush { /*------------------------------------------------------------------------------*/ /* PHASE II - collect sizes */ // Recalculate everything - MemstoreSize cf1MemstoreSizePhaseII = region.getStore(FAMILY1).getMemStoreSize(); - MemstoreSize cf2MemstoreSizePhaseII = region.getStore(FAMILY2).getMemStoreSize(); - MemstoreSize cf3MemstoreSizePhaseII = region.getStore(FAMILY3).getMemStoreSize(); + MemStoreSize cf1MemstoreSizePhaseII = region.getStore(FAMILY1).getMemStoreSize(); + MemStoreSize cf2MemstoreSizePhaseII = region.getStore(FAMILY2).getMemStoreSize(); + MemStoreSize cf3MemstoreSizePhaseII = region.getStore(FAMILY3).getMemStoreSize(); long smallestSeqInRegionCurrentMemstorePhaseII = getWAL(region) - .getEarliestMemstoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); + .getEarliestMemStoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); // Find the smallest LSNs for edits wrt to each CF. long smallestSeqCF3PhaseII = region.getOldestSeqIdOfStore(FAMILY3); - long totalMemstoreSizePhaseII = region.getMemstoreSize(); + long totalMemstoreSizePhaseII = region.getMemStoreSize(); /*------------------------------------------------------------------------------*/ /* PHASE II - validation */ @@ -509,8 +509,8 @@ public class TestWalAndCompactingMemStoreFlush { /*------------------------------------------------------------------------------*/ /* PHASE III - collect sizes */ // How much does the CF1 memstore occupy now? Will be used later. - MemstoreSize cf1MemstoreSizePhaseIII = region.getStore(FAMILY1).getMemStoreSize(); - long totalMemstoreSizePhaseIII = region.getMemstoreSize(); + MemStoreSize cf1MemstoreSizePhaseIII = region.getStore(FAMILY1).getMemStoreSize(); + long totalMemstoreSizePhaseIII = region.getMemStoreSize(); /*------------------------------------------------------------------------------*/ /* PHASE III - validation */ @@ -531,11 +531,11 @@ public class TestWalAndCompactingMemStoreFlush { /*------------------------------------------------------------------------------*/ /* PHASE IV - collect sizes */ // Recalculate everything - MemstoreSize cf1MemstoreSizePhaseIV = region.getStore(FAMILY1).getMemStoreSize(); - MemstoreSize cf2MemstoreSizePhaseIV = region.getStore(FAMILY2).getMemStoreSize(); - MemstoreSize cf3MemstoreSizePhaseIV = region.getStore(FAMILY3).getMemStoreSize(); + MemStoreSize cf1MemstoreSizePhaseIV = region.getStore(FAMILY1).getMemStoreSize(); + MemStoreSize cf2MemstoreSizePhaseIV = region.getStore(FAMILY2).getMemStoreSize(); + MemStoreSize cf3MemstoreSizePhaseIV = region.getStore(FAMILY3).getMemStoreSize(); long smallestSeqInRegionCurrentMemstorePhaseIV = getWAL(region) - .getEarliestMemstoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); + .getEarliestMemStoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); long smallestSeqCF3PhaseIV = region.getOldestSeqIdOfStore(FAMILY3); /*------------------------------------------------------------------------------*/ @@ -563,12 +563,12 @@ public class TestWalAndCompactingMemStoreFlush { /*------------------------------------------------------------------------------*/ /* PHASE V - collect sizes */ // Recalculate everything - MemstoreSize cf1MemstoreSizePhaseV = region.getStore(FAMILY1).getMemStoreSize(); - MemstoreSize cf2MemstoreSizePhaseV = region.getStore(FAMILY2).getMemStoreSize(); - MemstoreSize cf3MemstoreSizePhaseV = region.getStore(FAMILY3).getMemStoreSize(); + MemStoreSize cf1MemstoreSizePhaseV = region.getStore(FAMILY1).getMemStoreSize(); + MemStoreSize cf2MemstoreSizePhaseV = region.getStore(FAMILY2).getMemStoreSize(); + MemStoreSize cf3MemstoreSizePhaseV = region.getStore(FAMILY3).getMemStoreSize(); long smallestSeqInRegionCurrentMemstorePhaseV = getWAL(region) - .getEarliestMemstoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); - long totalMemstoreSizePhaseV = region.getMemstoreSize(); + .getEarliestMemStoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); + long totalMemstoreSizePhaseV = region.getMemStoreSize(); /*------------------------------------------------------------------------------*/ /* PHASE V - validation */ @@ -601,9 +601,9 @@ public class TestWalAndCompactingMemStoreFlush { region.put(createPut(5, i)); } - MemstoreSize cf1ActiveSizePhaseVI = region.getStore(FAMILY1).getMemStoreSize(); - MemstoreSize cf3ActiveSizePhaseVI = region.getStore(FAMILY3).getMemStoreSize(); - MemstoreSize cf5ActiveSizePhaseVI = region.getStore(FAMILIES[4]).getMemStoreSize(); + MemStoreSize cf1ActiveSizePhaseVI = region.getStore(FAMILY1).getMemStoreSize(); + MemStoreSize cf3ActiveSizePhaseVI = region.getStore(FAMILY3).getMemStoreSize(); + MemStoreSize cf5ActiveSizePhaseVI = region.getStore(FAMILIES[4]).getMemStoreSize(); /*------------------------------------------------------------------------------*/ /* PHASE VI - Flush */ @@ -614,9 +614,9 @@ public class TestWalAndCompactingMemStoreFlush { // Since we won't find any CF above the threshold, and hence no specific // store to flush, we should flush all the memstores // Also compacted memstores are flushed to disk, but not entirely emptied - MemstoreSize cf1ActiveSizePhaseVII = region.getStore(FAMILY1).getMemStoreSize(); - MemstoreSize cf3ActiveSizePhaseVII = region.getStore(FAMILY3).getMemStoreSize(); - MemstoreSize cf5ActiveSizePhaseVII = region.getStore(FAMILIES[4]).getMemStoreSize(); + MemStoreSize cf1ActiveSizePhaseVII = region.getStore(FAMILY1).getMemStoreSize(); + MemStoreSize cf3ActiveSizePhaseVII = region.getStore(FAMILY3).getMemStoreSize(); + MemStoreSize cf5ActiveSizePhaseVII = region.getStore(FAMILIES[4]).getMemStoreSize(); assertTrue(cf1ActiveSizePhaseVII.getDataSize() < cf1ActiveSizePhaseVI.getDataSize()); assertTrue(cf3ActiveSizePhaseVII.getDataSize() < cf3ActiveSizePhaseVI.getDataSize()); @@ -660,12 +660,12 @@ public class TestWalAndCompactingMemStoreFlush { ((CompactingMemStore) ((HStore) region.getStore(FAMILY1)).memstore).setCompositeSnapshot(false); ((CompactingMemStore) ((HStore) region.getStore(FAMILY3)).memstore).setCompositeSnapshot(false); - long totalMemstoreSize = region.getMemstoreSize(); + long totalMemstoreSize = region.getMemStoreSize(); // Find the sizes of the memstores of each CF. - MemstoreSize cf1MemstoreSizePhaseI = region.getStore(FAMILY1).getMemStoreSize(); - MemstoreSize cf2MemstoreSizePhaseI = region.getStore(FAMILY2).getMemStoreSize(); - MemstoreSize cf3MemstoreSizePhaseI = region.getStore(FAMILY3).getMemStoreSize(); + MemStoreSize cf1MemstoreSizePhaseI = region.getStore(FAMILY1).getMemStoreSize(); + MemStoreSize cf2MemstoreSizePhaseI = region.getStore(FAMILY2).getMemStoreSize(); + MemStoreSize cf3MemstoreSizePhaseI = region.getStore(FAMILY3).getMemStoreSize(); // Some other sanity checks. assertTrue(cf1MemstoreSizePhaseI.getDataSize() > 0); @@ -689,10 +689,10 @@ public class TestWalAndCompactingMemStoreFlush { cms3.flushInMemory(); region.flush(false); - MemstoreSize cf2MemstoreSizePhaseII = region.getStore(FAMILY2).getMemStoreSize(); + MemStoreSize cf2MemstoreSizePhaseII = region.getStore(FAMILY2).getMemStoreSize(); long smallestSeqInRegionCurrentMemstorePhaseII = - region.getWAL().getEarliestMemstoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); + region.getWAL().getEarliestMemStoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); long smallestSeqCF1PhaseII = region.getOldestSeqIdOfStore(FAMILY1); long smallestSeqCF2PhaseII = region.getOldestSeqIdOfStore(FAMILY2); long smallestSeqCF3PhaseII = region.getOldestSeqIdOfStore(FAMILY3); @@ -724,7 +724,7 @@ public class TestWalAndCompactingMemStoreFlush { } long smallestSeqInRegionCurrentMemstorePhaseIII = - region.getWAL().getEarliestMemstoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); + region.getWAL().getEarliestMemStoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); long smallestSeqCF1PhaseIII = region.getOldestSeqIdOfStore(FAMILY1); long smallestSeqCF2PhaseIII = region.getOldestSeqIdOfStore(FAMILY2); long smallestSeqCF3PhaseIII = region.getOldestSeqIdOfStore(FAMILY3); @@ -742,7 +742,7 @@ public class TestWalAndCompactingMemStoreFlush { region.flush(false); long smallestSeqInRegionCurrentMemstorePhaseIV = - region.getWAL().getEarliestMemstoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); + region.getWAL().getEarliestMemStoreSeqNum(region.getRegionInfo().getEncodedNameAsBytes()); long smallestSeqCF1PhaseIV = region.getOldestSeqIdOfStore(FAMILY1); long smallestSeqCF2PhaseIV = region.getOldestSeqIdOfStore(FAMILY2); long smallestSeqCF3PhaseIV = region.getOldestSeqIdOfStore(FAMILY3); @@ -795,12 +795,12 @@ public class TestWalAndCompactingMemStoreFlush { region.put(createPut(2, i)); } - long totalMemstoreSize = region.getMemstoreSize(); + long totalMemstoreSize = region.getMemStoreSize(); // Find the sizes of the memstores of each CF. - MemstoreSize cf1MemstoreSizePhaseI = region.getStore(FAMILY1).getMemStoreSize(); - MemstoreSize cf2MemstoreSizePhaseI = region.getStore(FAMILY2).getMemStoreSize(); - MemstoreSize cf3MemstoreSizePhaseI = region.getStore(FAMILY3).getMemStoreSize(); + MemStoreSize cf1MemstoreSizePhaseI = region.getStore(FAMILY1).getMemStoreSize(); + MemStoreSize cf2MemstoreSizePhaseI = region.getStore(FAMILY2).getMemStoreSize(); + MemStoreSize cf3MemstoreSizePhaseI = region.getStore(FAMILY3).getMemStoreSize(); // Some other sanity checks. assertTrue(cf1MemstoreSizePhaseI.getDataSize() > 0); @@ -829,9 +829,9 @@ public class TestWalAndCompactingMemStoreFlush { // Flush-to-disk! CF2 only should be flushed region.flush(false); - MemstoreSize cf1MemstoreSizePhaseII = region.getStore(FAMILY1).getMemStoreSize(); - MemstoreSize cf2MemstoreSizePhaseII = region.getStore(FAMILY2).getMemStoreSize(); - MemstoreSize cf3MemstoreSizePhaseII = region.getStore(FAMILY3).getMemStoreSize(); + MemStoreSize cf1MemstoreSizePhaseII = region.getStore(FAMILY1).getMemStoreSize(); + MemStoreSize cf2MemstoreSizePhaseII = region.getStore(FAMILY2).getMemStoreSize(); + MemStoreSize cf3MemstoreSizePhaseII = region.getStore(FAMILY3).getMemStoreSize(); // CF1 should be flushed in memory and just flattened, so CF1 heap overhead should be smaller assertTrue(cf1MemstoreSizePhaseI.getHeapSize() > cf1MemstoreSizePhaseII.getHeapSize()); @@ -855,7 +855,7 @@ public class TestWalAndCompactingMemStoreFlush { region.put(createPut(2, i)); } - MemstoreSize cf1MemstoreSizePhaseIII = region.getStore(FAMILY1).getMemStoreSize(); + MemStoreSize cf1MemstoreSizePhaseIII = region.getStore(FAMILY1).getMemStoreSize(); // Flush in memory! ((CompactingMemStore) ((HStore)region.getStore(FAMILY1)).memstore).flushInMemory(); @@ -871,8 +871,8 @@ public class TestWalAndCompactingMemStoreFlush { } region.flush(false); - MemstoreSize cf1MemstoreSizePhaseIV = region.getStore(FAMILY1).getMemStoreSize(); - MemstoreSize cf2MemstoreSizePhaseIV = region.getStore(FAMILY2).getMemStoreSize(); + MemStoreSize cf1MemstoreSizePhaseIV = region.getStore(FAMILY1).getMemStoreSize(); + MemStoreSize cf2MemstoreSizePhaseIV = region.getStore(FAMILY2).getMemStoreSize(); assertEquals(2*cf1MemstoreSizePhaseI.getDataSize(), cf1MemstoreSizePhaseIV.getDataSize()); // the decrease in the heap size due to usage of CellArrayMap instead of CSLM http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestWALReplay.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestWALReplay.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestWALReplay.java index 0598e34..096d3ca 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestWALReplay.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestWALReplay.java @@ -78,12 +78,11 @@ import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.HRegionServer; import org.apache.hadoop.hbase.regionserver.HStore; import org.apache.hadoop.hbase.regionserver.MemStoreSnapshot; -import org.apache.hadoop.hbase.regionserver.MemstoreSize; +import org.apache.hadoop.hbase.regionserver.MemStoreSize; import org.apache.hadoop.hbase.regionserver.MultiVersionConcurrencyControl; import org.apache.hadoop.hbase.regionserver.Region; import org.apache.hadoop.hbase.regionserver.RegionScanner; import org.apache.hadoop.hbase.regionserver.RegionServerServices; -import org.apache.hadoop.hbase.regionserver.Store; import org.apache.hadoop.hbase.regionserver.throttle.ThroughputController; import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.hbase.util.Bytes; @@ -544,7 +543,7 @@ public abstract class AbstractTestWALReplay { final AtomicInteger countOfRestoredEdits = new AtomicInteger(0); HRegion region3 = new HRegion(basedir, wal3, newFS, newConf, hri, htd, null) { @Override - protected void restoreEdit(HStore s, Cell cell, MemstoreSize memstoreSize) { + protected void restoreEdit(HStore s, Cell cell, MemStoreSize memstoreSize) { super.restoreEdit(s, cell, memstoreSize); countOfRestoredEdits.incrementAndGet(); } @@ -1143,7 +1142,7 @@ public abstract class AbstractTestWALReplay { } @Override - public void setGlobalMemstoreLimit(long globalMemStoreSize) { + public void setGlobalMemStoreLimit(long globalMemStoreSize) { } } http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestFSHLog.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestFSHLog.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestFSHLog.java index 1585e79..17416ba 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestFSHLog.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestFSHLog.java @@ -206,7 +206,7 @@ public class TestFSHLog extends AbstractTestFSWAL { assertEquals("Region did not flush?", 1, region.getStoreFileList(new byte[][]{b}).size()); // now check the region's unflushed seqIds. - long seqId = log.getEarliestMemstoreSeqNum(hri.getEncodedNameAsBytes()); + long seqId = log.getEarliestMemStoreSeqNum(hri.getEncodedNameAsBytes()); assertEquals("Found seqId for the region which is already flushed", HConstants.NO_SEQNUM, seqId);
