Revert "for creating patch HBASE-20074-V01.patch" This reverts commit 73028d5bd9f85655b284654579ddcbbca31e41e8.
bad commit message Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e4ce38df Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e4ce38df Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e4ce38df Branch: refs/heads/HBASE-15151 Commit: e4ce38df326e750015f6077b8ca8de9788cce4d4 Parents: 3443aa9 Author: Sean Busbey <bus...@apache.org> Authored: Tue Feb 27 11:20:54 2018 -0600 Committer: Sean Busbey <bus...@apache.org> Committed: Tue Feb 27 11:20:54 2018 -0600 ---------------------------------------------------------------------- .../hadoop/hbase/regionserver/CompactingMemStore.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/e4ce38df/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 d60b049..44b40eb 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 @@ -136,10 +136,14 @@ public class CompactingMemStore extends AbstractMemStore { numStores = 1; } inmemoryFlushSize = memstoreFlushSize / numStores; - // multiply by a factor (the same factor for all index types) - factor = conf.getDouble(IN_MEMORY_FLUSH_THRESHOLD_FACTOR_KEY, + // multiply by a factor (different factors for different index types) + if (indexType == IndexType.ARRAY_MAP) { + factor = conf.getDouble(IN_MEMORY_FLUSH_THRESHOLD_FACTOR_KEY, IN_MEMORY_FLUSH_THRESHOLD_FACTOR_DEFAULT); - + } else { + factor = conf.getDouble(IN_MEMORY_FLUSH_THRESHOLD_FACTOR_KEY, + IN_MEMORY_FLUSH_THRESHOLD_FACTOR_DEFAULT); + } inmemoryFlushSize = (long) (inmemoryFlushSize * factor); LOG.info("Setting in-memory flush size threshold to {} and immutable segments index to type={}", StringUtils.byteDesc(inmemoryFlushSize), indexType);
