hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From git-site-r...@apache.org
Subject [13/51] [partial] hbase-site git commit: Published site at .
Date Mon, 02 Oct 2017 15:13:42 GMT
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3332caca/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.html
index 95e2ca9..03692cd 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegionServer.html
@@ -957,7 +957,7 @@
 <span class="sourceLineNo">949</span>    // Background thread to check for compactions; needed if region has not gotten updates<a name="line.949"></a>
 <span class="sourceLineNo">950</span>    // in a while. It will take care of not checking too frequently on store-by-store basis.<a name="line.950"></a>
 <span class="sourceLineNo">951</span>    this.compactionChecker = new CompactionChecker(this, this.threadWakeFrequency, this);<a name="line.951"></a>
-<span class="sourceLineNo">952</span>    this.periodicFlusher = new PeriodicMemstoreFlusher(this.threadWakeFrequency, this);<a name="line.952"></a>
+<span class="sourceLineNo">952</span>    this.periodicFlusher = new PeriodicMemStoreFlusher(this.threadWakeFrequency, this);<a name="line.952"></a>
 <span class="sourceLineNo">953</span>    this.leases = new Leases(this.threadWakeFrequency);<a name="line.953"></a>
 <span class="sourceLineNo">954</span><a name="line.954"></a>
 <span class="sourceLineNo">955</span>    // Create the thread to clean the moved regions list<a name="line.955"></a>
@@ -1630,7 +1630,7 @@
 <span class="sourceLineNo">1622</span>      // MSLAB is enabled. So initialize MemStoreChunkPool<a name="line.1622"></a>
 <span class="sourceLineNo">1623</span>      // By this time, the MemstoreFlusher is already initialized. We can get the global limits from<a name="line.1623"></a>
 <span class="sourceLineNo">1624</span>      // it.<a name="line.1624"></a>
-<span class="sourceLineNo">1625</span>      Pair&lt;Long, MemoryType&gt; pair = MemorySizeUtil.getGlobalMemstoreSize(conf);<a name="line.1625"></a>
+<span class="sourceLineNo">1625</span>      Pair&lt;Long, MemoryType&gt; pair = MemorySizeUtil.getGlobalMemStoreSize(conf);<a name="line.1625"></a>
 <span class="sourceLineNo">1626</span>      long globalMemStoreSize = pair.getFirst();<a name="line.1626"></a>
 <span class="sourceLineNo">1627</span>      boolean offheap = this.regionServerAccounting.isOffheap();<a name="line.1627"></a>
 <span class="sourceLineNo">1628</span>      // When off heap memstore in use, take full area for chunk pool.<a name="line.1628"></a>
@@ -1687,7 +1687,7 @@
 <span class="sourceLineNo">1679</span>    int storefiles = 0;<a name="line.1679"></a>
 <span class="sourceLineNo">1680</span>    int storeUncompressedSizeMB = 0;<a name="line.1680"></a>
 <span class="sourceLineNo">1681</span>    int storefileSizeMB = 0;<a name="line.1681"></a>
-<span class="sourceLineNo">1682</span>    int memstoreSizeMB = (int) (r.getMemstoreSize() / 1024 / 1024);<a name="line.1682"></a>
+<span class="sourceLineNo">1682</span>    int memstoreSizeMB = (int) (r.getMemStoreSize() / 1024 / 1024);<a name="line.1682"></a>
 <span class="sourceLineNo">1683</span>    long storefileIndexSizeKB = 0;<a name="line.1683"></a>
 <span class="sourceLineNo">1684</span>    int rootIndexSizeKB = 0;<a name="line.1684"></a>
 <span class="sourceLineNo">1685</span>    int totalStaticIndexSizeKB = 0;<a name="line.1685"></a>
@@ -1726,7 +1726,7 @@
 <span class="sourceLineNo">1718</span>      .setStorefiles(storefiles)<a name="line.1718"></a>
 <span class="sourceLineNo">1719</span>      .setStoreUncompressedSizeMB(storeUncompressedSizeMB)<a name="line.1719"></a>
 <span class="sourceLineNo">1720</span>      .setStorefileSizeMB(storefileSizeMB)<a name="line.1720"></a>
-<span class="sourceLineNo">1721</span>      .setMemstoreSizeMB(memstoreSizeMB)<a name="line.1721"></a>
+<span class="sourceLineNo">1721</span>      .setMemStoreSizeMB(memstoreSizeMB)<a name="line.1721"></a>
 <span class="sourceLineNo">1722</span>      .setStorefileIndexSizeKB(storefileIndexSizeKB)<a name="line.1722"></a>
 <span class="sourceLineNo">1723</span>      .setRootIndexSizeKB(rootIndexSizeKB)<a name="line.1723"></a>
 <span class="sourceLineNo">1724</span>      .setTotalStaticIndexSizeKB(totalStaticIndexSizeKB)<a name="line.1724"></a>
@@ -1817,11 +1817,11 @@
 <span class="sourceLineNo">1809</span>    }<a name="line.1809"></a>
 <span class="sourceLineNo">1810</span>  }<a name="line.1810"></a>
 <span class="sourceLineNo">1811</span><a name="line.1811"></a>
-<span class="sourceLineNo">1812</span>  static class PeriodicMemstoreFlusher extends ScheduledChore {<a name="line.1812"></a>
+<span class="sourceLineNo">1812</span>  static class PeriodicMemStoreFlusher extends ScheduledChore {<a name="line.1812"></a>
 <span class="sourceLineNo">1813</span>    final HRegionServer server;<a name="line.1813"></a>
 <span class="sourceLineNo">1814</span>    final static int RANGE_OF_DELAY = 5 * 60 * 1000; // 5 min in milliseconds<a name="line.1814"></a>
 <span class="sourceLineNo">1815</span>    final static int MIN_DELAY_TIME = 0; // millisec<a name="line.1815"></a>
-<span class="sourceLineNo">1816</span>    public PeriodicMemstoreFlusher(int cacheFlushInterval, final HRegionServer server) {<a name="line.1816"></a>
+<span class="sourceLineNo">1816</span>    public PeriodicMemStoreFlusher(int cacheFlushInterval, final HRegionServer server) {<a name="line.1816"></a>
 <span class="sourceLineNo">1817</span>      super("MemstoreFlusherChore", server, cacheFlushInterval);<a name="line.1817"></a>
 <span class="sourceLineNo">1818</span>      this.server = server;<a name="line.1818"></a>
 <span class="sourceLineNo">1819</span>    }<a name="line.1819"></a>
@@ -2786,7 +2786,7 @@
 <span class="sourceLineNo">2778</span>        });<a name="line.2778"></a>
 <span class="sourceLineNo">2779</span>    // Copy over all regions. Regions are sorted by size with biggest first.<a name="line.2779"></a>
 <span class="sourceLineNo">2780</span>    for (Region region : this.onlineRegions.values()) {<a name="line.2780"></a>
-<span class="sourceLineNo">2781</span>      sortedRegions.put(region.getMemstoreSize(), region);<a name="line.2781"></a>
+<span class="sourceLineNo">2781</span>      sortedRegions.put(region.getMemStoreSize(), region);<a name="line.2781"></a>
 <span class="sourceLineNo">2782</span>    }<a name="line.2782"></a>
 <span class="sourceLineNo">2783</span>    return sortedRegions;<a name="line.2783"></a>
 <span class="sourceLineNo">2784</span>  }<a name="line.2784"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3332caca/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html
index 5a5ae00..c38335c 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html
@@ -401,18 +401,18 @@
 <span class="sourceLineNo">393</span>  }<a name="line.393"></a>
 <span class="sourceLineNo">394</span><a name="line.394"></a>
 <span class="sourceLineNo">395</span>  @Override<a name="line.395"></a>
-<span class="sourceLineNo">396</span>  public long getMemstoreFlushSize() {<a name="line.396"></a>
+<span class="sourceLineNo">396</span>  public long getMemStoreFlushSize() {<a name="line.396"></a>
 <span class="sourceLineNo">397</span>    // TODO: Why is this in here?  The flushsize of the region rather than the store?  St.Ack<a name="line.397"></a>
 <span class="sourceLineNo">398</span>    return this.region.memstoreFlushSize;<a name="line.398"></a>
 <span class="sourceLineNo">399</span>  }<a name="line.399"></a>
 <span class="sourceLineNo">400</span><a name="line.400"></a>
 <span class="sourceLineNo">401</span>  @Override<a name="line.401"></a>
-<span class="sourceLineNo">402</span>  public MemstoreSize getFlushableSize() {<a name="line.402"></a>
+<span class="sourceLineNo">402</span>  public MemStoreSize getFlushableSize() {<a name="line.402"></a>
 <span class="sourceLineNo">403</span>    return this.memstore.getFlushableSize();<a name="line.403"></a>
 <span class="sourceLineNo">404</span>  }<a name="line.404"></a>
 <span class="sourceLineNo">405</span><a name="line.405"></a>
 <span class="sourceLineNo">406</span>  @Override<a name="line.406"></a>
-<span class="sourceLineNo">407</span>  public MemstoreSize getSnapshotSize() {<a name="line.407"></a>
+<span class="sourceLineNo">407</span>  public MemStoreSize getSnapshotSize() {<a name="line.407"></a>
 <span class="sourceLineNo">408</span>    return this.memstore.getSnapshotSize();<a name="line.408"></a>
 <span class="sourceLineNo">409</span>  }<a name="line.409"></a>
 <span class="sourceLineNo">410</span><a name="line.410"></a>
@@ -469,8 +469,8 @@
 <span class="sourceLineNo">461</span>  }<a name="line.461"></a>
 <span class="sourceLineNo">462</span><a name="line.462"></a>
 <span class="sourceLineNo">463</span>  @Override<a name="line.463"></a>
-<span class="sourceLineNo">464</span>  public OptionalLong getMaxMemstoreTS() {<a name="line.464"></a>
-<span class="sourceLineNo">465</span>    return StoreUtils.getMaxMemstoreTSInList(this.getStorefiles());<a name="line.465"></a>
+<span class="sourceLineNo">464</span>  public OptionalLong getMaxMemStoreTS() {<a name="line.464"></a>
+<span class="sourceLineNo">465</span>    return StoreUtils.getMaxMemStoreTSInList(this.getStorefiles());<a name="line.465"></a>
 <span class="sourceLineNo">466</span>  }<a name="line.466"></a>
 <span class="sourceLineNo">467</span><a name="line.467"></a>
 <span class="sourceLineNo">468</span>  /**<a name="line.468"></a>
@@ -692,7 +692,7 @@
 <span class="sourceLineNo">684</span>   * @param cell<a name="line.684"></a>
 <span class="sourceLineNo">685</span>   * @param memstoreSize<a name="line.685"></a>
 <span class="sourceLineNo">686</span>   */<a name="line.686"></a>
-<span class="sourceLineNo">687</span>  public void add(final Cell cell, MemstoreSize memstoreSize) {<a name="line.687"></a>
+<span class="sourceLineNo">687</span>  public void add(final Cell cell, MemStoreSize memstoreSize) {<a name="line.687"></a>
 <span class="sourceLineNo">688</span>    lock.readLock().lock();<a name="line.688"></a>
 <span class="sourceLineNo">689</span>    try {<a name="line.689"></a>
 <span class="sourceLineNo">690</span>       this.memstore.add(cell, memstoreSize);<a name="line.690"></a>
@@ -706,7 +706,7 @@
 <span class="sourceLineNo">698</span>   * @param cells<a name="line.698"></a>
 <span class="sourceLineNo">699</span>   * @param memstoreSize<a name="line.699"></a>
 <span class="sourceLineNo">700</span>   */<a name="line.700"></a>
-<span class="sourceLineNo">701</span>  public void add(final Iterable&lt;Cell&gt; cells, MemstoreSize memstoreSize) {<a name="line.701"></a>
+<span class="sourceLineNo">701</span>  public void add(final Iterable&lt;Cell&gt; cells, MemStoreSize memstoreSize) {<a name="line.701"></a>
 <span class="sourceLineNo">702</span>    lock.readLock().lock();<a name="line.702"></a>
 <span class="sourceLineNo">703</span>    try {<a name="line.703"></a>
 <span class="sourceLineNo">704</span>      memstore.add(cells, memstoreSize);<a name="line.704"></a>
@@ -2123,7 +2123,7 @@
 <span class="sourceLineNo">2115</span>  }<a name="line.2115"></a>
 <span class="sourceLineNo">2116</span><a name="line.2116"></a>
 <span class="sourceLineNo">2117</span>  @Override<a name="line.2117"></a>
-<span class="sourceLineNo">2118</span>  public MemstoreSize getMemStoreSize() {<a name="line.2118"></a>
+<span class="sourceLineNo">2118</span>  public MemStoreSize getMemStoreSize() {<a name="line.2118"></a>
 <span class="sourceLineNo">2119</span>    return this.memstore.size();<a name="line.2119"></a>
 <span class="sourceLineNo">2120</span>  }<a name="line.2120"></a>
 <span class="sourceLineNo">2121</span><a name="line.2121"></a>
@@ -2177,7 +2177,7 @@
 <span class="sourceLineNo">2169</span>   * @param memstoreSize<a name="line.2169"></a>
 <span class="sourceLineNo">2170</span>   * @throws IOException<a name="line.2170"></a>
 <span class="sourceLineNo">2171</span>   */<a name="line.2171"></a>
-<span class="sourceLineNo">2172</span>  public void upsert(Iterable&lt;Cell&gt; cells, long readpoint, MemstoreSize memstoreSize)<a name="line.2172"></a>
+<span class="sourceLineNo">2172</span>  public void upsert(Iterable&lt;Cell&gt; cells, long readpoint, MemStoreSize memstoreSize)<a name="line.2172"></a>
 <span class="sourceLineNo">2173</span>      throws IOException {<a name="line.2173"></a>
 <span class="sourceLineNo">2174</span>    this.lock.readLock().lock();<a name="line.2174"></a>
 <span class="sourceLineNo">2175</span>    try {<a name="line.2175"></a>
@@ -2351,7 +2351,7 @@
 <span class="sourceLineNo">2343</span><a name="line.2343"></a>
 <span class="sourceLineNo">2344</span>  @Override<a name="line.2344"></a>
 <span class="sourceLineNo">2345</span>  public long heapSize() {<a name="line.2345"></a>
-<span class="sourceLineNo">2346</span>    MemstoreSize memstoreSize = this.memstore.size();<a name="line.2346"></a>
+<span class="sourceLineNo">2346</span>    MemStoreSize memstoreSize = this.memstore.size();<a name="line.2346"></a>
 <span class="sourceLineNo">2347</span>    return DEEP_OVERHEAD + memstoreSize.getHeapSize();<a name="line.2347"></a>
 <span class="sourceLineNo">2348</span>  }<a name="line.2348"></a>
 <span class="sourceLineNo">2349</span><a name="line.2349"></a>
@@ -2586,7 +2586,7 @@
 <span class="sourceLineNo">2578</span>  }<a name="line.2578"></a>
 <span class="sourceLineNo">2579</span><a name="line.2579"></a>
 <span class="sourceLineNo">2580</span>  @Override<a name="line.2580"></a>
-<span class="sourceLineNo">2581</span>  public boolean isSloppyMemstore() {<a name="line.2581"></a>
+<span class="sourceLineNo">2581</span>  public boolean isSloppyMemStore() {<a name="line.2581"></a>
 <span class="sourceLineNo">2582</span>    return this.memstore.isSloppy();<a name="line.2582"></a>
 <span class="sourceLineNo">2583</span>  }<a name="line.2583"></a>
 <span class="sourceLineNo">2584</span><a name="line.2584"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3332caca/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.html
index 5a5ae00..c38335c 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.html
@@ -401,18 +401,18 @@
 <span class="sourceLineNo">393</span>  }<a name="line.393"></a>
 <span class="sourceLineNo">394</span><a name="line.394"></a>
 <span class="sourceLineNo">395</span>  @Override<a name="line.395"></a>
-<span class="sourceLineNo">396</span>  public long getMemstoreFlushSize() {<a name="line.396"></a>
+<span class="sourceLineNo">396</span>  public long getMemStoreFlushSize() {<a name="line.396"></a>
 <span class="sourceLineNo">397</span>    // TODO: Why is this in here?  The flushsize of the region rather than the store?  St.Ack<a name="line.397"></a>
 <span class="sourceLineNo">398</span>    return this.region.memstoreFlushSize;<a name="line.398"></a>
 <span class="sourceLineNo">399</span>  }<a name="line.399"></a>
 <span class="sourceLineNo">400</span><a name="line.400"></a>
 <span class="sourceLineNo">401</span>  @Override<a name="line.401"></a>
-<span class="sourceLineNo">402</span>  public MemstoreSize getFlushableSize() {<a name="line.402"></a>
+<span class="sourceLineNo">402</span>  public MemStoreSize getFlushableSize() {<a name="line.402"></a>
 <span class="sourceLineNo">403</span>    return this.memstore.getFlushableSize();<a name="line.403"></a>
 <span class="sourceLineNo">404</span>  }<a name="line.404"></a>
 <span class="sourceLineNo">405</span><a name="line.405"></a>
 <span class="sourceLineNo">406</span>  @Override<a name="line.406"></a>
-<span class="sourceLineNo">407</span>  public MemstoreSize getSnapshotSize() {<a name="line.407"></a>
+<span class="sourceLineNo">407</span>  public MemStoreSize getSnapshotSize() {<a name="line.407"></a>
 <span class="sourceLineNo">408</span>    return this.memstore.getSnapshotSize();<a name="line.408"></a>
 <span class="sourceLineNo">409</span>  }<a name="line.409"></a>
 <span class="sourceLineNo">410</span><a name="line.410"></a>
@@ -469,8 +469,8 @@
 <span class="sourceLineNo">461</span>  }<a name="line.461"></a>
 <span class="sourceLineNo">462</span><a name="line.462"></a>
 <span class="sourceLineNo">463</span>  @Override<a name="line.463"></a>
-<span class="sourceLineNo">464</span>  public OptionalLong getMaxMemstoreTS() {<a name="line.464"></a>
-<span class="sourceLineNo">465</span>    return StoreUtils.getMaxMemstoreTSInList(this.getStorefiles());<a name="line.465"></a>
+<span class="sourceLineNo">464</span>  public OptionalLong getMaxMemStoreTS() {<a name="line.464"></a>
+<span class="sourceLineNo">465</span>    return StoreUtils.getMaxMemStoreTSInList(this.getStorefiles());<a name="line.465"></a>
 <span class="sourceLineNo">466</span>  }<a name="line.466"></a>
 <span class="sourceLineNo">467</span><a name="line.467"></a>
 <span class="sourceLineNo">468</span>  /**<a name="line.468"></a>
@@ -692,7 +692,7 @@
 <span class="sourceLineNo">684</span>   * @param cell<a name="line.684"></a>
 <span class="sourceLineNo">685</span>   * @param memstoreSize<a name="line.685"></a>
 <span class="sourceLineNo">686</span>   */<a name="line.686"></a>
-<span class="sourceLineNo">687</span>  public void add(final Cell cell, MemstoreSize memstoreSize) {<a name="line.687"></a>
+<span class="sourceLineNo">687</span>  public void add(final Cell cell, MemStoreSize memstoreSize) {<a name="line.687"></a>
 <span class="sourceLineNo">688</span>    lock.readLock().lock();<a name="line.688"></a>
 <span class="sourceLineNo">689</span>    try {<a name="line.689"></a>
 <span class="sourceLineNo">690</span>       this.memstore.add(cell, memstoreSize);<a name="line.690"></a>
@@ -706,7 +706,7 @@
 <span class="sourceLineNo">698</span>   * @param cells<a name="line.698"></a>
 <span class="sourceLineNo">699</span>   * @param memstoreSize<a name="line.699"></a>
 <span class="sourceLineNo">700</span>   */<a name="line.700"></a>
-<span class="sourceLineNo">701</span>  public void add(final Iterable&lt;Cell&gt; cells, MemstoreSize memstoreSize) {<a name="line.701"></a>
+<span class="sourceLineNo">701</span>  public void add(final Iterable&lt;Cell&gt; cells, MemStoreSize memstoreSize) {<a name="line.701"></a>
 <span class="sourceLineNo">702</span>    lock.readLock().lock();<a name="line.702"></a>
 <span class="sourceLineNo">703</span>    try {<a name="line.703"></a>
 <span class="sourceLineNo">704</span>      memstore.add(cells, memstoreSize);<a name="line.704"></a>
@@ -2123,7 +2123,7 @@
 <span class="sourceLineNo">2115</span>  }<a name="line.2115"></a>
 <span class="sourceLineNo">2116</span><a name="line.2116"></a>
 <span class="sourceLineNo">2117</span>  @Override<a name="line.2117"></a>
-<span class="sourceLineNo">2118</span>  public MemstoreSize getMemStoreSize() {<a name="line.2118"></a>
+<span class="sourceLineNo">2118</span>  public MemStoreSize getMemStoreSize() {<a name="line.2118"></a>
 <span class="sourceLineNo">2119</span>    return this.memstore.size();<a name="line.2119"></a>
 <span class="sourceLineNo">2120</span>  }<a name="line.2120"></a>
 <span class="sourceLineNo">2121</span><a name="line.2121"></a>
@@ -2177,7 +2177,7 @@
 <span class="sourceLineNo">2169</span>   * @param memstoreSize<a name="line.2169"></a>
 <span class="sourceLineNo">2170</span>   * @throws IOException<a name="line.2170"></a>
 <span class="sourceLineNo">2171</span>   */<a name="line.2171"></a>
-<span class="sourceLineNo">2172</span>  public void upsert(Iterable&lt;Cell&gt; cells, long readpoint, MemstoreSize memstoreSize)<a name="line.2172"></a>
+<span class="sourceLineNo">2172</span>  public void upsert(Iterable&lt;Cell&gt; cells, long readpoint, MemStoreSize memstoreSize)<a name="line.2172"></a>
 <span class="sourceLineNo">2173</span>      throws IOException {<a name="line.2173"></a>
 <span class="sourceLineNo">2174</span>    this.lock.readLock().lock();<a name="line.2174"></a>
 <span class="sourceLineNo">2175</span>    try {<a name="line.2175"></a>
@@ -2351,7 +2351,7 @@
 <span class="sourceLineNo">2343</span><a name="line.2343"></a>
 <span class="sourceLineNo">2344</span>  @Override<a name="line.2344"></a>
 <span class="sourceLineNo">2345</span>  public long heapSize() {<a name="line.2345"></a>
-<span class="sourceLineNo">2346</span>    MemstoreSize memstoreSize = this.memstore.size();<a name="line.2346"></a>
+<span class="sourceLineNo">2346</span>    MemStoreSize memstoreSize = this.memstore.size();<a name="line.2346"></a>
 <span class="sourceLineNo">2347</span>    return DEEP_OVERHEAD + memstoreSize.getHeapSize();<a name="line.2347"></a>
 <span class="sourceLineNo">2348</span>  }<a name="line.2348"></a>
 <span class="sourceLineNo">2349</span><a name="line.2349"></a>
@@ -2586,7 +2586,7 @@
 <span class="sourceLineNo">2578</span>  }<a name="line.2578"></a>
 <span class="sourceLineNo">2579</span><a name="line.2579"></a>
 <span class="sourceLineNo">2580</span>  @Override<a name="line.2580"></a>
-<span class="sourceLineNo">2581</span>  public boolean isSloppyMemstore() {<a name="line.2581"></a>
+<span class="sourceLineNo">2581</span>  public boolean isSloppyMemStore() {<a name="line.2581"></a>
 <span class="sourceLineNo">2582</span>    return this.memstore.isSloppy();<a name="line.2582"></a>
 <span class="sourceLineNo">2583</span>  }<a name="line.2583"></a>
 <span class="sourceLineNo">2584</span><a name="line.2584"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3332caca/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStoreFile.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStoreFile.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStoreFile.html
index ee70a27..656314f 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStoreFile.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStoreFile.html
@@ -167,7 +167,7 @@
 <span class="sourceLineNo">159</span>  }<a name="line.159"></a>
 <span class="sourceLineNo">160</span><a name="line.160"></a>
 <span class="sourceLineNo">161</span>  @Override<a name="line.161"></a>
-<span class="sourceLineNo">162</span>  public long getMaxMemstoreTS() {<a name="line.162"></a>
+<span class="sourceLineNo">162</span>  public long getMaxMemStoreTS() {<a name="line.162"></a>
 <span class="sourceLineNo">163</span>    return maxMemstoreTS;<a name="line.163"></a>
 <span class="sourceLineNo">164</span>  }<a name="line.164"></a>
 <span class="sourceLineNo">165</span><a name="line.165"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3332caca/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.HeapMemoryTuneObserver.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.HeapMemoryTuneObserver.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.HeapMemoryTuneObserver.html
index 7f00ac3..870007d 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.HeapMemoryTuneObserver.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.HeapMemoryTuneObserver.html
@@ -57,19 +57,19 @@
 <span class="sourceLineNo">049</span>public class HeapMemoryManager {<a name="line.49"></a>
 <span class="sourceLineNo">050</span>  private static final Log LOG = LogFactory.getLog(HeapMemoryManager.class);<a name="line.50"></a>
 <span class="sourceLineNo">051</span>  private static final int CONVERT_TO_PERCENTAGE = 100;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>  private static final int CLUSTER_MINIMUM_MEMORY_THRESHOLD = <a name="line.52"></a>
+<span class="sourceLineNo">052</span>  private static final int CLUSTER_MINIMUM_MEMORY_THRESHOLD =<a name="line.52"></a>
 <span class="sourceLineNo">053</span>    (int) (CONVERT_TO_PERCENTAGE * HConstants.HBASE_CLUSTER_MINIMUM_MEMORY_THRESHOLD);<a name="line.53"></a>
 <span class="sourceLineNo">054</span><a name="line.54"></a>
 <span class="sourceLineNo">055</span>  public static final String BLOCK_CACHE_SIZE_MAX_RANGE_KEY = "hfile.block.cache.size.max.range";<a name="line.55"></a>
 <span class="sourceLineNo">056</span>  public static final String BLOCK_CACHE_SIZE_MIN_RANGE_KEY = "hfile.block.cache.size.min.range";<a name="line.56"></a>
-<span class="sourceLineNo">057</span>  public static final String MEMSTORE_SIZE_MAX_RANGE_KEY = <a name="line.57"></a>
+<span class="sourceLineNo">057</span>  public static final String MEMSTORE_SIZE_MAX_RANGE_KEY =<a name="line.57"></a>
 <span class="sourceLineNo">058</span>      "hbase.regionserver.global.memstore.size.max.range";<a name="line.58"></a>
-<span class="sourceLineNo">059</span>  public static final String MEMSTORE_SIZE_MIN_RANGE_KEY = <a name="line.59"></a>
+<span class="sourceLineNo">059</span>  public static final String MEMSTORE_SIZE_MIN_RANGE_KEY =<a name="line.59"></a>
 <span class="sourceLineNo">060</span>      "hbase.regionserver.global.memstore.size.min.range";<a name="line.60"></a>
-<span class="sourceLineNo">061</span>  public static final String HBASE_RS_HEAP_MEMORY_TUNER_PERIOD = <a name="line.61"></a>
+<span class="sourceLineNo">061</span>  public static final String HBASE_RS_HEAP_MEMORY_TUNER_PERIOD =<a name="line.61"></a>
 <span class="sourceLineNo">062</span>      "hbase.regionserver.heapmemory.tuner.period";<a name="line.62"></a>
 <span class="sourceLineNo">063</span>  public static final int HBASE_RS_HEAP_MEMORY_TUNER_DEFAULT_PERIOD = 60 * 1000;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>  public static final String HBASE_RS_HEAP_MEMORY_TUNER_CLASS = <a name="line.64"></a>
+<span class="sourceLineNo">064</span>  public static final String HBASE_RS_HEAP_MEMORY_TUNER_CLASS =<a name="line.64"></a>
 <span class="sourceLineNo">065</span>      "hbase.regionserver.heapmemory.tuner.class";<a name="line.65"></a>
 <span class="sourceLineNo">066</span><a name="line.66"></a>
 <span class="sourceLineNo">067</span>  public static final float HEAP_OCCUPANCY_ERROR_VALUE = -0.0f;<a name="line.67"></a>
@@ -263,7 +263,7 @@
 <span class="sourceLineNo">255</span>          HBASE_RS_HEAP_MEMORY_TUNER_CLASS, DefaultHeapMemoryTuner.class, HeapMemoryTuner.class);<a name="line.255"></a>
 <span class="sourceLineNo">256</span>      heapMemTuner = ReflectionUtils.newInstance(tunerKlass, server.getConfiguration());<a name="line.256"></a>
 <span class="sourceLineNo">257</span>      tunerContext<a name="line.257"></a>
-<span class="sourceLineNo">258</span>          .setOffheapMemstore(regionServerAccounting.isOffheap());<a name="line.258"></a>
+<span class="sourceLineNo">258</span>          .setOffheapMemStore(regionServerAccounting.isOffheap());<a name="line.258"></a>
 <span class="sourceLineNo">259</span>    }<a name="line.259"></a>
 <span class="sourceLineNo">260</span><a name="line.260"></a>
 <span class="sourceLineNo">261</span>    @Override<a name="line.261"></a>
@@ -332,7 +332,7 @@
 <span class="sourceLineNo">324</span>      // TODO : add support for offheap metrics<a name="line.324"></a>
 <span class="sourceLineNo">325</span>      tunerContext.setCurBlockCacheUsed((float) blockCache.getCurrentSize() / maxHeapSize);<a name="line.325"></a>
 <span class="sourceLineNo">326</span>      metricsHeapMemoryManager.setCurBlockCacheSizeGauge(blockCache.getCurrentSize());<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      long globalMemstoreHeapSize = regionServerAccounting.getGlobalMemstoreHeapSize();<a name="line.327"></a>
+<span class="sourceLineNo">327</span>      long globalMemstoreHeapSize = regionServerAccounting.getGlobalMemStoreHeapSize();<a name="line.327"></a>
 <span class="sourceLineNo">328</span>      tunerContext.setCurMemStoreUsed((float) globalMemstoreHeapSize / maxHeapSize);<a name="line.328"></a>
 <span class="sourceLineNo">329</span>      metricsHeapMemoryManager.setCurMemStoreSizeGauge(globalMemstoreHeapSize);<a name="line.329"></a>
 <span class="sourceLineNo">330</span>      tunerContext.setCurBlockCacheSize(blockCachePercent);<a name="line.330"></a>
@@ -344,7 +344,7 @@
 <span class="sourceLineNo">336</span>        LOG.error("Exception thrown from the HeapMemoryTuner implementation", t);<a name="line.336"></a>
 <span class="sourceLineNo">337</span>      }<a name="line.337"></a>
 <span class="sourceLineNo">338</span>      if (result != null &amp;&amp; result.needsTuning()) {<a name="line.338"></a>
-<span class="sourceLineNo">339</span>        float memstoreSize = result.getMemstoreSize();<a name="line.339"></a>
+<span class="sourceLineNo">339</span>        float memstoreSize = result.getMemStoreSize();<a name="line.339"></a>
 <span class="sourceLineNo">340</span>        float blockCacheSize = result.getBlockCacheSize();<a name="line.340"></a>
 <span class="sourceLineNo">341</span>        LOG.debug("From HeapMemoryTuner new memstoreSize: " + memstoreSize<a name="line.341"></a>
 <span class="sourceLineNo">342</span>            + ". new blockCacheSize: " + blockCacheSize);<a name="line.342"></a>
@@ -396,7 +396,7 @@
 <span class="sourceLineNo">388</span>          globalMemStorePercent = memstoreSize;<a name="line.388"></a>
 <span class="sourceLineNo">389</span>          // Internally sets it to RegionServerAccounting<a name="line.389"></a>
 <span class="sourceLineNo">390</span>          // TODO : Set directly on RSAccounting??<a name="line.390"></a>
-<span class="sourceLineNo">391</span>          memStoreFlusher.setGlobalMemstoreLimit(newMemstoreSize);<a name="line.391"></a>
+<span class="sourceLineNo">391</span>          memStoreFlusher.setGlobalMemStoreLimit(newMemstoreSize);<a name="line.391"></a>
 <span class="sourceLineNo">392</span>          for (HeapMemoryTuneObserver observer : tuneObservers) {<a name="line.392"></a>
 <span class="sourceLineNo">393</span>            // Risky.. If this newMemstoreSize decreases we reduce the count in offheap chunk pool<a name="line.393"></a>
 <span class="sourceLineNo">394</span>            observer.onHeapMemoryTune(newMemstoreSize, newBlockCacheSize);<a name="line.394"></a>
@@ -508,11 +508,11 @@
 <span class="sourceLineNo">500</span>        this.curMemStoreUsed = d;<a name="line.500"></a>
 <span class="sourceLineNo">501</span>    }<a name="line.501"></a>
 <span class="sourceLineNo">502</span><a name="line.502"></a>
-<span class="sourceLineNo">503</span>    public void setOffheapMemstore(boolean offheapMemstore) {<a name="line.503"></a>
+<span class="sourceLineNo">503</span>    public void setOffheapMemStore(boolean offheapMemstore) {<a name="line.503"></a>
 <span class="sourceLineNo">504</span>      this.offheapMemstore = offheapMemstore;<a name="line.504"></a>
 <span class="sourceLineNo">505</span>    }<a name="line.505"></a>
 <span class="sourceLineNo">506</span><a name="line.506"></a>
-<span class="sourceLineNo">507</span>    public boolean isOffheapMemstore() {<a name="line.507"></a>
+<span class="sourceLineNo">507</span>    public boolean isOffheapMemStore() {<a name="line.507"></a>
 <span class="sourceLineNo">508</span>      return this.offheapMemstore;<a name="line.508"></a>
 <span class="sourceLineNo">509</span>    }<a name="line.509"></a>
 <span class="sourceLineNo">510</span>  }<a name="line.510"></a>
@@ -530,11 +530,11 @@
 <span class="sourceLineNo">522</span>      this.needsTuning = needsTuning;<a name="line.522"></a>
 <span class="sourceLineNo">523</span>    }<a name="line.523"></a>
 <span class="sourceLineNo">524</span><a name="line.524"></a>
-<span class="sourceLineNo">525</span>    public float getMemstoreSize() {<a name="line.525"></a>
+<span class="sourceLineNo">525</span>    public float getMemStoreSize() {<a name="line.525"></a>
 <span class="sourceLineNo">526</span>      return memstoreSize;<a name="line.526"></a>
 <span class="sourceLineNo">527</span>    }<a name="line.527"></a>
 <span class="sourceLineNo">528</span><a name="line.528"></a>
-<span class="sourceLineNo">529</span>    public void setMemstoreSize(float memstoreSize) {<a name="line.529"></a>
+<span class="sourceLineNo">529</span>    public void setMemStoreSize(float memstoreSize) {<a name="line.529"></a>
 <span class="sourceLineNo">530</span>      this.memstoreSize = memstoreSize;<a name="line.530"></a>
 <span class="sourceLineNo">531</span>    }<a name="line.531"></a>
 <span class="sourceLineNo">532</span><a name="line.532"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3332caca/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.HeapMemoryTunerChore.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.HeapMemoryTunerChore.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.HeapMemoryTunerChore.html
index 7f00ac3..870007d 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.HeapMemoryTunerChore.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.HeapMemoryTunerChore.html
@@ -57,19 +57,19 @@
 <span class="sourceLineNo">049</span>public class HeapMemoryManager {<a name="line.49"></a>
 <span class="sourceLineNo">050</span>  private static final Log LOG = LogFactory.getLog(HeapMemoryManager.class);<a name="line.50"></a>
 <span class="sourceLineNo">051</span>  private static final int CONVERT_TO_PERCENTAGE = 100;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>  private static final int CLUSTER_MINIMUM_MEMORY_THRESHOLD = <a name="line.52"></a>
+<span class="sourceLineNo">052</span>  private static final int CLUSTER_MINIMUM_MEMORY_THRESHOLD =<a name="line.52"></a>
 <span class="sourceLineNo">053</span>    (int) (CONVERT_TO_PERCENTAGE * HConstants.HBASE_CLUSTER_MINIMUM_MEMORY_THRESHOLD);<a name="line.53"></a>
 <span class="sourceLineNo">054</span><a name="line.54"></a>
 <span class="sourceLineNo">055</span>  public static final String BLOCK_CACHE_SIZE_MAX_RANGE_KEY = "hfile.block.cache.size.max.range";<a name="line.55"></a>
 <span class="sourceLineNo">056</span>  public static final String BLOCK_CACHE_SIZE_MIN_RANGE_KEY = "hfile.block.cache.size.min.range";<a name="line.56"></a>
-<span class="sourceLineNo">057</span>  public static final String MEMSTORE_SIZE_MAX_RANGE_KEY = <a name="line.57"></a>
+<span class="sourceLineNo">057</span>  public static final String MEMSTORE_SIZE_MAX_RANGE_KEY =<a name="line.57"></a>
 <span class="sourceLineNo">058</span>      "hbase.regionserver.global.memstore.size.max.range";<a name="line.58"></a>
-<span class="sourceLineNo">059</span>  public static final String MEMSTORE_SIZE_MIN_RANGE_KEY = <a name="line.59"></a>
+<span class="sourceLineNo">059</span>  public static final String MEMSTORE_SIZE_MIN_RANGE_KEY =<a name="line.59"></a>
 <span class="sourceLineNo">060</span>      "hbase.regionserver.global.memstore.size.min.range";<a name="line.60"></a>
-<span class="sourceLineNo">061</span>  public static final String HBASE_RS_HEAP_MEMORY_TUNER_PERIOD = <a name="line.61"></a>
+<span class="sourceLineNo">061</span>  public static final String HBASE_RS_HEAP_MEMORY_TUNER_PERIOD =<a name="line.61"></a>
 <span class="sourceLineNo">062</span>      "hbase.regionserver.heapmemory.tuner.period";<a name="line.62"></a>
 <span class="sourceLineNo">063</span>  public static final int HBASE_RS_HEAP_MEMORY_TUNER_DEFAULT_PERIOD = 60 * 1000;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>  public static final String HBASE_RS_HEAP_MEMORY_TUNER_CLASS = <a name="line.64"></a>
+<span class="sourceLineNo">064</span>  public static final String HBASE_RS_HEAP_MEMORY_TUNER_CLASS =<a name="line.64"></a>
 <span class="sourceLineNo">065</span>      "hbase.regionserver.heapmemory.tuner.class";<a name="line.65"></a>
 <span class="sourceLineNo">066</span><a name="line.66"></a>
 <span class="sourceLineNo">067</span>  public static final float HEAP_OCCUPANCY_ERROR_VALUE = -0.0f;<a name="line.67"></a>
@@ -263,7 +263,7 @@
 <span class="sourceLineNo">255</span>          HBASE_RS_HEAP_MEMORY_TUNER_CLASS, DefaultHeapMemoryTuner.class, HeapMemoryTuner.class);<a name="line.255"></a>
 <span class="sourceLineNo">256</span>      heapMemTuner = ReflectionUtils.newInstance(tunerKlass, server.getConfiguration());<a name="line.256"></a>
 <span class="sourceLineNo">257</span>      tunerContext<a name="line.257"></a>
-<span class="sourceLineNo">258</span>          .setOffheapMemstore(regionServerAccounting.isOffheap());<a name="line.258"></a>
+<span class="sourceLineNo">258</span>          .setOffheapMemStore(regionServerAccounting.isOffheap());<a name="line.258"></a>
 <span class="sourceLineNo">259</span>    }<a name="line.259"></a>
 <span class="sourceLineNo">260</span><a name="line.260"></a>
 <span class="sourceLineNo">261</span>    @Override<a name="line.261"></a>
@@ -332,7 +332,7 @@
 <span class="sourceLineNo">324</span>      // TODO : add support for offheap metrics<a name="line.324"></a>
 <span class="sourceLineNo">325</span>      tunerContext.setCurBlockCacheUsed((float) blockCache.getCurrentSize() / maxHeapSize);<a name="line.325"></a>
 <span class="sourceLineNo">326</span>      metricsHeapMemoryManager.setCurBlockCacheSizeGauge(blockCache.getCurrentSize());<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      long globalMemstoreHeapSize = regionServerAccounting.getGlobalMemstoreHeapSize();<a name="line.327"></a>
+<span class="sourceLineNo">327</span>      long globalMemstoreHeapSize = regionServerAccounting.getGlobalMemStoreHeapSize();<a name="line.327"></a>
 <span class="sourceLineNo">328</span>      tunerContext.setCurMemStoreUsed((float) globalMemstoreHeapSize / maxHeapSize);<a name="line.328"></a>
 <span class="sourceLineNo">329</span>      metricsHeapMemoryManager.setCurMemStoreSizeGauge(globalMemstoreHeapSize);<a name="line.329"></a>
 <span class="sourceLineNo">330</span>      tunerContext.setCurBlockCacheSize(blockCachePercent);<a name="line.330"></a>
@@ -344,7 +344,7 @@
 <span class="sourceLineNo">336</span>        LOG.error("Exception thrown from the HeapMemoryTuner implementation", t);<a name="line.336"></a>
 <span class="sourceLineNo">337</span>      }<a name="line.337"></a>
 <span class="sourceLineNo">338</span>      if (result != null &amp;&amp; result.needsTuning()) {<a name="line.338"></a>
-<span class="sourceLineNo">339</span>        float memstoreSize = result.getMemstoreSize();<a name="line.339"></a>
+<span class="sourceLineNo">339</span>        float memstoreSize = result.getMemStoreSize();<a name="line.339"></a>
 <span class="sourceLineNo">340</span>        float blockCacheSize = result.getBlockCacheSize();<a name="line.340"></a>
 <span class="sourceLineNo">341</span>        LOG.debug("From HeapMemoryTuner new memstoreSize: " + memstoreSize<a name="line.341"></a>
 <span class="sourceLineNo">342</span>            + ". new blockCacheSize: " + blockCacheSize);<a name="line.342"></a>
@@ -396,7 +396,7 @@
 <span class="sourceLineNo">388</span>          globalMemStorePercent = memstoreSize;<a name="line.388"></a>
 <span class="sourceLineNo">389</span>          // Internally sets it to RegionServerAccounting<a name="line.389"></a>
 <span class="sourceLineNo">390</span>          // TODO : Set directly on RSAccounting??<a name="line.390"></a>
-<span class="sourceLineNo">391</span>          memStoreFlusher.setGlobalMemstoreLimit(newMemstoreSize);<a name="line.391"></a>
+<span class="sourceLineNo">391</span>          memStoreFlusher.setGlobalMemStoreLimit(newMemstoreSize);<a name="line.391"></a>
 <span class="sourceLineNo">392</span>          for (HeapMemoryTuneObserver observer : tuneObservers) {<a name="line.392"></a>
 <span class="sourceLineNo">393</span>            // Risky.. If this newMemstoreSize decreases we reduce the count in offheap chunk pool<a name="line.393"></a>
 <span class="sourceLineNo">394</span>            observer.onHeapMemoryTune(newMemstoreSize, newBlockCacheSize);<a name="line.394"></a>
@@ -508,11 +508,11 @@
 <span class="sourceLineNo">500</span>        this.curMemStoreUsed = d;<a name="line.500"></a>
 <span class="sourceLineNo">501</span>    }<a name="line.501"></a>
 <span class="sourceLineNo">502</span><a name="line.502"></a>
-<span class="sourceLineNo">503</span>    public void setOffheapMemstore(boolean offheapMemstore) {<a name="line.503"></a>
+<span class="sourceLineNo">503</span>    public void setOffheapMemStore(boolean offheapMemstore) {<a name="line.503"></a>
 <span class="sourceLineNo">504</span>      this.offheapMemstore = offheapMemstore;<a name="line.504"></a>
 <span class="sourceLineNo">505</span>    }<a name="line.505"></a>
 <span class="sourceLineNo">506</span><a name="line.506"></a>
-<span class="sourceLineNo">507</span>    public boolean isOffheapMemstore() {<a name="line.507"></a>
+<span class="sourceLineNo">507</span>    public boolean isOffheapMemStore() {<a name="line.507"></a>
 <span class="sourceLineNo">508</span>      return this.offheapMemstore;<a name="line.508"></a>
 <span class="sourceLineNo">509</span>    }<a name="line.509"></a>
 <span class="sourceLineNo">510</span>  }<a name="line.510"></a>
@@ -530,11 +530,11 @@
 <span class="sourceLineNo">522</span>      this.needsTuning = needsTuning;<a name="line.522"></a>
 <span class="sourceLineNo">523</span>    }<a name="line.523"></a>
 <span class="sourceLineNo">524</span><a name="line.524"></a>
-<span class="sourceLineNo">525</span>    public float getMemstoreSize() {<a name="line.525"></a>
+<span class="sourceLineNo">525</span>    public float getMemStoreSize() {<a name="line.525"></a>
 <span class="sourceLineNo">526</span>      return memstoreSize;<a name="line.526"></a>
 <span class="sourceLineNo">527</span>    }<a name="line.527"></a>
 <span class="sourceLineNo">528</span><a name="line.528"></a>
-<span class="sourceLineNo">529</span>    public void setMemstoreSize(float memstoreSize) {<a name="line.529"></a>
+<span class="sourceLineNo">529</span>    public void setMemStoreSize(float memstoreSize) {<a name="line.529"></a>
 <span class="sourceLineNo">530</span>      this.memstoreSize = memstoreSize;<a name="line.530"></a>
 <span class="sourceLineNo">531</span>    }<a name="line.531"></a>
 <span class="sourceLineNo">532</span><a name="line.532"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3332caca/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.TunerContext.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.TunerContext.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.TunerContext.html
index 7f00ac3..870007d 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.TunerContext.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.TunerContext.html
@@ -57,19 +57,19 @@
 <span class="sourceLineNo">049</span>public class HeapMemoryManager {<a name="line.49"></a>
 <span class="sourceLineNo">050</span>  private static final Log LOG = LogFactory.getLog(HeapMemoryManager.class);<a name="line.50"></a>
 <span class="sourceLineNo">051</span>  private static final int CONVERT_TO_PERCENTAGE = 100;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>  private static final int CLUSTER_MINIMUM_MEMORY_THRESHOLD = <a name="line.52"></a>
+<span class="sourceLineNo">052</span>  private static final int CLUSTER_MINIMUM_MEMORY_THRESHOLD =<a name="line.52"></a>
 <span class="sourceLineNo">053</span>    (int) (CONVERT_TO_PERCENTAGE * HConstants.HBASE_CLUSTER_MINIMUM_MEMORY_THRESHOLD);<a name="line.53"></a>
 <span class="sourceLineNo">054</span><a name="line.54"></a>
 <span class="sourceLineNo">055</span>  public static final String BLOCK_CACHE_SIZE_MAX_RANGE_KEY = "hfile.block.cache.size.max.range";<a name="line.55"></a>
 <span class="sourceLineNo">056</span>  public static final String BLOCK_CACHE_SIZE_MIN_RANGE_KEY = "hfile.block.cache.size.min.range";<a name="line.56"></a>
-<span class="sourceLineNo">057</span>  public static final String MEMSTORE_SIZE_MAX_RANGE_KEY = <a name="line.57"></a>
+<span class="sourceLineNo">057</span>  public static final String MEMSTORE_SIZE_MAX_RANGE_KEY =<a name="line.57"></a>
 <span class="sourceLineNo">058</span>      "hbase.regionserver.global.memstore.size.max.range";<a name="line.58"></a>
-<span class="sourceLineNo">059</span>  public static final String MEMSTORE_SIZE_MIN_RANGE_KEY = <a name="line.59"></a>
+<span class="sourceLineNo">059</span>  public static final String MEMSTORE_SIZE_MIN_RANGE_KEY =<a name="line.59"></a>
 <span class="sourceLineNo">060</span>      "hbase.regionserver.global.memstore.size.min.range";<a name="line.60"></a>
-<span class="sourceLineNo">061</span>  public static final String HBASE_RS_HEAP_MEMORY_TUNER_PERIOD = <a name="line.61"></a>
+<span class="sourceLineNo">061</span>  public static final String HBASE_RS_HEAP_MEMORY_TUNER_PERIOD =<a name="line.61"></a>
 <span class="sourceLineNo">062</span>      "hbase.regionserver.heapmemory.tuner.period";<a name="line.62"></a>
 <span class="sourceLineNo">063</span>  public static final int HBASE_RS_HEAP_MEMORY_TUNER_DEFAULT_PERIOD = 60 * 1000;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>  public static final String HBASE_RS_HEAP_MEMORY_TUNER_CLASS = <a name="line.64"></a>
+<span class="sourceLineNo">064</span>  public static final String HBASE_RS_HEAP_MEMORY_TUNER_CLASS =<a name="line.64"></a>
 <span class="sourceLineNo">065</span>      "hbase.regionserver.heapmemory.tuner.class";<a name="line.65"></a>
 <span class="sourceLineNo">066</span><a name="line.66"></a>
 <span class="sourceLineNo">067</span>  public static final float HEAP_OCCUPANCY_ERROR_VALUE = -0.0f;<a name="line.67"></a>
@@ -263,7 +263,7 @@
 <span class="sourceLineNo">255</span>          HBASE_RS_HEAP_MEMORY_TUNER_CLASS, DefaultHeapMemoryTuner.class, HeapMemoryTuner.class);<a name="line.255"></a>
 <span class="sourceLineNo">256</span>      heapMemTuner = ReflectionUtils.newInstance(tunerKlass, server.getConfiguration());<a name="line.256"></a>
 <span class="sourceLineNo">257</span>      tunerContext<a name="line.257"></a>
-<span class="sourceLineNo">258</span>          .setOffheapMemstore(regionServerAccounting.isOffheap());<a name="line.258"></a>
+<span class="sourceLineNo">258</span>          .setOffheapMemStore(regionServerAccounting.isOffheap());<a name="line.258"></a>
 <span class="sourceLineNo">259</span>    }<a name="line.259"></a>
 <span class="sourceLineNo">260</span><a name="line.260"></a>
 <span class="sourceLineNo">261</span>    @Override<a name="line.261"></a>
@@ -332,7 +332,7 @@
 <span class="sourceLineNo">324</span>      // TODO : add support for offheap metrics<a name="line.324"></a>
 <span class="sourceLineNo">325</span>      tunerContext.setCurBlockCacheUsed((float) blockCache.getCurrentSize() / maxHeapSize);<a name="line.325"></a>
 <span class="sourceLineNo">326</span>      metricsHeapMemoryManager.setCurBlockCacheSizeGauge(blockCache.getCurrentSize());<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      long globalMemstoreHeapSize = regionServerAccounting.getGlobalMemstoreHeapSize();<a name="line.327"></a>
+<span class="sourceLineNo">327</span>      long globalMemstoreHeapSize = regionServerAccounting.getGlobalMemStoreHeapSize();<a name="line.327"></a>
 <span class="sourceLineNo">328</span>      tunerContext.setCurMemStoreUsed((float) globalMemstoreHeapSize / maxHeapSize);<a name="line.328"></a>
 <span class="sourceLineNo">329</span>      metricsHeapMemoryManager.setCurMemStoreSizeGauge(globalMemstoreHeapSize);<a name="line.329"></a>
 <span class="sourceLineNo">330</span>      tunerContext.setCurBlockCacheSize(blockCachePercent);<a name="line.330"></a>
@@ -344,7 +344,7 @@
 <span class="sourceLineNo">336</span>        LOG.error("Exception thrown from the HeapMemoryTuner implementation", t);<a name="line.336"></a>
 <span class="sourceLineNo">337</span>      }<a name="line.337"></a>
 <span class="sourceLineNo">338</span>      if (result != null &amp;&amp; result.needsTuning()) {<a name="line.338"></a>
-<span class="sourceLineNo">339</span>        float memstoreSize = result.getMemstoreSize();<a name="line.339"></a>
+<span class="sourceLineNo">339</span>        float memstoreSize = result.getMemStoreSize();<a name="line.339"></a>
 <span class="sourceLineNo">340</span>        float blockCacheSize = result.getBlockCacheSize();<a name="line.340"></a>
 <span class="sourceLineNo">341</span>        LOG.debug("From HeapMemoryTuner new memstoreSize: " + memstoreSize<a name="line.341"></a>
 <span class="sourceLineNo">342</span>            + ". new blockCacheSize: " + blockCacheSize);<a name="line.342"></a>
@@ -396,7 +396,7 @@
 <span class="sourceLineNo">388</span>          globalMemStorePercent = memstoreSize;<a name="line.388"></a>
 <span class="sourceLineNo">389</span>          // Internally sets it to RegionServerAccounting<a name="line.389"></a>
 <span class="sourceLineNo">390</span>          // TODO : Set directly on RSAccounting??<a name="line.390"></a>
-<span class="sourceLineNo">391</span>          memStoreFlusher.setGlobalMemstoreLimit(newMemstoreSize);<a name="line.391"></a>
+<span class="sourceLineNo">391</span>          memStoreFlusher.setGlobalMemStoreLimit(newMemstoreSize);<a name="line.391"></a>
 <span class="sourceLineNo">392</span>          for (HeapMemoryTuneObserver observer : tuneObservers) {<a name="line.392"></a>
 <span class="sourceLineNo">393</span>            // Risky.. If this newMemstoreSize decreases we reduce the count in offheap chunk pool<a name="line.393"></a>
 <span class="sourceLineNo">394</span>            observer.onHeapMemoryTune(newMemstoreSize, newBlockCacheSize);<a name="line.394"></a>
@@ -508,11 +508,11 @@
 <span class="sourceLineNo">500</span>        this.curMemStoreUsed = d;<a name="line.500"></a>
 <span class="sourceLineNo">501</span>    }<a name="line.501"></a>
 <span class="sourceLineNo">502</span><a name="line.502"></a>
-<span class="sourceLineNo">503</span>    public void setOffheapMemstore(boolean offheapMemstore) {<a name="line.503"></a>
+<span class="sourceLineNo">503</span>    public void setOffheapMemStore(boolean offheapMemstore) {<a name="line.503"></a>
 <span class="sourceLineNo">504</span>      this.offheapMemstore = offheapMemstore;<a name="line.504"></a>
 <span class="sourceLineNo">505</span>    }<a name="line.505"></a>
 <span class="sourceLineNo">506</span><a name="line.506"></a>
-<span class="sourceLineNo">507</span>    public boolean isOffheapMemstore() {<a name="line.507"></a>
+<span class="sourceLineNo">507</span>    public boolean isOffheapMemStore() {<a name="line.507"></a>
 <span class="sourceLineNo">508</span>      return this.offheapMemstore;<a name="line.508"></a>
 <span class="sourceLineNo">509</span>    }<a name="line.509"></a>
 <span class="sourceLineNo">510</span>  }<a name="line.510"></a>
@@ -530,11 +530,11 @@
 <span class="sourceLineNo">522</span>      this.needsTuning = needsTuning;<a name="line.522"></a>
 <span class="sourceLineNo">523</span>    }<a name="line.523"></a>
 <span class="sourceLineNo">524</span><a name="line.524"></a>
-<span class="sourceLineNo">525</span>    public float getMemstoreSize() {<a name="line.525"></a>
+<span class="sourceLineNo">525</span>    public float getMemStoreSize() {<a name="line.525"></a>
 <span class="sourceLineNo">526</span>      return memstoreSize;<a name="line.526"></a>
 <span class="sourceLineNo">527</span>    }<a name="line.527"></a>
 <span class="sourceLineNo">528</span><a name="line.528"></a>
-<span class="sourceLineNo">529</span>    public void setMemstoreSize(float memstoreSize) {<a name="line.529"></a>
+<span class="sourceLineNo">529</span>    public void setMemStoreSize(float memstoreSize) {<a name="line.529"></a>
 <span class="sourceLineNo">530</span>      this.memstoreSize = memstoreSize;<a name="line.530"></a>
 <span class="sourceLineNo">531</span>    }<a name="line.531"></a>
 <span class="sourceLineNo">532</span><a name="line.532"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3332caca/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.TunerResult.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.TunerResult.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.TunerResult.html
index 7f00ac3..870007d 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.TunerResult.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.TunerResult.html
@@ -57,19 +57,19 @@
 <span class="sourceLineNo">049</span>public class HeapMemoryManager {<a name="line.49"></a>
 <span class="sourceLineNo">050</span>  private static final Log LOG = LogFactory.getLog(HeapMemoryManager.class);<a name="line.50"></a>
 <span class="sourceLineNo">051</span>  private static final int CONVERT_TO_PERCENTAGE = 100;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>  private static final int CLUSTER_MINIMUM_MEMORY_THRESHOLD = <a name="line.52"></a>
+<span class="sourceLineNo">052</span>  private static final int CLUSTER_MINIMUM_MEMORY_THRESHOLD =<a name="line.52"></a>
 <span class="sourceLineNo">053</span>    (int) (CONVERT_TO_PERCENTAGE * HConstants.HBASE_CLUSTER_MINIMUM_MEMORY_THRESHOLD);<a name="line.53"></a>
 <span class="sourceLineNo">054</span><a name="line.54"></a>
 <span class="sourceLineNo">055</span>  public static final String BLOCK_CACHE_SIZE_MAX_RANGE_KEY = "hfile.block.cache.size.max.range";<a name="line.55"></a>
 <span class="sourceLineNo">056</span>  public static final String BLOCK_CACHE_SIZE_MIN_RANGE_KEY = "hfile.block.cache.size.min.range";<a name="line.56"></a>
-<span class="sourceLineNo">057</span>  public static final String MEMSTORE_SIZE_MAX_RANGE_KEY = <a name="line.57"></a>
+<span class="sourceLineNo">057</span>  public static final String MEMSTORE_SIZE_MAX_RANGE_KEY =<a name="line.57"></a>
 <span class="sourceLineNo">058</span>      "hbase.regionserver.global.memstore.size.max.range";<a name="line.58"></a>
-<span class="sourceLineNo">059</span>  public static final String MEMSTORE_SIZE_MIN_RANGE_KEY = <a name="line.59"></a>
+<span class="sourceLineNo">059</span>  public static final String MEMSTORE_SIZE_MIN_RANGE_KEY =<a name="line.59"></a>
 <span class="sourceLineNo">060</span>      "hbase.regionserver.global.memstore.size.min.range";<a name="line.60"></a>
-<span class="sourceLineNo">061</span>  public static final String HBASE_RS_HEAP_MEMORY_TUNER_PERIOD = <a name="line.61"></a>
+<span class="sourceLineNo">061</span>  public static final String HBASE_RS_HEAP_MEMORY_TUNER_PERIOD =<a name="line.61"></a>
 <span class="sourceLineNo">062</span>      "hbase.regionserver.heapmemory.tuner.period";<a name="line.62"></a>
 <span class="sourceLineNo">063</span>  public static final int HBASE_RS_HEAP_MEMORY_TUNER_DEFAULT_PERIOD = 60 * 1000;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>  public static final String HBASE_RS_HEAP_MEMORY_TUNER_CLASS = <a name="line.64"></a>
+<span class="sourceLineNo">064</span>  public static final String HBASE_RS_HEAP_MEMORY_TUNER_CLASS =<a name="line.64"></a>
 <span class="sourceLineNo">065</span>      "hbase.regionserver.heapmemory.tuner.class";<a name="line.65"></a>
 <span class="sourceLineNo">066</span><a name="line.66"></a>
 <span class="sourceLineNo">067</span>  public static final float HEAP_OCCUPANCY_ERROR_VALUE = -0.0f;<a name="line.67"></a>
@@ -263,7 +263,7 @@
 <span class="sourceLineNo">255</span>          HBASE_RS_HEAP_MEMORY_TUNER_CLASS, DefaultHeapMemoryTuner.class, HeapMemoryTuner.class);<a name="line.255"></a>
 <span class="sourceLineNo">256</span>      heapMemTuner = ReflectionUtils.newInstance(tunerKlass, server.getConfiguration());<a name="line.256"></a>
 <span class="sourceLineNo">257</span>      tunerContext<a name="line.257"></a>
-<span class="sourceLineNo">258</span>          .setOffheapMemstore(regionServerAccounting.isOffheap());<a name="line.258"></a>
+<span class="sourceLineNo">258</span>          .setOffheapMemStore(regionServerAccounting.isOffheap());<a name="line.258"></a>
 <span class="sourceLineNo">259</span>    }<a name="line.259"></a>
 <span class="sourceLineNo">260</span><a name="line.260"></a>
 <span class="sourceLineNo">261</span>    @Override<a name="line.261"></a>
@@ -332,7 +332,7 @@
 <span class="sourceLineNo">324</span>      // TODO : add support for offheap metrics<a name="line.324"></a>
 <span class="sourceLineNo">325</span>      tunerContext.setCurBlockCacheUsed((float) blockCache.getCurrentSize() / maxHeapSize);<a name="line.325"></a>
 <span class="sourceLineNo">326</span>      metricsHeapMemoryManager.setCurBlockCacheSizeGauge(blockCache.getCurrentSize());<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      long globalMemstoreHeapSize = regionServerAccounting.getGlobalMemstoreHeapSize();<a name="line.327"></a>
+<span class="sourceLineNo">327</span>      long globalMemstoreHeapSize = regionServerAccounting.getGlobalMemStoreHeapSize();<a name="line.327"></a>
 <span class="sourceLineNo">328</span>      tunerContext.setCurMemStoreUsed((float) globalMemstoreHeapSize / maxHeapSize);<a name="line.328"></a>
 <span class="sourceLineNo">329</span>      metricsHeapMemoryManager.setCurMemStoreSizeGauge(globalMemstoreHeapSize);<a name="line.329"></a>
 <span class="sourceLineNo">330</span>      tunerContext.setCurBlockCacheSize(blockCachePercent);<a name="line.330"></a>
@@ -344,7 +344,7 @@
 <span class="sourceLineNo">336</span>        LOG.error("Exception thrown from the HeapMemoryTuner implementation", t);<a name="line.336"></a>
 <span class="sourceLineNo">337</span>      }<a name="line.337"></a>
 <span class="sourceLineNo">338</span>      if (result != null &amp;&amp; result.needsTuning()) {<a name="line.338"></a>
-<span class="sourceLineNo">339</span>        float memstoreSize = result.getMemstoreSize();<a name="line.339"></a>
+<span class="sourceLineNo">339</span>        float memstoreSize = result.getMemStoreSize();<a name="line.339"></a>
 <span class="sourceLineNo">340</span>        float blockCacheSize = result.getBlockCacheSize();<a name="line.340"></a>
 <span class="sourceLineNo">341</span>        LOG.debug("From HeapMemoryTuner new memstoreSize: " + memstoreSize<a name="line.341"></a>
 <span class="sourceLineNo">342</span>            + ". new blockCacheSize: " + blockCacheSize);<a name="line.342"></a>
@@ -396,7 +396,7 @@
 <span class="sourceLineNo">388</span>          globalMemStorePercent = memstoreSize;<a name="line.388"></a>
 <span class="sourceLineNo">389</span>          // Internally sets it to RegionServerAccounting<a name="line.389"></a>
 <span class="sourceLineNo">390</span>          // TODO : Set directly on RSAccounting??<a name="line.390"></a>
-<span class="sourceLineNo">391</span>          memStoreFlusher.setGlobalMemstoreLimit(newMemstoreSize);<a name="line.391"></a>
+<span class="sourceLineNo">391</span>          memStoreFlusher.setGlobalMemStoreLimit(newMemstoreSize);<a name="line.391"></a>
 <span class="sourceLineNo">392</span>          for (HeapMemoryTuneObserver observer : tuneObservers) {<a name="line.392"></a>
 <span class="sourceLineNo">393</span>            // Risky.. If this newMemstoreSize decreases we reduce the count in offheap chunk pool<a name="line.393"></a>
 <span class="sourceLineNo">394</span>            observer.onHeapMemoryTune(newMemstoreSize, newBlockCacheSize);<a name="line.394"></a>
@@ -508,11 +508,11 @@
 <span class="sourceLineNo">500</span>        this.curMemStoreUsed = d;<a name="line.500"></a>
 <span class="sourceLineNo">501</span>    }<a name="line.501"></a>
 <span class="sourceLineNo">502</span><a name="line.502"></a>
-<span class="sourceLineNo">503</span>    public void setOffheapMemstore(boolean offheapMemstore) {<a name="line.503"></a>
+<span class="sourceLineNo">503</span>    public void setOffheapMemStore(boolean offheapMemstore) {<a name="line.503"></a>
 <span class="sourceLineNo">504</span>      this.offheapMemstore = offheapMemstore;<a name="line.504"></a>
 <span class="sourceLineNo">505</span>    }<a name="line.505"></a>
 <span class="sourceLineNo">506</span><a name="line.506"></a>
-<span class="sourceLineNo">507</span>    public boolean isOffheapMemstore() {<a name="line.507"></a>
+<span class="sourceLineNo">507</span>    public boolean isOffheapMemStore() {<a name="line.507"></a>
 <span class="sourceLineNo">508</span>      return this.offheapMemstore;<a name="line.508"></a>
 <span class="sourceLineNo">509</span>    }<a name="line.509"></a>
 <span class="sourceLineNo">510</span>  }<a name="line.510"></a>
@@ -530,11 +530,11 @@
 <span class="sourceLineNo">522</span>      this.needsTuning = needsTuning;<a name="line.522"></a>
 <span class="sourceLineNo">523</span>    }<a name="line.523"></a>
 <span class="sourceLineNo">524</span><a name="line.524"></a>
-<span class="sourceLineNo">525</span>    public float getMemstoreSize() {<a name="line.525"></a>
+<span class="sourceLineNo">525</span>    public float getMemStoreSize() {<a name="line.525"></a>
 <span class="sourceLineNo">526</span>      return memstoreSize;<a name="line.526"></a>
 <span class="sourceLineNo">527</span>    }<a name="line.527"></a>
 <span class="sourceLineNo">528</span><a name="line.528"></a>
-<span class="sourceLineNo">529</span>    public void setMemstoreSize(float memstoreSize) {<a name="line.529"></a>
+<span class="sourceLineNo">529</span>    public void setMemStoreSize(float memstoreSize) {<a name="line.529"></a>
 <span class="sourceLineNo">530</span>      this.memstoreSize = memstoreSize;<a name="line.530"></a>
 <span class="sourceLineNo">531</span>    }<a name="line.531"></a>
 <span class="sourceLineNo">532</span><a name="line.532"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3332caca/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.html
index 7f00ac3..870007d 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.html
@@ -57,19 +57,19 @@
 <span class="sourceLineNo">049</span>public class HeapMemoryManager {<a name="line.49"></a>
 <span class="sourceLineNo">050</span>  private static final Log LOG = LogFactory.getLog(HeapMemoryManager.class);<a name="line.50"></a>
 <span class="sourceLineNo">051</span>  private static final int CONVERT_TO_PERCENTAGE = 100;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>  private static final int CLUSTER_MINIMUM_MEMORY_THRESHOLD = <a name="line.52"></a>
+<span class="sourceLineNo">052</span>  private static final int CLUSTER_MINIMUM_MEMORY_THRESHOLD =<a name="line.52"></a>
 <span class="sourceLineNo">053</span>    (int) (CONVERT_TO_PERCENTAGE * HConstants.HBASE_CLUSTER_MINIMUM_MEMORY_THRESHOLD);<a name="line.53"></a>
 <span class="sourceLineNo">054</span><a name="line.54"></a>
 <span class="sourceLineNo">055</span>  public static final String BLOCK_CACHE_SIZE_MAX_RANGE_KEY = "hfile.block.cache.size.max.range";<a name="line.55"></a>
 <span class="sourceLineNo">056</span>  public static final String BLOCK_CACHE_SIZE_MIN_RANGE_KEY = "hfile.block.cache.size.min.range";<a name="line.56"></a>
-<span class="sourceLineNo">057</span>  public static final String MEMSTORE_SIZE_MAX_RANGE_KEY = <a name="line.57"></a>
+<span class="sourceLineNo">057</span>  public static final String MEMSTORE_SIZE_MAX_RANGE_KEY =<a name="line.57"></a>
 <span class="sourceLineNo">058</span>      "hbase.regionserver.global.memstore.size.max.range";<a name="line.58"></a>
-<span class="sourceLineNo">059</span>  public static final String MEMSTORE_SIZE_MIN_RANGE_KEY = <a name="line.59"></a>
+<span class="sourceLineNo">059</span>  public static final String MEMSTORE_SIZE_MIN_RANGE_KEY =<a name="line.59"></a>
 <span class="sourceLineNo">060</span>      "hbase.regionserver.global.memstore.size.min.range";<a name="line.60"></a>
-<span class="sourceLineNo">061</span>  public static final String HBASE_RS_HEAP_MEMORY_TUNER_PERIOD = <a name="line.61"></a>
+<span class="sourceLineNo">061</span>  public static final String HBASE_RS_HEAP_MEMORY_TUNER_PERIOD =<a name="line.61"></a>
 <span class="sourceLineNo">062</span>      "hbase.regionserver.heapmemory.tuner.period";<a name="line.62"></a>
 <span class="sourceLineNo">063</span>  public static final int HBASE_RS_HEAP_MEMORY_TUNER_DEFAULT_PERIOD = 60 * 1000;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>  public static final String HBASE_RS_HEAP_MEMORY_TUNER_CLASS = <a name="line.64"></a>
+<span class="sourceLineNo">064</span>  public static final String HBASE_RS_HEAP_MEMORY_TUNER_CLASS =<a name="line.64"></a>
 <span class="sourceLineNo">065</span>      "hbase.regionserver.heapmemory.tuner.class";<a name="line.65"></a>
 <span class="sourceLineNo">066</span><a name="line.66"></a>
 <span class="sourceLineNo">067</span>  public static final float HEAP_OCCUPANCY_ERROR_VALUE = -0.0f;<a name="line.67"></a>
@@ -263,7 +263,7 @@
 <span class="sourceLineNo">255</span>          HBASE_RS_HEAP_MEMORY_TUNER_CLASS, DefaultHeapMemoryTuner.class, HeapMemoryTuner.class);<a name="line.255"></a>
 <span class="sourceLineNo">256</span>      heapMemTuner = ReflectionUtils.newInstance(tunerKlass, server.getConfiguration());<a name="line.256"></a>
 <span class="sourceLineNo">257</span>      tunerContext<a name="line.257"></a>
-<span class="sourceLineNo">258</span>          .setOffheapMemstore(regionServerAccounting.isOffheap());<a name="line.258"></a>
+<span class="sourceLineNo">258</span>          .setOffheapMemStore(regionServerAccounting.isOffheap());<a name="line.258"></a>
 <span class="sourceLineNo">259</span>    }<a name="line.259"></a>
 <span class="sourceLineNo">260</span><a name="line.260"></a>
 <span class="sourceLineNo">261</span>    @Override<a name="line.261"></a>
@@ -332,7 +332,7 @@
 <span class="sourceLineNo">324</span>      // TODO : add support for offheap metrics<a name="line.324"></a>
 <span class="sourceLineNo">325</span>      tunerContext.setCurBlockCacheUsed((float) blockCache.getCurrentSize() / maxHeapSize);<a name="line.325"></a>
 <span class="sourceLineNo">326</span>      metricsHeapMemoryManager.setCurBlockCacheSizeGauge(blockCache.getCurrentSize());<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      long globalMemstoreHeapSize = regionServerAccounting.getGlobalMemstoreHeapSize();<a name="line.327"></a>
+<span class="sourceLineNo">327</span>      long globalMemstoreHeapSize = regionServerAccounting.getGlobalMemStoreHeapSize();<a name="line.327"></a>
 <span class="sourceLineNo">328</span>      tunerContext.setCurMemStoreUsed((float) globalMemstoreHeapSize / maxHeapSize);<a name="line.328"></a>
 <span class="sourceLineNo">329</span>      metricsHeapMemoryManager.setCurMemStoreSizeGauge(globalMemstoreHeapSize);<a name="line.329"></a>
 <span class="sourceLineNo">330</span>      tunerContext.setCurBlockCacheSize(blockCachePercent);<a name="line.330"></a>
@@ -344,7 +344,7 @@
 <span class="sourceLineNo">336</span>        LOG.error("Exception thrown from the HeapMemoryTuner implementation", t);<a name="line.336"></a>
 <span class="sourceLineNo">337</span>      }<a name="line.337"></a>
 <span class="sourceLineNo">338</span>      if (result != null &amp;&amp; result.needsTuning()) {<a name="line.338"></a>
-<span class="sourceLineNo">339</span>        float memstoreSize = result.getMemstoreSize();<a name="line.339"></a>
+<span class="sourceLineNo">339</span>        float memstoreSize = result.getMemStoreSize();<a name="line.339"></a>
 <span class="sourceLineNo">340</span>        float blockCacheSize = result.getBlockCacheSize();<a name="line.340"></a>
 <span class="sourceLineNo">341</span>        LOG.debug("From HeapMemoryTuner new memstoreSize: " + memstoreSize<a name="line.341"></a>
 <span class="sourceLineNo">342</span>            + ". new blockCacheSize: " + blockCacheSize);<a name="line.342"></a>
@@ -396,7 +396,7 @@
 <span class="sourceLineNo">388</span>          globalMemStorePercent = memstoreSize;<a name="line.388"></a>
 <span class="sourceLineNo">389</span>          // Internally sets it to RegionServerAccounting<a name="line.389"></a>
 <span class="sourceLineNo">390</span>          // TODO : Set directly on RSAccounting??<a name="line.390"></a>
-<span class="sourceLineNo">391</span>          memStoreFlusher.setGlobalMemstoreLimit(newMemstoreSize);<a name="line.391"></a>
+<span class="sourceLineNo">391</span>          memStoreFlusher.setGlobalMemStoreLimit(newMemstoreSize);<a name="line.391"></a>
 <span class="sourceLineNo">392</span>          for (HeapMemoryTuneObserver observer : tuneObservers) {<a name="line.392"></a>
 <span class="sourceLineNo">393</span>            // Risky.. If this newMemstoreSize decreases we reduce the count in offheap chunk pool<a name="line.393"></a>
 <span class="sourceLineNo">394</span>            observer.onHeapMemoryTune(newMemstoreSize, newBlockCacheSize);<a name="line.394"></a>
@@ -508,11 +508,11 @@
 <span class="sourceLineNo">500</span>        this.curMemStoreUsed = d;<a name="line.500"></a>
 <span class="sourceLineNo">501</span>    }<a name="line.501"></a>
 <span class="sourceLineNo">502</span><a name="line.502"></a>
-<span class="sourceLineNo">503</span>    public void setOffheapMemstore(boolean offheapMemstore) {<a name="line.503"></a>
+<span class="sourceLineNo">503</span>    public void setOffheapMemStore(boolean offheapMemstore) {<a name="line.503"></a>
 <span class="sourceLineNo">504</span>      this.offheapMemstore = offheapMemstore;<a name="line.504"></a>
 <span class="sourceLineNo">505</span>    }<a name="line.505"></a>
 <span class="sourceLineNo">506</span><a name="line.506"></a>
-<span class="sourceLineNo">507</span>    public boolean isOffheapMemstore() {<a name="line.507"></a>
+<span class="sourceLineNo">507</span>    public boolean isOffheapMemStore() {<a name="line.507"></a>
 <span class="sourceLineNo">508</span>      return this.offheapMemstore;<a name="line.508"></a>
 <span class="sourceLineNo">509</span>    }<a name="line.509"></a>
 <span class="sourceLineNo">510</span>  }<a name="line.510"></a>
@@ -530,11 +530,11 @@
 <span class="sourceLineNo">522</span>      this.needsTuning = needsTuning;<a name="line.522"></a>
 <span class="sourceLineNo">523</span>    }<a name="line.523"></a>
 <span class="sourceLineNo">524</span><a name="line.524"></a>
-<span class="sourceLineNo">525</span>    public float getMemstoreSize() {<a name="line.525"></a>
+<span class="sourceLineNo">525</span>    public float getMemStoreSize() {<a name="line.525"></a>
 <span class="sourceLineNo">526</span>      return memstoreSize;<a name="line.526"></a>
 <span class="sourceLineNo">527</span>    }<a name="line.527"></a>
 <span class="sourceLineNo">528</span><a name="line.528"></a>
-<span class="sourceLineNo">529</span>    public void setMemstoreSize(float memstoreSize) {<a name="line.529"></a>
+<span class="sourceLineNo">529</span>    public void setMemStoreSize(float memstoreSize) {<a name="line.529"></a>
 <span class="sourceLineNo">530</span>      this.memstoreSize = memstoreSize;<a name="line.530"></a>
 <span class="sourceLineNo">531</span>    }<a name="line.531"></a>
 <span class="sourceLineNo">532</span><a name="line.532"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3332caca/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/MemStore.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/MemStore.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/MemStore.html
index e4a415b..2aef4f6 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/MemStore.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/MemStore.html
@@ -65,13 +65,13 @@
 <span class="sourceLineNo">057</span>   *<a name="line.57"></a>
 <span class="sourceLineNo">058</span>   * @return size of data that is going to be flushed<a name="line.58"></a>
 <span class="sourceLineNo">059</span>   */<a name="line.59"></a>
-<span class="sourceLineNo">060</span>  MemstoreSize getFlushableSize();<a name="line.60"></a>
+<span class="sourceLineNo">060</span>  MemStoreSize getFlushableSize();<a name="line.60"></a>
 <span class="sourceLineNo">061</span><a name="line.61"></a>
 <span class="sourceLineNo">062</span>  /**<a name="line.62"></a>
 <span class="sourceLineNo">063</span>   * Return the size of the snapshot(s) if any<a name="line.63"></a>
 <span class="sourceLineNo">064</span>   * @return size of the memstore snapshot<a name="line.64"></a>
 <span class="sourceLineNo">065</span>   */<a name="line.65"></a>
-<span class="sourceLineNo">066</span>  MemstoreSize getSnapshotSize();<a name="line.66"></a>
+<span class="sourceLineNo">066</span>  MemStoreSize getSnapshotSize();<a name="line.66"></a>
 <span class="sourceLineNo">067</span><a name="line.67"></a>
 <span class="sourceLineNo">068</span>  /**<a name="line.68"></a>
 <span class="sourceLineNo">069</span>   * Write an update<a name="line.69"></a>
@@ -79,7 +79,7 @@
 <span class="sourceLineNo">071</span>   * @param memstoreSize The delta in memstore size will be passed back via this.<a name="line.71"></a>
 <span class="sourceLineNo">072</span>   *        This will include both data size and heap overhead delta.<a name="line.72"></a>
 <span class="sourceLineNo">073</span>   */<a name="line.73"></a>
-<span class="sourceLineNo">074</span>  void add(final Cell cell, MemstoreSize memstoreSize);<a name="line.74"></a>
+<span class="sourceLineNo">074</span>  void add(final Cell cell, MemStoreSize memstoreSize);<a name="line.74"></a>
 <span class="sourceLineNo">075</span><a name="line.75"></a>
 <span class="sourceLineNo">076</span>  /**<a name="line.76"></a>
 <span class="sourceLineNo">077</span>   * Write the updates<a name="line.77"></a>
@@ -87,7 +87,7 @@
 <span class="sourceLineNo">079</span>   * @param memstoreSize The delta in memstore size will be passed back via this.<a name="line.79"></a>
 <span class="sourceLineNo">080</span>   *        This will include both data size and heap overhead delta.<a name="line.80"></a>
 <span class="sourceLineNo">081</span>   */<a name="line.81"></a>
-<span class="sourceLineNo">082</span>  void add(Iterable&lt;Cell&gt; cells, MemstoreSize memstoreSize);<a name="line.82"></a>
+<span class="sourceLineNo">082</span>  void add(Iterable&lt;Cell&gt; cells, MemStoreSize memstoreSize);<a name="line.82"></a>
 <span class="sourceLineNo">083</span><a name="line.83"></a>
 <span class="sourceLineNo">084</span>  /**<a name="line.84"></a>
 <span class="sourceLineNo">085</span>   * @return Oldest timestamp of all the Cells in the MemStore<a name="line.85"></a>
@@ -110,7 +110,7 @@
 <span class="sourceLineNo">102</span>   * @param memstoreSize The delta in memstore size will be passed back via this.<a name="line.102"></a>
 <span class="sourceLineNo">103</span>   *        This will include both data size and heap overhead delta.<a name="line.103"></a>
 <span class="sourceLineNo">104</span>   */<a name="line.104"></a>
-<span class="sourceLineNo">105</span>  void upsert(Iterable&lt;Cell&gt; cells, long readpoint, MemstoreSize memstoreSize);<a name="line.105"></a>
+<span class="sourceLineNo">105</span>  void upsert(Iterable&lt;Cell&gt; cells, long readpoint, MemStoreSize memstoreSize);<a name="line.105"></a>
 <span class="sourceLineNo">106</span><a name="line.106"></a>
 <span class="sourceLineNo">107</span>  /**<a name="line.107"></a>
 <span class="sourceLineNo">108</span>   * @return scanner over the memstore. This might include scanner over the snapshot when one is<a name="line.108"></a>
@@ -124,7 +124,7 @@
 <span class="sourceLineNo">116</span>   *         the memstore may be changed while computing its size. It is the responsibility of the<a name="line.116"></a>
 <span class="sourceLineNo">117</span>   *         caller to make sure this doesn't happen.<a name="line.117"></a>
 <span class="sourceLineNo">118</span>   */<a name="line.118"></a>
-<span class="sourceLineNo">119</span>  MemstoreSize size();<a name="line.119"></a>
+<span class="sourceLineNo">119</span>  MemStoreSize size();<a name="line.119"></a>
 <span class="sourceLineNo">120</span><a name="line.120"></a>
 <span class="sourceLineNo">121</span>  /**<a name="line.121"></a>
 <span class="sourceLineNo">122</span>   * This method is called before the flush is executed.<a name="line.122"></a>


Mime
View raw message