Repository: hbase Updated Branches: refs/heads/master f8281aa20 -> 4f2dfd387
HBASE-20539 Disable IMC; part 2 Set default for in-memory compaction to NONE. PE was using this value creating its table. Add test to ensure expected default. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4f2dfd38 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4f2dfd38 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4f2dfd38 Branch: refs/heads/master Commit: 4f2dfd387779968d3b76a22f1f4189d3278b202d Parents: f8281aa Author: Michael Stack <st...@apache.org> Authored: Tue May 8 10:08:40 2018 -0700 Committer: Michael Stack <st...@apache.org> Committed: Wed May 9 06:30:28 2018 -0700 ---------------------------------------------------------------------- .../hadoop/hbase/TestPerformanceEvaluation.java | 14 ++++++++++++++ .../hadoop/hbase/regionserver/CompactingMemStore.java | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2dfd38/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/TestPerformanceEvaluation.java ---------------------------------------------------------------------- diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/TestPerformanceEvaluation.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/TestPerformanceEvaluation.java index ab93857..b2a89c8 100644 --- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/TestPerformanceEvaluation.java +++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/TestPerformanceEvaluation.java @@ -40,6 +40,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.PerformanceEvaluation.RandomReadTest; import org.apache.hadoop.hbase.PerformanceEvaluation.TestOptions; +import org.apache.hadoop.hbase.regionserver.CompactingMemStore; import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.ClassRule; @@ -57,6 +58,19 @@ public class TestPerformanceEvaluation { private static final HBaseTestingUtility HTU = new HBaseTestingUtility(); @Test + public void testDefaultInMemoryCompaction() { + PerformanceEvaluation.TestOptions defaultOpts = + new PerformanceEvaluation.TestOptions(); + assertEquals(CompactingMemStore.COMPACTING_MEMSTORE_TYPE_DEFAULT.toString(), + defaultOpts.getInMemoryCompaction().toString()); + HTableDescriptor htd = PerformanceEvaluation.getTableDescriptor(defaultOpts); + for (HColumnDescriptor hcd: htd.getFamilies()) { + assertEquals(CompactingMemStore.COMPACTING_MEMSTORE_TYPE_DEFAULT.toString(), + hcd.getInMemoryCompaction().toString()); + } + } + + @Test public void testSerialization() throws JsonGenerationException, JsonMappingException, IOException { PerformanceEvaluation.TestOptions options = new PerformanceEvaluation.TestOptions(); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2dfd38/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactingMemStore.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactingMemStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactingMemStore.java index 68d7d7e..c1b061a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactingMemStore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactingMemStore.java @@ -58,7 +58,7 @@ public class CompactingMemStore extends AbstractMemStore { public static final String COMPACTING_MEMSTORE_TYPE_KEY = "hbase.hregion.compacting.memstore.type"; public static final String COMPACTING_MEMSTORE_TYPE_DEFAULT = - String.valueOf(MemoryCompactionPolicy.BASIC); + String.valueOf(MemoryCompactionPolicy.NONE); // Default fraction of in-memory-flush size w.r.t. flush-to-disk size public static final String IN_MEMORY_FLUSH_THRESHOLD_FACTOR_KEY = "hbase.memstore.inmemoryflush.threshold.factor";
