Repository: hbase
Updated Branches:
  refs/heads/master 0cf164292 -> db5953c6f


HBASE-17333 HBASE-17294 always ensures CompactingMemstore is default (Ram)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/db5953c6
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/db5953c6
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/db5953c6

Branch: refs/heads/master
Commit: db5953c6fec74b044e01525273c7d107a51720b9
Parents: 0cf1642
Author: Ramkrishna <[email protected]>
Authored: Tue Dec 20 11:01:27 2016 +0530
Committer: Ramkrishna <[email protected]>
Committed: Tue Dec 20 11:01:27 2016 +0530

----------------------------------------------------------------------
 .../org/apache/hadoop/hbase/regionserver/CompactingMemStore.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/db5953c6/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 d279f4a..f8192a2 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
@@ -56,7 +56,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(HColumnDescriptor.MemoryCompaction.BASIC);
+      String.valueOf(HColumnDescriptor.MemoryCompaction.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";

Reply via email to