.../java/org/apache/hadoop/hbase/regionserver/HStore.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java index c56abaa..bdce004 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java @@ -242,10 +242,13 @@ public class HStore implements Store { scanInfo = new ScanInfo(conf, family, ttl, timeToPurgeDeletes, this.comparator); String className = conf.get(MEMSTORE_CLASS_NAME, DefaultMemStore.class.getName()); HColumnDescriptor.MemoryCompaction inMemoryCompaction = family.getInMemoryCompaction(); - if(inMemoryCompaction == null) { - inMemoryCompaction = HColumnDescriptor.MemoryCompaction.valueOf(conf.get - (CompactingMemStore.COMPACTING_MEMSTORE_TYPE_KEY, - CompactingMemStore.COMPACTING_MEMSTORE_TYPE_DEFAULT)); + if (inMemoryCompaction != null) { + inMemoryCompaction = HColumnDescriptor.MemoryCompaction + .valueOf(conf.get(CompactingMemStore.COMPACTING_MEMSTORE_TYPE_KEY, + CompactingMemStore.COMPACTING_MEMSTORE_TYPE_DEFAULT)); + } else { + // if there is no in memory compaction set - then we go with DefaultMemstore + inMemoryCompaction = HColumnDescriptor.MemoryCompaction.NONE; } switch (inMemoryCompaction) { case BASIC :