Revert "for creating patch HBASE-20074-V01.patch"

This reverts commit a312705dbc.

bad commit message
This commit is contained in:
Sean Busbey 2018-02-27 11:22:59 -06:00
parent 07eae00ec1
commit e0f8076693
1 changed files with 7 additions and 3 deletions

View File

@ -136,10 +136,14 @@ public class CompactingMemStore extends AbstractMemStore {
numStores = 1; numStores = 1;
} }
inmemoryFlushSize = memstoreFlushSize / numStores; inmemoryFlushSize = memstoreFlushSize / numStores;
// multiply by a factor (the same factor for all index types) // multiply by a factor (different factors for different index types)
factor = conf.getDouble(IN_MEMORY_FLUSH_THRESHOLD_FACTOR_KEY, if (indexType == IndexType.ARRAY_MAP) {
factor = conf.getDouble(IN_MEMORY_FLUSH_THRESHOLD_FACTOR_KEY,
IN_MEMORY_FLUSH_THRESHOLD_FACTOR_DEFAULT); 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); inmemoryFlushSize = (long) (inmemoryFlushSize * factor);
LOG.info("Setting in-memory flush size threshold to {} and immutable segments index to type={}", LOG.info("Setting in-memory flush size threshold to {} and immutable segments index to type={}",
StringUtils.byteDesc(inmemoryFlushSize), indexType); StringUtils.byteDesc(inmemoryFlushSize), indexType);