HBASE-18897 Substitute MemStore for Memstore
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e047f518 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e047f518 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e047f518 Branch: refs/heads/branch-2 Commit: e047f518ef128aeda7af4359b28a840149769385 Parents: 8c6ed57 Author: Chia-Ping Tsai <chia7...@gmail.com> Authored: Mon Oct 2 21:10:11 2017 +0800 Committer: Chia-Ping Tsai <chia7...@gmail.com> Committed: Mon Oct 2 21:10:11 2017 +0800 ---------------------------------------------------------------------- .../apache/hadoop/hbase/HTableDescriptor.java | 26 +++- .../org/apache/hadoop/hbase/RegionLoad.java | 2 +- .../org/apache/hadoop/hbase/ServerLoad.java | 6 +- .../hadoop/hbase/client/MetricsConnection.java | 2 +- .../hadoop/hbase/client/RegionLoadStats.java | 9 ++ .../hadoop/hbase/client/TableDescriptor.java | 2 +- .../hbase/client/TableDescriptorBuilder.java | 8 +- .../backoff/ExponentialClientBackoffPolicy.java | 2 +- .../hbase/client/backoff/ServerStatistics.java | 4 +- .../hbase/shaded/protobuf/ProtobufUtil.java | 2 +- .../client/TestClientExponentialBackoff.java | 4 +- .../regionserver/MetricsRegionServerSource.java | 2 +- .../MetricsRegionServerWrapper.java | 6 +- .../regionserver/MetricsRegionWrapper.java | 2 +- .../MetricsTableWrapperAggregate.java | 2 +- .../MetricsRegionServerSourceImpl.java | 4 +- .../regionserver/MetricsRegionSourceImpl.java | 2 +- .../regionserver/MetricsTableSourceImpl.java | 2 +- .../TestMetricsRegionSourceImpl.java | 2 +- .../TestMetricsTableSourceImpl.java | 2 +- .../src/main/protobuf/Client.proto | 6 +- .../src/main/protobuf/ClusterStatus.proto | 2 +- hbase-protocol/src/main/protobuf/Client.proto | 6 +- .../rest/model/StorageClusterStatusModel.java | 8 +- .../protobuf/StorageClusterStatusMessage.proto | 4 +- .../model/TestStorageClusterStatusModel.java | 12 +- .../tmpl/master/RegionServerListTmpl.jamon | 4 +- .../tmpl/regionserver/RegionListTmpl.jamon | 2 +- .../tmpl/regionserver/ServerMetricsTmpl.jamon | 4 +- .../org/apache/hadoop/hbase/io/hfile/HFile.java | 4 +- .../hadoop/hbase/io/hfile/HFileBlock.java | 4 +- .../hadoop/hbase/io/hfile/HFileReaderImpl.java | 20 +-- .../hadoop/hbase/io/util/MemorySizeUtil.java | 6 +- .../master/balancer/StochasticLoadBalancer.java | 6 +- .../org/apache/hadoop/hbase/mob/MobFile.java | 4 +- .../hbase/regionserver/AbstractMemStore.java | 14 +- .../regionserver/CellArrayImmutableSegment.java | 4 +- .../regionserver/CellChunkImmutableSegment.java | 4 +- .../hbase/regionserver/CompactingMemStore.java | 18 +-- .../hbase/regionserver/CompactionPipeline.java | 18 +-- .../regionserver/CompositeImmutableSegment.java | 4 +- .../regionserver/DefaultHeapMemoryTuner.java | 4 +- .../hbase/regionserver/DefaultMemStore.java | 14 +- .../regionserver/FlushLargeStoresPolicy.java | 2 +- .../FlushNonSloppyStoresFirstPolicy.java | 2 +- .../hbase/regionserver/FlushRequester.java | 2 +- .../hadoop/hbase/regionserver/HRegion.java | 154 +++++++++---------- .../hbase/regionserver/HRegionServer.java | 14 +- .../hadoop/hbase/regionserver/HStore.java | 22 +-- .../hadoop/hbase/regionserver/HStoreFile.java | 2 +- .../hbase/regionserver/HeapMemoryManager.java | 26 ++-- .../hadoop/hbase/regionserver/MemStore.java | 12 +- .../hbase/regionserver/MemStoreFlusher.java | 54 +++---- .../hadoop/hbase/regionserver/MemStoreSize.java | 107 +++++++++++++ .../hadoop/hbase/regionserver/MemstoreSize.java | 107 ------------- .../hbase/regionserver/MetricsRegionServer.java | 2 +- .../MetricsRegionServerWrapperImpl.java | 10 +- .../regionserver/MetricsRegionWrapperImpl.java | 2 +- .../MetricsTableWrapperAggregateImpl.java | 12 +- .../hbase/regionserver/MutableSegment.java | 6 +- .../hadoop/hbase/regionserver/Region.java | 2 +- .../regionserver/RegionServerAccounting.java | 64 ++++---- .../regionserver/RegionServicesForStores.java | 16 +- .../hadoop/hbase/regionserver/Segment.java | 8 +- .../hbase/regionserver/SegmentFactory.java | 2 +- .../apache/hadoop/hbase/regionserver/Store.java | 10 +- .../regionserver/StoreConfigInformation.java | 2 +- .../hadoop/hbase/regionserver/StoreFile.java | 2 +- .../hadoop/hbase/regionserver/StoreUtils.java | 4 +- .../hbase/regionserver/StripeStoreConfig.java | 2 +- .../compactions/CompactionConfiguration.java | 8 +- .../regionserver/compactions/Compactor.java | 12 +- .../hbase/regionserver/wal/AbstractFSWAL.java | 8 +- .../hbase/regionserver/wal/FSWALEntry.java | 2 +- .../RegionReplicaReplicationEndpoint.java | 2 +- .../hadoop/hbase/wal/DisabledWALProvider.java | 4 +- .../java/org/apache/hadoop/hbase/wal/WAL.java | 6 +- .../hadoop/hbase/TestGlobalMemStoreSize.java | 16 +- .../hbase/client/TestAsyncRegionAdminApi.java | 12 +- .../hadoop/hbase/client/TestClientPushback.java | 13 +- ...NegativeMemStoreSizeWithSlowCoprocessor.java | 104 +++++++++++++ ...NegativeMemstoreSizeWithSlowCoprocessor.java | 104 ------------- .../hadoop/hbase/io/hfile/TestHFileBlock.java | 2 +- .../balancer/TestStochasticLoadBalancer.java | 2 +- .../MetricsRegionServerWrapperStub.java | 4 +- .../regionserver/MetricsRegionWrapperStub.java | 2 +- .../regionserver/MetricsTableWrapperStub.java | 2 +- .../regionserver/TestCompactingMemStore.java | 58 +++---- .../TestCompactingToCellFlatMapMemStore.java | 46 +++--- .../hbase/regionserver/TestDefaultMemStore.java | 8 +- .../TestEndToEndSplitTransaction.java | 3 +- .../hadoop/hbase/regionserver/TestHRegion.java | 30 ++-- .../regionserver/TestHRegionReplayEvents.java | 42 ++--- .../hadoop/hbase/regionserver/TestHStore.java | 22 +-- .../regionserver/TestHeapMemoryManager.java | 8 +- .../regionserver/TestPerColumnFamilyFlush.java | 45 +++--- .../TestRegionServerAccounting.java | 36 ++--- .../hbase/regionserver/TestWALLockup.java | 6 +- .../TestWalAndCompactingMemStoreFlush.java | 136 ++++++++-------- .../regionserver/wal/AbstractTestWALReplay.java | 7 +- .../hbase/regionserver/wal/TestFSHLog.java | 2 +- 101 files changed, 844 insertions(+), 819 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java index c62ab1d..c9807c3 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java @@ -563,11 +563,29 @@ public class HTableDescriptor implements TableDescriptor, Comparable<HTableDescr } /** + * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0. + * Use {@link #hasRegionMemStoreReplication()} instead + */ + @Deprecated + public boolean hasRegionMemstoreReplication() { + return hasRegionMemStoreReplication(); + } + + /** * @return true if the read-replicas memstore replication is enabled. */ @Override - public boolean hasRegionMemstoreReplication() { - return delegatee.hasRegionMemstoreReplication(); + public boolean hasRegionMemStoreReplication() { + return delegatee.hasRegionMemStoreReplication(); + } + + /** + * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0. + * Use {@link #setRegionMemStoreReplication(boolean)} instead + */ + @Deprecated + public HTableDescriptor setRegionMemstoreReplication(boolean memstoreReplication) { + return setRegionMemStoreReplication(memstoreReplication); } /** @@ -579,8 +597,8 @@ public class HTableDescriptor implements TableDescriptor, Comparable<HTableDescr * false if the secondaries can tollerate to have new * data only when the primary flushes the memstore. */ - public HTableDescriptor setRegionMemstoreReplication(boolean memstoreReplication) { - getDelegateeForModification().setRegionMemstoreReplication(memstoreReplication); + public HTableDescriptor setRegionMemStoreReplication(boolean memstoreReplication) { + getDelegateeForModification().setRegionMemStoreReplication(memstoreReplication); return this; } http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionLoad.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionLoad.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionLoad.java index 37502df..a2b993f 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionLoad.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionLoad.java @@ -80,7 +80,7 @@ public class RegionLoad { * @return the memstore size, in MB */ public int getMemStoreSizeMB() { - return regionLoadPB.getMemstoreSizeMB(); + return regionLoadPB.getMemStoreSizeMB(); } /** http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java index 89302f6..c6cc4e9 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerLoad.java @@ -65,7 +65,7 @@ public class ServerLoad { storefiles += rl.getStorefiles(); storeUncompressedSizeMB += rl.getStoreUncompressedSizeMB(); storefileSizeMB += rl.getStorefileSizeMB(); - memstoreSizeMB += rl.getMemstoreSizeMB(); + memstoreSizeMB += rl.getMemStoreSizeMB(); storefileIndexSizeKB += rl.getStorefileIndexSizeKB(); readRequestsCount += rl.getReadRequestsCount(); filteredReadRequestsCount += rl.getFilteredReadRequestsCount(); @@ -147,14 +147,14 @@ public class ServerLoad { /** * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 - * Use {@link #getMemstoreSizeMB()} instead. + * Use {@link #getMemStoreSizeMB()} instead. */ @Deprecated public int getMemstoreSizeInMB() { return memstoreSizeMB; } - public int getMemstoreSizeMB() { + public int getMemStoreSizeMB() { return memstoreSizeMB; } http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetricsConnection.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetricsConnection.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetricsConnection.java index b88baa4..8461376 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetricsConnection.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetricsConnection.java @@ -167,7 +167,7 @@ public class MetricsConnection implements StatisticTrackable { } public void update(RegionLoadStats regionStatistics) { - this.memstoreLoadHist.update(regionStatistics.getMemstoreLoad()); + this.memstoreLoadHist.update(regionStatistics.getMemStoreLoad()); this.heapOccupancyHist.update(regionStatistics.getHeapOccupancy()); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionLoadStats.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionLoadStats.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionLoadStats.java index df37a38..052ac53 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionLoadStats.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionLoadStats.java @@ -34,10 +34,19 @@ public class RegionLoadStats { this.compactionPressure = compactionPressure; } + /** + * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0. + * Use {@link #getMemStoreLoad()} instead + */ + @Deprecated public int getMemstoreLoad() { return this.memstoreLoad; } + public int getMemStoreLoad() { + return this.memstoreLoad; + } + public int getHeapOccupancy() { return this.heapOccupancy; } http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptor.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptor.java index 33e712f..4e2deed 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptor.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptor.java @@ -220,7 +220,7 @@ public interface TableDescriptor { /** * @return true if the read-replicas memstore replication is enabled. */ - boolean hasRegionMemstoreReplication(); + boolean hasRegionMemStoreReplication(); /** * @return true if there are at least one cf whose replication scope is http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java index 034d550..7bde1c1 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java @@ -379,8 +379,8 @@ public class TableDescriptorBuilder { return this; } - public TableDescriptorBuilder setRegionMemstoreReplication(boolean memstoreReplication) { - desc.setRegionMemstoreReplication(memstoreReplication); + public TableDescriptorBuilder setRegionMemStoreReplication(boolean memstoreReplication) { + desc.setRegionMemStoreReplication(memstoreReplication); return this; } @@ -1067,7 +1067,7 @@ public class TableDescriptorBuilder { * @return true if the read-replicas memstore replication is enabled. */ @Override - public boolean hasRegionMemstoreReplication() { + public boolean hasRegionMemStoreReplication() { return getOrDefault(REGION_MEMSTORE_REPLICATION_KEY, Boolean::valueOf, DEFAULT_REGION_MEMSTORE_REPLICATION); } @@ -1081,7 +1081,7 @@ public class TableDescriptorBuilder { * have new data only when the primary flushes the memstore. * @return the modifyable TD */ - public ModifyableTableDescriptor setRegionMemstoreReplication(boolean memstoreReplication) { + public ModifyableTableDescriptor setRegionMemStoreReplication(boolean memstoreReplication) { setValue(REGION_MEMSTORE_REPLICATION_KEY, Boolean.toString(memstoreReplication)); // If the memstore replication is setup, we do not have to wait for observing a flush event // from primary before starting to serve reads, because gaps from replication is not applicable http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-client/src/main/java/org/apache/hadoop/hbase/client/backoff/ExponentialClientBackoffPolicy.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/backoff/ExponentialClientBackoffPolicy.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/backoff/ExponentialClientBackoffPolicy.java index 3ca9d4f..53d6776 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/backoff/ExponentialClientBackoffPolicy.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/backoff/ExponentialClientBackoffPolicy.java @@ -64,7 +64,7 @@ public class ExponentialClientBackoffPolicy implements ClientBackoffPolicy { } // Factor in memstore load - double percent = regionStats.getMemstoreLoadPercent() / 100.0; + double percent = regionStats.getMemStoreLoadPercent() / 100.0; // Factor in heap occupancy float heapOccupancy = regionStats.getHeapOccupancyPercent() / 100.0f; http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-client/src/main/java/org/apache/hadoop/hbase/client/backoff/ServerStatistics.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/backoff/ServerStatistics.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/backoff/ServerStatistics.java index e40a6e2..e18309d 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/backoff/ServerStatistics.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/backoff/ServerStatistics.java @@ -59,12 +59,12 @@ public class ServerStatistics { private int compactionPressure = 0; public void update(RegionLoadStats currentStats) { - this.memstoreLoad = currentStats.getMemstoreLoad(); + this.memstoreLoad = currentStats.getMemStoreLoad(); this.heapOccupancy = currentStats.getHeapOccupancy(); this.compactionPressure = currentStats.getCompactionPressure(); } - public int getMemstoreLoadPercent(){ + public int getMemStoreLoadPercent(){ return this.memstoreLoad; } http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java index 1de57c5..776aff2 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java @@ -3155,7 +3155,7 @@ public final class ProtobufUtil { } public static RegionLoadStats createRegionLoadStats(ClientProtos.RegionLoadStats stats) { - return new RegionLoadStats(stats.getMemstoreLoad(), stats.getHeapOccupancy(), + return new RegionLoadStats(stats.getMemStoreLoad(), stats.getHeapOccupancy(), stats.getCompactionPressure()); } http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientExponentialBackoff.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientExponentialBackoff.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientExponentialBackoff.java index 0261ad7..dcd2230 100644 --- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientExponentialBackoff.java +++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientExponentialBackoff.java @@ -156,7 +156,7 @@ public class TestClientExponentialBackoff { private void update(ServerStatistics stats, int load) { ClientProtos.RegionLoadStats stat = ClientProtos.RegionLoadStats.newBuilder() - .setMemstoreLoad + .setMemStoreLoad (load).build(); stats.update(regionname, ProtobufUtil.createRegionLoadStats(stat)); } @@ -164,7 +164,7 @@ public class TestClientExponentialBackoff { private void update(ServerStatistics stats, int memstoreLoad, int heapOccupancy, int compactionPressure) { ClientProtos.RegionLoadStats stat = ClientProtos.RegionLoadStats.newBuilder() - .setMemstoreLoad(memstoreLoad) + .setMemStoreLoad(memstoreLoad) .setHeapOccupancy(heapOccupancy) .setCompactionPressure(compactionPressure) .build(); http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSource.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSource.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSource.java index 7ed9cbb..3dd4445 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSource.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSource.java @@ -175,7 +175,7 @@ public interface MetricsRegionServerSource extends BaseSource, JvmPauseMonitorSo * Update the flush memstore size histogram * @param bytes the number of bytes in the memstore */ - void updateFlushMemstoreSize(long bytes); + void updateFlushMemStoreSize(long bytes); /** * Update the flush output file size histogram http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapper.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapper.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapper.java index e835636..761945a 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapper.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapper.java @@ -71,7 +71,7 @@ public interface MetricsRegionServerWrapper { * Get the number of WAL files of this region server. */ long getNumWALFiles(); - + /** * Get the size of WAL files of this region server. */ @@ -90,7 +90,7 @@ public interface MetricsRegionServerWrapper { /** * Get the size of the memstore on this region server. */ - long getMemstoreSize(); + long getMemStoreSize(); /** * Get the total size of the store files this region server is serving from. @@ -207,7 +207,7 @@ public interface MetricsRegionServerWrapper { */ int getFlushQueueSize(); - public long getMemstoreLimit(); + public long getMemStoreLimit(); /** * Get the size (in bytes) of the block cache that is free. */ http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionWrapper.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionWrapper.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionWrapper.java index fcc600d..371f9ba 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionWrapper.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionWrapper.java @@ -57,7 +57,7 @@ public interface MetricsRegionWrapper { /** * Get the size of the memstore on this region server. */ - long getMemstoreSize(); + long getMemStoreSize(); /** * Get the total size of the store files this region server is serving from. http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableWrapperAggregate.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableWrapperAggregate.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableWrapperAggregate.java index 85ea4f6..910c729 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableWrapperAggregate.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableWrapperAggregate.java @@ -43,7 +43,7 @@ public interface MetricsTableWrapperAggregate { /** * Get the memory store size against this table */ - long getMemstoresSize(String table); + long getMemStoresSize(String table); /** * Get the store file size against this table http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceImpl.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceImpl.java index bdebba9..a123a89 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceImpl.java @@ -264,7 +264,7 @@ public class MetricsRegionServerSourceImpl } @Override - public void updateFlushMemstoreSize(long bytes) { + public void updateFlushMemStoreSize(long bytes) { flushMemstoreSizeHisto.add(bytes); flushedMemstoreBytes.incr(bytes); } @@ -339,7 +339,7 @@ public class MetricsRegionServerSourceImpl .addGauge(Interns.info(WALFILE_COUNT, WALFILE_COUNT_DESC), rsWrap.getNumWALFiles()) .addGauge(Interns.info(WALFILE_SIZE, WALFILE_SIZE_DESC), rsWrap.getWALFileSize()) .addGauge(Interns.info(STOREFILE_COUNT, STOREFILE_COUNT_DESC), rsWrap.getNumStoreFiles()) - .addGauge(Interns.info(MEMSTORE_SIZE, MEMSTORE_SIZE_DESC), rsWrap.getMemstoreSize()) + .addGauge(Interns.info(MEMSTORE_SIZE, MEMSTORE_SIZE_DESC), rsWrap.getMemStoreSize()) .addGauge(Interns.info(STOREFILE_SIZE, STOREFILE_SIZE_DESC), rsWrap.getStoreFileSize()) .addGauge(Interns.info(MAX_STORE_FILE_AGE, MAX_STORE_FILE_AGE_DESC), rsWrap.getMaxStoreFileAge()) http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSourceImpl.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSourceImpl.java index a103951..09175d5 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSourceImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSourceImpl.java @@ -216,7 +216,7 @@ public class MetricsRegionSourceImpl implements MetricsRegionSource { mrb.addGauge(Interns.info( regionNamePrefix + MetricsRegionServerSource.MEMSTORE_SIZE, MetricsRegionServerSource.MEMSTORE_SIZE_DESC), - this.regionWrapper.getMemstoreSize()); + this.regionWrapper.getMemStoreSize()); mrb.addGauge(Interns.info( regionNamePrefix + MetricsRegionServerSource.MAX_STORE_FILE_AGE, MetricsRegionServerSource.MAX_STORE_FILE_AGE_DESC), http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.java index c9e9b17..f95eb4c 100644 --- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.java +++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.java @@ -133,7 +133,7 @@ public class MetricsTableSourceImpl implements MetricsTableSource { tableWrapperAgg.getTotalRequestsCount(tableName.getNameAsString())); mrb.addGauge(Interns.info(tableNamePrefix + MetricsTableSource.MEMSTORE_SIZE, MetricsTableSource.MEMSTORE_SIZE_DESC), - tableWrapperAgg.getMemstoresSize(tableName.getNameAsString())); + tableWrapperAgg.getMemStoresSize(tableName.getNameAsString())); mrb.addGauge(Interns.info(tableNamePrefix + MetricsTableSource.STORE_FILE_SIZE, MetricsTableSource.STORE_FILE_SIZE_DESC), tableWrapperAgg.getStoreFilesSize(tableName.getNameAsString())); http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionSourceImpl.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionSourceImpl.java b/hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionSourceImpl.java index b5c3a8b..b01bbe3 100644 --- a/hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionSourceImpl.java +++ b/hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionSourceImpl.java @@ -92,7 +92,7 @@ public class TestMetricsRegionSourceImpl { } @Override - public long getMemstoreSize() { + public long getMemStoreSize() { return 0; } http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsTableSourceImpl.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsTableSourceImpl.java b/hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsTableSourceImpl.java index 2717817..0c2350f 100644 --- a/hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsTableSourceImpl.java +++ b/hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsTableSourceImpl.java @@ -92,7 +92,7 @@ public class TestMetricsTableSourceImpl { } @Override - public long getMemstoresSize(String table) { + public long getMemStoresSize(String table) { return 1000; } http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-protocol-shaded/src/main/protobuf/Client.proto ---------------------------------------------------------------------- diff --git a/hbase-protocol-shaded/src/main/protobuf/Client.proto b/hbase-protocol-shaded/src/main/protobuf/Client.proto index e5c843f..642eb61 100644 --- a/hbase-protocol-shaded/src/main/protobuf/Client.proto +++ b/hbase-protocol-shaded/src/main/protobuf/Client.proto @@ -102,7 +102,7 @@ message Result { // in the query. optional bool exists = 3; - // Whether or not the results are coming from possibly stale data + // Whether or not the results are coming from possibly stale data optional bool stale = 4 [default = false]; // Whether or not the entire result could be returned. Results will be split when @@ -452,7 +452,7 @@ message RegionAction { */ message RegionLoadStats { // Percent load on the memstore. Guaranteed to be positive, between 0 and 100. - optional int32 memstoreLoad = 1 [default = 0]; + optional int32 memStoreLoad = 1 [default = 0]; // Percent JVM heap occupancy. Guaranteed to be positive, between 0 and 100. // We can move this to "ServerLoadStats" should we develop them. optional int32 heapOccupancy = 2 [default = 0]; @@ -533,7 +533,7 @@ service ClientService { rpc ExecService(CoprocessorServiceRequest) returns(CoprocessorServiceResponse); - + rpc ExecRegionServerService(CoprocessorServiceRequest) returns(CoprocessorServiceResponse); http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-protocol-shaded/src/main/protobuf/ClusterStatus.proto ---------------------------------------------------------------------- diff --git a/hbase-protocol-shaded/src/main/protobuf/ClusterStatus.proto b/hbase-protocol-shaded/src/main/protobuf/ClusterStatus.proto index 2fb221b..7b9fb8c 100644 --- a/hbase-protocol-shaded/src/main/protobuf/ClusterStatus.proto +++ b/hbase-protocol-shaded/src/main/protobuf/ClusterStatus.proto @@ -94,7 +94,7 @@ message RegionLoad { optional uint32 storefile_size_MB = 5; /** the current size of the memstore for the region, in MB */ - optional uint32 memstore_size_MB = 6; + optional uint32 mem_store_size_MB = 6; /** * The current total size of root-level store file indexes for the region, http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-protocol/src/main/protobuf/Client.proto ---------------------------------------------------------------------- diff --git a/hbase-protocol/src/main/protobuf/Client.proto b/hbase-protocol/src/main/protobuf/Client.proto index 20a5b63..bc15aec 100644 --- a/hbase-protocol/src/main/protobuf/Client.proto +++ b/hbase-protocol/src/main/protobuf/Client.proto @@ -103,7 +103,7 @@ message Result { // in the query. optional bool exists = 3; - // Whether or not the results are coming from possibly stale data + // Whether or not the results are coming from possibly stale data optional bool stale = 4 [default = false]; // Whether or not the entire result could be returned. Results will be split when @@ -453,7 +453,7 @@ message RegionAction { */ message RegionLoadStats { // Percent load on the memstore. Guaranteed to be positive, between 0 and 100. - optional int32 memstoreLoad = 1 [default = 0]; + optional int32 memStoreLoad = 1 [default = 0]; // Percent JVM heap occupancy. Guaranteed to be positive, between 0 and 100. // We can move this to "ServerLoadStats" should we develop them. optional int32 heapOccupancy = 2 [default = 0]; @@ -534,7 +534,7 @@ service ClientService { rpc ExecService(CoprocessorServiceRequest) returns(CoprocessorServiceResponse); - + rpc ExecRegionServerService(CoprocessorServiceRequest) returns(CoprocessorServiceResponse); http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterStatusModel.java ---------------------------------------------------------------------- diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterStatusModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterStatusModel.java index 86d8662..ccce92d 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterStatusModel.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterStatusModel.java @@ -203,7 +203,7 @@ public class StorageClusterStatusModel * @return memstore size, in MB */ @XmlAttribute - public int getMemstoreSizeMB() { + public int getMemStoreSizeMB() { return memstoreSizeMB; } @@ -356,7 +356,7 @@ public class StorageClusterStatusModel /** * @param memstoreSizeMB memstore size, in MB */ - public void setMemstoreSizeMB(int memstoreSizeMB) { + public void setMemStoreSizeMB(int memstoreSizeMB) { this.memstoreSizeMB = memstoreSizeMB; } @@ -728,7 +728,7 @@ public class StorageClusterStatusModel regionBuilder.setStores(region.stores); regionBuilder.setStorefiles(region.storefiles); regionBuilder.setStorefileSizeMB(region.storefileSizeMB); - regionBuilder.setMemstoreSizeMB(region.memstoreSizeMB); + regionBuilder.setMemStoreSizeMB(region.memstoreSizeMB); regionBuilder.setStorefileIndexSizeKB(region.storefileIndexSizeKB); regionBuilder.setReadRequestsCount(region.readRequestsCount); regionBuilder.setWriteRequestsCount(region.writeRequestsCount); @@ -774,7 +774,7 @@ public class StorageClusterStatusModel region.getStores(), region.getStorefiles(), region.getStorefileSizeMB(), - region.getMemstoreSizeMB(), + region.getMemStoreSizeMB(), region.getStorefileIndexSizeKB(), region.getReadRequestsCount(), region.getWriteRequestsCount(), http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-rest/src/main/protobuf/StorageClusterStatusMessage.proto ---------------------------------------------------------------------- diff --git a/hbase-rest/src/main/protobuf/StorageClusterStatusMessage.proto b/hbase-rest/src/main/protobuf/StorageClusterStatusMessage.proto index f69efd7..f03a6bc 100644 --- a/hbase-rest/src/main/protobuf/StorageClusterStatusMessage.proto +++ b/hbase-rest/src/main/protobuf/StorageClusterStatusMessage.proto @@ -23,7 +23,7 @@ message StorageClusterStatus { optional int32 stores = 2; optional int32 storefiles = 3; optional int32 storefileSizeMB = 4; - optional int32 memstoreSizeMB = 5; + optional int32 memStoreSizeMB = 5; optional int64 storefileIndexSizeKB = 6; optional int64 readRequestsCount = 7; optional int64 writeRequestsCount = 8; @@ -45,7 +45,7 @@ message StorageClusterStatus { repeated Node liveNodes = 1; repeated string deadNodes = 2; // summary statistics - optional int32 regions = 3; + optional int32 regions = 3; optional int64 requests = 4; optional double averageLoad = 5; } http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterStatusModel.java ---------------------------------------------------------------------- diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterStatusModel.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterStatusModel.java index 884e451..18060e8 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterStatusModel.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterStatusModel.java @@ -61,13 +61,13 @@ public class TestStorageClusterStatusModel extends TestModelBase<StorageClusterS AS_JSON = "{\"regions\":2,\"requests\":0,\"averageLoad\":1.0,\"LiveNodes\":[{\"name\":\"test1\"," + "\"Region\":[{\"name\":\"aGJhc2U6cm9vdCwsMA==\",\"stores\":1,\"storefiles\":1," + - "\"storefileSizeMB\":0,\"memstoreSizeMB\":0,\"storefileIndexSizeKB\":0," + + "\"storefileSizeMB\":0,\"memStoreSizeMB\":0,\"storefileIndexSizeKB\":0," + "\"readRequestsCount\":1,\"writeRequestsCount\":2,\"rootIndexSizeKB\":1," + "\"totalStaticIndexSizeKB\":1,\"totalStaticBloomSizeKB\":1,\"totalCompactingKVs\":1," + "\"currentCompactedKVs\":1}],\"requests\":0,\"startCode\":1245219839331," + "\"heapSizeMB\":128,\"maxHeapSizeMB\":1024},{\"name\":\"test2\"," + "\"Region\":[{\"name\":\"aGJhc2U6bWV0YSwsMTI0NjAwMDA0MzcyNA==\",\"stores\":1," + - "\"storefiles\":1,\"storefileSizeMB\":0,\"memstoreSizeMB\":0,\"storefileIndexSizeKB\":0," + + "\"storefiles\":1,\"storefileSizeMB\":0,\"memStoreSizeMB\":0,\"storefileIndexSizeKB\":0," + "\"readRequestsCount\":1,\"writeRequestsCount\":2,\"rootIndexSizeKB\":1," + "\"totalStaticIndexSizeKB\":1,\"totalStaticBloomSizeKB\":1,\"totalCompactingKVs\":1," + "\"currentCompactedKVs\":1}],\"requests\":0,\"startCode\":1245239331198," + @@ -98,7 +98,7 @@ public class TestStorageClusterStatusModel extends TestModelBase<StorageClusterS assertEquals(node.getStartCode(), 1245219839331L); assertEquals(node.getHeapSizeMB(), 128); assertEquals(node.getMaxHeapSizeMB(), 1024); - Iterator<StorageClusterStatusModel.Node.Region> regions = + Iterator<StorageClusterStatusModel.Node.Region> regions = node.getRegions().iterator(); StorageClusterStatusModel.Node.Region region = regions.next(); assertTrue(Bytes.toString(region.getName()).equals( @@ -106,7 +106,7 @@ public class TestStorageClusterStatusModel extends TestModelBase<StorageClusterS assertEquals(region.getStores(), 1); assertEquals(region.getStorefiles(), 1); assertEquals(region.getStorefileSizeMB(), 0); - assertEquals(region.getMemstoreSizeMB(), 0); + assertEquals(region.getMemStoreSizeMB(), 0); assertEquals(region.getStorefileIndexSizeKB(), 0); assertEquals(region.getReadRequestsCount(), 1); assertEquals(region.getWriteRequestsCount(), 2); @@ -128,7 +128,7 @@ public class TestStorageClusterStatusModel extends TestModelBase<StorageClusterS assertEquals(region.getStores(), 1); assertEquals(region.getStorefiles(), 1); assertEquals(region.getStorefileSizeMB(), 0); - assertEquals(region.getMemstoreSizeMB(), 0); + assertEquals(region.getMemStoreSizeMB(), 0); assertEquals(region.getStorefileIndexSizeKB(), 0); assertEquals(region.getReadRequestsCount(), 1); assertEquals(region.getWriteRequestsCount(), 2); @@ -137,7 +137,7 @@ public class TestStorageClusterStatusModel extends TestModelBase<StorageClusterS assertEquals(region.getTotalStaticBloomSizeKB(), 1); assertEquals(region.getTotalCompactingKVs(), 1); assertEquals(region.getCurrentCompactedKVs(), 1); - + assertFalse(regions.hasNext()); assertFalse(nodes.hasNext()); } http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon index aa6e877..0b5599d 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon @@ -94,7 +94,7 @@ Arrays.sort(serverNames); if (!masterVersion.equals(version)) { inconsistentNodeNum ++; } - + double requestsPerSecond = 0.0; int numRegionsOnline = 0; long lastContact = 0; @@ -158,7 +158,7 @@ for (ServerName serverName: serverNames) { * TraditionalBinaryPrefix.MEGA.value, "B", 1) %></td> <td><% TraditionalBinaryPrefix.long2String(sl.getMaxHeapMB() * TraditionalBinaryPrefix.MEGA.value, "B", 1) %></td> - <td><% TraditionalBinaryPrefix.long2String(sl.getMemstoreSizeMB() + <td><% TraditionalBinaryPrefix.long2String(sl.getMemStoreSizeMB() * TraditionalBinaryPrefix.MEGA.value, "B", 1) %></td> </tr> http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon index cf0e8ad..d16ce06 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon @@ -255,7 +255,7 @@ <td><a href="region.jsp?name=<% r.getEncodedName() %>"><% displayName %></a></td> <%if load != null %> <td><% TraditionalBinaryPrefix.long2String( - load.getMemstoreSizeMB() * TraditionalBinaryPrefix.MEGA.value, "B", 1) %></td> + load.getMemStoreSizeMB() * TraditionalBinaryPrefix.MEGA.value, "B", 1) %></td> </%if> </tr> </%for> http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon index 1a8b274..2e99d5b 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon @@ -129,10 +129,10 @@ MetricsRegionServerWrapper mWrap; <% TraditionalBinaryPrefix.long2String(DirectMemoryUtils.getDirectMemorySize(), "B", 1) %> </td> <td> - <% TraditionalBinaryPrefix.long2String(mWrap.getMemstoreSize(), "B", 1) %> + <% TraditionalBinaryPrefix.long2String(mWrap.getMemStoreSize(), "B", 1) %> </td> <td> - <% TraditionalBinaryPrefix.long2String(mWrap.getMemstoreLimit(), "B", 1) %> + <% TraditionalBinaryPrefix.long2String(mWrap.getMemStoreLimit(), "B", 1) %> </td> </tr> </table> http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java index 9cf00b3..35b741d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java @@ -489,9 +489,9 @@ public class HFile { boolean isPrimaryReplicaReader(); - boolean shouldIncludeMemstoreTS(); + boolean shouldIncludeMemStoreTS(); - boolean isDecodeMemstoreTS(); + boolean isDecodeMemStoreTS(); DataBlockEncoding getEffectiveEncodingInCache(boolean isCompaction); http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java index 24557ad..c6c7446 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java @@ -1388,7 +1388,7 @@ public class HFileBlock implements Cacheable { /** Get the default decoder for blocks from this file. */ HFileBlockDecodingContext getDefaultBlockDecodingContext(); - void setIncludesMemstoreTS(boolean includesMemstoreTS); + void setIncludesMemStoreTS(boolean includesMemstoreTS); void setDataBlockEncoder(HFileDataBlockEncoder encoder); /** @@ -1810,7 +1810,7 @@ public class HFileBlock implements Cacheable { } @Override - public void setIncludesMemstoreTS(boolean includesMemstoreTS) { + public void setIncludesMemStoreTS(boolean includesMemstoreTS) { this.fileContext.setIncludesMvcc(includesMemstoreTS); } http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.java index 381279a..039f499 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.java @@ -236,7 +236,7 @@ public class HFileReaderImpl implements HFile.Reader, Configurable { byte [] keyValueFormatVersion = fileInfo.get(HFileWriterImpl.KEY_VALUE_VERSION); includesMemstoreTS = keyValueFormatVersion != null && Bytes.toInt(keyValueFormatVersion) == HFileWriterImpl.KEY_VALUE_VER_WITH_MEMSTORE; - fsBlockReader.setIncludesMemstoreTS(includesMemstoreTS); + fsBlockReader.setIncludesMemStoreTS(includesMemstoreTS); if (includesMemstoreTS) { decodeMemstoreTS = Bytes.toLong(fileInfo.get(HFileWriterImpl.MAX_MEMSTORE_TS_KEY)) > 0; } @@ -645,8 +645,8 @@ public class HFileReaderImpl implements HFile.Reader, Configurable { */ protected void readMvccVersion(final int offsetFromPos) { // See if we even need to decode mvcc. - if (!this.reader.shouldIncludeMemstoreTS()) return; - if (!this.reader.isDecodeMemstoreTS()) { + if (!this.reader.shouldIncludeMemStoreTS()) return; + if (!this.reader.isDecodeMemStoreTS()) { currMemstoreTS = 0; currMemstoreTSLen = 1; return; @@ -741,7 +741,7 @@ public class HFileReaderImpl implements HFile.Reader, Configurable { // add the two bytes read for the tags. offsetFromPos += tlen + (Bytes.SIZEOF_SHORT); } - if (this.reader.shouldIncludeMemstoreTS()) { + if (this.reader.shouldIncludeMemStoreTS()) { // Directly read the mvcc based on current position readMvccVersion(offsetFromPos); } @@ -873,7 +873,7 @@ public class HFileReaderImpl implements HFile.Reader, Configurable { return false; } - // The first key in the current block 'seekToBlock' is greater than the given + // The first key in the current block 'seekToBlock' is greater than the given // seekBefore key. We will go ahead by reading the next block that satisfies the // given key. Return the current block before reading the next one. reader.returnBlock(seekToBlock); @@ -945,7 +945,7 @@ public class HFileReaderImpl implements HFile.Reader, Configurable { Cell ret; int cellBufSize = getKVBufSize(); long seqId = 0l; - if (this.reader.shouldIncludeMemstoreTS()) { + if (this.reader.shouldIncludeMemStoreTS()) { seqId = currMemstoreTS; } if (blockBuffer.hasArray()) { @@ -987,7 +987,7 @@ public class HFileReaderImpl implements HFile.Reader, Configurable { + keyPair.getSecond(), currKeyLen); } else { // Better to do a copy here instead of holding on to this BB so that - // we could release the blocks referring to this key. This key is specifically used + // we could release the blocks referring to this key. This key is specifically used // in HalfStoreFileReader to get the firstkey and lastkey by creating a new scanner // every time. So holding onto the BB (incase of DBB) is not advised here. byte[] key = new byte[currKeyLen]; @@ -1275,11 +1275,11 @@ public class HFileReaderImpl implements HFile.Reader, Configurable { protected boolean decodeMemstoreTS = false; - public boolean isDecodeMemstoreTS() { + public boolean isDecodeMemStoreTS() { return this.decodeMemstoreTS; } - public boolean shouldIncludeMemstoreTS() { + public boolean shouldIncludeMemStoreTS() { return includesMemstoreTS; } @@ -1783,7 +1783,7 @@ public class HFileReaderImpl implements HFile.Reader, Configurable { protected HFileContext createHFileContext(FSDataInputStreamWrapper fsdis, long fileSize, HFileSystem hfs, Path path, FixedFileTrailer trailer) throws IOException { HFileContextBuilder builder = new HFileContextBuilder() - .withIncludesMvcc(shouldIncludeMemstoreTS()) + .withIncludesMvcc(shouldIncludeMemStoreTS()) .withHBaseCheckSum(true) .withHFileName(this.getName()) .withCompression(this.compressAlgo); http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-server/src/main/java/org/apache/hadoop/hbase/io/util/MemorySizeUtil.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/util/MemorySizeUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/util/MemorySizeUtil.java index 545c54d..dbfb295 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/util/MemorySizeUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/util/MemorySizeUtil.java @@ -159,7 +159,7 @@ public class MemorySizeUtil { /** * @return Pair of global memstore size and memory type(ie. on heap or off heap). */ - public static Pair<Long, MemoryType> getGlobalMemstoreSize(Configuration conf) { + public static Pair<Long, MemoryType> getGlobalMemStoreSize(Configuration conf) { long offheapMSGlobal = conf.getLong(OFFHEAP_MEMSTORE_SIZE_KEY, 0);// Size in MBs if (offheapMSGlobal > 0) { // Off heap memstore size has not relevance when MSLAB is turned OFF. We will go with making @@ -178,7 +178,7 @@ public class MemorySizeUtil { + " Going with on heap global memstore size ('" + MEMSTORE_SIZE_KEY + "')"); } } - return new Pair<>(getOnheapGlobalMemstoreSize(conf), MemoryType.HEAP); + return new Pair<>(getOnheapGlobalMemStoreSize(conf), MemoryType.HEAP); } /** @@ -187,7 +187,7 @@ public class MemorySizeUtil { * @param conf * @return the onheap global memstore limt */ - public static long getOnheapGlobalMemstoreSize(Configuration conf) { + public static long getOnheapGlobalMemStoreSize(Configuration conf) { long max = -1L; final MemoryUsage usage = safeGetHeapMemoryUsage(); if (usage != null) { http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java index 258f68a..23d9cb4 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java @@ -192,7 +192,7 @@ public class StochasticLoadBalancer extends BaseLoadBalancer { regionLoadFunctions = new CostFromRegionLoadFunction[] { new ReadRequestCostFunction(conf), new WriteRequestCostFunction(conf), - new MemstoreSizeCostFunction(conf), + new MemStoreSizeCostFunction(conf), new StoreFileCostFunction(conf) }; regionReplicaHostCostFunction = new RegionReplicaHostCostFunction(conf); @@ -1668,13 +1668,13 @@ public class StochasticLoadBalancer extends BaseLoadBalancer { * Compute the cost of total memstore size. The more unbalanced the higher the * computed cost will be. This uses a rolling average of regionload. */ - static class MemstoreSizeCostFunction extends CostFromRegionLoadAsRateFunction { + static class MemStoreSizeCostFunction extends CostFromRegionLoadAsRateFunction { private static final String MEMSTORE_SIZE_COST_KEY = "hbase.master.balancer.stochastic.memstoreSizeCost"; private static final float DEFAULT_MEMSTORE_SIZE_COST = 5; - MemstoreSizeCostFunction(Configuration conf) { + MemStoreSizeCostFunction(Configuration conf) { super(conf); this.setMultiplier(conf.getFloat(MEMSTORE_SIZE_COST_KEY, DEFAULT_MEMSTORE_SIZE_COST)); } http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobFile.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobFile.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobFile.java index 91702c1..1d0d5ff 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobFile.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobFile.java @@ -58,7 +58,7 @@ public class MobFile { List<HStoreFile> sfs = new ArrayList<>(); sfs.add(sf); List<StoreFileScanner> sfScanners = StoreFileScanner.getScannersForStoreFiles(sfs, false, true, - false, false, sf.getMaxMemstoreTS()); + false, false, sf.getMaxMemStoreTS()); return sfScanners.get(0); } @@ -71,7 +71,7 @@ public class MobFile { * @throws IOException */ public Cell readCell(Cell search, boolean cacheMobBlocks) throws IOException { - return readCell(search, cacheMobBlocks, sf.getMaxMemstoreTS()); + return readCell(search, cacheMobBlocks, sf.getMaxMemStoreTS()); } /** http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AbstractMemStore.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AbstractMemStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AbstractMemStore.java index a5c5855..4cb9ed1 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AbstractMemStore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AbstractMemStore.java @@ -96,14 +96,14 @@ public abstract class AbstractMemStore implements MemStore { public abstract void updateLowestUnflushedSequenceIdInWAL(boolean onlyIfMoreRecent); @Override - public void add(Iterable<Cell> cells, MemstoreSize memstoreSize) { + public void add(Iterable<Cell> cells, MemStoreSize memstoreSize) { for (Cell cell : cells) { add(cell, memstoreSize); } } @Override - public void add(Cell cell, MemstoreSize memstoreSize) { + public void add(Cell cell, MemStoreSize memstoreSize) { Cell toAdd = maybeCloneWithAllocator(cell); boolean mslabUsed = (toAdd != cell); // This cell data is backed by the same byte[] where we read request in RPC(See HBASE-15180). By @@ -129,7 +129,7 @@ public abstract class AbstractMemStore implements MemStore { } @Override - public void upsert(Iterable<Cell> cells, long readpoint, MemstoreSize memstoreSize) { + public void upsert(Iterable<Cell> cells, long readpoint, MemStoreSize memstoreSize) { for (Cell cell : cells) { upsert(cell, readpoint, memstoreSize); } @@ -166,8 +166,8 @@ public abstract class AbstractMemStore implements MemStore { } @Override - public MemstoreSize getSnapshotSize() { - return new MemstoreSize(this.snapshot.keySize(), this.snapshot.heapSize()); + public MemStoreSize getSnapshotSize() { + return new MemStoreSize(this.snapshot.keySize(), this.snapshot.heapSize()); } @Override @@ -210,7 +210,7 @@ public abstract class AbstractMemStore implements MemStore { * @param readpoint readpoint below which we can safely remove duplicate KVs * @param memstoreSize */ - private void upsert(Cell cell, long readpoint, MemstoreSize memstoreSize) { + private void upsert(Cell cell, long readpoint, MemStoreSize memstoreSize) { // Add the Cell to the MemStore // Use the internalAdd method here since we (a) already have a lock // and (b) cannot safely use the MSLAB here without potentially @@ -277,7 +277,7 @@ public abstract class AbstractMemStore implements MemStore { * @param mslabUsed whether using MSLAB * @param memstoreSize */ - private void internalAdd(final Cell toAdd, final boolean mslabUsed, MemstoreSize memstoreSize) { + private void internalAdd(final Cell toAdd, final boolean mslabUsed, MemStoreSize memstoreSize) { active.add(toAdd, mslabUsed, memstoreSize); setOldestEditTimeToNow(); checkActiveSize(); http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CellArrayImmutableSegment.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CellArrayImmutableSegment.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CellArrayImmutableSegment.java index fc3a652..a4b8c7b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CellArrayImmutableSegment.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CellArrayImmutableSegment.java @@ -54,7 +54,7 @@ public class CellArrayImmutableSegment extends ImmutableSegment { * of CSLMImmutableSegment * The given iterator returns the Cells that "survived" the compaction. */ - protected CellArrayImmutableSegment(CSLMImmutableSegment segment, MemstoreSize memstoreSize) { + protected CellArrayImmutableSegment(CSLMImmutableSegment segment, MemStoreSize memstoreSize) { super(segment); // initiailize the upper class incSize(0, DEEP_OVERHEAD_CAM - CSLMImmutableSegment.DEEP_OVERHEAD_CSLM); int numOfCells = segment.getCellsCount(); @@ -64,7 +64,7 @@ public class CellArrayImmutableSegment extends ImmutableSegment { // add sizes of CellArrayMap entry (reinitializeCellSet doesn't take the care for the sizes) long newSegmentSizeDelta = numOfCells*(indexEntrySize()-ClassSize.CONCURRENT_SKIPLISTMAP_ENTRY); incSize(0, newSegmentSizeDelta); - memstoreSize.incMemstoreSize(0, newSegmentSizeDelta); + memstoreSize.incMemStoreSize(0, newSegmentSizeDelta); } @Override http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CellChunkImmutableSegment.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CellChunkImmutableSegment.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CellChunkImmutableSegment.java index d4667e1..62b62da 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CellChunkImmutableSegment.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CellChunkImmutableSegment.java @@ -60,7 +60,7 @@ public class CellChunkImmutableSegment extends ImmutableSegment { * of CSLMImmutableSegment * The given iterator returns the Cells that "survived" the compaction. */ - protected CellChunkImmutableSegment(CSLMImmutableSegment segment, MemstoreSize memstoreSize) { + protected CellChunkImmutableSegment(CSLMImmutableSegment segment, MemStoreSize memstoreSize) { super(segment); // initiailize the upper class incSize(0,-CSLMImmutableSegment.DEEP_OVERHEAD_CSLM+ CellChunkImmutableSegment.DEEP_OVERHEAD_CCM); int numOfCells = segment.getCellsCount(); @@ -72,7 +72,7 @@ public class CellChunkImmutableSegment extends ImmutableSegment { long newSegmentSizeDelta = numOfCells*(indexEntrySize()-ClassSize.CONCURRENT_SKIPLISTMAP_ENTRY); incSize(0, newSegmentSizeDelta); - memstoreSize.incMemstoreSize(0, newSegmentSizeDelta); + memstoreSize.incMemStoreSize(0, newSegmentSizeDelta); } @Override http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/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 da502c2..01138df 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 @@ -124,7 +124,7 @@ public class CompactingMemStore extends AbstractMemStore { } private void initInmemoryFlushSize(Configuration conf) { - long memstoreFlushSize = getRegionServices().getMemstoreFlushSize(); + long memstoreFlushSize = getRegionServices().getMemStoreFlushSize(); int numStores = getRegionServices().getNumStores(); if (numStores <= 1) { // Family number might also be zero in some of our unit test case @@ -145,11 +145,11 @@ public class CompactingMemStore extends AbstractMemStore { * caller to make sure this doesn't happen. */ @Override - public MemstoreSize size() { - MemstoreSize memstoreSize = new MemstoreSize(); - memstoreSize.incMemstoreSize(this.active.keySize(), this.active.heapSize()); + public MemStoreSize size() { + MemStoreSize memstoreSize = new MemStoreSize(); + memstoreSize.incMemStoreSize(this.active.keySize(), this.active.heapSize()); for (Segment item : pipeline.getSegments()) { - memstoreSize.incMemstoreSize(item.keySize(), item.heapSize()); + memstoreSize.incMemStoreSize(item.keySize(), item.heapSize()); } return memstoreSize; } @@ -214,19 +214,19 @@ public class CompactingMemStore extends AbstractMemStore { * @return size of data that is going to be flushed */ @Override - public MemstoreSize getFlushableSize() { - MemstoreSize snapshotSize = getSnapshotSize(); + public MemStoreSize getFlushableSize() { + MemStoreSize snapshotSize = getSnapshotSize(); if (snapshotSize.getDataSize() == 0) { // if snapshot is empty the tail of the pipeline (or everything in the memstore) is flushed if (compositeSnapshot) { snapshotSize = pipeline.getPipelineSize(); - snapshotSize.incMemstoreSize(this.active.keySize(), this.active.heapSize()); + snapshotSize.incMemStoreSize(this.active.keySize(), this.active.heapSize()); } else { snapshotSize = pipeline.getTailSize(); } } return snapshotSize.getDataSize() > 0 ? snapshotSize - : new MemstoreSize(this.active.keySize(), this.active.heapSize()); + : new MemStoreSize(this.active.keySize(), this.active.heapSize()); } @Override http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactionPipeline.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactionPipeline.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactionPipeline.java index 7fb8df4..944a7fe 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactionPipeline.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactionPipeline.java @@ -149,7 +149,7 @@ public class CompactionPipeline { long newHeapSize = 0; if(segment != null) newHeapSize = segment.heapSize(); long heapSizeDelta = suffixHeapSize - newHeapSize; - region.addMemstoreSize(new MemstoreSize(-dataSizeDelta, -heapSizeDelta)); + region.addMemStoreSize(new MemStoreSize(-dataSizeDelta, -heapSizeDelta)); if (LOG.isDebugEnabled()) { LOG.debug("Suffix data size: " + suffixDataSize + " new segment data size: " + newDataSize + ". Suffix heap size: " + suffixHeapSize @@ -199,14 +199,14 @@ public class CompactionPipeline { int i = 0; for (ImmutableSegment s : pipeline) { if ( s.canBeFlattened() ) { - MemstoreSize newMemstoreSize = new MemstoreSize(); // the size to be updated + MemStoreSize newMemstoreSize = new MemStoreSize(); // the size to be updated ImmutableSegment newS = SegmentFactory.instance().createImmutableSegmentByFlattening( (CSLMImmutableSegment)s,idxType,newMemstoreSize); replaceAtIndex(i,newS); if(region != null) { // update the global memstore size counter // upon flattening there is no change in the data size - region.addMemstoreSize(new MemstoreSize(0, newMemstoreSize.getHeapSize())); + region.addMemStoreSize(new MemStoreSize(0, newMemstoreSize.getHeapSize())); } LOG.debug("Compaction pipeline segment " + s + " was flattened"); return true; @@ -241,22 +241,22 @@ public class CompactionPipeline { return minSequenceId; } - public MemstoreSize getTailSize() { + public MemStoreSize getTailSize() { LinkedList<? extends Segment> localCopy = readOnlyCopy; - if (localCopy.isEmpty()) return new MemstoreSize(true); - return new MemstoreSize(localCopy.peekLast().keySize(), localCopy.peekLast().heapSize()); + if (localCopy.isEmpty()) return new MemStoreSize(true); + return new MemStoreSize(localCopy.peekLast().keySize(), localCopy.peekLast().heapSize()); } - public MemstoreSize getPipelineSize() { + public MemStoreSize getPipelineSize() { long keySize = 0; long heapSize = 0; LinkedList<? extends Segment> localCopy = readOnlyCopy; - if (localCopy.isEmpty()) return new MemstoreSize(true); + if (localCopy.isEmpty()) return new MemStoreSize(true); for (Segment segment : localCopy) { keySize += segment.keySize(); heapSize += segment.heapSize(); } - return new MemstoreSize(keySize, heapSize); + return new MemStoreSize(keySize, heapSize); } private void swapSuffix(List<? extends Segment> suffix, ImmutableSegment segment, http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompositeImmutableSegment.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompositeImmutableSegment.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompositeImmutableSegment.java index 5c1410f..0d2608f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompositeImmutableSegment.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompositeImmutableSegment.java @@ -268,13 +268,13 @@ public class CompositeImmutableSegment extends ImmutableSegment { } @Override - protected void internalAdd(Cell cell, boolean mslabUsed, MemstoreSize memstoreSize) { + protected void internalAdd(Cell cell, boolean mslabUsed, MemStoreSize memstoreSize) { throw new IllegalStateException("Not supported by CompositeImmutableScanner"); } @Override protected void updateMetaInfo(Cell cellToAdd, boolean succ, boolean mslabUsed, - MemstoreSize memstoreSize) { + MemStoreSize memstoreSize) { throw new IllegalStateException("Not supported by CompositeImmutableScanner"); } http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultHeapMemoryTuner.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultHeapMemoryTuner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultHeapMemoryTuner.java index 17e7919..13c3441 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultHeapMemoryTuner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultHeapMemoryTuner.java @@ -142,7 +142,7 @@ class DefaultHeapMemoryTuner implements HeapMemoryTuner { long blockedFlushCount = context.getBlockedFlushCount(); long unblockedFlushCount = context.getUnblockedFlushCount(); long totalOnheapFlushCount = blockedFlushCount + unblockedFlushCount; - boolean offheapMemstore = context.isOffheapMemstore(); + boolean offheapMemstore = context.isOffheapMemStore(); float newMemstoreSize; float newBlockCacheSize; @@ -223,7 +223,7 @@ class DefaultHeapMemoryTuner implements HeapMemoryTuner { newBlockCacheSize = blockCachePercentMinRange; } TUNER_RESULT.setBlockCacheSize(newBlockCacheSize); - TUNER_RESULT.setMemstoreSize(newMemstoreSize); + TUNER_RESULT.setMemStoreSize(newMemstoreSize); prevTuneDirection = newTuneDirection; return TUNER_RESULT; } http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java index 086a291..7883d12 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java @@ -103,10 +103,10 @@ public class DefaultMemStore extends AbstractMemStore { * @return size of data that is going to be flushed from active set */ @Override - public MemstoreSize getFlushableSize() { - MemstoreSize snapshotSize = getSnapshotSize(); + public MemStoreSize getFlushableSize() { + MemStoreSize snapshotSize = getSnapshotSize(); return snapshotSize.getDataSize() > 0 ? snapshotSize - : new MemstoreSize(keySize(), heapSize()); + : new MemStoreSize(keySize(), heapSize()); } @Override @@ -154,8 +154,8 @@ public class DefaultMemStore extends AbstractMemStore { } @Override - public MemstoreSize size() { - return new MemstoreSize(this.active.keySize(), this.active.heapSize()); + public MemStoreSize size() { + return new MemStoreSize(this.active.keySize(), this.active.heapSize()); } /** @@ -194,7 +194,7 @@ public class DefaultMemStore extends AbstractMemStore { byte [] fam = Bytes.toBytes("col"); byte [] qf = Bytes.toBytes("umn"); byte [] empty = new byte[0]; - MemstoreSize memstoreSize = new MemstoreSize(); + MemStoreSize memstoreSize = new MemStoreSize(); for (int i = 0; i < count; i++) { // Give each its own ts memstore1.add(new KeyValue(Bytes.toBytes(i), fam, qf, i, empty), memstoreSize); @@ -208,7 +208,7 @@ public class DefaultMemStore extends AbstractMemStore { + (memstoreSize.getDataSize() + memstoreSize.getHeapSize())); // Make a variably sized memstore. DefaultMemStore memstore2 = new DefaultMemStore(); - memstoreSize = new MemstoreSize(); + memstoreSize = new MemStoreSize(); for (int i = 0; i < count; i++) { memstore2.add(new KeyValue(Bytes.toBytes(i), fam, qf, i, new byte[i]), memstoreSize); } http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/FlushLargeStoresPolicy.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/FlushLargeStoresPolicy.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/FlushLargeStoresPolicy.java index 4777e62..1610fd8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/FlushLargeStoresPolicy.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/FlushLargeStoresPolicy.java @@ -46,7 +46,7 @@ public abstract class FlushLargeStoresPolicy extends FlushPolicy { int familyNumber = region.getTableDescriptor().getColumnFamilyCount(); // For multiple families, lower bound is the "average flush size" by default // unless setting in configuration is larger. - long flushSizeLowerBound = region.getMemstoreFlushSize() / familyNumber; + long flushSizeLowerBound = region.getMemStoreFlushSize() / familyNumber; long minimumLowerBound = getConf().getLong(HREGION_COLUMNFAMILY_FLUSH_SIZE_LOWER_BOUND_MIN, DEFAULT_HREGION_COLUMNFAMILY_FLUSH_SIZE_LOWER_BOUND_MIN); http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/FlushNonSloppyStoresFirstPolicy.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/FlushNonSloppyStoresFirstPolicy.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/FlushNonSloppyStoresFirstPolicy.java index c779ce3..ed23e3d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/FlushNonSloppyStoresFirstPolicy.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/FlushNonSloppyStoresFirstPolicy.java @@ -65,7 +65,7 @@ public class FlushNonSloppyStoresFirstPolicy extends FlushLargeStoresPolicy { super.configureForRegion(region); this.flushSizeLowerBound = getFlushSizeLowerBound(region); for (HStore store : region.stores.values()) { - if (store.isSloppyMemstore()) { + if (store.isSloppyMemStore()) { sloppyStores.add(store); } else { regularStores.add(store); http://git-wip-us.apache.org/repos/asf/hbase/blob/e047f518/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/FlushRequester.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/FlushRequester.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/FlushRequester.java index 5e1fc6d..e9f5d76 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/FlushRequester.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/FlushRequester.java @@ -65,5 +65,5 @@ public interface FlushRequester { * * @param globalMemStoreSize */ - public void setGlobalMemstoreLimit(long globalMemStoreSize); + public void setGlobalMemStoreLimit(long globalMemStoreSize); }
