hbase git commit: HBASE-18652 Expose individual cache stats in a CombinedCache through JMX - revert due to test failure

[tedyu]

Repository: hbase
Updated Branches:
  refs/heads/branch-1.4 e177f71fd -> 59312575c


HBASE-18652 Expose individual cache stats in a CombinedCache through JMX - 
revert due to test failure


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

Branch: refs/heads/branch-1.4
Commit: 59312575c81c029cac437d5dce8458869a3a3b3d
Parents: e177f71
Author: tedyu 
Authored: Fri Sep 8 14:22:06 2017 -0700
Committer: tedyu 
Committed: Fri Sep 8 14:22:06 2017 -0700

--
 .../regionserver/MetricsRegionServerSource.java | 17 -
 .../MetricsRegionServerWrapper.java | 40 ---
 .../MetricsRegionServerSourceImpl.java  | 16 -
 .../hadoop/hbase/io/hfile/CacheConfig.java  | 28 ++--
 .../MetricsRegionServerWrapperImpl.java | 71 +---
 .../MetricsRegionServerWrapperStub.java | 40 ---
 .../regionserver/TestMetricsRegionServer.java   |  8 ---
 7 files changed, 6 insertions(+), 214 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/59312575/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 b72deb8..3ac678e 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
@@ -345,23 +345,6 @@ public interface MetricsRegionServerSource extends 
BaseSource, JvmPauseMonitorSo
   String BLOCK_CACHE_DELETE_FAMILY_BLOOM_HIT_COUNT = 
"blockCacheDeleteFamilyBloomHitCount";
   String BLOCK_CACHE_TRAILER_HIT_COUNT = "blockCacheTrailerHitCount";
 
-  String L1_CACHE_HIT_COUNT = "l1CacheHitCount";
-  String L1_CACHE_HIT_COUNT_DESC = "L1 cache hit count.";
-  String L1_CACHE_MISS_COUNT = "l1CacheMissCount";
-  String L1_CACHE_MISS_COUNT_DESC = "L1 cache miss count.";
-  String L1_CACHE_HIT_RATIO = "l1CacheHitRatio";
-  String L1_CACHE_HIT_RATIO_DESC = "L1 cache hit ratio.";
-  String L1_CACHE_MISS_RATIO = "l1CacheMissRatio";
-  String L1_CACHE_MISS_RATIO_DESC = "L1 cache miss ratio.";
-  String L2_CACHE_HIT_COUNT = "l2CacheHitCount";
-  String L2_CACHE_HIT_COUNT_DESC = "L2 cache hit count.";
-  String L2_CACHE_MISS_COUNT = "l2CacheMissCount";
-  String L2_CACHE_MISS_COUNT_DESC = "L2 cache miss count.";
-  String L2_CACHE_HIT_RATIO = "l2CacheHitRatio";
-  String L2_CACHE_HIT_RATIO_DESC = "L2 cache hit ratio.";
-  String L2_CACHE_MISS_RATIO = "l2CacheMissRatio";
-  String L2_CACHE_MISS_RATIO_DESC = "L2 cache miss ratio.";
-
   String RS_START_TIME_NAME = "regionServerStartTime";
   String ZOOKEEPER_QUORUM_NAME = "zookeeperQuorum";
   String SERVER_NAME_NAME = "serverName";

http://git-wip-us.apache.org/repos/asf/hbase/blob/59312575/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 3344dce..7d7f66d 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
@@ -259,46 +259,6 @@ public interface MetricsRegionServerWrapper {
   long getBlockCacheFailedInsertions();
 
   /**
-   * Hit count of L1 cache.
-   */
-  public long getL1CacheHitCount();
-
-  /**
-   * Miss count of L1 cache.
-   */
-  public long getL1CacheMissCount();
-
-  /**
-   * Hit ratio of L1 cache.
-   */
-  public double getL1CacheHitRatio();
-
-  /**
-   * Miss ratio of L1 cache.
-   */
-  public double getL1CacheMissRatio();
-
-  /**
-   * Hit count of L2 cache.
-   */
-  public long getL2CacheHitCount();
-
-  /**
-   * Miss count of L2 cache.
-   */
-  public long getL2CacheMissCount();
-
-  /**
-   * Hit ratio of L2 cache.
-   */
-  public double getL2CacheHitRatio();
-
-  /**
-   * Miss ratio of L2 cache.
-   */
-  public double getL2CacheMissRatio();
-
-  /**
* Force a re-computation of the metrics.
*/
   void forceRecompute();

hbase git commit: HBASE-18652 Expose individual cache stats in a CombinedCache through JMX - revert due to test failure

[tedyu]

Repository: hbase
Updated Branches:
  refs/heads/branch-1 ab8a667c4 -> b6a12c843


HBASE-18652 Expose individual cache stats in a CombinedCache through JMX - 
revert due to test failure


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

Branch: refs/heads/branch-1
Commit: b6a12c843e3eca5b90065a6d045df77fd7164494
Parents: ab8a667
Author: tedyu 
Authored: Fri Sep 8 14:21:30 2017 -0700
Committer: tedyu 
Committed: Fri Sep 8 14:21:30 2017 -0700

--
 .../regionserver/MetricsRegionServerSource.java | 17 -
 .../MetricsRegionServerWrapper.java | 40 ---
 .../MetricsRegionServerSourceImpl.java  | 16 -
 .../hadoop/hbase/io/hfile/CacheConfig.java  | 28 ++--
 .../MetricsRegionServerWrapperImpl.java | 71 +---
 .../MetricsRegionServerWrapperStub.java | 40 ---
 .../regionserver/TestMetricsRegionServer.java   |  8 ---
 7 files changed, 6 insertions(+), 214 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/b6a12c84/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 b72deb8..3ac678e 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
@@ -345,23 +345,6 @@ public interface MetricsRegionServerSource extends 
BaseSource, JvmPauseMonitorSo
   String BLOCK_CACHE_DELETE_FAMILY_BLOOM_HIT_COUNT = 
"blockCacheDeleteFamilyBloomHitCount";
   String BLOCK_CACHE_TRAILER_HIT_COUNT = "blockCacheTrailerHitCount";
 
-  String L1_CACHE_HIT_COUNT = "l1CacheHitCount";
-  String L1_CACHE_HIT_COUNT_DESC = "L1 cache hit count.";
-  String L1_CACHE_MISS_COUNT = "l1CacheMissCount";
-  String L1_CACHE_MISS_COUNT_DESC = "L1 cache miss count.";
-  String L1_CACHE_HIT_RATIO = "l1CacheHitRatio";
-  String L1_CACHE_HIT_RATIO_DESC = "L1 cache hit ratio.";
-  String L1_CACHE_MISS_RATIO = "l1CacheMissRatio";
-  String L1_CACHE_MISS_RATIO_DESC = "L1 cache miss ratio.";
-  String L2_CACHE_HIT_COUNT = "l2CacheHitCount";
-  String L2_CACHE_HIT_COUNT_DESC = "L2 cache hit count.";
-  String L2_CACHE_MISS_COUNT = "l2CacheMissCount";
-  String L2_CACHE_MISS_COUNT_DESC = "L2 cache miss count.";
-  String L2_CACHE_HIT_RATIO = "l2CacheHitRatio";
-  String L2_CACHE_HIT_RATIO_DESC = "L2 cache hit ratio.";
-  String L2_CACHE_MISS_RATIO = "l2CacheMissRatio";
-  String L2_CACHE_MISS_RATIO_DESC = "L2 cache miss ratio.";
-
   String RS_START_TIME_NAME = "regionServerStartTime";
   String ZOOKEEPER_QUORUM_NAME = "zookeeperQuorum";
   String SERVER_NAME_NAME = "serverName";

http://git-wip-us.apache.org/repos/asf/hbase/blob/b6a12c84/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 3344dce..7d7f66d 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
@@ -259,46 +259,6 @@ public interface MetricsRegionServerWrapper {
   long getBlockCacheFailedInsertions();
 
   /**
-   * Hit count of L1 cache.
-   */
-  public long getL1CacheHitCount();
-
-  /**
-   * Miss count of L1 cache.
-   */
-  public long getL1CacheMissCount();
-
-  /**
-   * Hit ratio of L1 cache.
-   */
-  public double getL1CacheHitRatio();
-
-  /**
-   * Miss ratio of L1 cache.
-   */
-  public double getL1CacheMissRatio();
-
-  /**
-   * Hit count of L2 cache.
-   */
-  public long getL2CacheHitCount();
-
-  /**
-   * Miss count of L2 cache.
-   */
-  public long getL2CacheMissCount();
-
-  /**
-   * Hit ratio of L2 cache.
-   */
-  public double getL2CacheHitRatio();
-
-  /**
-   * Miss ratio of L2 cache.
-   */
-  public double getL2CacheMissRatio();
-
-  /**
* Force a re-computation of the metrics.
*/
   void forceRecompute();

hbase git commit: HBASE-18641 Include block content verification logic used in lruCache in bucketCache - revert due to test failure

[tedyu]

Repository: hbase
Updated Branches:
  refs/heads/branch-1 a6dbeba22 -> ab8a667c4


HBASE-18641 Include block content verification logic used in lruCache in 
bucketCache - revert due to test failure


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

Branch: refs/heads/branch-1
Commit: ab8a667c451bd7a023a5e506bb3fb58928de
Parents: a6dbeba
Author: tedyu 
Authored: Fri Sep 8 12:45:47 2017 -0700
Committer: tedyu 
Committed: Fri Sep 8 12:45:47 2017 -0700

--
 .../hadoop/hbase/io/hfile/BlockCacheUtil.java  | 11 ---
 .../hadoop/hbase/io/hfile/LruBlockCache.java   | 13 +++--
 .../hadoop/hbase/io/hfile/bucket/BucketCache.java  | 17 ++---
 3 files changed, 13 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/ab8a667c/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
index a3d46ed..e5bb83b 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
@@ -18,7 +18,6 @@
 package org.apache.hadoop.hbase.io.hfile;
 
 import java.io.IOException;
-import java.nio.ByteBuffer;
 import java.util.NavigableMap;
 import java.util.NavigableSet;
 import java.util.concurrent.ConcurrentSkipListMap;
@@ -27,7 +26,6 @@ import java.util.concurrent.ConcurrentSkipListSet;
 import org.apache.hadoop.hbase.classification.InterfaceAudience;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.metrics.impl.FastLongHistogram;
-import org.apache.hadoop.hbase.util.Bytes;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 import org.codehaus.jackson.map.JsonMappingException;
@@ -173,15 +171,6 @@ public class BlockCacheUtil {
 return cbsbf;
   }
 
-  public static int compareCacheBlock(Cacheable left, Cacheable right) {
-ByteBuffer l = ByteBuffer.allocate(left.getSerializedLength());
-left.serialize(l);
-ByteBuffer r = ByteBuffer.allocate(right.getSerializedLength());
-right.serialize(r);
-return Bytes.compareTo(l.array(), l.arrayOffset(), l.limit(),
- r.array(), r.arrayOffset(), r.limit());
-  }
-
   /**
* Use one of these to keep a running account of cached blocks by file.  
Throw it away when done.
* This is different than metrics in that it is stats on current state of a 
cache.

http://git-wip-us.apache.org/repos/asf/hbase/blob/ab8a667c/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
index 69fea76..3fbe44b 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
@@ -373,7 +373,7 @@ public class LruBlockCache implements ResizableBlockCache, 
HeapSize {
 LruCachedBlock cb = map.get(cacheKey);
 if (cb != null) {
   // compare the contents, if they are not equal, we are in big trouble
-  if (BlockCacheUtil.compareCacheBlock(buf, cb.getBuffer()) != 0) {
+  if (compare(buf, cb.getBuffer()) != 0) {
 throw new RuntimeException("Cached block contents differ, which should 
not have happened."
   + "cacheKey:" + cacheKey);
   }
@@ -433,6 +433,15 @@ public class LruBlockCache implements ResizableBlockCache, 
HeapSize {
 }
   }
 
+  private int compare(Cacheable left, Cacheable right) {
+ByteBuffer l = ByteBuffer.allocate(left.getSerializedLength());
+left.serialize(l);
+ByteBuffer r = ByteBuffer.allocate(right.getSerializedLength());
+right.serialize(r);
+return Bytes.compareTo(l.array(), l.arrayOffset(), l.limit(),
+  r.array(), r.arrayOffset(), r.limit());
+  }
+
   /**
* Cache the block with the specified name and buffer.
* 
@@ -568,7 +577,7 @@ public class LruBlockCache implements ResizableBlockCache, 
HeapSize {
 boolean wait = getCurrentSize() < acceptableSize();
 boolean inMemory = block.getPriority() == BlockPriority.MEMORY;
 

hbase git commit: HBASE-18621 Refactor ClusterOptions before applying to code base

[chia7712]

Repository: hbase
Updated Branches:
  refs/heads/master af2157242 -> 77ca743d0


HBASE-18621 Refactor ClusterOptions before applying to code base

Signed-off-by: Chia-Ping Tsai 


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

Branch: refs/heads/master
Commit: 77ca743d095de11bbe30cdc230d8198f0c3d7d4d
Parents: af21572
Author: Reid Chan 
Authored: Sat Sep 9 03:27:47 2017 +0800
Committer: Chia-Ping Tsai 
Committed: Sat Sep 9 03:31:28 2017 +0800

--
 .../org/apache/hadoop/hbase/ClusterStatus.java  | 236 +++
 .../org/apache/hadoop/hbase/client/Admin.java   |  17 +-
 .../apache/hadoop/hbase/client/AsyncAdmin.java  |   5 +-
 .../hadoop/hbase/client/AsyncHBaseAdmin.java|  13 +-
 .../apache/hadoop/hbase/client/HBaseAdmin.java  |   7 +-
 .../hadoop/hbase/client/RawAsyncHBaseAdmin.java |   7 +-
 .../hbase/shaded/protobuf/ProtobufUtil.java | 103 +---
 .../hbase/shaded/protobuf/RequestConverter.java |   7 +-
 .../src/main/protobuf/ClusterStatus.proto   |  20 +-
 .../src/main/protobuf/Master.proto  |   2 +-
 .../src/main/protobuf/ClusterStatus.proto   |  20 +-
 .../org/apache/hadoop/hbase/master/HMaster.java |  73 +++---
 .../hadoop/hbase/master/MasterRpcServices.java  |   2 +-
 .../hbase/client/TestClientClusterStatus.java   |  54 ++---
 14 files changed, 208 insertions(+), 358 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/77ca743d/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java
index 0dc4984..d12ad0d 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java
@@ -29,6 +29,8 @@ import 
org.apache.hadoop.hbase.classification.InterfaceAudience;
 import org.apache.hadoop.hbase.master.RegionState;
 import org.apache.hadoop.io.VersionedWritable;
 
+import com.google.common.base.Objects;
+
 
 /**
  * Status information on the HBase cluster.
@@ -47,26 +49,23 @@ import org.apache.hadoop.io.VersionedWritable;
  * Regions in transition at master
  * The unique cluster ID
  * 
- * {@link Options} provides a way to filter out infos which unwanted.
- * The following codes will retrieve all the cluster information.
+ * {@link Option} provides a way to get desired ClusterStatus 
information.
+ * The following codes will get all the cluster information.
  * 
  * {@code
  * // Original version still works
  * Admin admin = connection.getAdmin();
  * ClusterStatus status = admin.getClusterStatus();
  * // or below, a new version which has the same effects
- * ClusterStatus status = admin.getClusterStatus(Options.defaultOptions());
+ * ClusterStatus status = admin.getClusterStatus(EnumSet.allOf(Option.class));
  * }
  * 
- * If information about dead servers and master coprocessors are unwanted,
+ * If information about live servers is the only wanted.
  * then codes in the following way:
  * 
  * {@code
  * Admin admin = connection.getAdmin();
- * ClusterStatus status = admin.getClusterStatus(
- *Options.defaultOptions()
- *   .excludeDeadServers()
- *   .excludeMasterCoprocessors());
+ * ClusterStatus status = 
admin.getClusterStatus(EnumSet.of(Option.LIVE_SERVERS));
  * }
  * 
  */
@@ -208,23 +207,23 @@ public class ClusterStatus extends VersionedWritable {
 if (!(o instanceof ClusterStatus)) {
   return false;
 }
-return (getVersion() == ((ClusterStatus)o).getVersion()) &&
-  getHBaseVersion().equals(((ClusterStatus)o).getHBaseVersion()) &&
-  this.liveServers.equals(((ClusterStatus)o).liveServers) &&
-  this.deadServers.containsAll(((ClusterStatus)o).deadServers) &&
-  Arrays.equals(this.masterCoprocessors,
-((ClusterStatus)o).masterCoprocessors) &&
-  this.master.equals(((ClusterStatus)o).master) &&
-  this.backupMasters.containsAll(((ClusterStatus)o).backupMasters);
+ClusterStatus other = (ClusterStatus) o;
+//TODO Override the equals() methods in ServerLoad.
+return (getVersion() == other.getVersion()) &&
+  Objects.equal(getHBaseVersion(), other.getHBaseVersion()) &&
+  Objects.equal(this.liveServers, other.liveServers) &&
+  getDeadServerNames().containsAll(other.getDeadServerNames()) &&
+  

hbase git commit: HBASE-18641 Include block content verification logic used in lruCache in bucketCache - revert due to test failure

[tedyu]

Repository: hbase
Updated Branches:
  refs/heads/branch-1.4 3f831ebdc -> e177f71fd


HBASE-18641 Include block content verification logic used in lruCache in 
bucketCache - revert due to test failure


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

Branch: refs/heads/branch-1.4
Commit: e177f71fd13f00faa104172a0a42bb6a7f5f9040
Parents: 3f831eb
Author: tedyu 
Authored: Fri Sep 8 12:45:24 2017 -0700
Committer: tedyu 
Committed: Fri Sep 8 12:45:24 2017 -0700

--
 .../hadoop/hbase/io/hfile/BlockCacheUtil.java  | 11 ---
 .../hadoop/hbase/io/hfile/LruBlockCache.java   | 13 +++--
 .../hadoop/hbase/io/hfile/bucket/BucketCache.java  | 17 ++---
 3 files changed, 13 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/e177f71f/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
index a3d46ed..e5bb83b 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
@@ -18,7 +18,6 @@
 package org.apache.hadoop.hbase.io.hfile;
 
 import java.io.IOException;
-import java.nio.ByteBuffer;
 import java.util.NavigableMap;
 import java.util.NavigableSet;
 import java.util.concurrent.ConcurrentSkipListMap;
@@ -27,7 +26,6 @@ import java.util.concurrent.ConcurrentSkipListSet;
 import org.apache.hadoop.hbase.classification.InterfaceAudience;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.metrics.impl.FastLongHistogram;
-import org.apache.hadoop.hbase.util.Bytes;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 import org.codehaus.jackson.map.JsonMappingException;
@@ -173,15 +171,6 @@ public class BlockCacheUtil {
 return cbsbf;
   }
 
-  public static int compareCacheBlock(Cacheable left, Cacheable right) {
-ByteBuffer l = ByteBuffer.allocate(left.getSerializedLength());
-left.serialize(l);
-ByteBuffer r = ByteBuffer.allocate(right.getSerializedLength());
-right.serialize(r);
-return Bytes.compareTo(l.array(), l.arrayOffset(), l.limit(),
- r.array(), r.arrayOffset(), r.limit());
-  }
-
   /**
* Use one of these to keep a running account of cached blocks by file.  
Throw it away when done.
* This is different than metrics in that it is stats on current state of a 
cache.

http://git-wip-us.apache.org/repos/asf/hbase/blob/e177f71f/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
index 69fea76..3fbe44b 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
@@ -373,7 +373,7 @@ public class LruBlockCache implements ResizableBlockCache, 
HeapSize {
 LruCachedBlock cb = map.get(cacheKey);
 if (cb != null) {
   // compare the contents, if they are not equal, we are in big trouble
-  if (BlockCacheUtil.compareCacheBlock(buf, cb.getBuffer()) != 0) {
+  if (compare(buf, cb.getBuffer()) != 0) {
 throw new RuntimeException("Cached block contents differ, which should 
not have happened."
   + "cacheKey:" + cacheKey);
   }
@@ -433,6 +433,15 @@ public class LruBlockCache implements ResizableBlockCache, 
HeapSize {
 }
   }
 
+  private int compare(Cacheable left, Cacheable right) {
+ByteBuffer l = ByteBuffer.allocate(left.getSerializedLength());
+left.serialize(l);
+ByteBuffer r = ByteBuffer.allocate(right.getSerializedLength());
+right.serialize(r);
+return Bytes.compareTo(l.array(), l.arrayOffset(), l.limit(),
+  r.array(), r.arrayOffset(), r.limit());
+  }
+
   /**
* Cache the block with the specified name and buffer.
* 
@@ -568,7 +577,7 @@ public class LruBlockCache implements ResizableBlockCache, 
HeapSize {
 boolean wait = getCurrentSize() < acceptableSize();
 boolean inMemory = block.getPriority() == BlockPriority.MEMORY;
 

hbase git commit: HBASE-18621 Refactor ClusterOptions before applying to code base

[chia7712]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 c48dc02b7 -> 6970c1e9e


HBASE-18621 Refactor ClusterOptions before applying to code base

Signed-off-by: Chia-Ping Tsai 


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

Branch: refs/heads/branch-2
Commit: 6970c1e9eb650cb9ec4e87433449cabbbe4351aa
Parents: c48dc02
Author: Reid Chan 
Authored: Sat Sep 9 03:27:47 2017 +0800
Committer: Chia-Ping Tsai 
Committed: Sat Sep 9 03:38:42 2017 +0800

--
 .../org/apache/hadoop/hbase/ClusterStatus.java  | 236 +++
 .../org/apache/hadoop/hbase/client/Admin.java   |  17 +-
 .../apache/hadoop/hbase/client/AsyncAdmin.java  |   5 +-
 .../hadoop/hbase/client/AsyncHBaseAdmin.java|  13 +-
 .../apache/hadoop/hbase/client/HBaseAdmin.java  |   7 +-
 .../hadoop/hbase/client/RawAsyncHBaseAdmin.java |   7 +-
 .../hbase/shaded/protobuf/ProtobufUtil.java | 103 +---
 .../hbase/shaded/protobuf/RequestConverter.java |   7 +-
 .../src/main/protobuf/ClusterStatus.proto   |  20 +-
 .../src/main/protobuf/Master.proto  |   2 +-
 .../src/main/protobuf/ClusterStatus.proto   |  20 +-
 .../org/apache/hadoop/hbase/master/HMaster.java |  73 +++---
 .../hadoop/hbase/master/MasterRpcServices.java  |   2 +-
 .../hbase/client/TestClientClusterStatus.java   |  54 ++---
 14 files changed, 208 insertions(+), 358 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/6970c1e9/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java
index 0dc4984..d12ad0d 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java
@@ -29,6 +29,8 @@ import 
org.apache.hadoop.hbase.classification.InterfaceAudience;
 import org.apache.hadoop.hbase.master.RegionState;
 import org.apache.hadoop.io.VersionedWritable;
 
+import com.google.common.base.Objects;
+
 
 /**
  * Status information on the HBase cluster.
@@ -47,26 +49,23 @@ import org.apache.hadoop.io.VersionedWritable;
  * Regions in transition at master
  * The unique cluster ID
  * 
- * {@link Options} provides a way to filter out infos which unwanted.
- * The following codes will retrieve all the cluster information.
+ * {@link Option} provides a way to get desired ClusterStatus 
information.
+ * The following codes will get all the cluster information.
  * 
  * {@code
  * // Original version still works
  * Admin admin = connection.getAdmin();
  * ClusterStatus status = admin.getClusterStatus();
  * // or below, a new version which has the same effects
- * ClusterStatus status = admin.getClusterStatus(Options.defaultOptions());
+ * ClusterStatus status = admin.getClusterStatus(EnumSet.allOf(Option.class));
  * }
  * 
- * If information about dead servers and master coprocessors are unwanted,
+ * If information about live servers is the only wanted.
  * then codes in the following way:
  * 
  * {@code
  * Admin admin = connection.getAdmin();
- * ClusterStatus status = admin.getClusterStatus(
- *Options.defaultOptions()
- *   .excludeDeadServers()
- *   .excludeMasterCoprocessors());
+ * ClusterStatus status = 
admin.getClusterStatus(EnumSet.of(Option.LIVE_SERVERS));
  * }
  * 
  */
@@ -208,23 +207,23 @@ public class ClusterStatus extends VersionedWritable {
 if (!(o instanceof ClusterStatus)) {
   return false;
 }
-return (getVersion() == ((ClusterStatus)o).getVersion()) &&
-  getHBaseVersion().equals(((ClusterStatus)o).getHBaseVersion()) &&
-  this.liveServers.equals(((ClusterStatus)o).liveServers) &&
-  this.deadServers.containsAll(((ClusterStatus)o).deadServers) &&
-  Arrays.equals(this.masterCoprocessors,
-((ClusterStatus)o).masterCoprocessors) &&
-  this.master.equals(((ClusterStatus)o).master) &&
-  this.backupMasters.containsAll(((ClusterStatus)o).backupMasters);
+ClusterStatus other = (ClusterStatus) o;
+//TODO Override the equals() methods in ServerLoad.
+return (getVersion() == other.getVersion()) &&
+  Objects.equal(getHBaseVersion(), other.getHBaseVersion()) &&
+  Objects.equal(this.liveServers, other.liveServers) &&
+  getDeadServerNames().containsAll(other.getDeadServerNames()) &&
+  

hbase git commit: HBASE-18641 Include block content verification logic used in lruCache in bucketCache

[tedyu]

Repository: hbase
Updated Branches:
  refs/heads/branch-1.4 93fbf25e3 -> 3f831ebdc


HBASE-18641 Include block content verification logic used in lruCache in 
bucketCache

Signed-off-by: tedyu 


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

Branch: refs/heads/branch-1.4
Commit: 3f831ebdc52999bc4eed657effb5a9aa6f8866fa
Parents: 93fbf25
Author: Biju Nair 
Authored: Fri Sep 8 14:59:26 2017 -0400
Committer: tedyu 
Committed: Fri Sep 8 12:07:31 2017 -0700

--
 .../hadoop/hbase/io/hfile/BlockCacheUtil.java  | 11 +++
 .../hadoop/hbase/io/hfile/LruBlockCache.java   | 13 ++---
 .../hadoop/hbase/io/hfile/bucket/BucketCache.java  | 17 +++--
 3 files changed, 28 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/3f831ebd/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
index e5bb83b..a3d46ed 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
@@ -18,6 +18,7 @@
 package org.apache.hadoop.hbase.io.hfile;
 
 import java.io.IOException;
+import java.nio.ByteBuffer;
 import java.util.NavigableMap;
 import java.util.NavigableSet;
 import java.util.concurrent.ConcurrentSkipListMap;
@@ -26,6 +27,7 @@ import java.util.concurrent.ConcurrentSkipListSet;
 import org.apache.hadoop.hbase.classification.InterfaceAudience;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.metrics.impl.FastLongHistogram;
+import org.apache.hadoop.hbase.util.Bytes;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 import org.codehaus.jackson.map.JsonMappingException;
@@ -171,6 +173,15 @@ public class BlockCacheUtil {
 return cbsbf;
   }
 
+  public static int compareCacheBlock(Cacheable left, Cacheable right) {
+ByteBuffer l = ByteBuffer.allocate(left.getSerializedLength());
+left.serialize(l);
+ByteBuffer r = ByteBuffer.allocate(right.getSerializedLength());
+right.serialize(r);
+return Bytes.compareTo(l.array(), l.arrayOffset(), l.limit(),
+ r.array(), r.arrayOffset(), r.limit());
+  }
+
   /**
* Use one of these to keep a running account of cached blocks by file.  
Throw it away when done.
* This is different than metrics in that it is stats on current state of a 
cache.

http://git-wip-us.apache.org/repos/asf/hbase/blob/3f831ebd/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
index 3fbe44b..69fea76 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
@@ -373,7 +373,7 @@ public class LruBlockCache implements ResizableBlockCache, 
HeapSize {
 LruCachedBlock cb = map.get(cacheKey);
 if (cb != null) {
   // compare the contents, if they are not equal, we are in big trouble
-  if (compare(buf, cb.getBuffer()) != 0) {
+  if (BlockCacheUtil.compareCacheBlock(buf, cb.getBuffer()) != 0) {
 throw new RuntimeException("Cached block contents differ, which should 
not have happened."
   + "cacheKey:" + cacheKey);
   }
@@ -433,15 +433,6 @@ public class LruBlockCache implements ResizableBlockCache, 
HeapSize {
 }
   }
 
-  private int compare(Cacheable left, Cacheable right) {
-ByteBuffer l = ByteBuffer.allocate(left.getSerializedLength());
-left.serialize(l);
-ByteBuffer r = ByteBuffer.allocate(right.getSerializedLength());
-right.serialize(r);
-return Bytes.compareTo(l.array(), l.arrayOffset(), l.limit(),
-  r.array(), r.arrayOffset(), r.limit());
-  }
-
   /**
* Cache the block with the specified name and buffer.
* 
@@ -577,7 +568,7 @@ public class LruBlockCache implements ResizableBlockCache, 
HeapSize {
 boolean wait = getCurrentSize() < acceptableSize();
 boolean inMemory = block.getPriority() == BlockPriority.MEMORY;
 

hbase git commit: HBASE-18641 Include block content verification logic used in lruCache in bucketCache

[tedyu]

Repository: hbase
Updated Branches:
  refs/heads/branch-1 5bfe1da98 -> a6dbeba22


HBASE-18641 Include block content verification logic used in lruCache in 
bucketCache

Signed-off-by: tedyu 


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

Branch: refs/heads/branch-1
Commit: a6dbeba22a2ce73cfe1c71551bd932102d196224
Parents: 5bfe1da
Author: Biju Nair 
Authored: Fri Sep 8 14:59:26 2017 -0400
Committer: tedyu 
Committed: Fri Sep 8 12:07:02 2017 -0700

--
 .../hadoop/hbase/io/hfile/BlockCacheUtil.java  | 11 +++
 .../hadoop/hbase/io/hfile/LruBlockCache.java   | 13 ++---
 .../hadoop/hbase/io/hfile/bucket/BucketCache.java  | 17 +++--
 3 files changed, 28 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/a6dbeba2/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
index e5bb83b..a3d46ed 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
@@ -18,6 +18,7 @@
 package org.apache.hadoop.hbase.io.hfile;
 
 import java.io.IOException;
+import java.nio.ByteBuffer;
 import java.util.NavigableMap;
 import java.util.NavigableSet;
 import java.util.concurrent.ConcurrentSkipListMap;
@@ -26,6 +27,7 @@ import java.util.concurrent.ConcurrentSkipListSet;
 import org.apache.hadoop.hbase.classification.InterfaceAudience;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.metrics.impl.FastLongHistogram;
+import org.apache.hadoop.hbase.util.Bytes;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 import org.codehaus.jackson.map.JsonMappingException;
@@ -171,6 +173,15 @@ public class BlockCacheUtil {
 return cbsbf;
   }
 
+  public static int compareCacheBlock(Cacheable left, Cacheable right) {
+ByteBuffer l = ByteBuffer.allocate(left.getSerializedLength());
+left.serialize(l);
+ByteBuffer r = ByteBuffer.allocate(right.getSerializedLength());
+right.serialize(r);
+return Bytes.compareTo(l.array(), l.arrayOffset(), l.limit(),
+ r.array(), r.arrayOffset(), r.limit());
+  }
+
   /**
* Use one of these to keep a running account of cached blocks by file.  
Throw it away when done.
* This is different than metrics in that it is stats on current state of a 
cache.

http://git-wip-us.apache.org/repos/asf/hbase/blob/a6dbeba2/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
index 3fbe44b..69fea76 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
@@ -373,7 +373,7 @@ public class LruBlockCache implements ResizableBlockCache, 
HeapSize {
 LruCachedBlock cb = map.get(cacheKey);
 if (cb != null) {
   // compare the contents, if they are not equal, we are in big trouble
-  if (compare(buf, cb.getBuffer()) != 0) {
+  if (BlockCacheUtil.compareCacheBlock(buf, cb.getBuffer()) != 0) {
 throw new RuntimeException("Cached block contents differ, which should 
not have happened."
   + "cacheKey:" + cacheKey);
   }
@@ -433,15 +433,6 @@ public class LruBlockCache implements ResizableBlockCache, 
HeapSize {
 }
   }
 
-  private int compare(Cacheable left, Cacheable right) {
-ByteBuffer l = ByteBuffer.allocate(left.getSerializedLength());
-left.serialize(l);
-ByteBuffer r = ByteBuffer.allocate(right.getSerializedLength());
-right.serialize(r);
-return Bytes.compareTo(l.array(), l.arrayOffset(), l.limit(),
-  r.array(), r.arrayOffset(), r.limit());
-  }
-
   /**
* Cache the block with the specified name and buffer.
* 
@@ -577,7 +568,7 @@ public class LruBlockCache implements ResizableBlockCache, 
HeapSize {
 boolean wait = getCurrentSize() < acceptableSize();
 boolean inMemory = block.getPriority() == BlockPriority.MEMORY;
 

[3/5] hbase git commit: HBASE-18106 Redo ProcedureInfo and LockInfo

[stack]

http://git-wip-us.apache.org/repos/asf/hbase/blob/c48dc02b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestYieldProcedures.java
--
diff --git 
a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestYieldProcedures.java
 
b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestYieldProcedures.java
index b1d0669..4882168 100644
--- 
a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestYieldProcedures.java
+++ 
b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestYieldProcedures.java
@@ -19,8 +19,6 @@
 package org.apache.hadoop.hbase.procedure2;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
@@ -336,11 +334,13 @@ public class TestYieldProcedures {
 }
 
 @Override
-protected void serializeStateData(final OutputStream stream) throws 
IOException {
+protected void serializeStateData(ProcedureStateSerializer serializer)
+throws IOException {
 }
 
 @Override
-protected void deserializeStateData(final InputStream stream) throws 
IOException {
+protected void deserializeStateData(ProcedureStateSerializer serializer)
+throws IOException {
 }
   }
 
@@ -353,6 +353,7 @@ public class TestYieldProcedures {
 
 public TestScheduler() {}
 
+@Override
 public void addFront(final Procedure proc) {
   addFrontCalls++;
   super.addFront(proc);

http://git-wip-us.apache.org/repos/asf/hbase/blob/c48dc02b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
--
diff --git 
a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
 
b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
index 9b8c46f..44c8e12 100644
--- 
a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
+++ 
b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
@@ -36,6 +36,7 @@ import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
 import org.apache.hadoop.hbase.procedure2.Procedure;
+import org.apache.hadoop.hbase.procedure2.ProcedureStateSerializer;
 import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility;
 import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility.LoadCounter;
 import 
org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility.TestProcedure;
@@ -43,9 +44,9 @@ import org.apache.hadoop.hbase.procedure2.SequentialProcedure;
 import org.apache.hadoop.hbase.procedure2.store.ProcedureStore;
 import 
org.apache.hadoop.hbase.procedure2.store.ProcedureStore.ProcedureIterator;
 import org.apache.hadoop.hbase.procedure2.store.ProcedureStoreTracker;
+import org.apache.hadoop.hbase.shaded.com.google.protobuf.Int64Value;
 import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.testclassification.MasterTests;
-import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.io.IOUtils;
 
 import org.junit.After;
@@ -514,7 +515,7 @@ public class TestWALProcedureStore {
 storeRestart(loader);
 assertTrue(procStore.getCorruptedLogs() != null);
 assertEquals(1, procStore.getCorruptedLogs().size());
-assertEquals(85, loader.getLoadedCount());
+assertEquals(87, loader.getLoadedCount());
 assertEquals(0, loader.getCorruptedCount());
   }
 
@@ -911,22 +912,22 @@ public class TestWALProcedureStore {
 protected boolean abort(Void env) { return false; }
 
 @Override
-protected void serializeStateData(final OutputStream stream) throws 
IOException {
+protected void serializeStateData(ProcedureStateSerializer serializer)
+throws IOException {
   long procId = getProcId();
   if (procId % 2 == 0) {
-stream.write(Bytes.toBytes(procId));
+Int64Value.Builder builder = Int64Value.newBuilder().setValue(procId);
+serializer.serialize(builder.build());
   }
 }
 
 @Override
-protected void deserializeStateData(InputStream stream) throws IOException 
{
+protected void deserializeStateData(ProcedureStateSerializer serializer)
+throws IOException {
   long procId = getProcId();
   if (procId % 2 == 0) {
-byte[] bProcId = new byte[8];
-assertEquals(8, stream.read(bProcId));
-assertEquals(procId, Bytes.toLong(bProcId));
-  } else {
-assertEquals(0, stream.available());
+Int64Value value = serializer.deserialize(Int64Value.class);
+assertEquals(procId, value.getValue());
   }
 

[5/5] hbase git commit: HBASE-18106 Redo ProcedureInfo and LockInfo

[stack]

HBASE-18106 Redo ProcedureInfo and LockInfo

Main changes:
- ProcedureInfo and LockInfo were removed, we use JSON instead of them
- Procedure and LockedResource are their server side equivalent
- Procedure protobuf state_data became obsolate, it is only kept for
reading previously written WAL
- Procedure protobuf contains a state_message field, which stores the internal
state messages (Any type instead of bytes)
- Procedure.serializeStateData and deserializeStateData were changed slightly
- Procedures internal states are available on client side
- Procedures are displayed on web UI and in shell in the following jruby format:
  { ID => '1', PARENT_ID = '-1', PARAMETERS => [ ..extra state information.. ] }

Signed-off-by: Michael Stack 


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

Branch: refs/heads/branch-2
Commit: c48dc02b7611dca305940b737cbddd07039dd30b
Parents: 9a50203
Author: Balazs Meszaros 
Authored: Wed Sep 6 15:21:32 2017 +0200
Committer: Michael Stack 
Committed: Fri Sep 8 11:56:28 2017 -0700

--
 .../org/apache/hadoop/hbase/client/Admin.java   |  14 +-
 .../apache/hadoop/hbase/client/AsyncAdmin.java  |  12 +-
 .../hadoop/hbase/client/AsyncHBaseAdmin.java|  10 +-
 .../hbase/client/ConnectionImplementation.java  |  12 +-
 .../apache/hadoop/hbase/client/HBaseAdmin.java  |  48 +-
 .../hadoop/hbase/client/RawAsyncHBaseAdmin.java |  92 ++--
 .../client/ShortCircuitMasterConnection.java| 139 +-
 .../protobuf/ProtobufMessageConverter.java  | 159 +++
 .../hbase/shaded/protobuf/ProtobufUtil.java | 197 +---
 .../hbase/shaded/protobuf/TestProtobufUtil.java | 466 +++
 .../org/apache/hadoop/hbase/ProcedureInfo.java  | 215 -
 .../hadoop/hbase/procedure2/LockInfo.java   | 128 -
 .../apache/hadoop/hbase/util/JRubyFormat.java   | 151 ++
 .../hadoop/hbase/util/TestJRubyFormat.java  |  54 +++
 .../hadoop/hbase/procedure2/LockType.java   |  26 ++
 .../hadoop/hbase/procedure2/LockedResource.java |  69 +++
 .../hbase/procedure2/LockedResourceType.java|  26 ++
 .../hadoop/hbase/procedure2/Procedure.java  |  12 +-
 .../hbase/procedure2/ProcedureExecutor.java |  42 +-
 .../procedure2/ProcedureInMemoryChore.java  |  12 +-
 .../hbase/procedure2/ProcedureScheduler.java|   8 +-
 .../procedure2/ProcedureStateSerializer.java|  28 ++
 .../hadoop/hbase/procedure2/ProcedureUtil.java  | 194 
 .../hbase/procedure2/SequentialProcedure.java   |  13 +-
 .../procedure2/SimpleProcedureScheduler.java|   5 +-
 .../hbase/procedure2/StateMachineProcedure.java |  12 +-
 .../procedure2/ProcedureTestingUtility.java |  33 +-
 .../hbase/procedure2/TestProcedureEvents.java   |  26 +-
 .../hbase/procedure2/TestProcedureRecovery.java |  21 +-
 .../procedure2/TestProcedureReplayOrder.java|  16 +-
 .../procedure2/TestProcedureSuspended.java  |   8 +-
 .../hbase/procedure2/TestProcedureToString.java |   9 +-
 .../hbase/procedure2/TestProcedureUtil.java |  27 +-
 .../hbase/procedure2/TestYieldProcedures.java   |   9 +-
 .../store/wal/TestWALProcedureStore.java|  21 +-
 .../src/main/protobuf/LockService.proto |  21 +-
 .../src/main/protobuf/Master.proto  |  18 +-
 .../src/main/protobuf/Procedure.proto   |   4 +-
 .../hbase/rsgroup/RSGroupAdminServer.java   |  11 +-
 .../hbase/coprocessor/MasterObserver.java   |  33 +-
 .../master/ExpiredMobFileCleanerChore.java  |   4 +-
 .../org/apache/hadoop/hbase/master/HMaster.java |  30 +-
 .../hbase/master/MasterCoprocessorHost.java |  25 +-
 .../hbase/master/MasterMobCompactionThread.java |   4 +-
 .../hadoop/hbase/master/MasterRpcServices.java  | 156 ++-
 .../hadoop/hbase/master/MasterServices.java |  12 +-
 .../hadoop/hbase/master/MobCompactionChore.java |   4 +-
 .../master/assignment/AssignProcedure.java  |  14 +-
 .../assignment/GCMergedRegionsProcedure.java|  18 +-
 .../master/assignment/GCRegionProcedure.java|  18 +-
 .../assignment/MergeTableRegionsProcedure.java  |  24 +-
 .../master/assignment/MoveRegionProcedure.java  |  18 +-
 .../assignment/SplitTableRegionProcedure.java   |  19 +-
 .../master/assignment/UnassignProcedure.java|  18 +-
 .../hbase/master/locking/LockManager.java   |  33 +-
 .../hbase/master/locking/LockProcedure.java |  17 +-
 .../AbstractStateMachineRegionProcedure.java|  21 +-
 .../procedure/AddColumnFamilyProcedure.java |  17 +-
 .../procedure/CloneSnapshotProcedure.java   |  17 +-
 .../procedure/CreateNamespaceProcedure.java |  18 +-
 .../master/procedure/CreateTableProcedure.java  |  17 +-
 

[1/5] hbase git commit: HBASE-18106 Redo ProcedureInfo and LockInfo

[stack]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 9a5020367 -> c48dc02b7


http://git-wip-us.apache.org/repos/asf/hbase/blob/c48dc02b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockManager.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockManager.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockManager.java
index d85146a..e2e97dc 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockManager.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockManager.java
@@ -18,6 +18,12 @@
 
 package org.apache.hadoop.hbase.master.locking;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
@@ -26,10 +32,9 @@ import org.apache.hadoop.hbase.HRegionInfo;
 import org.apache.hadoop.hbase.NamespaceDescriptor;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.master.MasterServices;
-import org.apache.hadoop.hbase.master.locking.LockProcedure;
-import org.apache.hadoop.hbase.master.locking.TestLockProcedure;
 import org.apache.hadoop.hbase.master.procedure.MasterProcedureConstants;
 import org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv;
+import org.apache.hadoop.hbase.procedure2.LockType;
 import org.apache.hadoop.hbase.procedure2.Procedure;
 import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;
 import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility;
@@ -43,12 +48,6 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.rules.TestName;
 
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 @Category({MasterTests.class, SmallTests.class})
 public class TestLockManager {
   @Rule
@@ -94,7 +93,7 @@ public class TestLockManager {
 
   @After
   public void tearDown() throws Exception {
-for (Procedure proc : getMasterProcedureExecutor().listProcedures()) {
+for (Procedure proc : getMasterProcedureExecutor().getProcedures()) {
   if (proc instanceof LockProcedure) {
 ((LockProcedure) 
proc).unlock(getMasterProcedureExecutor().getEnvironment());
 ProcedureTestingUtility.waitProcedure(getMasterProcedureExecutor(), 
proc);
@@ -113,7 +112,7 @@ public class TestLockManager {
   @Test
   public void testMasterLockAcquire() throws Exception {
 LockManager.MasterLock lock = 
masterServices.getLockManager().createMasterLock(namespace,
-LockProcedure.LockType.EXCLUSIVE, "desc");
+LockType.EXCLUSIVE, "desc");
 assertTrue(lock.tryAcquire(2000));
 assertTrue(lock.getProc().isLocked());
 lock.release();
@@ -126,9 +125,9 @@ public class TestLockManager {
   @Test
   public void testMasterLockAcquireTimeout() throws Exception {
 LockManager.MasterLock lock = 
masterServices.getLockManager().createMasterLock(
-tableName, LockProcedure.LockType.EXCLUSIVE, "desc");
+tableName, LockType.EXCLUSIVE, "desc");
 LockManager.MasterLock lock2 = 
masterServices.getLockManager().createMasterLock(
-tableName, LockProcedure.LockType.EXCLUSIVE, "desc");
+tableName, LockType.EXCLUSIVE, "desc");
 assertTrue(lock.tryAcquire(2000));
 assertFalse(lock2.tryAcquire(LOCAL_LOCKS_TIMEOUT/2));  // wait less than 
other lock's timeout
 assertEquals(null, lock2.getProc());
@@ -146,7 +145,7 @@ public class TestLockManager {
 LockManager.MasterLock lock = 
masterServices.getLockManager().createMasterLock(
 tableRegions, "desc");
 LockManager.MasterLock lock2 = 
masterServices.getLockManager().createMasterLock(
-tableName, LockProcedure.LockType.EXCLUSIVE, "desc");
+tableName, LockType.EXCLUSIVE, "desc");
 assertTrue(lock.tryAcquire(2000));
 assertFalse(lock2.tryAcquire(LOCAL_LOCKS_TIMEOUT/2));  // wait less than 
other lock's timeout
 assertEquals(null, lock2.getProc());

http://git-wip-us.apache.org/repos/asf/hbase/blob/c48dc02b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockProcedure.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockProcedure.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockProcedure.java
index adaebf4..e338849 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockProcedure.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockProcedure.java
@@ -18,9 +18,20 @@
 
 package 

[2/5] hbase git commit: HBASE-18106 Redo ProcedureInfo and LockInfo

[stack]

http://git-wip-us.apache.org/repos/asf/hbase/blob/c48dc02b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AddColumnFamilyProcedure.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AddColumnFamilyProcedure.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AddColumnFamilyProcedure.java
index f19195e..84fc7e5 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AddColumnFamilyProcedure.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AddColumnFamilyProcedure.java
@@ -19,8 +19,6 @@
 package org.apache.hadoop.hbase.master.procedure;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.util.List;
 
 import org.apache.commons.logging.Log;
@@ -33,6 +31,7 @@ import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
 import org.apache.hadoop.hbase.client.TableDescriptor;
 import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
 import org.apache.hadoop.hbase.master.MasterCoprocessorHost;
+import org.apache.hadoop.hbase.procedure2.ProcedureStateSerializer;
 import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos;
 import 
org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.AddColumnFamilyState;
@@ -166,8 +165,9 @@ public class AddColumnFamilyProcedure
   }
 
   @Override
-  public void serializeStateData(final OutputStream stream) throws IOException 
{
-super.serializeStateData(stream);
+  protected void serializeStateData(ProcedureStateSerializer serializer)
+  throws IOException {
+super.serializeStateData(serializer);
 
 MasterProcedureProtos.AddColumnFamilyStateData.Builder addCFMsg =
 MasterProcedureProtos.AddColumnFamilyStateData.newBuilder()
@@ -179,15 +179,16 @@ public class AddColumnFamilyProcedure
   
.setUnmodifiedTableSchema(ProtobufUtil.toTableSchema(unmodifiedTableDescriptor));
 }
 
-addCFMsg.build().writeDelimitedTo(stream);
+serializer.serialize(addCFMsg.build());
   }
 
   @Override
-  public void deserializeStateData(final InputStream stream) throws 
IOException {
-super.deserializeStateData(stream);
+  protected void deserializeStateData(ProcedureStateSerializer serializer)
+  throws IOException {
+super.deserializeStateData(serializer);
 
 MasterProcedureProtos.AddColumnFamilyStateData addCFMsg =
-
MasterProcedureProtos.AddColumnFamilyStateData.parseDelimitedFrom(stream);
+
serializer.deserialize(MasterProcedureProtos.AddColumnFamilyStateData.class);
 setUser(MasterProcedureUtil.toUserInfo(addCFMsg.getUserInfo()));
 tableName = ProtobufUtil.toTableName(addCFMsg.getTableName());
 cfDescriptor = 
ProtobufUtil.toColumnFamilyDescriptor(addCFMsg.getColumnfamilySchema());

http://git-wip-us.apache.org/repos/asf/hbase/blob/c48dc02b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.java
index cc39f53..7e21ad6 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.java
@@ -19,8 +19,6 @@
 package org.apache.hadoop.hbase.master.procedure;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -47,6 +45,7 @@ import org.apache.hadoop.hbase.master.MetricsSnapshot;
 import 
org.apache.hadoop.hbase.master.procedure.CreateTableProcedure.CreateHdfsRegions;
 import org.apache.hadoop.hbase.monitoring.MonitoredTask;
 import org.apache.hadoop.hbase.monitoring.TaskMonitor;
+import org.apache.hadoop.hbase.procedure2.ProcedureStateSerializer;
 import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos;
@@ -244,8 +243,9 @@ public class CloneSnapshotProcedure
   }
 
   @Override
-  public void serializeStateData(final OutputStream stream) throws IOException 
{
-super.serializeStateData(stream);
+  protected void serializeStateData(ProcedureStateSerializer serializer)
+  throws IOException {
+super.serializeStateData(serializer);
 
 MasterProcedureProtos.CloneSnapshotStateData.Builder cloneSnapshotMsg =
   MasterProcedureProtos.CloneSnapshotStateData.newBuilder()
@@ -271,15 +271,16 @@ public class 

[4/5] hbase git commit: HBASE-18106 Redo ProcedureInfo and LockInfo

[stack]

http://git-wip-us.apache.org/repos/asf/hbase/blob/c48dc02b/hbase-client/src/test/java/org/apache/hadoop/hbase/shaded/protobuf/TestProtobufUtil.java
--
diff --git 
a/hbase-client/src/test/java/org/apache/hadoop/hbase/shaded/protobuf/TestProtobufUtil.java
 
b/hbase-client/src/test/java/org/apache/hadoop/hbase/shaded/protobuf/TestProtobufUtil.java
new file mode 100644
index 000..0c12648
--- /dev/null
+++ 
b/hbase-client/src/test/java/org/apache/hadoop/hbase/shaded/protobuf/TestProtobufUtil.java
@@ -0,0 +1,466 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.shaded.protobuf;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+import org.apache.hadoop.hbase.ByteBufferKeyValue;
+import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellBuilderFactory;
+import org.apache.hadoop.hbase.CellBuilderType;
+import org.apache.hadoop.hbase.CellComparator;
+import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.client.Append;
+import org.apache.hadoop.hbase.client.Delete;
+import org.apache.hadoop.hbase.client.Get;
+import org.apache.hadoop.hbase.client.Increment;
+import org.apache.hadoop.hbase.client.Put;
+import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
+import org.apache.hadoop.hbase.shaded.com.google.protobuf.Any;
+import org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString;
+import org.apache.hadoop.hbase.shaded.com.google.protobuf.BytesValue;
+import org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos;
+import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos;
+import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.Column;
+import 
org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MutationProto;
+import 
org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MutationProto.ColumnValue;
+import 
org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue;
+import 
org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MutationProto.DeleteType;
+import 
org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MutationProto.MutationType;
+import 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NameBytesPair;
+import org.apache.hadoop.hbase.shaded.protobuf.generated.LockServiceProtos;
+import org.apache.hadoop.hbase.shaded.protobuf.generated.ProcedureProtos;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
+import org.apache.hadoop.hbase.util.Bytes;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(SmallTests.class)
+public class TestProtobufUtil {
+  public TestProtobufUtil() {
+  }
+
+  @Test
+  public void testException() throws IOException {
+NameBytesPair.Builder builder = NameBytesPair.newBuilder();
+final String omg = "OMG!!!";
+builder.setName("java.io.IOException");
+builder.setValue(ByteString.copyFrom(Bytes.toBytes(omg)));
+Throwable t = ProtobufUtil.toException(builder.build());
+assertEquals(omg, t.getMessage());
+builder.clear();
+builder.setName("org.apache.hadoop.ipc.RemoteException");
+builder.setValue(ByteString.copyFrom(Bytes.toBytes(omg)));
+t = ProtobufUtil.toException(builder.build());
+assertEquals(omg, t.getMessage());
+  }
+
+  /**
+   * Test basic Get conversions.
+   *
+   * @throws IOException
+   */
+  @Test
+  public void testGet() throws IOException {
+ClientProtos.Get.Builder getBuilder = ClientProtos.Get.newBuilder();
+getBuilder.setRow(ByteString.copyFromUtf8("row"));
+Column.Builder columnBuilder = Column.newBuilder();
+columnBuilder.setFamily(ByteString.copyFromUtf8("f1"));
+columnBuilder.addQualifier(ByteString.copyFromUtf8("c1"));
+columnBuilder.addQualifier(ByteString.copyFromUtf8("c2"));
+getBuilder.addColumn(columnBuilder.build());
+
+columnBuilder.clear();
+columnBuilder.setFamily(ByteString.copyFromUtf8("f2"));
+getBuilder.addColumn(columnBuilder.build());
+

hbase git commit: HBASE-18641 Include block content verification logic used in lruCache in bucketCache

[tedyu]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 84ec18eb4 -> 9a5020367


HBASE-18641 Include block content verification logic used in lruCache in 
bucketCache

Signed-off-by: tedyu 


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

Branch: refs/heads/branch-2
Commit: 9a50203679f835000ff4df40fd9f601fdee84a77
Parents: 84ec18e
Author: Biju Nair 
Authored: Thu Aug 24 13:14:57 2017 -0400
Committer: tedyu 
Committed: Fri Sep 8 11:25:22 2017 -0700

--
 .../hadoop/hbase/io/hfile/BlockCacheUtil.java  | 11 +++
 .../hadoop/hbase/io/hfile/LruBlockCache.java   | 13 ++---
 .../hadoop/hbase/io/hfile/bucket/BucketCache.java  | 17 +++--
 3 files changed, 28 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/9a502036/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
index 5c306c0..f5f3d7f 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
@@ -18,6 +18,7 @@
 package org.apache.hadoop.hbase.io.hfile;
 
 import java.io.IOException;
+import java.nio.ByteBuffer;
 import java.util.NavigableMap;
 import java.util.NavigableSet;
 import java.util.concurrent.ConcurrentSkipListMap;
@@ -26,6 +27,7 @@ import java.util.concurrent.ConcurrentSkipListSet;
 import org.apache.hadoop.hbase.classification.InterfaceAudience;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.metrics.impl.FastLongHistogram;
+import org.apache.hadoop.hbase.util.Bytes;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 import org.codehaus.jackson.map.JsonMappingException;
@@ -172,6 +174,15 @@ public class BlockCacheUtil {
 return cbsbf;
   }
 
+  public static int compareCacheBlock(Cacheable left, Cacheable right) {
+ByteBuffer l = ByteBuffer.allocate(left.getSerializedLength());
+left.serialize(l);
+ByteBuffer r = ByteBuffer.allocate(right.getSerializedLength());
+right.serialize(r);
+return Bytes.compareTo(l.array(), l.arrayOffset(), l.limit(),
+ r.array(), r.arrayOffset(), r.limit());
+  }
+
   /**
* Use one of these to keep a running account of cached blocks by file.  
Throw it away when done.
* This is different than metrics in that it is stats on current state of a 
cache.

http://git-wip-us.apache.org/repos/asf/hbase/blob/9a502036/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
index 04aed06..56996a4 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
@@ -379,7 +379,7 @@ public class LruBlockCache implements ResizableBlockCache, 
HeapSize {
 LruCachedBlock cb = map.get(cacheKey);
 if (cb != null) {
   // compare the contents, if they are not equal, we are in big trouble
-  if (compare(buf, cb.getBuffer()) != 0) {
+  if (BlockCacheUtil.compareCacheBlock(buf, cb.getBuffer()) != 0) {
 throw new RuntimeException("Cached block contents differ, which should 
not have happened."
   + "cacheKey:" + cacheKey);
   }
@@ -439,15 +439,6 @@ public class LruBlockCache implements ResizableBlockCache, 
HeapSize {
 }
   }
 
-  private int compare(Cacheable left, Cacheable right) {
-ByteBuffer l = ByteBuffer.allocate(left.getSerializedLength());
-left.serialize(l);
-ByteBuffer r = ByteBuffer.allocate(right.getSerializedLength());
-right.serialize(r);
-return Bytes.compareTo(l.array(), l.arrayOffset(), l.limit(),
-  r.array(), r.arrayOffset(), r.limit());
-  }
-
   /**
* Cache the block with the specified name and buffer.
* 
@@ -589,7 +580,7 @@ public class LruBlockCache implements ResizableBlockCache, 
HeapSize {
   boolean wait = getCurrentSize() < acceptableSize();
   boolean inMemory = block.getPriority() == BlockPriority.MEMORY;
   ((BucketCache) 

hbase git commit: HBASE-18641 Include block content verification logic used in lruCache in bucketCache

[tedyu]

Repository: hbase
Updated Branches:
  refs/heads/master 359fed7b4 -> af2157242


HBASE-18641 Include block content verification logic used in lruCache in 
bucketCache

Signed-off-by: tedyu 


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

Branch: refs/heads/master
Commit: af2157242759e5e50ddeab3c1c6b03b41080372f
Parents: 359fed7
Author: Biju Nair 
Authored: Thu Aug 24 13:14:57 2017 -0400
Committer: tedyu 
Committed: Fri Sep 8 11:24:31 2017 -0700

--
 .../hadoop/hbase/io/hfile/BlockCacheUtil.java  | 11 +++
 .../hadoop/hbase/io/hfile/LruBlockCache.java   | 13 ++---
 .../hadoop/hbase/io/hfile/bucket/BucketCache.java  | 17 +++--
 3 files changed, 28 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/af215724/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
index 5c306c0..f5f3d7f 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
@@ -18,6 +18,7 @@
 package org.apache.hadoop.hbase.io.hfile;
 
 import java.io.IOException;
+import java.nio.ByteBuffer;
 import java.util.NavigableMap;
 import java.util.NavigableSet;
 import java.util.concurrent.ConcurrentSkipListMap;
@@ -26,6 +27,7 @@ import java.util.concurrent.ConcurrentSkipListSet;
 import org.apache.hadoop.hbase.classification.InterfaceAudience;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.metrics.impl.FastLongHistogram;
+import org.apache.hadoop.hbase.util.Bytes;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 import org.codehaus.jackson.map.JsonMappingException;
@@ -172,6 +174,15 @@ public class BlockCacheUtil {
 return cbsbf;
   }
 
+  public static int compareCacheBlock(Cacheable left, Cacheable right) {
+ByteBuffer l = ByteBuffer.allocate(left.getSerializedLength());
+left.serialize(l);
+ByteBuffer r = ByteBuffer.allocate(right.getSerializedLength());
+right.serialize(r);
+return Bytes.compareTo(l.array(), l.arrayOffset(), l.limit(),
+ r.array(), r.arrayOffset(), r.limit());
+  }
+
   /**
* Use one of these to keep a running account of cached blocks by file.  
Throw it away when done.
* This is different than metrics in that it is stats on current state of a 
cache.

http://git-wip-us.apache.org/repos/asf/hbase/blob/af215724/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
index 04aed06..56996a4 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
@@ -379,7 +379,7 @@ public class LruBlockCache implements ResizableBlockCache, 
HeapSize {
 LruCachedBlock cb = map.get(cacheKey);
 if (cb != null) {
   // compare the contents, if they are not equal, we are in big trouble
-  if (compare(buf, cb.getBuffer()) != 0) {
+  if (BlockCacheUtil.compareCacheBlock(buf, cb.getBuffer()) != 0) {
 throw new RuntimeException("Cached block contents differ, which should 
not have happened."
   + "cacheKey:" + cacheKey);
   }
@@ -439,15 +439,6 @@ public class LruBlockCache implements ResizableBlockCache, 
HeapSize {
 }
   }
 
-  private int compare(Cacheable left, Cacheable right) {
-ByteBuffer l = ByteBuffer.allocate(left.getSerializedLength());
-left.serialize(l);
-ByteBuffer r = ByteBuffer.allocate(right.getSerializedLength());
-right.serialize(r);
-return Bytes.compareTo(l.array(), l.arrayOffset(), l.limit(),
-  r.array(), r.arrayOffset(), r.limit());
-  }
-
   /**
* Cache the block with the specified name and buffer.
* 
@@ -589,7 +580,7 @@ public class LruBlockCache implements ResizableBlockCache, 
HeapSize {
   boolean wait = getCurrentSize() < acceptableSize();
   boolean inMemory = block.getPriority() == BlockPriority.MEMORY;
   ((BucketCache) 

[2/5] hbase git commit: HBASE-18106 Redo ProcedureInfo and LockInfo

[stack]

http://git-wip-us.apache.org/repos/asf/hbase/blob/359fed7b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AddColumnFamilyProcedure.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AddColumnFamilyProcedure.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AddColumnFamilyProcedure.java
index f19195e..84fc7e5 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AddColumnFamilyProcedure.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AddColumnFamilyProcedure.java
@@ -19,8 +19,6 @@
 package org.apache.hadoop.hbase.master.procedure;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.util.List;
 
 import org.apache.commons.logging.Log;
@@ -33,6 +31,7 @@ import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
 import org.apache.hadoop.hbase.client.TableDescriptor;
 import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
 import org.apache.hadoop.hbase.master.MasterCoprocessorHost;
+import org.apache.hadoop.hbase.procedure2.ProcedureStateSerializer;
 import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos;
 import 
org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.AddColumnFamilyState;
@@ -166,8 +165,9 @@ public class AddColumnFamilyProcedure
   }
 
   @Override
-  public void serializeStateData(final OutputStream stream) throws IOException 
{
-super.serializeStateData(stream);
+  protected void serializeStateData(ProcedureStateSerializer serializer)
+  throws IOException {
+super.serializeStateData(serializer);
 
 MasterProcedureProtos.AddColumnFamilyStateData.Builder addCFMsg =
 MasterProcedureProtos.AddColumnFamilyStateData.newBuilder()
@@ -179,15 +179,16 @@ public class AddColumnFamilyProcedure
   
.setUnmodifiedTableSchema(ProtobufUtil.toTableSchema(unmodifiedTableDescriptor));
 }
 
-addCFMsg.build().writeDelimitedTo(stream);
+serializer.serialize(addCFMsg.build());
   }
 
   @Override
-  public void deserializeStateData(final InputStream stream) throws 
IOException {
-super.deserializeStateData(stream);
+  protected void deserializeStateData(ProcedureStateSerializer serializer)
+  throws IOException {
+super.deserializeStateData(serializer);
 
 MasterProcedureProtos.AddColumnFamilyStateData addCFMsg =
-
MasterProcedureProtos.AddColumnFamilyStateData.parseDelimitedFrom(stream);
+
serializer.deserialize(MasterProcedureProtos.AddColumnFamilyStateData.class);
 setUser(MasterProcedureUtil.toUserInfo(addCFMsg.getUserInfo()));
 tableName = ProtobufUtil.toTableName(addCFMsg.getTableName());
 cfDescriptor = 
ProtobufUtil.toColumnFamilyDescriptor(addCFMsg.getColumnfamilySchema());

http://git-wip-us.apache.org/repos/asf/hbase/blob/359fed7b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.java
index cc39f53..7e21ad6 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.java
@@ -19,8 +19,6 @@
 package org.apache.hadoop.hbase.master.procedure;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -47,6 +45,7 @@ import org.apache.hadoop.hbase.master.MetricsSnapshot;
 import 
org.apache.hadoop.hbase.master.procedure.CreateTableProcedure.CreateHdfsRegions;
 import org.apache.hadoop.hbase.monitoring.MonitoredTask;
 import org.apache.hadoop.hbase.monitoring.TaskMonitor;
+import org.apache.hadoop.hbase.procedure2.ProcedureStateSerializer;
 import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos;
@@ -244,8 +243,9 @@ public class CloneSnapshotProcedure
   }
 
   @Override
-  public void serializeStateData(final OutputStream stream) throws IOException 
{
-super.serializeStateData(stream);
+  protected void serializeStateData(ProcedureStateSerializer serializer)
+  throws IOException {
+super.serializeStateData(serializer);
 
 MasterProcedureProtos.CloneSnapshotStateData.Builder cloneSnapshotMsg =
   MasterProcedureProtos.CloneSnapshotStateData.newBuilder()
@@ -271,15 +271,16 @@ public class 

[4/5] hbase git commit: HBASE-18106 Redo ProcedureInfo and LockInfo

[stack]

http://git-wip-us.apache.org/repos/asf/hbase/blob/359fed7b/hbase-client/src/test/java/org/apache/hadoop/hbase/shaded/protobuf/TestProtobufUtil.java
--
diff --git 
a/hbase-client/src/test/java/org/apache/hadoop/hbase/shaded/protobuf/TestProtobufUtil.java
 
b/hbase-client/src/test/java/org/apache/hadoop/hbase/shaded/protobuf/TestProtobufUtil.java
new file mode 100644
index 000..0c12648
--- /dev/null
+++ 
b/hbase-client/src/test/java/org/apache/hadoop/hbase/shaded/protobuf/TestProtobufUtil.java
@@ -0,0 +1,466 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.shaded.protobuf;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+import org.apache.hadoop.hbase.ByteBufferKeyValue;
+import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellBuilderFactory;
+import org.apache.hadoop.hbase.CellBuilderType;
+import org.apache.hadoop.hbase.CellComparator;
+import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.client.Append;
+import org.apache.hadoop.hbase.client.Delete;
+import org.apache.hadoop.hbase.client.Get;
+import org.apache.hadoop.hbase.client.Increment;
+import org.apache.hadoop.hbase.client.Put;
+import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
+import org.apache.hadoop.hbase.shaded.com.google.protobuf.Any;
+import org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString;
+import org.apache.hadoop.hbase.shaded.com.google.protobuf.BytesValue;
+import org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos;
+import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos;
+import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.Column;
+import 
org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MutationProto;
+import 
org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MutationProto.ColumnValue;
+import 
org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue;
+import 
org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MutationProto.DeleteType;
+import 
org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MutationProto.MutationType;
+import 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NameBytesPair;
+import org.apache.hadoop.hbase.shaded.protobuf.generated.LockServiceProtos;
+import org.apache.hadoop.hbase.shaded.protobuf.generated.ProcedureProtos;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
+import org.apache.hadoop.hbase.util.Bytes;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(SmallTests.class)
+public class TestProtobufUtil {
+  public TestProtobufUtil() {
+  }
+
+  @Test
+  public void testException() throws IOException {
+NameBytesPair.Builder builder = NameBytesPair.newBuilder();
+final String omg = "OMG!!!";
+builder.setName("java.io.IOException");
+builder.setValue(ByteString.copyFrom(Bytes.toBytes(omg)));
+Throwable t = ProtobufUtil.toException(builder.build());
+assertEquals(omg, t.getMessage());
+builder.clear();
+builder.setName("org.apache.hadoop.ipc.RemoteException");
+builder.setValue(ByteString.copyFrom(Bytes.toBytes(omg)));
+t = ProtobufUtil.toException(builder.build());
+assertEquals(omg, t.getMessage());
+  }
+
+  /**
+   * Test basic Get conversions.
+   *
+   * @throws IOException
+   */
+  @Test
+  public void testGet() throws IOException {
+ClientProtos.Get.Builder getBuilder = ClientProtos.Get.newBuilder();
+getBuilder.setRow(ByteString.copyFromUtf8("row"));
+Column.Builder columnBuilder = Column.newBuilder();
+columnBuilder.setFamily(ByteString.copyFromUtf8("f1"));
+columnBuilder.addQualifier(ByteString.copyFromUtf8("c1"));
+columnBuilder.addQualifier(ByteString.copyFromUtf8("c2"));
+getBuilder.addColumn(columnBuilder.build());
+
+columnBuilder.clear();
+columnBuilder.setFamily(ByteString.copyFromUtf8("f2"));
+getBuilder.addColumn(columnBuilder.build());
+

[5/5] hbase git commit: HBASE-18106 Redo ProcedureInfo and LockInfo

[stack]

HBASE-18106 Redo ProcedureInfo and LockInfo

Main changes:
- ProcedureInfo and LockInfo were removed, we use JSON instead of them
- Procedure and LockedResource are their server side equivalent
- Procedure protobuf state_data became obsolate, it is only kept for
reading previously written WAL
- Procedure protobuf contains a state_message field, which stores the internal
state messages (Any type instead of bytes)
- Procedure.serializeStateData and deserializeStateData were changed slightly
- Procedures internal states are available on client side
- Procedures are displayed on web UI and in shell in the following jruby format:
  { ID => '1', PARENT_ID = '-1', PARAMETERS => [ ..extra state information.. ] }

Signed-off-by: Michael Stack 


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

Branch: refs/heads/master
Commit: 359fed7b4b62e4dc7818a211735630cf0e10fc14
Parents: 87c3ae9
Author: Balazs Meszaros 
Authored: Wed Sep 6 15:21:32 2017 +0200
Committer: Michael Stack 
Committed: Fri Sep 8 10:24:04 2017 -0700

--
 .../org/apache/hadoop/hbase/client/Admin.java   |  14 +-
 .../apache/hadoop/hbase/client/AsyncAdmin.java  |  12 +-
 .../hadoop/hbase/client/AsyncHBaseAdmin.java|  10 +-
 .../hbase/client/ConnectionImplementation.java  |  12 +-
 .../apache/hadoop/hbase/client/HBaseAdmin.java  |  48 +-
 .../hadoop/hbase/client/RawAsyncHBaseAdmin.java |  92 ++--
 .../client/ShortCircuitMasterConnection.java| 139 +-
 .../protobuf/ProtobufMessageConverter.java  | 159 +++
 .../hbase/shaded/protobuf/ProtobufUtil.java | 197 +---
 .../hbase/shaded/protobuf/TestProtobufUtil.java | 466 +++
 .../org/apache/hadoop/hbase/ProcedureInfo.java  | 215 -
 .../hadoop/hbase/procedure2/LockInfo.java   | 128 -
 .../apache/hadoop/hbase/util/JRubyFormat.java   | 151 ++
 .../hadoop/hbase/util/TestJRubyFormat.java  |  54 +++
 .../hadoop/hbase/procedure2/LockType.java   |  26 ++
 .../hadoop/hbase/procedure2/LockedResource.java |  69 +++
 .../hbase/procedure2/LockedResourceType.java|  26 ++
 .../hadoop/hbase/procedure2/Procedure.java  |  12 +-
 .../hbase/procedure2/ProcedureExecutor.java |  42 +-
 .../procedure2/ProcedureInMemoryChore.java  |  12 +-
 .../hbase/procedure2/ProcedureScheduler.java|   8 +-
 .../procedure2/ProcedureStateSerializer.java|  28 ++
 .../hadoop/hbase/procedure2/ProcedureUtil.java  | 194 
 .../hbase/procedure2/SequentialProcedure.java   |  13 +-
 .../procedure2/SimpleProcedureScheduler.java|   5 +-
 .../hbase/procedure2/StateMachineProcedure.java |  12 +-
 .../procedure2/ProcedureTestingUtility.java |  33 +-
 .../hbase/procedure2/TestProcedureEvents.java   |  26 +-
 .../hbase/procedure2/TestProcedureRecovery.java |  21 +-
 .../procedure2/TestProcedureReplayOrder.java|  16 +-
 .../procedure2/TestProcedureSuspended.java  |   8 +-
 .../hbase/procedure2/TestProcedureToString.java |   9 +-
 .../hbase/procedure2/TestProcedureUtil.java |  27 +-
 .../hbase/procedure2/TestYieldProcedures.java   |   9 +-
 .../store/wal/TestWALProcedureStore.java|  21 +-
 .../src/main/protobuf/LockService.proto |  21 +-
 .../src/main/protobuf/Master.proto  |  18 +-
 .../src/main/protobuf/Procedure.proto   |   4 +-
 .../hbase/rsgroup/RSGroupAdminServer.java   |  11 +-
 .../hbase/coprocessor/MasterObserver.java   |  33 +-
 .../master/ExpiredMobFileCleanerChore.java  |   4 +-
 .../org/apache/hadoop/hbase/master/HMaster.java |  30 +-
 .../hbase/master/MasterCoprocessorHost.java |  25 +-
 .../hbase/master/MasterMobCompactionThread.java |   4 +-
 .../hadoop/hbase/master/MasterRpcServices.java  | 156 ++-
 .../hadoop/hbase/master/MasterServices.java |  12 +-
 .../hadoop/hbase/master/MobCompactionChore.java |   4 +-
 .../master/assignment/AssignProcedure.java  |  14 +-
 .../assignment/GCMergedRegionsProcedure.java|  18 +-
 .../master/assignment/GCRegionProcedure.java|  18 +-
 .../assignment/MergeTableRegionsProcedure.java  |  24 +-
 .../master/assignment/MoveRegionProcedure.java  |  18 +-
 .../assignment/SplitTableRegionProcedure.java   |  19 +-
 .../master/assignment/UnassignProcedure.java|  18 +-
 .../hbase/master/locking/LockManager.java   |  33 +-
 .../hbase/master/locking/LockProcedure.java |  17 +-
 .../AbstractStateMachineRegionProcedure.java|  21 +-
 .../procedure/AddColumnFamilyProcedure.java |  17 +-
 .../procedure/CloneSnapshotProcedure.java   |  17 +-
 .../procedure/CreateNamespaceProcedure.java |  18 +-
 .../master/procedure/CreateTableProcedure.java  |  17 +-
 

[3/5] hbase git commit: HBASE-18106 Redo ProcedureInfo and LockInfo

[stack]

http://git-wip-us.apache.org/repos/asf/hbase/blob/359fed7b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestYieldProcedures.java
--
diff --git 
a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestYieldProcedures.java
 
b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestYieldProcedures.java
index b1d0669..4882168 100644
--- 
a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestYieldProcedures.java
+++ 
b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestYieldProcedures.java
@@ -19,8 +19,6 @@
 package org.apache.hadoop.hbase.procedure2;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
@@ -336,11 +334,13 @@ public class TestYieldProcedures {
 }
 
 @Override
-protected void serializeStateData(final OutputStream stream) throws 
IOException {
+protected void serializeStateData(ProcedureStateSerializer serializer)
+throws IOException {
 }
 
 @Override
-protected void deserializeStateData(final InputStream stream) throws 
IOException {
+protected void deserializeStateData(ProcedureStateSerializer serializer)
+throws IOException {
 }
   }
 
@@ -353,6 +353,7 @@ public class TestYieldProcedures {
 
 public TestScheduler() {}
 
+@Override
 public void addFront(final Procedure proc) {
   addFrontCalls++;
   super.addFront(proc);

http://git-wip-us.apache.org/repos/asf/hbase/blob/359fed7b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
--
diff --git 
a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
 
b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
index 9b8c46f..44c8e12 100644
--- 
a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
+++ 
b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
@@ -36,6 +36,7 @@ import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
 import org.apache.hadoop.hbase.procedure2.Procedure;
+import org.apache.hadoop.hbase.procedure2.ProcedureStateSerializer;
 import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility;
 import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility.LoadCounter;
 import 
org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility.TestProcedure;
@@ -43,9 +44,9 @@ import org.apache.hadoop.hbase.procedure2.SequentialProcedure;
 import org.apache.hadoop.hbase.procedure2.store.ProcedureStore;
 import 
org.apache.hadoop.hbase.procedure2.store.ProcedureStore.ProcedureIterator;
 import org.apache.hadoop.hbase.procedure2.store.ProcedureStoreTracker;
+import org.apache.hadoop.hbase.shaded.com.google.protobuf.Int64Value;
 import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.testclassification.MasterTests;
-import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.io.IOUtils;
 
 import org.junit.After;
@@ -514,7 +515,7 @@ public class TestWALProcedureStore {
 storeRestart(loader);
 assertTrue(procStore.getCorruptedLogs() != null);
 assertEquals(1, procStore.getCorruptedLogs().size());
-assertEquals(85, loader.getLoadedCount());
+assertEquals(87, loader.getLoadedCount());
 assertEquals(0, loader.getCorruptedCount());
   }
 
@@ -911,22 +912,22 @@ public class TestWALProcedureStore {
 protected boolean abort(Void env) { return false; }
 
 @Override
-protected void serializeStateData(final OutputStream stream) throws 
IOException {
+protected void serializeStateData(ProcedureStateSerializer serializer)
+throws IOException {
   long procId = getProcId();
   if (procId % 2 == 0) {
-stream.write(Bytes.toBytes(procId));
+Int64Value.Builder builder = Int64Value.newBuilder().setValue(procId);
+serializer.serialize(builder.build());
   }
 }
 
 @Override
-protected void deserializeStateData(InputStream stream) throws IOException 
{
+protected void deserializeStateData(ProcedureStateSerializer serializer)
+throws IOException {
   long procId = getProcId();
   if (procId % 2 == 0) {
-byte[] bProcId = new byte[8];
-assertEquals(8, stream.read(bProcId));
-assertEquals(procId, Bytes.toLong(bProcId));
-  } else {
-assertEquals(0, stream.available());
+Int64Value value = serializer.deserialize(Int64Value.class);
+assertEquals(procId, value.getValue());
   }
 

[1/5] hbase git commit: HBASE-18106 Redo ProcedureInfo and LockInfo

[stack]

Repository: hbase
Updated Branches:
  refs/heads/master 87c3ae931 -> 359fed7b4


http://git-wip-us.apache.org/repos/asf/hbase/blob/359fed7b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockManager.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockManager.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockManager.java
index d85146a..e2e97dc 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockManager.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockManager.java
@@ -18,6 +18,12 @@
 
 package org.apache.hadoop.hbase.master.locking;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
@@ -26,10 +32,9 @@ import org.apache.hadoop.hbase.HRegionInfo;
 import org.apache.hadoop.hbase.NamespaceDescriptor;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.master.MasterServices;
-import org.apache.hadoop.hbase.master.locking.LockProcedure;
-import org.apache.hadoop.hbase.master.locking.TestLockProcedure;
 import org.apache.hadoop.hbase.master.procedure.MasterProcedureConstants;
 import org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv;
+import org.apache.hadoop.hbase.procedure2.LockType;
 import org.apache.hadoop.hbase.procedure2.Procedure;
 import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;
 import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility;
@@ -43,12 +48,6 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.rules.TestName;
 
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 @Category({MasterTests.class, SmallTests.class})
 public class TestLockManager {
   @Rule
@@ -94,7 +93,7 @@ public class TestLockManager {
 
   @After
   public void tearDown() throws Exception {
-for (Procedure proc : getMasterProcedureExecutor().listProcedures()) {
+for (Procedure proc : getMasterProcedureExecutor().getProcedures()) {
   if (proc instanceof LockProcedure) {
 ((LockProcedure) 
proc).unlock(getMasterProcedureExecutor().getEnvironment());
 ProcedureTestingUtility.waitProcedure(getMasterProcedureExecutor(), 
proc);
@@ -113,7 +112,7 @@ public class TestLockManager {
   @Test
   public void testMasterLockAcquire() throws Exception {
 LockManager.MasterLock lock = 
masterServices.getLockManager().createMasterLock(namespace,
-LockProcedure.LockType.EXCLUSIVE, "desc");
+LockType.EXCLUSIVE, "desc");
 assertTrue(lock.tryAcquire(2000));
 assertTrue(lock.getProc().isLocked());
 lock.release();
@@ -126,9 +125,9 @@ public class TestLockManager {
   @Test
   public void testMasterLockAcquireTimeout() throws Exception {
 LockManager.MasterLock lock = 
masterServices.getLockManager().createMasterLock(
-tableName, LockProcedure.LockType.EXCLUSIVE, "desc");
+tableName, LockType.EXCLUSIVE, "desc");
 LockManager.MasterLock lock2 = 
masterServices.getLockManager().createMasterLock(
-tableName, LockProcedure.LockType.EXCLUSIVE, "desc");
+tableName, LockType.EXCLUSIVE, "desc");
 assertTrue(lock.tryAcquire(2000));
 assertFalse(lock2.tryAcquire(LOCAL_LOCKS_TIMEOUT/2));  // wait less than 
other lock's timeout
 assertEquals(null, lock2.getProc());
@@ -146,7 +145,7 @@ public class TestLockManager {
 LockManager.MasterLock lock = 
masterServices.getLockManager().createMasterLock(
 tableRegions, "desc");
 LockManager.MasterLock lock2 = 
masterServices.getLockManager().createMasterLock(
-tableName, LockProcedure.LockType.EXCLUSIVE, "desc");
+tableName, LockType.EXCLUSIVE, "desc");
 assertTrue(lock.tryAcquire(2000));
 assertFalse(lock2.tryAcquire(LOCAL_LOCKS_TIMEOUT/2));  // wait less than 
other lock's timeout
 assertEquals(null, lock2.getProc());

http://git-wip-us.apache.org/repos/asf/hbase/blob/359fed7b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockProcedure.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockProcedure.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockProcedure.java
index adaebf4..e338849 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockProcedure.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockProcedure.java
@@ -18,9 +18,20 @@
 
 package 

hbase git commit: HBASE-18779 Move CompareOperator to hbase-client module

[stack]

Repository: hbase
Updated Branches:
  refs/heads/master b8e0a8396 -> c90602ef6


HBASE-18779 Move CompareOperator to hbase-client module


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

Branch: refs/heads/master
Commit: c90602ef67d490205098f11bff57ec31a6ac6f87
Parents: b8e0a83
Author: Michael Stack 
Authored: Fri Sep 8 10:18:32 2017 -0700
Committer: Michael Stack 
Committed: Fri Sep 8 10:19:10 2017 -0700

--
 .../apache/hadoop/hbase/CompareOperator.java| 44 
 .../apache/hadoop/hbase/CompareOperator.java| 44 
 2 files changed, 44 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/c90602ef/hbase-client/src/main/java/org/apache/hadoop/hbase/CompareOperator.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/CompareOperator.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/CompareOperator.java
new file mode 100644
index 000..46fa55d
--- /dev/null
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/CompareOperator.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase;
+
+import org.apache.hadoop.hbase.classification.InterfaceAudience;
+
+/**
+ * Generic set of comparison operators.
+ * @since 2.0.0
+ */
+@InterfaceAudience.Public
+public enum CompareOperator {
+  // Keeps same names as the enums over in filter's CompareOp intentionally.
+  // The convertion of operator to protobuf representation is via a name 
comparison.
+  /** less than */
+  LESS,
+  /** less than or equal to */
+  LESS_OR_EQUAL,
+  /** equals */
+  EQUAL,
+  /** not equal */
+  NOT_EQUAL,
+  /** greater than or equal to */
+  GREATER_OR_EQUAL,
+  /** greater than */
+  GREATER,
+  /** no operation */
+  NO_OP,
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hbase/blob/c90602ef/hbase-common/src/main/java/org/apache/hadoop/hbase/CompareOperator.java
--
diff --git 
a/hbase-common/src/main/java/org/apache/hadoop/hbase/CompareOperator.java 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/CompareOperator.java
deleted file mode 100644
index 46fa55d..000
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/CompareOperator.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.hbase;
-
-import org.apache.hadoop.hbase.classification.InterfaceAudience;
-
-/**
- * Generic set of comparison operators.
- * @since 2.0.0
- */
-@InterfaceAudience.Public
-public enum CompareOperator {
-  // Keeps same names as the enums over in filter's CompareOp intentionally.
-  // The convertion of operator to protobuf representation is via a name 
comparison.
-  /** less than */
-  LESS,
-  /** less than or equal to */
-  LESS_OR_EQUAL,
-  /** equals */
-  EQUAL,
-  /** not equal */
-  NOT_EQUAL,
-  /** greater than or equal to */
-  GREATER_OR_EQUAL,
-  /** greater than */
-  

hbase git commit: HBASE-18780 Remove HLogPrettyPrinter

[stack]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 f08dd5d34 -> 84ec18eb4


HBASE-18780 Remove HLogPrettyPrinter

Signed-off-by: Michael Stack 


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

Branch: refs/heads/branch-2
Commit: 84ec18eb45a1b94a0f670545cf460292c4f79161
Parents: f08dd5d
Author: Chia-Ping Tsai 
Authored: Fri Sep 8 21:27:20 2017 +0800
Committer: Michael Stack 
Committed: Fri Sep 8 10:22:18 2017 -0700

--
 bin/hbase   |  3 +-
 bin/hbase.cmd   |  5 --
 .../regionserver/wal/HLogPrettyPrinter.java | 88 
 src/main/asciidoc/_chapters/ops_mgt.adoc|  8 +-
 4 files changed, 5 insertions(+), 99 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/84ec18eb/bin/hbase
--
diff --git a/bin/hbase b/bin/hbase
index 5982c68..ad2f3b8 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -357,8 +357,7 @@ if [ "$COMMAND" = "shell" ] ; then
   CLASS="org.jruby.Main -X+O ${JRUBY_OPTS} ${HBASE_HOME}/bin/hirb.rb"
 elif [ "$COMMAND" = "hbck" ] ; then
   CLASS='org.apache.hadoop.hbase.util.HBaseFsck'
-# TODO remove old 'hlog' version
-elif [ "$COMMAND" = "hlog" -o "$COMMAND" = "wal" ] ; then
+elif [ "$COMMAND" = "wal" ] ; then
   CLASS='org.apache.hadoop.hbase.wal.WALPrettyPrinter'
 elif [ "$COMMAND" = "hfile" ] ; then
   CLASS='org.apache.hadoop.hbase.io.hfile.HFilePrettyPrinter'

http://git-wip-us.apache.org/repos/asf/hbase/blob/84ec18eb/bin/hbase.cmd
--
diff --git a/bin/hbase.cmd b/bin/hbase.cmd
index 457e4f7..af546a7 100644
--- a/bin/hbase.cmd
+++ b/bin/hbase.cmd
@@ -415,11 +415,6 @@ goto :eof
   set CLASS=org.apache.hadoop.hbase.util.HBaseFsck
   goto :eof
 
-@rem TODO remove older 'hlog' command
-:hlog
-  set CLASS=org.apache.hadoop.hbase.wal.WALPrettyPrinter
-  goto :eof
-
 :wal
   set CLASS=org.apache.hadoop.hbase.wal.WALPrettyPrinter
   goto :eof

http://git-wip-us.apache.org/repos/asf/hbase/blob/84ec18eb/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogPrettyPrinter.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogPrettyPrinter.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogPrettyPrinter.java
deleted file mode 100644
index cf3b5c4..000
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogPrettyPrinter.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.hbase.regionserver.wal;
-
-import java.io.IOException;
-import java.io.PrintStream;
-import org.apache.hadoop.hbase.classification.InterfaceAudience;
-import org.apache.hadoop.hbase.classification.InterfaceStability;
-import org.apache.hadoop.hbase.HBaseInterfaceAudience;
-import org.apache.hadoop.hbase.wal.WALPrettyPrinter;
-
-/**
- * HLogPrettyPrinter prints the contents of a given HLog with a variety of
- * options affecting formatting and extent of content.
- *
- * It targets two usage cases: pretty printing for ease of debugging directly 
by
- * humans, and JSON output for consumption by monitoring and/or maintenance
- * scripts.
- *
- * It can filter by row, region, or sequence id.
- *
- * It can also toggle output of values.
- *
- * @deprecated use the "hbase wal" command
- */
-@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS)
-@InterfaceStability.Evolving
-@Deprecated
-public class HLogPrettyPrinter extends WALPrettyPrinter {
-
-  /**
-   * Basic constructor that simply initializes values to reasonable defaults.
-   */
-  public HLogPrettyPrinter() {
-this(false, false, -1l, null, 

hbase git commit: HBASE-18780 Remove HLogPrettyPrinter

[stack]

Repository: hbase
Updated Branches:
  refs/heads/master c90602ef6 -> 87c3ae931


HBASE-18780 Remove HLogPrettyPrinter

Signed-off-by: Michael Stack 


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

Branch: refs/heads/master
Commit: 87c3ae9314e3a6ba85900cceb06ea34cf295395a
Parents: c90602e
Author: Chia-Ping Tsai 
Authored: Fri Sep 8 21:27:20 2017 +0800
Committer: Michael Stack 
Committed: Fri Sep 8 10:20:20 2017 -0700

--
 bin/hbase   |  3 +-
 bin/hbase.cmd   |  5 --
 .../regionserver/wal/HLogPrettyPrinter.java | 88 
 src/main/asciidoc/_chapters/ops_mgt.adoc|  8 +-
 4 files changed, 5 insertions(+), 99 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/87c3ae93/bin/hbase
--
diff --git a/bin/hbase b/bin/hbase
index c2e077c..998bdbe 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -357,8 +357,7 @@ if [ "$COMMAND" = "shell" ] ; then
   CLASS="org.jruby.Main -X+O ${JRUBY_OPTS} ${HBASE_HOME}/bin/hirb.rb"
 elif [ "$COMMAND" = "hbck" ] ; then
   CLASS='org.apache.hadoop.hbase.util.HBaseFsck'
-# TODO remove old 'hlog' version
-elif [ "$COMMAND" = "hlog" -o "$COMMAND" = "wal" ] ; then
+elif [ "$COMMAND" = "wal" ] ; then
   CLASS='org.apache.hadoop.hbase.wal.WALPrettyPrinter'
 elif [ "$COMMAND" = "hfile" ] ; then
   CLASS='org.apache.hadoop.hbase.io.hfile.HFilePrettyPrinter'

http://git-wip-us.apache.org/repos/asf/hbase/blob/87c3ae93/bin/hbase.cmd
--
diff --git a/bin/hbase.cmd b/bin/hbase.cmd
index 0ff6ff5..070cb61 100644
--- a/bin/hbase.cmd
+++ b/bin/hbase.cmd
@@ -415,11 +415,6 @@ goto :eof
   set CLASS=org.apache.hadoop.hbase.util.HBaseFsck
   goto :eof
 
-@rem TODO remove older 'hlog' command
-:hlog
-  set CLASS=org.apache.hadoop.hbase.wal.WALPrettyPrinter
-  goto :eof
-
 :wal
   set CLASS=org.apache.hadoop.hbase.wal.WALPrettyPrinter
   goto :eof

http://git-wip-us.apache.org/repos/asf/hbase/blob/87c3ae93/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogPrettyPrinter.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogPrettyPrinter.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogPrettyPrinter.java
deleted file mode 100644
index cf3b5c4..000
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogPrettyPrinter.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.hbase.regionserver.wal;
-
-import java.io.IOException;
-import java.io.PrintStream;
-import org.apache.hadoop.hbase.classification.InterfaceAudience;
-import org.apache.hadoop.hbase.classification.InterfaceStability;
-import org.apache.hadoop.hbase.HBaseInterfaceAudience;
-import org.apache.hadoop.hbase.wal.WALPrettyPrinter;
-
-/**
- * HLogPrettyPrinter prints the contents of a given HLog with a variety of
- * options affecting formatting and extent of content.
- *
- * It targets two usage cases: pretty printing for ease of debugging directly 
by
- * humans, and JSON output for consumption by monitoring and/or maintenance
- * scripts.
- *
- * It can filter by row, region, or sequence id.
- *
- * It can also toggle output of values.
- *
- * @deprecated use the "hbase wal" command
- */
-@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS)
-@InterfaceStability.Evolving
-@Deprecated
-public class HLogPrettyPrinter extends WALPrettyPrinter {
-
-  /**
-   * Basic constructor that simply initializes values to reasonable defaults.
-   */
-  public HLogPrettyPrinter() {
-this(false, false, -1l, null, null, 

hbase git commit: HBASE-18779 Move CompareOperator to hbase-client module

[stack]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 7f70b6c8e -> f08dd5d34


HBASE-18779 Move CompareOperator to hbase-client module


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

Branch: refs/heads/branch-2
Commit: f08dd5d3420f4a3a53b39cd99d82d7c16056f916
Parents: 7f70b6c
Author: Michael Stack 
Authored: Fri Sep 8 10:18:32 2017 -0700
Committer: Michael Stack 
Committed: Fri Sep 8 10:18:32 2017 -0700

--
 .../apache/hadoop/hbase/CompareOperator.java| 44 
 .../apache/hadoop/hbase/CompareOperator.java| 44 
 2 files changed, 44 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/f08dd5d3/hbase-client/src/main/java/org/apache/hadoop/hbase/CompareOperator.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/CompareOperator.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/CompareOperator.java
new file mode 100644
index 000..46fa55d
--- /dev/null
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/CompareOperator.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase;
+
+import org.apache.hadoop.hbase.classification.InterfaceAudience;
+
+/**
+ * Generic set of comparison operators.
+ * @since 2.0.0
+ */
+@InterfaceAudience.Public
+public enum CompareOperator {
+  // Keeps same names as the enums over in filter's CompareOp intentionally.
+  // The convertion of operator to protobuf representation is via a name 
comparison.
+  /** less than */
+  LESS,
+  /** less than or equal to */
+  LESS_OR_EQUAL,
+  /** equals */
+  EQUAL,
+  /** not equal */
+  NOT_EQUAL,
+  /** greater than or equal to */
+  GREATER_OR_EQUAL,
+  /** greater than */
+  GREATER,
+  /** no operation */
+  NO_OP,
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hbase/blob/f08dd5d3/hbase-common/src/main/java/org/apache/hadoop/hbase/CompareOperator.java
--
diff --git 
a/hbase-common/src/main/java/org/apache/hadoop/hbase/CompareOperator.java 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/CompareOperator.java
deleted file mode 100644
index 46fa55d..000
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/CompareOperator.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.hbase;
-
-import org.apache.hadoop.hbase.classification.InterfaceAudience;
-
-/**
- * Generic set of comparison operators.
- * @since 2.0.0
- */
-@InterfaceAudience.Public
-public enum CompareOperator {
-  // Keeps same names as the enums over in filter's CompareOp intentionally.
-  // The convertion of operator to protobuf representation is via a name 
comparison.
-  /** less than */
-  LESS,
-  /** less than or equal to */
-  LESS_OR_EQUAL,
-  /** equals */
-  EQUAL,
-  /** not equal */
-  NOT_EQUAL,
-  /** greater than or equal to */
-  GREATER_OR_EQUAL,
-  /** greater than */
-  

[1/2] hbase git commit: HBASE-18769 Make CompareFilter use generic CompareOperator instead of internal enum

[stack]

Repository: hbase
Updated Branches:
  refs/heads/master 331910192 -> b8e0a8396


http://git-wip-us.apache.org/repos/asf/hbase/blob/b8e0a839/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java
index 38e292c..b74bb14 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java
@@ -18,6 +18,7 @@
 
 package org.apache.hadoop.hbase.security.access;
 
+import org.apache.hadoop.hbase.CompareOperator;
 import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.ArrayListMultimap;
 import org.apache.hadoop.hbase.shaded.com.google.common.collect.ListMultimap;
 import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
@@ -323,7 +324,7 @@ public class AccessControlLists {
 scan.addFamily(ACL_LIST_FAMILY);
 
 String columnName = Bytes.toString(column);
-scan.setFilter(new QualifierFilter(CompareOp.EQUAL, new 
RegexStringComparator(
+scan.setFilter(new QualifierFilter(CompareOperator.EQUAL, new 
RegexStringComparator(
 String.format("(%s%s%s)|(%s%s)$",
 ACL_KEY_DELIMITER, columnName, ACL_KEY_DELIMITER,
 ACL_KEY_DELIMITER, columnName;

http://git-wip-us.apache.org/repos/asf/hbase/blob/b8e0a839/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSerialization.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSerialization.java 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSerialization.java
index be033e9..e3c1df3 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSerialization.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSerialization.java
@@ -131,7 +131,7 @@ public class TestSerialization {
   }
 
   @Test public void testCompareFilter() throws Exception {
-Filter f = new RowFilter(CompareOp.EQUAL,
+Filter f = new RowFilter(CompareOperator.EQUAL,
   new BinaryComparator(Bytes.toBytes("testRowOne-2")));
 byte [] bytes = f.toByteArray();
 Filter ff = RowFilter.parseFrom(bytes);

http://git-wip-us.apache.org/repos/asf/hbase/blob/b8e0a839/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerSideScanMetricsFromClientSide.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerSideScanMetricsFromClientSide.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerSideScanMetricsFromClientSide.java
index 370d3d8..7c0e471 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerSideScanMetricsFromClientSide.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerSideScanMetricsFromClientSide.java
@@ -205,21 +205,21 @@ public class TestServerSideScanMetricsFromClientSide {
 }
 
 // The filter should filter out all rows, but we still expect to see every 
row.
-Filter filter = new RowFilter(CompareOp.EQUAL, new 
BinaryComparator("xyz".getBytes()));
+Filter filter = new RowFilter(CompareOperator.EQUAL, new 
BinaryComparator("xyz".getBytes()));
 scan = new Scan(baseScan);
 scan.setFilter(filter);
 testMetric(scan, 
ServerSideScanMetrics.COUNT_OF_ROWS_SCANNED_KEY_METRIC_NAME, ROWS.length);
 
 // Filter should pass on all rows
 SingleColumnValueFilter singleColumnValueFilter =
-new SingleColumnValueFilter(FAMILIES[0], QUALIFIERS[0], 
CompareOp.EQUAL, VALUE);
+new SingleColumnValueFilter(FAMILIES[0], QUALIFIERS[0], 
CompareOperator.EQUAL, VALUE);
 scan = new Scan(baseScan);
 scan.setFilter(singleColumnValueFilter);
 testMetric(scan, 
ServerSideScanMetrics.COUNT_OF_ROWS_SCANNED_KEY_METRIC_NAME, ROWS.length);
 
 // Filter should filter out all rows
 singleColumnValueFilter =
-new SingleColumnValueFilter(FAMILIES[0], QUALIFIERS[0], 
CompareOp.NOT_EQUAL, VALUE);
+new SingleColumnValueFilter(FAMILIES[0], QUALIFIERS[0], 
CompareOperator.NOT_EQUAL, VALUE);
 scan = new Scan(baseScan);
 scan.setFilter(singleColumnValueFilter);
 testMetric(scan, 
ServerSideScanMetrics.COUNT_OF_ROWS_SCANNED_KEY_METRIC_NAME, ROWS.length);
@@ -255,7 +255,7 @@ public class TestServerSideScanMetricsFromClientSide {
 testRowsFilteredMetric(baseScan, null, 0);
 
 // Row filter doesn't match any row key. All rows should be filtered
-Filter filter = new RowFilter(CompareOp.EQUAL, new 
BinaryComparator("xyz".getBytes()));
+Filter filter = new RowFilter(CompareOperator.EQUAL, new 
BinaryComparator("xyz".getBytes()));
 

[2/2] hbase git commit: HBASE-18769 Make CompareFilter use generic CompareOperator instead of internal enum

[stack]

HBASE-18769 Make CompareFilter use generic CompareOperator instead of
internal enum


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

Branch: refs/heads/master
Commit: b8e0a8396f5f6ec02d9382a75f550499d85f3a23
Parents: 3319101
Author: Michael Stack 
Authored: Thu Sep 7 13:59:46 2017 -0700
Committer: Michael Stack 
Committed: Fri Sep 8 10:06:56 2017 -0700

--
 .../org/apache/hadoop/hbase/client/Table.java   |   3 +-
 .../hadoop/hbase/filter/CompareFilter.java  | 128 ---
 .../hbase/filter/DependentColumnFilter.java |  40 --
 .../hadoop/hbase/filter/FamilyFilter.java   |  24 +++-
 .../apache/hadoop/hbase/filter/ParseFilter.java |  41 +-
 .../hadoop/hbase/filter/QualifierFilter.java|  23 +++-
 .../apache/hadoop/hbase/filter/RowFilter.java   |  23 +++-
 .../filter/SingleColumnValueExcludeFilter.java  |  69 +-
 .../hbase/filter/SingleColumnValueFilter.java   | 120 -
 .../apache/hadoop/hbase/filter/ValueFilter.java |  23 +++-
 .../hadoop/hbase/quotas/QuotaTableUtil.java |  15 ++-
 .../hbase/filter/ByteArrayComparable.java   |   2 +-
 .../hbase/IntegrationTestLazyCfLoading.java |   2 +-
 .../hadoop/hbase/mapreduce/CellCounter.java |   5 +-
 .../hadoop/hbase/mapreduce/ExportUtils.java |   3 +-
 .../hadoop/hbase/PerformanceEvaluation.java |   9 +-
 .../hbase/mapred/TestTableInputFormat.java  |   6 +-
 .../hbase/mapreduce/TestTableInputFormat.java   |   9 +-
 .../hbase/replication/ReplicationTableBase.java |   3 +-
 .../TableBasedReplicationQueuesImpl.java|   2 +-
 .../hadoop/hbase/rest/model/ScannerModel.java   |  15 ++-
 .../hbase/rest/PerformanceEvaluation.java   |   3 +-
 .../hbase/rest/TestScannersWithFilters.java |  71 +-
 .../security/access/AccessControlLists.java |   3 +-
 .../apache/hadoop/hbase/TestSerialization.java  |   2 +-
 ...TestServerSideScanMetricsFromClientSide.java |  19 +--
 .../hadoop/hbase/client/TestCheckAndMutate.java |   4 +-
 .../hadoop/hbase/client/TestFromClientSide.java | 107 
 .../hbase/filter/TestDependentColumnFilter.java |   9 +-
 .../apache/hadoop/hbase/filter/TestFilter.java  | 115 -
 .../hadoop/hbase/filter/TestFilterList.java |   9 +-
 .../hbase/filter/TestFilterSerialization.java   |  21 +--
 .../hbase/filter/TestFilterWithScanLimits.java  |   3 +-
 .../hadoop/hbase/filter/TestFilterWrapper.java  |   3 +-
 .../hadoop/hbase/filter/TestParseFilter.java|  35 +++--
 .../TestSingleColumnValueExcludeFilter.java |   3 +-
 .../filter/TestSingleColumnValueFilter.java |  13 +-
 .../hadoop/hbase/thrift2/ThriftUtilities.java   |  17 +--
 src/main/asciidoc/_chapters/architecture.adoc   |  14 +-
 39 files changed, 678 insertions(+), 338 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/b8e0a839/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java
index 2409406..66d4616 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java
@@ -134,8 +134,7 @@ public interface Table extends Closeable {
*/
void batchCallback(
 final List actions, final Object[] results, final 
Batch.Callback callback
-  )
-throws IOException, InterruptedException;
+  ) throws IOException, InterruptedException;
 
   /**
* Extracts certain cells from a given row.

http://git-wip-us.apache.org/repos/asf/hbase/blob/b8e0a839/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/CompareFilter.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/CompareFilter.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/CompareFilter.java
index 631fbe4..e5fe6fa 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/CompareFilter.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/CompareFilter.java
@@ -54,8 +54,9 @@ public abstract class CompareFilter extends FilterBase {
* Comparison operators. For filters only!
* Use {@link CompareOperator} otherwise.
* It (intentionally) has at least the below enums with same names.
-   * TODO: Replace with generic {@link CompareOperator}
+   * @deprecated  since 2.0.0. Will be removed in 3.0.0. Use {@link 
CompareOperator} instead.
   

[2/2] hbase git commit: HBASE-18769 Make CompareFilter use generic CompareOperator instead of internal enum

[stack]

HBASE-18769 Make CompareFilter use generic CompareOperator instead of
internal enum


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

Branch: refs/heads/branch-2
Commit: 7f70b6c8e319802303f3ef000e37e42a855c79fc
Parents: 4ad47cc
Author: Michael Stack 
Authored: Thu Sep 7 13:59:46 2017 -0700
Committer: Michael Stack 
Committed: Fri Sep 8 10:05:51 2017 -0700

--
 .../org/apache/hadoop/hbase/client/Table.java   |   3 +-
 .../hadoop/hbase/filter/CompareFilter.java  | 128 ---
 .../hbase/filter/DependentColumnFilter.java |  40 --
 .../hadoop/hbase/filter/FamilyFilter.java   |  24 +++-
 .../apache/hadoop/hbase/filter/ParseFilter.java |  41 +-
 .../hadoop/hbase/filter/QualifierFilter.java|  23 +++-
 .../apache/hadoop/hbase/filter/RowFilter.java   |  23 +++-
 .../filter/SingleColumnValueExcludeFilter.java  |  69 +-
 .../hbase/filter/SingleColumnValueFilter.java   | 120 -
 .../apache/hadoop/hbase/filter/ValueFilter.java |  23 +++-
 .../hadoop/hbase/quotas/QuotaTableUtil.java |  15 ++-
 .../hbase/filter/ByteArrayComparable.java   |   2 +-
 .../hbase/IntegrationTestLazyCfLoading.java |   2 +-
 .../hadoop/hbase/mapreduce/CellCounter.java |   5 +-
 .../hadoop/hbase/mapreduce/ExportUtils.java |   3 +-
 .../hadoop/hbase/PerformanceEvaluation.java |   9 +-
 .../hbase/mapred/TestTableInputFormat.java  |   6 +-
 .../hbase/mapreduce/TestTableInputFormat.java   |   9 +-
 .../hbase/replication/ReplicationTableBase.java |   3 +-
 .../TableBasedReplicationQueuesImpl.java|   2 +-
 .../hadoop/hbase/rest/model/ScannerModel.java   |  15 ++-
 .../hbase/rest/PerformanceEvaluation.java   |   3 +-
 .../hbase/rest/TestScannersWithFilters.java |  71 +-
 .../security/access/AccessControlLists.java |   3 +-
 .../apache/hadoop/hbase/TestSerialization.java  |   2 +-
 ...TestServerSideScanMetricsFromClientSide.java |  19 +--
 .../hadoop/hbase/client/TestCheckAndMutate.java |   4 +-
 .../hadoop/hbase/client/TestFromClientSide.java | 107 
 .../hbase/filter/TestDependentColumnFilter.java |   9 +-
 .../apache/hadoop/hbase/filter/TestFilter.java  | 115 -
 .../hadoop/hbase/filter/TestFilterList.java |   9 +-
 .../hbase/filter/TestFilterSerialization.java   |  21 +--
 .../hbase/filter/TestFilterWithScanLimits.java  |   3 +-
 .../hadoop/hbase/filter/TestFilterWrapper.java  |   3 +-
 .../hadoop/hbase/filter/TestParseFilter.java|  35 +++--
 .../TestSingleColumnValueExcludeFilter.java |   3 +-
 .../filter/TestSingleColumnValueFilter.java |  13 +-
 .../hadoop/hbase/thrift2/ThriftUtilities.java   |  17 +--
 src/main/asciidoc/_chapters/architecture.adoc   |  14 +-
 39 files changed, 678 insertions(+), 338 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/7f70b6c8/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java
index 2409406..66d4616 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java
@@ -134,8 +134,7 @@ public interface Table extends Closeable {
*/
void batchCallback(
 final List actions, final Object[] results, final 
Batch.Callback callback
-  )
-throws IOException, InterruptedException;
+  ) throws IOException, InterruptedException;
 
   /**
* Extracts certain cells from a given row.

http://git-wip-us.apache.org/repos/asf/hbase/blob/7f70b6c8/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/CompareFilter.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/CompareFilter.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/CompareFilter.java
index 631fbe4..e5fe6fa 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/CompareFilter.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/CompareFilter.java
@@ -54,8 +54,9 @@ public abstract class CompareFilter extends FilterBase {
* Comparison operators. For filters only!
* Use {@link CompareOperator} otherwise.
* It (intentionally) has at least the below enums with same names.
-   * TODO: Replace with generic {@link CompareOperator}
+   * @deprecated  since 2.0.0. Will be removed in 3.0.0. Use {@link 
CompareOperator} instead.
 

[1/2] hbase git commit: HBASE-18769 Make CompareFilter use generic CompareOperator instead of internal enum

[stack]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 4ad47ccd9 -> 7f70b6c8e


http://git-wip-us.apache.org/repos/asf/hbase/blob/7f70b6c8/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java
index 38e292c..b74bb14 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlLists.java
@@ -18,6 +18,7 @@
 
 package org.apache.hadoop.hbase.security.access;
 
+import org.apache.hadoop.hbase.CompareOperator;
 import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.ArrayListMultimap;
 import org.apache.hadoop.hbase.shaded.com.google.common.collect.ListMultimap;
 import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
@@ -323,7 +324,7 @@ public class AccessControlLists {
 scan.addFamily(ACL_LIST_FAMILY);
 
 String columnName = Bytes.toString(column);
-scan.setFilter(new QualifierFilter(CompareOp.EQUAL, new 
RegexStringComparator(
+scan.setFilter(new QualifierFilter(CompareOperator.EQUAL, new 
RegexStringComparator(
 String.format("(%s%s%s)|(%s%s)$",
 ACL_KEY_DELIMITER, columnName, ACL_KEY_DELIMITER,
 ACL_KEY_DELIMITER, columnName;

http://git-wip-us.apache.org/repos/asf/hbase/blob/7f70b6c8/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSerialization.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSerialization.java 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSerialization.java
index be033e9..e3c1df3 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSerialization.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSerialization.java
@@ -131,7 +131,7 @@ public class TestSerialization {
   }
 
   @Test public void testCompareFilter() throws Exception {
-Filter f = new RowFilter(CompareOp.EQUAL,
+Filter f = new RowFilter(CompareOperator.EQUAL,
   new BinaryComparator(Bytes.toBytes("testRowOne-2")));
 byte [] bytes = f.toByteArray();
 Filter ff = RowFilter.parseFrom(bytes);

http://git-wip-us.apache.org/repos/asf/hbase/blob/7f70b6c8/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerSideScanMetricsFromClientSide.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerSideScanMetricsFromClientSide.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerSideScanMetricsFromClientSide.java
index 370d3d8..7c0e471 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerSideScanMetricsFromClientSide.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerSideScanMetricsFromClientSide.java
@@ -205,21 +205,21 @@ public class TestServerSideScanMetricsFromClientSide {
 }
 
 // The filter should filter out all rows, but we still expect to see every 
row.
-Filter filter = new RowFilter(CompareOp.EQUAL, new 
BinaryComparator("xyz".getBytes()));
+Filter filter = new RowFilter(CompareOperator.EQUAL, new 
BinaryComparator("xyz".getBytes()));
 scan = new Scan(baseScan);
 scan.setFilter(filter);
 testMetric(scan, 
ServerSideScanMetrics.COUNT_OF_ROWS_SCANNED_KEY_METRIC_NAME, ROWS.length);
 
 // Filter should pass on all rows
 SingleColumnValueFilter singleColumnValueFilter =
-new SingleColumnValueFilter(FAMILIES[0], QUALIFIERS[0], 
CompareOp.EQUAL, VALUE);
+new SingleColumnValueFilter(FAMILIES[0], QUALIFIERS[0], 
CompareOperator.EQUAL, VALUE);
 scan = new Scan(baseScan);
 scan.setFilter(singleColumnValueFilter);
 testMetric(scan, 
ServerSideScanMetrics.COUNT_OF_ROWS_SCANNED_KEY_METRIC_NAME, ROWS.length);
 
 // Filter should filter out all rows
 singleColumnValueFilter =
-new SingleColumnValueFilter(FAMILIES[0], QUALIFIERS[0], 
CompareOp.NOT_EQUAL, VALUE);
+new SingleColumnValueFilter(FAMILIES[0], QUALIFIERS[0], 
CompareOperator.NOT_EQUAL, VALUE);
 scan = new Scan(baseScan);
 scan.setFilter(singleColumnValueFilter);
 testMetric(scan, 
ServerSideScanMetrics.COUNT_OF_ROWS_SCANNED_KEY_METRIC_NAME, ROWS.length);
@@ -255,7 +255,7 @@ public class TestServerSideScanMetricsFromClientSide {
 testRowsFilteredMetric(baseScan, null, 0);
 
 // Row filter doesn't match any row key. All rows should be filtered
-Filter filter = new RowFilter(CompareOp.EQUAL, new 
BinaryComparator("xyz".getBytes()));
+Filter filter = new RowFilter(CompareOperator.EQUAL, new 
BinaryComparator("xyz".getBytes()));
 

[43/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/apidocs/src-html/org/apache/hadoop/hbase/client/Table.html
--
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/client/Table.html 
b/apidocs/src-html/org/apache/hadoop/hbase/client/Table.html
index fff3c46..5a6e98e 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/client/Table.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/client/Table.html
@@ -32,619 +32,695 @@
 024import java.util.Map;
 025
 026import 
org.apache.hadoop.conf.Configuration;
-027import 
org.apache.hadoop.hbase.HTableDescriptor;
-028import 
org.apache.hadoop.hbase.TableName;
-029import 
org.apache.hadoop.hbase.classification.InterfaceAudience;
-030import 
org.apache.hadoop.hbase.client.coprocessor.Batch;
-031import 
org.apache.hadoop.hbase.filter.CompareFilter;
-032import 
org.apache.hadoop.hbase.ipc.CoprocessorRpcChannel;
-033
-034import com.google.protobuf.Descriptors;
-035import com.google.protobuf.Message;
-036import com.google.protobuf.Service;
-037import 
com.google.protobuf.ServiceException;
-038
-039/**
-040 * Used to communicate with a single 
HBase table.
-041 * Obtain an instance from a {@link 
Connection} and call {@link #close()} afterwards.
-042 *
-043 * pTable can be used to get, 
put, delete or scan data from a table.
-044 * @see ConnectionFactory
-045 * @see Connection
-046 * @see Admin
-047 * @see RegionLocator
-048 * @since 0.99.0
-049 */
-050@InterfaceAudience.Public
-051public interface Table extends Closeable 
{
-052  /**
-053   * Gets the fully qualified table name 
instance of this table.
-054   */
-055  TableName getName();
-056
-057  /**
-058   * Returns the {@link 
org.apache.hadoop.conf.Configuration} object used by this instance.
-059   * p
-060   * The reference returned is not a 
copy, so any change made to it will
-061   * affect this instance.
-062   */
-063  Configuration getConfiguration();
-064
-065  /**
-066   * Gets the {@link 
org.apache.hadoop.hbase.HTableDescriptor table descriptor} for this table.
-067   * @throws java.io.IOException if a 
remote or network exception occurs.
-068   * @deprecated since 2.0 version and 
will be removed in 3.0 version.
-069   * use {@link 
#getDescriptor()}
-070   */
-071  @Deprecated
-072  HTableDescriptor getTableDescriptor() 
throws IOException;
-073
-074  /**
-075   * Gets the {@link 
org.apache.hadoop.hbase.client.TableDescriptor table descriptor} for this 
table.
-076   * @throws java.io.IOException if a 
remote or network exception occurs.
-077   */
-078  TableDescriptor getDescriptor() throws 
IOException;
-079
-080  /**
-081   * Test for the existence of columns in 
the table, as specified by the Get.
-082   * p
-083   *
-084   * This will return true if the Get 
matches one or more keys, false if not.
-085   * p
-086   *
-087   * This is a server-side call so it 
prevents any data from being transfered to
-088   * the client.
-089   *
-090   * @param get the Get
-091   * @return true if the specified Get 
matches one or more keys, false if not
-092   * @throws IOException e
-093   */
-094  boolean exists(Get get) throws 
IOException;
-095
-096  /**
-097   * Test for the existence of columns in 
the table, as specified by the Gets.
-098   * p
-099   *
-100   * This will return an array of 
booleans. Each value will be true if the related Get matches
-101   * one or more keys, false if not.
-102   * p
-103   *
-104   * This is a server-side call so it 
prevents any data from being transferred to
-105   * the client.
-106   *
-107   * @param gets the Gets
-108   * @return Array of boolean.  True if 
the specified Get matches one or more keys, false if not.
-109   * @throws IOException e
-110   */
-111  boolean[] existsAll(ListGet 
gets) throws IOException;
-112
-113  /**
-114   * Method that does a batch call on 
Deletes, Gets, Puts, Increments, Appends, RowMutations.
-115   * The ordering of execution of the 
actions is not defined. Meaning if you do a Put and a
-116   * Get in the same {@link #batch} call, 
you will not necessarily be
-117   * guaranteed that the Get returns what 
the Put had put.
-118   *
-119   * @param actions list of Get, Put, 
Delete, Increment, Append, RowMutations.
-120   * @param results Empty Object[], same 
size as actions. Provides access to partial
-121   *results, in case an 
exception is thrown. A null in the result array means that
-122   *the call for that 
action failed, even after retries. The order of the objects
-123   *in the results array 
corresponds to the order of actions in the request list.
-124   * @throws IOException
-125   * @since 0.90.0
-126   */
-127  void batch(final List? extends 
Row actions, final Object[] results) throws IOException,
-128InterruptedException;
-129
-130  /**
-131   * Same as {@link #batch(List, 
Object[])}, but with a callback.
-132   * @since 0.96.0
-133   */
-134  R void 

[10/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.html
--
diff --git 
a/devapidocs/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.html
 
b/devapidocs/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.html
index cac5e3e..2302832 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.html
@@ -18,7 +18,7 @@
 catch(err) {
 }
 //-->
-var methods = 
{"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10};
+var methods = 
{"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance 
Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -108,10 +108,6 @@ var activeTableTab = "activeTableTab";
 
 
 
-All Implemented Interfaces:
-http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true;
 title="class or interface in java.lang">ComparableCompactionRequest
-
-
 Direct Known Subclasses:
 DateTieredCompactionRequest
 
@@ -120,8 +116,7 @@ var activeTableTab = "activeTableTab";
 @InterfaceAudience.LimitedPrivate(value="coprocessor")
  @InterfaceStability.Evolving
 public class CompactionRequest
-extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true;
 title="class or interface in java.lang">Object
-implements http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true;
 title="class or interface in java.lang">ComparableCompactionRequest
+extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true;
 title="class or interface in java.lang">Object
 This class holds all logical details necessary to run a 
compaction.
 
 
@@ -189,7 +184,7 @@ implements http://docs.oracle.com/javase/8/docs/api/java/lang/Comparabl
 storeName
 
 
-private http://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true;
 title="class or interface in java.lang">Long
+private long
 timeInNanos
 
 
@@ -252,83 +247,76 @@ implements http://docs.oracle.com/javase/8/docs/api/java/lang/Comparabl
 
 
 
-int
-compareTo(CompactionRequestrequest)
-This function will define where in the priority queue the 
request will
- end up.
-
-
-
-boolean
-equals(http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true;
 title="class or interface in java.lang">Objectobj)
-
-
 http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true;
 title="class or interface in java.util">CollectionStoreFile
 getFiles()
 
-
+
 int
 getPriority()
 Gets the priority for the request
 
 
-
+
+long
+getSelectionNanoTime()
+
+
 long
 getSelectionTime()
 
-
+
 long
 getSize()
 Gets the total size of all StoreFiles in compaction
 
 
-
+
 boolean
 isAllFiles()
 
-
+
 boolean
 isMajor()
 
-
+
 boolean
 isOffPeak()
 
-
+
 private void
 recalculateSize()
 Recalculate the size of the compaction based on current 
files.
 
 
-
+
 void
 setDescription(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">StringregionName,
   http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">StringstoreName)
 Sets the region/store name, for logging.
 
 
-
+
 void
 setIsMajor(booleanisMajor,
   booleanisAllFiles)
 Specify if this compaction should be a major compaction 
based on the state of the store
 
 
-
+
 void
 setOffPeak(booleanvalue)
 
-
+
 void
 setPriority(intp)
 Sets the priority for the request
 
 
-
+
 http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String
 toString()
 
-
+
 void
 updateFiles(http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true;
 title="class or interface in java.util">CollectionStoreFilefiles)
 
@@ -338,7 +326,7 @@ implements http://docs.oracle.com/javase/8/docs/api/java/lang/Comparabl
 
 
 Methods inherited from classjava.lang.http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true;
 title="class or interface in java.lang">Object
-http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--;
 title="class or interface in java.lang">clone, http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--;
 title="class or interface in java.lang">finalize, http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--;
 title="class 

[26/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/coprocessor/class-use/ObserverContext.html
--
diff --git 
a/devapidocs/org/apache/hadoop/hbase/coprocessor/class-use/ObserverContext.html 
b/devapidocs/org/apache/hadoop/hbase/coprocessor/class-use/ObserverContext.html
index dfebb30..a7d1b84 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/coprocessor/class-use/ObserverContext.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/coprocessor/class-use/ObserverContext.html
@@ -376,11 +376,11 @@
 
 
 default boolean
-RegionObserver.postCheckAndDelete(ObserverContextRegionCoprocessorEnvironmentc,
+RegionObserver.postCheckAndDelete(ObserverContextRegionCoprocessorEnvironmentc,
   byte[]row,
   byte[]family,
   byte[]qualifier,
-  CompareFilter.CompareOpcompareOp,
+  CompareOperatorop,
   ByteArrayComparablecomparator,
   Deletedelete,
   booleanresult)
@@ -389,11 +389,11 @@
 
 
 default boolean
-RegionObserver.postCheckAndPut(ObserverContextRegionCoprocessorEnvironmentc,
+RegionObserver.postCheckAndPut(ObserverContextRegionCoprocessorEnvironmentc,
byte[]row,
byte[]family,
byte[]qualifier,
-   CompareFilter.CompareOpcompareOp,
+   CompareOperatorop,
ByteArrayComparablecomparator,
Putput,
booleanresult)
@@ -1472,11 +1472,11 @@
 
 
 default boolean
-RegionObserver.preCheckAndDelete(ObserverContextRegionCoprocessorEnvironmentc,
+RegionObserver.preCheckAndDelete(ObserverContextRegionCoprocessorEnvironmentc,
  byte[]row,
  byte[]family,
  byte[]qualifier,
- CompareFilter.CompareOpcompareOp,
+ CompareOperatorop,
  ByteArrayComparablecomparator,
  Deletedelete,
  booleanresult)
@@ -1485,11 +1485,11 @@
 
 
 default boolean
-RegionObserver.preCheckAndDeleteAfterRowLock(ObserverContextRegionCoprocessorEnvironmentc,
+RegionObserver.preCheckAndDeleteAfterRowLock(ObserverContextRegionCoprocessorEnvironmentc,
  byte[]row,
  byte[]family,
  byte[]qualifier,
- CompareFilter.CompareOpcompareOp,
+ CompareOperatorop,
  ByteArrayComparablecomparator,
  Deletedelete,
  booleanresult)
@@ -1498,11 +1498,11 @@
 
 
 default boolean
-RegionObserver.preCheckAndPut(ObserverContextRegionCoprocessorEnvironmentc,
+RegionObserver.preCheckAndPut(ObserverContextRegionCoprocessorEnvironmentc,
   byte[]row,
   byte[]family,
   byte[]qualifier,
-  CompareFilter.CompareOpcompareOp,
+  CompareOperatorop,
   ByteArrayComparablecomparator,
   Putput,
   booleanresult)
@@ -1511,11 +1511,11 @@
 
 
 default boolean
-RegionObserver.preCheckAndPutAfterRowLock(ObserverContextRegionCoprocessorEnvironmentc,
+RegionObserver.preCheckAndPutAfterRowLock(ObserverContextRegionCoprocessorEnvironmentc,
   byte[]row,
   byte[]family,
   byte[]qualifier,
-  CompareFilter.CompareOpcompareOp,
+  CompareOperatorop,
   ByteArrayComparablecomparator,
   Putput,
   booleanresult)
@@ -3099,44 +3099,44 @@
 
 
 boolean
-AccessController.preCheckAndDelete(ObserverContextRegionCoprocessorEnvironmentc,
+AccessController.preCheckAndDelete(ObserverContextRegionCoprocessorEnvironmentc,
  byte[]row,
  byte[]family,
  byte[]qualifier,
- CompareFilter.CompareOpcompareOp,
+ CompareOperatorop,
  ByteArrayComparablecomparator,
  Deletedelete,
  booleanresult)
 
 
 boolean
-AccessController.preCheckAndDeleteAfterRowLock(ObserverContextRegionCoprocessorEnvironmentc,
+AccessController.preCheckAndDeleteAfterRowLock(ObserverContextRegionCoprocessorEnvironmentc,
  byte[]row,
  byte[]family,
  byte[]qualifier,
- CompareFilter.CompareOpcompareOp,
+ CompareOperatorop,
  ByteArrayComparablecomparator,
  Deletedelete,
  booleanresult)
 
 
 boolean
-AccessController.preCheckAndPut(ObserverContextRegionCoprocessorEnvironmentc,

[35/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/class-use/CompareOperator.html
--
diff --git a/devapidocs/org/apache/hadoop/hbase/class-use/CompareOperator.html 
b/devapidocs/org/apache/hadoop/hbase/class-use/CompareOperator.html
new file mode 100644
index 000..38601b8
--- /dev/null
+++ b/devapidocs/org/apache/hadoop/hbase/class-use/CompareOperator.html
@@ -0,0 +1,736 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+
+
+
+Uses of Class org.apache.hadoop.hbase.CompareOperator (Apache HBase 
3.0.0-SNAPSHOT API)
+
+
+
+
+
+
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+Skip navigation links
+
+
+
+
+Overview
+Package
+Class
+Use
+Tree
+Deprecated
+Index
+Help
+
+
+
+
+Prev
+Next
+
+
+Frames
+NoFrames
+
+
+AllClasses
+
+
+
+
+
+
+
+
+
+
+Uses of Classorg.apache.hadoop.hbase.CompareOperator
+
+
+
+
+
+Packages that use CompareOperator
+
+Package
+Description
+
+
+
+org.apache.hadoop.hbase
+
+
+
+org.apache.hadoop.hbase.client
+
+Provides HBase Client
+
+
+
+org.apache.hadoop.hbase.coprocessor
+
+Table of Contents
+
+
+
+org.apache.hadoop.hbase.regionserver
+
+
+
+org.apache.hadoop.hbase.rest.client
+
+
+
+org.apache.hadoop.hbase.security.access
+
+
+
+
+
+
+
+
+
+
+Uses of CompareOperator in org.apache.hadoop.hbase
+
+Methods in org.apache.hadoop.hbase
 that return CompareOperator
+
+Modifier and Type
+Method and Description
+
+
+
+static CompareOperator
+CompareOperator.valueOf(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">Stringname)
+Returns the enum constant of this type with the specified 
name.
+
+
+
+static CompareOperator[]
+CompareOperator.values()
+Returns an array containing the constants of this enum 
type, in
+the order they are declared.
+
+
+
+
+
+
+
+
+Uses of CompareOperator in org.apache.hadoop.hbase.client
+
+Methods in org.apache.hadoop.hbase.client
 with parameters of type CompareOperator
+
+Modifier and Type
+Method and Description
+
+
+
+boolean
+Table.checkAndDelete(byte[]row,
+  byte[]family,
+  byte[]qualifier,
+  CompareOperatorop,
+  byte[]value,
+  Deletedelete)
+Atomically checks if a row/family/qualifier value matches 
the expected
+ value.
+
+
+
+http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true;
 title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">Boolean
+AsyncTableImpl.checkAndDelete(byte[]row,
+  byte[]family,
+  byte[]qualifier,
+  CompareOperatorop,
+  byte[]value,
+  Deletedelete)
+
+
+http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true;
 title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">Boolean
+RawAsyncTableImpl.checkAndDelete(byte[]row,
+  byte[]family,
+  byte[]qualifier,
+  CompareOperatorop,
+  byte[]value,
+  Deletedelete)
+
+
+boolean
+HTable.checkAndDelete(byte[]row,
+  byte[]family,
+  byte[]qualifier,
+  CompareOperatorop,
+  byte[]value,
+  Deletedelete)
+Atomically checks if a row/family/qualifier value matches 
the expected
+ value.
+
+
+
+http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true;
 title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">Boolean
+AsyncTableBase.checkAndDelete(byte[]row,
+  byte[]family,
+  byte[]qualifier,
+  CompareOperatorcompareOp,
+  byte[]value,
+  Deletedelete)
+Atomically checks if a row/family/qualifier value matches 
the expected value.
+
+
+
+boolean
+HTableWrapper.checkAndDelete(byte[]row,
+  byte[]family,
+  byte[]qualifier,
+  CompareOperatorop,
+  byte[]value,
+  Deletedelete)
+
+
+boolean
+Table.checkAndMutate(byte[]row,
+  

[39/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/checkstyle.rss
--
diff --git a/checkstyle.rss b/checkstyle.rss
index e11378f..53190b1 100644
--- a/checkstyle.rss
+++ b/checkstyle.rss
@@ -25,8 +25,8 @@ under the License.
 en-us
 2007 - 2017 The Apache Software Foundation
 
-  File: 2038,
- Errors: 12895,
+  File: 2039,
+ Errors: 12943,
  Warnings: 0,
  Infos: 0
   
@@ -3793,7 +3793,7 @@ under the License.
   0
 
 
-  3
+  5
 
   
   
@@ -4521,7 +4521,7 @@ under the License.
   0
 
 
-  1
+  2
 
   
   
@@ -5193,7 +5193,7 @@ under the License.
   0
 
 
-  191
+  193
 
   
   
@@ -15091,7 +15091,7 @@ under the License.
   0
 
 
-  36
+  37
 
   
   
@@ -17023,7 +17023,7 @@ under the License.
   0
 
 
-  107
+  109
 
   
   
@@ -18031,7 +18031,7 @@ under the License.
   0
 
 
-  3
+  2
 
   
   
@@ -18255,7 +18255,7 @@ under the License.
   0
 
 
-  7
+  8
 
   
   
@@ -21382,6 +21382,20 @@ under the License.
   
   
 
+  http://hbase.apache.org/checkstyle.html#org.apache.hadoop.hbase.CompareOperator.java;>org/apache/hadoop/hbase/CompareOperator.java
+
+
+  0
+
+
+  0
+
+
+  0
+
+  
+  
+
   http://hbase.apache.org/checkstyle.html#org.apache.hadoop.hbase.regionserver.compactions.CurrentHourProvider.java;>org/apache/hadoop/hbase/regionserver/compactions/CurrentHourProvider.java
 
 
@@ -22119,7 +22133,7 @@ under the License.
   0
 
 
-  146
+  150
 
   
   
@@ -24233,7 +24247,7 @@ under the License.
   0
 
 
-  11
+  10
 
   
   
@@ -24933,7 +24947,7 @@ under the License.
   0
 
 
-  0
+  2
 
   
   
@@ -25857,7 +25871,7 @@ under the License.
   0
 
 
-  213
+  215
 
   
   
@@ -26207,7 +26221,7 @@ under the License.
   0
 
 
-  48
+  50
 
   
   
@@ -26991,7 +27005,7 @@ under the License.
   0
 
 
-  30
+  63
 
   
   
@@ -27257,7 +27271,7 @@ under the License.
   0
 
 
-  2
+  1
 
   
   
@@ -28307,7 +28321,7 @@ under the License.
   0
 
 
-  35
+  34
 
   
   

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/coc.html
--
diff --git a/coc.html b/coc.html
index d26e81c..1e4d624 100644
--- a/coc.html
+++ b/coc.html
@@ -7,7 +7,7 @@
   
 
 
-
+
 
 Apache HBase  
   Code of Conduct Policy
@@ -380,7 +380,7 @@ email to mailto:priv...@hbase.apache.org;>the priv
 https://www.apache.org/;>The Apache Software 
Foundation.
 All rights reserved.  
 
-  Last Published: 
2017-09-07
+  Last Published: 

[18/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/regionserver/HRegion.RowLockContext.html
--
diff --git 
a/devapidocs/org/apache/hadoop/hbase/regionserver/HRegion.RowLockContext.html 
b/devapidocs/org/apache/hadoop/hbase/regionserver/HRegion.RowLockContext.html
index 0b22b22..f77ec7b 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/regionserver/HRegion.RowLockContext.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/regionserver/HRegion.RowLockContext.html
@@ -113,7 +113,7 @@ var activeTableTab = "activeTableTab";
 
 
 
-class HRegion.RowLockContext
+class HRegion.RowLockContext
 extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true;
 title="class or interface in java.lang">Object
 
 
@@ -241,7 +241,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 row
-private finalHashedBytes row
+private finalHashedBytes row
 
 
 
@@ -250,7 +250,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 readWriteLock
-finalhttp://docs.oracle.com/javase/8/docs/api/java/util/concurrent/locks/ReadWriteLock.html?is-external=true;
 title="class or interface in java.util.concurrent.locks">ReadWriteLock readWriteLock
+finalhttp://docs.oracle.com/javase/8/docs/api/java/util/concurrent/locks/ReadWriteLock.html?is-external=true;
 title="class or interface in java.util.concurrent.locks">ReadWriteLock readWriteLock
 
 
 
@@ -259,7 +259,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 usable
-finalhttp://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicBoolean.html?is-external=true;
 title="class or interface in java.util.concurrent.atomic">AtomicBoolean usable
+finalhttp://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicBoolean.html?is-external=true;
 title="class or interface in java.util.concurrent.atomic">AtomicBoolean usable
 
 
 
@@ -268,7 +268,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 count
-finalhttp://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicInteger.html?is-external=true;
 title="class or interface in java.util.concurrent.atomic">AtomicInteger count
+finalhttp://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicInteger.html?is-external=true;
 title="class or interface in java.util.concurrent.atomic">AtomicInteger count
 
 
 
@@ -277,7 +277,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 lock
-finalhttp://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true;
 title="class or interface in java.lang">Object lock
+finalhttp://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true;
 title="class or interface in java.lang">Object lock
 
 
 
@@ -286,7 +286,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 threadName
-privatehttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String threadName
+privatehttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String threadName
 
 
 
@@ -303,7 +303,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 RowLockContext
-RowLockContext(HashedBytesrow)
+RowLockContext(HashedBytesrow)
 
 
 
@@ -320,7 +320,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 newWriteLock
-HRegion.RowLockImplnewWriteLock()
+HRegion.RowLockImplnewWriteLock()
 
 
 
@@ -329,7 +329,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 newReadLock
-HRegion.RowLockImplnewReadLock()
+HRegion.RowLockImplnewReadLock()
 
 
 
@@ -338,7 +338,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 getRowLock
-privateHRegion.RowLockImplgetRowLock(http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/locks/Lock.html?is-external=true;
 title="class or interface in java.util.concurrent.locks">Lockl)
+privateHRegion.RowLockImplgetRowLock(http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/locks/Lock.html?is-external=true;
 title="class or interface in java.util.concurrent.locks">Lockl)
 
 
 
@@ -347,7 +347,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 cleanUp
-voidcleanUp()
+voidcleanUp()
 
 
 
@@ -356,7 +356,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 setThreadName
-publicvoidsetThreadName(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">StringthreadName)
+publicvoidsetThreadName(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">StringthreadName)
 
 
 
@@ -365,7 +365,7 @@ extends 

[32/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/client/HTableWrapper.html
--
diff --git a/devapidocs/org/apache/hadoop/hbase/client/HTableWrapper.html 
b/devapidocs/org/apache/hadoop/hbase/client/HTableWrapper.html
index ded3baf..e76d0c2 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/HTableWrapper.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/HTableWrapper.html
@@ -18,7 +18,7 @@
 catch(err) {
 }
 //-->
-var methods = 
{"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":9,"i15":10,"i16":10,"i17":10,"i18":42,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":42,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":42,"i43":10};
+var methods = 
{"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":9,"i18":10,"i19":10,"i20":10,"i21":42,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":42,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":42,"i46":10};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static 
Methods"],2:["t2","Instance Methods"],8:["t4","Concrete 
Methods"],32:["t6","Deprecated Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -115,7 +115,7 @@ var activeTableTab = "activeTableTab";
 
 @InterfaceAudience.LimitedPrivate(value="Coprocesssor")
  @InterfaceStability.Stable
-public final class HTableWrapper
+public final class HTableWrapper
 extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true;
 title="class or interface in java.lang">Object
 implements Table
 A wrapper for HTable. Can be used to restrict privilege.
@@ -268,6 +268,18 @@ implements 
 
 boolean
+checkAndDelete(byte[]row,
+  byte[]family,
+  byte[]qualifier,
+  CompareOperatorop,
+  byte[]value,
+  Deletedelete)
+Atomically checks if a row/family/qualifier value matches 
the expected
+ value.
+
+
+
+boolean
 checkAndMutate(byte[]row,
   byte[]family,
   byte[]qualifier,
@@ -277,7 +289,18 @@ implements Atomically checks if a row/family/qualifier value matches 
the expected value.
 
 
-
+
+boolean
+checkAndMutate(byte[]row,
+  byte[]family,
+  byte[]qualifier,
+  CompareOperatorop,
+  byte[]value,
+  RowMutationsrm)
+Atomically checks if a row/family/qualifier value matches 
the expected value.
+
+
+
 boolean
 checkAndPut(byte[]row,
byte[]family,
@@ -288,7 +311,7 @@ implements 
 
 
-
+
 boolean
 checkAndPut(byte[]row,
byte[]family,
@@ -300,20 +323,32 @@ implements 
 
 
-
+
+boolean
+checkAndPut(byte[]row,
+   byte[]family,
+   byte[]qualifier,
+   CompareOperatorop,
+   byte[]value,
+   Putput)
+Atomically checks if a row/family/qualifier value matches 
the expected
+ value.
+
+
+
 void
 close()
 Releases any resources held or pending changes in internal 
buffers.
 
 
-
+
 CoprocessorRpcChannel
 coprocessorService(byte[]row)
 Creates and returns a RpcChannel instance 
connected to the
  table region containing the specified row.
 
 
-
+
 T extends 
com.google.protobuf.Service,Rhttp://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true;
 title="class or interface in java.util">Mapbyte[],R
 coprocessorService(http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true;
 title="class or interface in java.lang">ClassTservice,
   byte[]startKey,
@@ -325,7 +360,7 @@ implements Service instance.
 
 
-
+
 T extends 
com.google.protobuf.Service,Rvoid
 coprocessorService(http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true;
 title="class or interface in java.lang">ClassTservice,
   byte[]startKey,
@@ -338,32 +373,32 @@ implements Service instance.
 
 
-
+
 static Table
 createWrapper(http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true;
 title="class or interface in java.util">ListTableopenTables,
  TableNametableName,
  CoprocessorHost.Environmentenv,
  http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ExecutorService.html?is-external=true;
 title="class or interface in 
java.util.concurrent">ExecutorServicepool)
 
-
+
 void
 delete(Deletedelete)
 Deletes the specified cells/row.
 
 
-
+
 void
 delete(http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true;
 title="class or interface in java.util">ListDeletedeletes)
 Deletes the specified cells/rows in bulk.
 
 
-
+
 boolean
 

[42/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html
--
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html 
b/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html
index 97df5d5..4f8ff6b 100644
--- 
a/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html
+++ 
b/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html
@@ -32,198 +32,203 @@
 024
 025import org.apache.hadoop.hbase.Cell;
 026import 
org.apache.hadoop.hbase.CellComparator;
-027import 
org.apache.hadoop.hbase.classification.InterfaceAudience;
-028import 
org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
-029import 
org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;
-030import 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos;
-031import 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.CompareType;
-032import 
org.apache.hadoop.hbase.util.Bytes;
-033
-034import 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
-035/**
-036 * This is a generic filter to be used to 
filter by comparison.  It takes an
-037 * operator (equal, greater, not equal, 
etc) and a byte [] comparator.
-038 * p
-039 * To filter by row key, use {@link 
RowFilter}.
-040 * p
-041 * To filter by column qualifier, use 
{@link QualifierFilter}.
-042 * p
-043 * To filter by value, use {@link 
SingleColumnValueFilter}.
-044 * p
-045 * These filters can be wrapped with 
{@link SkipFilter} and {@link WhileMatchFilter}
-046 * to add more control.
-047 * p
-048 * Multiple filters can be combined using 
{@link FilterList}.
-049 */
-050@InterfaceAudience.Public
-051public abstract class CompareFilter 
extends FilterBase {
-052
-053  /** Comparison operators. */
-054  @InterfaceAudience.Public
-055  public enum CompareOp {
-056/** less than */
-057LESS,
-058/** less than or equal to */
-059LESS_OR_EQUAL,
-060/** equals */
-061EQUAL,
-062/** not equal */
-063NOT_EQUAL,
-064/** greater than or equal to */
-065GREATER_OR_EQUAL,
-066/** greater than */
-067GREATER,
-068/** no operation */
-069NO_OP,
-070  }
-071
-072  protected CompareOp compareOp;
-073  protected ByteArrayComparable 
comparator;
-074
-075  /**
-076   * Constructor.
-077   * @param compareOp the compare op for 
row matching
-078   * @param comparator the comparator for 
row matching
-079   */
-080  public CompareFilter(final CompareOp 
compareOp,
-081  final ByteArrayComparable 
comparator) {
-082this.compareOp = compareOp;
-083this.comparator = comparator;
-084  }
-085
-086  /**
-087   * @return operator
-088   */
-089  public CompareOp getOperator() {
-090return compareOp;
-091  }
-092
-093  /**
-094   * @return the comparator
-095   */
-096  public ByteArrayComparable 
getComparator() {
-097return comparator;
-098  }
-099
-100  @Override
-101  public boolean filterRowKey(Cell cell) 
throws IOException {
-102// Impl in FilterBase might do 
unnecessary copy for Off heap backed Cells.
-103return false;
-104  }
-105
-106  protected boolean compareRow(final 
CompareOp compareOp, final ByteArrayComparable comparator,
-107  final Cell cell) {
-108if (compareOp == CompareOp.NO_OP) {
-109  return true;
-110}
-111int compareResult = 
CellComparator.compareRow(cell, comparator);
-112return compare(compareOp, 
compareResult);
-113  }
-114
-115  protected boolean compareFamily(final 
CompareOp compareOp, final ByteArrayComparable comparator,
-116  final Cell cell) {
-117if (compareOp == CompareOp.NO_OP) {
-118  return true;
-119}
-120int compareResult = 
CellComparator.compareFamily(cell, comparator);
-121return compare(compareOp, 
compareResult);
-122  }
-123
-124  protected boolean 
compareQualifier(final CompareOp compareOp,
-125  final ByteArrayComparable 
comparator, final Cell cell) {
-126if (compareOp == CompareOp.NO_OP) {
-127  return true;
-128}
-129int compareResult = 
CellComparator.compareQualifier(cell, comparator);
-130return compare(compareOp, 
compareResult);
-131  }
-132
-133  protected boolean compareValue(final 
CompareOp compareOp, final ByteArrayComparable comparator,
-134  final Cell cell) {
-135if (compareOp == CompareOp.NO_OP) {
-136  return true;
-137}
-138int compareResult = 
CellComparator.compareValue(cell, comparator);
-139return compare(compareOp, 
compareResult);
-140  }
-141
-142  private boolean compare(final CompareOp 
compareOp, int compareResult) {
-143switch (compareOp) {
-144case LESS:
-145  return compareResult = 0;
-146case LESS_OR_EQUAL:
-147  return compareResult  0;
-148case EQUAL:
-149  return compareResult != 0;
-150case NOT_EQUAL:
-151  return compareResult == 

[12/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.html
--
diff --git 
a/devapidocs/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.html 
b/devapidocs/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.html
index 93cced8..6a01ea0 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.html
@@ -116,7 +116,7 @@ var activeTableTab = "activeTableTab";
 
 @InterfaceAudience.LimitedPrivate(value="Coprocesssor")
  @InterfaceStability.Evolving
-public class RegionCoprocessorHost
+public class RegionCoprocessorHost
 extends CoprocessorHostRegionCoprocessorHost.RegionEnvironment
 Implements the coprocessor environment and runtime support 
for coprocessors
  loaded within a Region.
@@ -211,7 +211,7 @@ extends 
-private static 
org.apache.commons.collections.map.ReferenceMap
+private static 
org.apache.commons.collections4.map.ReferenceMap
 sharedDataMap
 
 
@@ -323,20 +323,20 @@ extends 
 boolean
-postCheckAndDelete(byte[]row,
+postCheckAndDelete(byte[]row,
   byte[]family,
   byte[]qualifier,
-  CompareFilter.CompareOpcompareOp,
+  CompareOperatorop,
   ByteArrayComparablecomparator,
   Deletedelete,
   booleanresult)
 
 
 boolean
-postCheckAndPut(byte[]row,
+postCheckAndPut(byte[]row,
byte[]family,
byte[]qualifier,
-   CompareFilter.CompareOpcompareOp,
+   CompareOperatorop,
ByteArrayComparablecomparator,
Putput,
booleanresult)
@@ -533,37 +533,37 @@ extends 
 http://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">Boolean
-preCheckAndDelete(byte[]row,
+preCheckAndDelete(byte[]row,
  byte[]family,
  byte[]qualifier,
- CompareFilter.CompareOpcompareOp,
+ CompareOperatorop,
  ByteArrayComparablecomparator,
  Deletedelete)
 
 
 http://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">Boolean
-preCheckAndDeleteAfterRowLock(byte[]row,
+preCheckAndDeleteAfterRowLock(byte[]row,
  byte[]family,
  byte[]qualifier,
- CompareFilter.CompareOpcompareOp,
+ CompareOperatorop,
  ByteArrayComparablecomparator,
  Deletedelete)
 
 
 http://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">Boolean
-preCheckAndPut(byte[]row,
+preCheckAndPut(byte[]row,
   byte[]family,
   byte[]qualifier,
-  CompareFilter.CompareOpcompareOp,
+  CompareOperatorop,
   ByteArrayComparablecomparator,
   Putput)
 
 
 http://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">Boolean
-preCheckAndPutAfterRowLock(byte[]row,
+preCheckAndPutAfterRowLock(byte[]row,
   byte[]family,
   byte[]qualifier,
-  CompareFilter.CompareOpcompareOp,
+  CompareOperatorop,
   ByteArrayComparablecomparator,
   Putput)
 
@@ -802,7 +802,7 @@ extends 
 
 LOG
-private static finalorg.apache.commons.logging.Log LOG
+private static finalorg.apache.commons.logging.Log LOG
 
 
 
@@ -811,7 +811,7 @@ extends 
 
 sharedDataMap
-private staticorg.apache.commons.collections.map.ReferenceMap sharedDataMap
+private staticorg.apache.commons.collections4.map.ReferenceMap sharedDataMap
 
 
 
@@ -1571,7 +1571,7 @@ publicvoid
+
 
 
 
@@ -1580,7 +1580,7 @@ publicvoidhttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">BooleanpreCheckAndPut(byte[]row,
   byte[]family,
   byte[]qualifier,
-  CompareFilter.CompareOpcompareOp,
+  CompareOperatorop,
   ByteArrayComparablecomparator,
   Putput)
throws http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true;
 title="class or interface in java.io">IOException
@@ -1589,7 +1589,7 @@ publicvoidReturns:
@@ -1600,7 +1600,7 @@ publicvoid
+
 
 
 
@@ -1609,7 +1609,7 @@ publicvoidhttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 

[04/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/tool/WriteSinkCoprocessor.html
--
diff --git a/devapidocs/org/apache/hadoop/hbase/tool/WriteSinkCoprocessor.html 
b/devapidocs/org/apache/hadoop/hbase/tool/WriteSinkCoprocessor.html
index 295230f..35d237d 100644
--- a/devapidocs/org/apache/hadoop/hbase/tool/WriteSinkCoprocessor.html
+++ b/devapidocs/org/apache/hadoop/hbase/tool/WriteSinkCoprocessor.html
@@ -258,7 +258,7 @@ implements RegionObserver
-postAppend,
 postBatchMutate,
 postBatchMutateIndispensably,
 postBulkLoadHFile,
 postBulkLoadHFile,
 postCheckAndDelete,
 postCheckAndPut,
 postClose, postCloseRegionOperation,
 postCommitStoreFile,
 postCompact,
 postCompact,
 postCompactSelection,
 postCompactSelection,
 postCompleteSplit,
 postDelete,
 postExists,
 postFlush,
 postFlush,
 postGetOp, postIncrement,
 postIncrementColumnValue,
 postInstantiateDeleteTracker,
 postLogReplay,
 postMutationBeforeWAL,
 postOpen,
 postPut,
 postReplayWALs,
 postRollBackSplit,
 postScannerClose,
 postScannerFilterRow,
 postScannerFilterRow,
 postScannerNext,
 postScannerOpen,
 postSplit,
 postStartRegionOperation,
 postStoreFileReaderOpen,
 postWALRestore,
 preAppend,
 preAppendAfterRowLock, preBulkLoadHFile,
 preCheckAndDelete,
 preCheckAndDeleteAfterRowLock,
 preCheckAndPut,
 preCheckAndPutAfterRowLock,
 preClose,
 preCommi
 tStoreFile, preCompact,
 preCompact,
 preCompactScannerOpen, preCompactScannerOpen,
 preCompactScannerOpen,
 preCompactSelection,
 preCompactSelection,
 preDelete,
 preExists,
 preFlush, preFlush,
 preFlushScannerOpen,
 preFlushScannerOpen,
 preFlushScannerOpen,
 preGetOp,
 preIncrement,
 preIncrementAfterRowLock,
 preIncrementColumnValue,
 prePrepareTimeStampForDeleteVersion,
 prePut,
 preReplayWALs,
 preRollBackSplit,
 preScannerClose,
 preScannerNext,
 preScannerOpen,
 preSplit,
 preSplit,
 preSplitAfterPONR,
 preSplitBeforePONR,
 preStoreFileReaderOpen,
 preStoreScannerOpen,
 preStoreScannerOpen,
 preWALRestore
+postAppend,
 postBatchMutate,
 postBatchMutateIndispensably,
 postBulkLoadHFile,
 postBulkLoadHFile,
 postCheckAndDelete,
 postCheckAndPut,
 postClose,
 postCloseRegionOperation,
 postCommitStoreFile,
 postCompact,
 postCompact, postCompactSelection,
 postCompactSelection,
 postCompleteSplit,
 postDelete,
 postExists,
 postFlush,
 postFlush,
 postGetOp,
  postIncrement,
 postIncrementColumnValue,
 postInstantiateDeleteTracker,
 postLogReplay,
 postMutationBeforeWAL,
 postOpen,
 postPut,
 postReplayWALs,
 postRollBackSplit,
 postScannerClose,
 postScannerFilterRow,
 postScannerFilterRow,
 postScannerNext,
 postScannerOpen,
 postSplit,
 postStartRegionOperation,
 postStoreFileReaderOpen,
 postWALRestore,
 preAppend,
 preAppendAfterRowLock
 , preBulkLoadHFile,
 preCheckAndDelete,
 preCheckAndDeleteAfterRowLock,
 preCheckAndPut,
 preCheckAndPutAfterRowLock,
 preClose,
 preCommitStoreFile,
 preCompact,
 preCompact,
 preCompactScannerOpen,
 preCompactScannerOpen,
 preCompactScannerOpen,
 preCompac
 tSelection, preCompactSelection,
 preDelete,
 preExists,
 preFlush,
 preFlush,
 preFlushScannerOpen,
 preFlushScannerOpen,
 preFlushScannerOpen,
 preGetOp,
 preIncrement,
 preIncrementAfterRowLock,
 preIncrementColumn
 Value, prePrepareTimeStampForDeleteVersion,
 prePut,
 preReplayWALs,
 preRo
 llBackSplit, preScannerClose,
 preScannerNext,
 preScannerOpen,
 preSplit,
 preSplit, preSplitAfterPONR,
 preSplitBeforePONR,
 preStoreFileReaderOpen,
 preStoreScannerOpen,
 preStoreScannerOpen,
 preWALRestore
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/util/EncryptionTest.html
--
diff --git a/devapidocs/org/apache/hadoop/hbase/util/EncryptionTest.html 
b/devapidocs/org/apache/hadoop/hbase/util/EncryptionTest.html
index 6275510..fe6ed29 100644
--- a/devapidocs/org/apache/hadoop/hbase/util/EncryptionTest.html
+++ b/devapidocs/org/apache/hadoop/hbase/util/EncryptionTest.html
@@ -109,8 +109,8 @@ var activeTableTab = "activeTableTab";
 
 
 
-@InterfaceAudience.Public
-public class EncryptionTest
+@InterfaceAudience.LimitedPrivate(value="Tools")
+public class EncryptionTest
 extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true;
 title="class or interface in java.lang">Object
 
 
@@ -231,7 +231,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 LOG
-private static finalorg.apache.commons.logging.Log LOG
+private static finalorg.apache.commons.logging.Log LOG
 
 
 
@@ -240,7 +240,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 keyProviderResults
-static finalhttp://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true;
 title="class or interface in java.util">Maphttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class 

[15/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/regionserver/RSRpcServices.html
--
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/RSRpcServices.html 
b/devapidocs/org/apache/hadoop/hbase/regionserver/RSRpcServices.html
index 1ef4fa4..6fb4c6b 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/RSRpcServices.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/RSRpcServices.html
@@ -118,7 +118,7 @@ var activeTableTab = "activeTableTab";
 
 
 @InterfaceAudience.Private
-public class RSRpcServices
+public class RSRpcServices
 extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true;
 title="class or interface in java.lang">Object
 implements HBaseRPCErrorHandler, 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.AdminService.BlockingInterface,
 
org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ClientService.BlockingInterface,
 PriorityFunction, ConfigurationObserver
 Implements the regionserver RPC services.
@@ -412,13 +412,13 @@ implements 
 private boolean
-checkAndRowMutate(Regionregion,
+checkAndRowMutate(Regionregion,
  http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true;
 title="class or interface in 
java.util">Listorg.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.Actionactions,
  CellScannercellScanner,
  byte[]row,
  byte[]family,
  byte[]qualifier,
- CompareFilter.CompareOpcompareOp,
+ CompareOperatorop,
  ByteArrayComparablecomparator,
  
org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.RegionActionResult.Builderbuilder,
  ActivePolicyEnforcementspaceQuotaEnforcement)
@@ -894,7 +894,7 @@ implements 
 
 LOG
-protected static finalorg.apache.commons.logging.Log LOG
+protected static finalorg.apache.commons.logging.Log LOG
 
 
 
@@ -903,7 +903,7 @@ implements 
 
 REGION_SERVER_RPC_SCHEDULER_FACTORY_CLASS
-public static finalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String REGION_SERVER_RPC_SCHEDULER_FACTORY_CLASS
+public static finalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String REGION_SERVER_RPC_SCHEDULER_FACTORY_CLASS
 RPC scheduler to use for the region server.
 
 See Also:
@@ -917,7 +917,7 @@ implements 
 
 REGION_SERVER_RPC_MINIMUM_SCAN_TIME_LIMIT_DELTA
-private static finalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String REGION_SERVER_RPC_MINIMUM_SCAN_TIME_LIMIT_DELTA
+private static finalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String REGION_SERVER_RPC_MINIMUM_SCAN_TIME_LIMIT_DELTA
 Minimum allowable time limit delta (in milliseconds) that 
can be enforced during scans. This
  configuration exists to prevent the scenario where a time limit is specified 
to be so
  restrictive that the time limit is reached immediately (before any cells are 
scanned).
@@ -933,7 +933,7 @@ implements 
 
 DEFAULT_REGION_SERVER_RPC_MINIMUM_SCAN_TIME_LIMIT_DELTA
-private static finallong DEFAULT_REGION_SERVER_RPC_MINIMUM_SCAN_TIME_LIMIT_DELTA
+private static finallong DEFAULT_REGION_SERVER_RPC_MINIMUM_SCAN_TIME_LIMIT_DELTA
 Default value of REGION_SERVER_RPC_MINIMUM_SCAN_TIME_LIMIT_DELTA
 
 See Also:
@@ -947,7 +947,7 @@ implements 
 
 BATCH_ROWS_THRESHOLD_NAME
-static finalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String BATCH_ROWS_THRESHOLD_NAME
+static finalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String BATCH_ROWS_THRESHOLD_NAME
 Number of rows in a batch operation above which a warning 
will be logged.
 
 See Also:
@@ -961,7 +961,7 @@ implements 
 
 BATCH_ROWS_THRESHOLD_DEFAULT
-static finalint BATCH_ROWS_THRESHOLD_DEFAULT
+static finalint BATCH_ROWS_THRESHOLD_DEFAULT
 Default value of BATCH_ROWS_THRESHOLD_NAME
 
 See Also:
@@ -975,7 +975,7 @@ implements 
 
 requestCount
-finalhttp://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/LongAdder.html?is-external=true;
 title="class or interface in java.util.concurrent.atomic">LongAdder requestCount
+finalhttp://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/LongAdder.html?is-external=true;
 title="class or interface in java.util.concurrent.atomic">LongAdder requestCount
 
 
 
@@ -984,7 +984,7 @@ implements 
 
 requestRowActionCount
-finalhttp://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/LongAdder.html?is-external=true;
 title="class or 

[09/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/regionserver/package-use.html
--
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/package-use.html 
b/devapidocs/org/apache/hadoop/hbase/regionserver/package-use.html
index a984504..6d2f313 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/package-use.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/package-use.html
@@ -970,207 +970,204 @@ Input/OutputFormats, a table indexing MapReduce job, 
and utility methods.
 
 
 
-CompactSplit.CompactionRunner
-
-
 CompositeImmutableSegment
 The CompositeImmutableSegments is created as a collection 
of ImmutableSegments and supports
  the interface of a single ImmutableSegments.
 
 
-
+
 ConstantSizeRegionSplitPolicy
 A RegionSplitPolicy 
implementation which splits a region
  as soon as any of its store files exceeds a maximum configurable
  size.
 
 
-
+
 CSLMImmutableSegment
 CSLMImmutableSegment is an abstract class that extends the 
API supported by a Segment,
  and ImmutableSegment.
 
 
-
+
 DefaultHeapMemoryTuner.StepDirection
 
-
+
 DefaultStoreFlusher
 Default implementation of StoreFlusher.
 
 
-
+
 FavoredNodesForRegion
 Abstraction that allows different modules in RegionServer 
to update/get
  the favored nodes information for regions.
 
 
-
+
 FlushLargeStoresPolicy
 A FlushPolicy that only 
flushes store larger a given threshold.
 
 
-
+
 FlushPolicy
 A flush policy determines the stores that need to be 
flushed when flushing a region.
 
 
-
+
 FlushRequester
 Request a flush.
 
 
-
+
 FlushRequestListener
 Listener which will get notified regarding flush requests 
of regions.
 
 
-
+
 FlushType
 Reasons we flush.
 
 
-
+
 HeapMemoryManager
 Manages tuning of Heap memory using 
HeapMemoryTuner.
 
 
-
+
 HeapMemoryManager.HeapMemoryTuneObserver
 Every class that wants to observe heap memory tune actions 
must implement this interface.
 
 
-
+
 HeapMemoryManager.HeapMemoryTunerChore
 
-
+
 HeapMemoryManager.TunerContext
 POJO to pass all the relevant information required to do 
the heap memory tuning.
 
 
-
+
 HeapMemoryManager.TunerResult
 POJO which holds the result of memory tuning done by 
HeapMemoryTuner implementation.
 
 
-
+
 HeapMemoryTuner
 Makes the decision regarding proper sizing of the heap 
memory.
 
 
-
+
 HMobStore
 The store implementation to save MOBs (medium objects), it 
extends the HStore.
 
 
-
+
 HRegion
 
-
+
 HRegion.BatchOperation
 Struct-like class that tracks the progress of a batch 
operation,
  accumulating status codes and tracking the index at which processing
  is proceeding.
 
 
-
+
 HRegion.ObservedExceptionsInBatch
 A class that tracks exceptions that have been observed in 
one batch.
 
 
-
+
 HRegion.PrepareFlushResult
 A result object from prepare flush cache stage
 
 
-
+
 HRegion.RegionScannerImpl
 RegionScannerImpl is used to combine scanners from multiple 
Stores (aka column families).
 
 
-
+
 HRegion.RowLockContext
 
-
+
 HRegion.RowLockImpl
 Class used to represent a lock on a row.
 
 
-
+
 HRegion.WriteState
 
-
+
 HRegionFileSystem
 View to an on-disk Region.
 
 
-
+
 HRegionServer
 HRegionServer makes a set of HRegions available to 
clients.
 
 
-
+
 HRegionServer.MovedRegionInfo
 
-
+
 HRegionServer.MovedRegionsCleaner
 Creates a Chore thread to clean the moved region 
cache.
 
 
-
+
 HStore
 A Store holds a column family in a Region.
 
 
-
+
 ImmutableSegment
 ImmutableSegment is an abstract class that extends the API 
supported by a Segment,
  and is not needed for a MutableSegment.
 
 
-
+
 IncreasingToUpperBoundRegionSplitPolicy
 Split size is the number of regions that are on this server 
that all are
  of the same table, cubed, times 2x the region flush size OR the maximum
  region split size, whichever is smaller.
 
 
-
+
 InternalScanner
 Internal scanners differ from client-side scanners in that 
they operate on
  HStoreKeys and byte[] instead of RowResults.
 
 
-
+
 KeyValueHeap
 Implements a heap merge across any number of 
KeyValueScanners.
 
 
-
+
 KeyValueHeap.KVScannerComparator
 
-
+
 KeyValueScanner
 Scanner that returns the next KeyValue.
 
 
-
+
 LastSequenceId
 Last flushed sequence Ids for the regions and their stores 
on region server
 
 
-
+
 LeaseException
 Reports a problem with a lease
 
 
-
+
 LeaseListener
 LeaseListener is an interface meant to be implemented by 
users of the Leases
  class.
 
 
-
+
 Leases
 Leases
 
@@ -1178,39 +1175,39 @@ Input/OutputFormats, a table indexing MapReduce job, 
and utility methods.
  clients that occasionally send heartbeats.
 
 
-
+
 Leases.Lease
 This class tracks a single Lease.
 
 
-
+
 Leases.LeaseStillHeldException
 Thrown if we are asked to create a lease but lease on 
passed name already
  exists.
 
 
-
+
 LogRoller
 Runs periodically to determine if the WAL should be 
rolled.
 
 
-
+
 MemStore
 The MemStore holds in-memory modifications to 

[38/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/deprecated-list.html
--
diff --git a/devapidocs/deprecated-list.html b/devapidocs/deprecated-list.html
index bd6e670..f9c5e11 100644
--- a/devapidocs/deprecated-list.html
+++ b/devapidocs/deprecated-list.html
@@ -434,137 +434,155 @@
 
 
 
+org.apache.hadoop.hbase.client.Table.checkAndDelete(byte[],
 byte[], byte[], CompareFilter.CompareOp, byte[], Delete)
+Since 2.0.0. Will be 
removed in 3.0.0. Use
+  Table.checkAndDelete(byte[],
 byte[], byte[], byte[], Delete)
+
+
+
+org.apache.hadoop.hbase.client.Table.checkAndMutate(byte[],
 byte[], byte[], CompareFilter.CompareOp, byte[], RowMutations)
+Since 2.0.0. Will be 
removed in 3.0.0. Use
+ Table.checkAndMutate(byte[],
 byte[], byte[], CompareOperator, byte[], RowMutations)
+
+
+
+org.apache.hadoop.hbase.client.Table.checkAndPut(byte[],
 byte[], byte[], CompareFilter.CompareOp, byte[], Put)
+Since 2.0.0. Will be 
removed in 3.0.0. Use
+  Table.checkAndPut(byte[],
 byte[], byte[], CompareOperator, byte[], Put)}
+
+
+
 org.apache.hadoop.hbase.client.HBaseAdmin.checkHBaseAvailable(Configuration)
 since hbase-2.0.0 because 
throws a ServiceException. We don't want to have
  protobuf as part of our public API. Use HBaseAdmin.available(Configuration)
 
 
-
+
 org.apache.hadoop.hbase.security.visibility.VisibilityClient.clearAuths(Configuration,
 String[], String)
 Use VisibilityClient.clearAuths(Connection,String[],String)
 instead.
 
 
-
+
 org.apache.hadoop.hbase.client.AsyncAdmin.closeRegion(byte[],
 OptionalServerName)
 As of release 2.0.0, this 
will be removed in HBase 3.0.0
  (https://issues.apache.org/jira/browse/HBASE-18231;>HBASE-18231).
  Use AsyncAdmin.unassign(byte[],
 boolean).
 
 
-
+
 org.apache.hadoop.hbase.client.Admin.closeRegion(byte[],
 String)
 As of release 2.0.0, this 
will be removed in HBase 3.0.0
  (https://issues.apache.org/jira/browse/HBASE-18231;>HBASE-18231).
  Use Admin.unassign(byte[],
 boolean).
 
 
-
+
 org.apache.hadoop.hbase.client.HBaseAdmin.closeRegion(byte[],
 String)
 
-
+
 org.apache.hadoop.hbase.client.Admin.closeRegion(ServerName,
 HRegionInfo)
 As of release 2.0.0, this 
will be removed in HBase 3.0.0
  (https://issues.apache.org/jira/browse/HBASE-18231;>HBASE-18231).
  Use Admin.unassign(byte[],
 boolean).
 
 
-
+
 org.apache.hadoop.hbase.client.HBaseAdmin.closeRegion(ServerName,
 HRegionInfo)
 
-
+
 org.apache.hadoop.hbase.client.Admin.closeRegion(String,
 String)
 As of release 2.0.0, this 
will be removed in HBase 3.0.0
  (https://issues.apache.org/jira/browse/HBASE-18231;>HBASE-18231).
  Use Admin.unassign(byte[],
 boolean).
 
 
-
+
 org.apache.hadoop.hbase.client.HBaseAdmin.closeRegion(String,
 String)
 
-
+
 org.apache.hadoop.hbase.client.Admin.closeRegionWithEncodedRegionName(String,
 String)
 As of release 2.0.0, this 
will be removed in HBase 3.0.0
  (https://issues.apache.org/jira/browse/HBASE-18231;>HBASE-18231).
  Use Admin.unassign(byte[],
 boolean).
 
 
-
+
 org.apache.hadoop.hbase.client.HBaseAdmin.closeRegionWithEncodedRegionName(String,
 String)
 
-
+
 org.apache.hadoop.hbase.regionserver.Store.compact(CompactionContext,
 ThroughputController)
 see 
compact(CompactionContext, ThroughputController, User)
 
 
-
+
 org.apache.hadoop.hbase.KeyValue.RawBytesComparator.compareFlatKey(byte[],
 int, int, byte[], int, int)
 Since 0.99.2.
 
 
-
+
 org.apache.hadoop.hbase.mapreduce.CellCreator.create(byte[],
 int, int, byte[], int, int, byte[], int, int, long, byte[], int, int, 
String)
 
-
+
 org.apache.hadoop.hbase.regionserver.RpcSchedulerFactory.create(Configuration,
 PriorityFunction)
 
-
+
 org.apache.hadoop.hbase.regionserver.SimpleRpcSchedulerFactory.create(Configuration,
 PriorityFunction)
 
-
+
 org.apache.hadoop.hbase.regionserver.FifoRpcSchedulerFactory.create(Configuration,
 PriorityFunction)
 
-
+
 org.apache.hadoop.hbase.coprocessor.ObserverContext.createAndPrepare(T,
 ObserverContextT)
 
-
+
 org.apache.hadoop.hbase.CellUtil.createCell(byte[])
 As of release 2.0.0, this 
will be removed in HBase 3.0.0.
  Use CellBuilder 
instead
 
 
-
+
 org.apache.hadoop.hbase.CellUtil.createCell(byte[],
 byte[])
 As of release 2.0.0, this 
will be removed in HBase 3.0.0.
  Use CellBuilder 
instead
 
 
-
+
 org.apache.hadoop.hbase.CellUtil.createCell(byte[],
 byte[], byte[])
 As of release 2.0.0, this 
will be removed in HBase 3.0.0.
  Use CellBuilder 
instead
 
 
-
+
 org.apache.hadoop.hbase.CellUtil.createCell(byte[],
 byte[], byte[], long, byte, byte[])
 As of release 2.0.0, this 
will be removed in HBase 3.0.0.
  Use CellBuilder 
instead
 
 
-
+
 org.apache.hadoop.hbase.CellUtil.createCell(byte[],
 byte[], byte[], long, byte, byte[], byte[], long)
 As of release 2.0.0, this 
will be removed in HBase 

[28/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/client/class-use/RowMutations.html
--
diff --git 
a/devapidocs/org/apache/hadoop/hbase/client/class-use/RowMutations.html 
b/devapidocs/org/apache/hadoop/hbase/client/class-use/RowMutations.html
index bab00a5..9cb7466 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/class-use/RowMutations.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/class-use/RowMutations.html
@@ -143,58 +143,101 @@ service.
   CompareFilter.CompareOpcompareOp,
   byte[]value,
   RowMutationsmutation)
-Atomically checks if a row/family/qualifier value matches 
the expected value.
+Deprecated.
+Since 2.0.0. Will be 
removed in 3.0.0. Use
+ Table.checkAndMutate(byte[],
 byte[], byte[], CompareOperator, byte[], RowMutations)
+
 
 
 
-http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true;
 title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">Boolean
-AsyncTableImpl.checkAndMutate(byte[]row,
+boolean
+HTable.checkAndMutate(byte[]row,
   byte[]family,
   byte[]qualifier,
   CompareFilter.CompareOpcompareOp,
   byte[]value,
-  RowMutationsmutation)
+  RowMutationsrm)
+Atomically checks if a row/family/qualifier value matches 
the expected value.
+
 
 
-http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true;
 title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">Boolean
-RawAsyncTableImpl.checkAndMutate(byte[]row,
+boolean
+HTableWrapper.checkAndMutate(byte[]row,
   byte[]family,
   byte[]qualifier,
   CompareFilter.CompareOpcompareOp,
   byte[]value,
+  RowMutationsrm)
+
+
+boolean
+Table.checkAndMutate(byte[]row,
+  byte[]family,
+  byte[]qualifier,
+  CompareOperatorop,
+  byte[]value,
+  RowMutationsmutation)
+Atomically checks if a row/family/qualifier value matches 
the expected value.
+
+
+
+http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true;
 title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">Boolean
+AsyncTableImpl.checkAndMutate(byte[]row,
+  byte[]family,
+  byte[]qualifier,
+  CompareOperatorop,
+  byte[]value,
   RowMutationsmutation)
 
 
+http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true;
 title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">Boolean
+RawAsyncTableImpl.checkAndMutate(byte[]row,
+  byte[]family,
+  byte[]qualifier,
+  CompareOperatorop,
+  byte[]value,
+  RowMutationsmutation)
+
+
 boolean
-HTable.checkAndMutate(byte[]row,
+HTable.checkAndMutate(byte[]row,
   byte[]family,
   byte[]qualifier,
-  CompareFilter.CompareOpcompareOp,
+  CompareOperatorop,
   byte[]value,
   RowMutationsrm)
 Atomically checks if a row/family/qualifier value matches 
the expected value.
 
 
-
+
 http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true;
 title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">Boolean
-AsyncTableBase.checkAndMutate(byte[]row,
+AsyncTableBase.checkAndMutate(byte[]row,
   byte[]family,
   byte[]qualifier,
-  CompareFilter.CompareOpcompareOp,
+  CompareOperatorcompareOp,
   byte[]value,
   RowMutationsmutation)
 Atomically checks if a row/family/qualifier value matches 
the expected value.
 
 
-
+
 boolean
-HTableWrapper.checkAndMutate(byte[]row,
+HTableWrapper.checkAndMutate(byte[]row,
   byte[]family,
   byte[]qualifier,
-  CompareFilter.CompareOpcompareOp,
+  CompareOperatorop,
   byte[]value,
   RowMutationsrm)
 
+
+private boolean
+HTable.doCheckAndMutate(byte[]row,
+byte[]family,
+byte[]qualifier,
+

[31/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/client/Query.html
--
diff --git a/devapidocs/org/apache/hadoop/hbase/client/Query.html 
b/devapidocs/org/apache/hadoop/hbase/client/Query.html
index a53fe3a..9578b2b 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/Query.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/Query.html
@@ -128,8 +128,9 @@ var activeTableTab = "activeTableTab";
 
 
 @InterfaceAudience.Public
-public abstract class Query
+public abstract class Query
 extends OperationWithAttributes
+Base class for HBase read operations; e.g. Scan and 
Get.
 
 
 
@@ -352,7 +353,7 @@ extends 
 
 ISOLATION_LEVEL
-private static finalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String ISOLATION_LEVEL
+private static finalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String ISOLATION_LEVEL
 
 See Also:
 Constant
 Field Values
@@ -365,7 +366,7 @@ extends 
 
 filter
-protectedFilter filter
+protectedFilter filter
 
 
 
@@ -374,7 +375,7 @@ extends 
 
 targetReplicaId
-protectedint targetReplicaId
+protectedint targetReplicaId
 
 
 
@@ -383,7 +384,7 @@ extends 
 
 consistency
-protectedConsistency consistency
+protectedConsistency consistency
 
 
 
@@ -392,7 +393,7 @@ extends 
 
 colFamTimeRangeMap
-protectedhttp://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true;
 title="class or interface in java.util">Mapbyte[],TimeRange colFamTimeRangeMap
+protectedhttp://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true;
 title="class or interface in java.util">Mapbyte[],TimeRange colFamTimeRangeMap
 
 
 
@@ -401,7 +402,7 @@ extends 
 
 loadColumnFamiliesOnDemand
-protectedhttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">Boolean loadColumnFamiliesOnDemand
+protectedhttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">Boolean loadColumnFamiliesOnDemand
 
 
 
@@ -418,7 +419,7 @@ extends 
 
 Query
-publicQuery()
+publicQuery()
 
 
 
@@ -435,7 +436,7 @@ extends 
 
 getFilter
-publicFiltergetFilter()
+publicFiltergetFilter()
 
 Returns:
 Filter
@@ -448,7 +449,7 @@ extends 
 
 setFilter
-publicQuerysetFilter(Filterfilter)
+publicQuerysetFilter(Filterfilter)
 Apply the specified server-side filter when performing the 
Query. Only
  Filter.filterKeyValue(org.apache.hadoop.hbase.Cell)
 is called AFTER all tests for ttl,
  column match, deletes and column family's max versions have been run.
@@ -466,7 +467,7 @@ extends 
 
 setAuthorizations
-publicQuerysetAuthorizations(Authorizationsauthorizations)
+publicQuerysetAuthorizations(Authorizationsauthorizations)
 Sets the authorizations to be used by this Query
 
 Parameters:
@@ -480,7 +481,7 @@ extends 
 
 getAuthorizations
-publicAuthorizationsgetAuthorizations()
+publicAuthorizationsgetAuthorizations()
  throws DeserializationException
 
 Returns:
@@ -496,7 +497,7 @@ extends 
 
 getACL
-publicbyte[]getACL()
+publicbyte[]getACL()
 
 Returns:
 The serialized ACL for this operation, or null if none
@@ -509,7 +510,7 @@ extends 
 
 setACL
-publicQuerysetACL(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">Stringuser,
+publicQuerysetACL(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">Stringuser,
 Permissionperms)
 
 Parameters:
@@ -524,7 +525,7 @@ extends 
 
 setACL
-publicQuerysetACL(http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true;
 title="class or interface in java.util">Maphttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String,Permissionperms)
+publicQuerysetACL(http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true;
 title="class or interface in java.util">Maphttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String,Permissionperms)
 
 Parameters:
 perms - A map of permissions for a user or users
@@ -537,7 +538,7 @@ extends 
 
 getConsistency
-publicConsistencygetConsistency()
+publicConsistencygetConsistency()
 Returns the consistency level for this operation
 
 Returns:
@@ -551,7 +552,7 @@ extends 
 
 setConsistency
-publicQuerysetConsistency(Consistencyconsistency)
+publicQuerysetConsistency(Consistencyconsistency)
 Sets the consistency level for this operation
 
 Parameters:
@@ -565,7 +566,7 @@ extends 
 
 setReplicaId
-publicQuerysetReplicaId(intId)
+publicQuerysetReplicaId(intId)
 Specify region replica id where Query will fetch 

[24/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html
--
diff --git 
a/devapidocs/org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html 
b/devapidocs/org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html
index 705e2b3..51fddd2 100644
--- a/devapidocs/org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html
+++ b/devapidocs/org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html
@@ -123,9 +123,12 @@ var activeTableTab = "activeTableTab";
 
 
 @InterfaceAudience.Public
-public static enum CompareFilter.CompareOp
+public static enum CompareFilter.CompareOp
 extends http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true;
 title="class or interface in java.lang">EnumCompareFilter.CompareOp
-Comparison operators.
+Comparison operators. For filters only!
+ Use CompareOperator 
otherwise.
+ It (intentionally) has at least the below enums with same names.
+ TODO: Replace with generic CompareOperator
 
 
 
@@ -241,7 +244,7 @@ the order they are declared.
 
 
 LESS
-public static finalCompareFilter.CompareOp LESS
+public static finalCompareFilter.CompareOp LESS
 less than
 
 
@@ -251,7 +254,7 @@ the order they are declared.
 
 
 LESS_OR_EQUAL
-public static finalCompareFilter.CompareOp LESS_OR_EQUAL
+public static finalCompareFilter.CompareOp LESS_OR_EQUAL
 less than or equal to
 
 
@@ -261,7 +264,7 @@ the order they are declared.
 
 
 EQUAL
-public static finalCompareFilter.CompareOp EQUAL
+public static finalCompareFilter.CompareOp EQUAL
 equals
 
 
@@ -271,7 +274,7 @@ the order they are declared.
 
 
 NOT_EQUAL
-public static finalCompareFilter.CompareOp NOT_EQUAL
+public static finalCompareFilter.CompareOp NOT_EQUAL
 not equal
 
 
@@ -281,7 +284,7 @@ the order they are declared.
 
 
 GREATER_OR_EQUAL
-public static finalCompareFilter.CompareOp GREATER_OR_EQUAL
+public static finalCompareFilter.CompareOp GREATER_OR_EQUAL
 greater than or equal to
 
 
@@ -291,7 +294,7 @@ the order they are declared.
 
 
 GREATER
-public static finalCompareFilter.CompareOp GREATER
+public static finalCompareFilter.CompareOp GREATER
 greater than
 
 
@@ -301,7 +304,7 @@ the order they are declared.
 
 
 NO_OP
-public static finalCompareFilter.CompareOp NO_OP
+public static finalCompareFilter.CompareOp NO_OP
 no operation
 
 
@@ -319,7 +322,7 @@ the order they are declared.
 
 
 values
-public staticCompareFilter.CompareOp[]values()
+public staticCompareFilter.CompareOp[]values()
 Returns an array containing the constants of this enum 
type, in
 the order they are declared.  This method may be used to iterate
 over the constants as follows:
@@ -339,7 +342,7 @@ for (CompareFilter.CompareOp c : 
CompareFilter.CompareOp.values())
 
 
 valueOf
-public staticCompareFilter.CompareOpvalueOf(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">Stringname)
+public staticCompareFilter.CompareOpvalueOf(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">Stringname)
 Returns the enum constant of this type with the specified 
name.
 The string must match exactly an identifier used to declare an
 enum constant in this type.  (Extraneous whitespace characters are 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/filter/CompareFilter.html
--
diff --git a/devapidocs/org/apache/hadoop/hbase/filter/CompareFilter.html 
b/devapidocs/org/apache/hadoop/hbase/filter/CompareFilter.html
index d7f8ee3..6c21181 100644
--- a/devapidocs/org/apache/hadoop/hbase/filter/CompareFilter.html
+++ b/devapidocs/org/apache/hadoop/hbase/filter/CompareFilter.html
@@ -124,7 +124,7 @@ var activeTableTab = "activeTableTab";
 
 
 @InterfaceAudience.Public
-public abstract class CompareFilter
+public abstract class CompareFilter
 extends FilterBase
 This is a generic filter to be used to filter by 
comparison.  It takes an
  operator (equal, greater, not equal, etc) and a byte [] comparator.
@@ -340,7 +340,7 @@ extends 
 
 compareOp
-protectedCompareFilter.CompareOp compareOp
+protectedCompareFilter.CompareOp compareOp
 
 
 
@@ -349,7 +349,7 @@ extends 
 
 comparator
-protectedByteArrayComparable comparator
+protectedByteArrayComparable comparator
 
 
 
@@ -366,7 +366,7 @@ extends 
 
 CompareFilter
-publicCompareFilter(CompareFilter.CompareOpcompareOp,
+publicCompareFilter(CompareFilter.CompareOpcompareOp,
  ByteArrayComparablecomparator)
 Constructor.
 
@@ -390,7 +390,7 @@ extends 
 
 getOperator
-publicCompareFilter.CompareOpgetOperator()
+publicCompareFilter.CompareOpgetOperator()
 
 Returns:
 operator
@@ -403,7 +403,7 @@ extends 
 
 getComparator
-publicByteArrayComparablegetComparator()

[33/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/client/HTable.html
--
diff --git a/devapidocs/org/apache/hadoop/hbase/client/HTable.html 
b/devapidocs/org/apache/hadoop/hbase/client/HTable.html
index 1a74501..8f1fde3 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/HTable.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/HTable.html
@@ -18,7 +18,7 @@
 catch(err) {
 }
 //-->
-var methods = 
{"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":9,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":9,"i27":10,"i28":10,"i29":10,"i30":9,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":42,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10,"i49":10,"i50":42,"i51":42,"i52":42,"i53":42,"i54":10,"i55":10,"i56":9};
+var methods = 
{"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":9,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":9,"i33":10,"i34":10,"i35":10,"i36":9,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":42,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10,"i49":10,"i50":10,"i51":10,"i52":10,"i53":10,"i54":10,"i55":10,"i56":42,"i57":42,"i58":42,"i59":42,"i60":10,"i61":10,"i62":9};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static 
Methods"],2:["t2","Instance Methods"],8:["t4","Concrete 
Methods"],32:["t6","Deprecated Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -115,7 +115,7 @@ var activeTableTab = "activeTableTab";
 
 @InterfaceAudience.Private
  @InterfaceStability.Stable
-public class HTable
+public class HTable
 extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true;
 title="class or interface in java.lang">Object
 implements Table
 An implementation of Table. 
Used to communicate with a single HBase table.
@@ -354,6 +354,18 @@ implements 
 
 boolean
+checkAndDelete(byte[]row,
+  byte[]family,
+  byte[]qualifier,
+  CompareOperatorop,
+  byte[]value,
+  Deletedelete)
+Atomically checks if a row/family/qualifier value matches 
the expected
+ value.
+
+
+
+boolean
 checkAndMutate(byte[]row,
   byte[]family,
   byte[]qualifier,
@@ -363,7 +375,18 @@ implements Atomically checks if a row/family/qualifier value matches 
the expected value.
 
 
-
+
+boolean
+checkAndMutate(byte[]row,
+  byte[]family,
+  byte[]qualifier,
+  CompareOperatorop,
+  byte[]value,
+  RowMutationsrm)
+Atomically checks if a row/family/qualifier value matches 
the expected value.
+
+
+
 boolean
 checkAndPut(byte[]row,
byte[]family,
@@ -374,7 +397,7 @@ implements 
 
 
-
+
 boolean
 checkAndPut(byte[]row,
byte[]family,
@@ -386,26 +409,38 @@ implements 
 
 
-
+
+boolean
+checkAndPut(byte[]row,
+   byte[]family,
+   byte[]qualifier,
+   CompareOperatorop,
+   byte[]value,
+   Putput)
+Atomically checks if a row/family/qualifier value matches 
the expected
+ value.
+
+
+
 void
 clearRegionCache()
 Explicitly clears the region cache to fetch the latest 
value from META.
 
 
-
+
 void
 close()
 Releases any resources held or pending changes in internal 
buffers.
 
 
-
+
 CoprocessorRpcChannel
 coprocessorService(byte[]row)
 Creates and returns a RpcChannel instance 
connected to the
  table region containing the specified row.
 
 
-
+
 T extends 
com.google.protobuf.Service,Rhttp://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true;
 title="class or interface in java.util">Mapbyte[],R
 coprocessorService(http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true;
 title="class or interface in java.lang">ClassTservice,
   byte[]startKey,
@@ -417,7 +452,7 @@ implements Service instance.
 
 
-
+
 T extends 
com.google.protobuf.Service,Rvoid
 coprocessorService(http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true;
 title="class or interface in java.lang">ClassTservice,
   byte[]startKey,
@@ -430,19 +465,19 @@ implements Service instance.
 
 
-
+
 void
 delete(Deletedelete)
 Deletes the specified cells/row.
 
 
-
+
 void
 delete(http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true;
 title="class or interface in java.util">ListDeletedeletes)
 Deletes the specified cells/rows in bulk.
 
 
-
+
 static Rvoid
 doBatchWithCallback(http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true;
 title="class or interface in java.util">List? extends 

[05/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
--
diff --git 
a/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html 
b/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
index 66b8b75..78d1305 100644
--- a/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
@@ -136,9 +136,9 @@
 
 java.lang.http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true;
 title="class or interface in java.lang">EnumE (implements java.lang.http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true;
 title="class or interface in java.lang">ComparableT, java.io.http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true;
 title="class or interface in java.io">Serializable)
 
-org.apache.hadoop.hbase.security.access.AccessController.OpType
-org.apache.hadoop.hbase.security.access.Permission.Action
 org.apache.hadoop.hbase.security.access.AccessControlFilter.Strategy
+org.apache.hadoop.hbase.security.access.Permission.Action
+org.apache.hadoop.hbase.security.access.AccessController.OpType
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
--
diff --git a/devapidocs/org/apache/hadoop/hbase/security/package-tree.html 
b/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
index 6a709a8..bec1bbc 100644
--- a/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
@@ -191,9 +191,9 @@
 
 java.lang.http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true;
 title="class or interface in java.lang">EnumE (implements java.lang.http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true;
 title="class or interface in java.lang">ComparableT, java.io.http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true;
 title="class or interface in java.io">Serializable)
 
-org.apache.hadoop.hbase.security.SaslStatus
 org.apache.hadoop.hbase.security.AuthMethod
 org.apache.hadoop.hbase.security.SaslUtil.QualityOfProtection
+org.apache.hadoop.hbase.security.SaslStatus
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/security/visibility/VisibilityController.html
--
diff --git 
a/devapidocs/org/apache/hadoop/hbase/security/visibility/VisibilityController.html
 
b/devapidocs/org/apache/hadoop/hbase/security/visibility/VisibilityController.html
index 9ec389c..3a7a671 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/security/visibility/VisibilityController.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/security/visibility/VisibilityController.html
@@ -579,7 +579,7 @@ implements RegionObserver
-postAppend,
 postBatchMutate,
 postBatchMutateIndispensably,
 postBulkLoadHFile,
 postBulkLoadHFile,
 postCheckAndDelete,
 postCheckAndPut,
 postClose, postCloseRegionOperation,
 postCommitStoreFile,
 postCompact,
 postCompact,
 postCompactSelection,
 postCompactSelection,
 postCompleteSplit,
 postDelete,
 postExists,
 postFlush,
 postFlush,
 postGetOp,
 postIncrement,
 postIncrementColumnValue,
 postPut,
 postReplayWALs,
 postRollBackSplit,
 postScannerFilterRow,
 postScannerNext,
 postSplit, postStartRegionOperation,
 postStoreFileReaderOpen,
 
 postWALRestore, preAppendAfterRowLock,
 preBulkLoadHFile,
 preCheckAndDelete,
 preCheckAndDeleteAfterRowLock,
 preCheckAndPut,
 preCheckAndPutAfterRowLock,
 preClose, preCommitStoreFile,
 preCompact,
 preCompact,
 preCompactScannerOpen,
 preCompactScannerOpen,
 preCompactScannerOpen,
 preCompactSelection,
 preCompactSelection,
 preDelete,
 preExists,
 preFlush,
 preFlush,
 preFlushScannerOpen,
 preFlushScannerOpen,
 preFlushScannerOpen,
 preIncrementAfterRowLock,
 preIncrementColumnValue,
 preOpen,
 prePut,
 preReplayWALs,
 preRollBackSplit,
 preSplit,
 preSplit,
 preSplitAfterPONR,
 preSplitBeforePONR,
 preStoreFileReaderOpen,
 preStoreScannerOpen,
 preStoreScannerOpen,
 preWALRestore
+postAppend,
 postBatchMutate,
 postBatchMutateIndispensably,
 postBulkLoadHFile,
 postBulkLoadHFile,
 postCheckAndDelete,
 postCheckAndPut,
 postClose, postCloseRegionOperation,
 postCommitStoreFile,
 postCompact,
 postCompact,
 postCompactSelection,
 postCompactSelection,
 postCompleteSplit,
 postDelete,
 postExists,
 postFlush,
 postFlush,
 postGetOp, postIncrement,
 postIncrementColumnValue,
 postPut,
 postReplayWALs, postRollBackSplit,
 postScannerFilterRow,
 postScannerNext,
 postSp
 lit, postStartRegionOperation,
 postStoreFileReaderOpen,
 postWALRestore,
 preAppendAfterRowLock,

[20/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/regionserver/CompactSplit.html
--
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/CompactSplit.html 
b/devapidocs/org/apache/hadoop/hbase/regionserver/CompactSplit.html
index 192fc45..5b62a8a 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/CompactSplit.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/CompactSplit.html
@@ -114,7 +114,7 @@ var activeTableTab = "activeTableTab";
 
 
 @InterfaceAudience.Private
-public class CompactSplit
+public class CompactSplit
 extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true;
 title="class or interface in java.lang">Object
 implements CompactionRequestor, PropagatingConfigurationObserver
 Compact region on request and then run split if 
appropriate
@@ -166,40 +166,32 @@ implements compactionThroughputController
 
 
+private static http://docs.oracle.com/javase/8/docs/api/java/util/Comparator.html?is-external=true;
 title="class or interface in java.util">Comparatorhttp://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true;
 title="class or interface in java.lang">Runnable
+COMPARATOR
+
+
 private 
org.apache.hadoop.conf.Configuration
 conf
 
-
+
 static int
 DEFAULT_REGION_SERVER_REGION_SPLIT_LIMIT
 
-
+
 static http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String
 LARGE_COMPACTION_THREADS
 
-
+
 static int
 LARGE_COMPACTION_THREADS_DEFAULT
 
-
+
 private static 
org.apache.commons.logging.Log
 LOG
 
-
-private http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ThreadPoolExecutor.html?is-external=true;
 title="class or interface in 
java.util.concurrent">ThreadPoolExecutor
-longCompactions
-
-
-static http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String
-MERGE_THREADS
-
-
-static int
-MERGE_THREADS_DEFAULT
-
 
 private http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ThreadPoolExecutor.html?is-external=true;
 title="class or interface in 
java.util.concurrent">ThreadPoolExecutor
-mergePool
+longCompactions
 
 
 static http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String
@@ -484,7 +476,7 @@ implements 
 
 LOG
-private static finalorg.apache.commons.logging.Log LOG
+private static finalorg.apache.commons.logging.Log LOG
 
 
 
@@ -493,7 +485,7 @@ implements 
 
 LARGE_COMPACTION_THREADS
-public static finalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String LARGE_COMPACTION_THREADS
+public static finalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String LARGE_COMPACTION_THREADS
 
 See Also:
 Constant
 Field Values
@@ -506,7 +498,7 @@ implements 
 
 LARGE_COMPACTION_THREADS_DEFAULT
-public static finalint LARGE_COMPACTION_THREADS_DEFAULT
+public static finalint LARGE_COMPACTION_THREADS_DEFAULT
 
 See Also:
 Constant
 Field Values
@@ -519,7 +511,7 @@ implements 
 
 SMALL_COMPACTION_THREADS
-public static finalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String SMALL_COMPACTION_THREADS
+public static finalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String SMALL_COMPACTION_THREADS
 
 See Also:
 Constant
 Field Values
@@ -532,7 +524,7 @@ implements 
 
 SMALL_COMPACTION_THREADS_DEFAULT
-public static finalint SMALL_COMPACTION_THREADS_DEFAULT
+public static finalint SMALL_COMPACTION_THREADS_DEFAULT
 
 See Also:
 Constant
 Field Values
@@ -545,7 +537,7 @@ implements 
 
 SPLIT_THREADS
-public static finalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String SPLIT_THREADS
+public static finalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String SPLIT_THREADS
 
 See Also:
 Constant
 Field Values
@@ -558,46 +550,20 @@ implements 
 
 SPLIT_THREADS_DEFAULT
-public static finalint SPLIT_THREADS_DEFAULT
+public static finalint SPLIT_THREADS_DEFAULT
 
 See Also:
 Constant
 Field Values
 
 
 
-
-
-
-
-
-MERGE_THREADS
-public static finalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String MERGE_THREADS
-
-See Also:
-Constant
 Field Values
-
-
-
-
-
-
-
-
-MERGE_THREADS_DEFAULT
-public static finalint MERGE_THREADS_DEFAULT
-
-See Also:
-Constant
 Field Values
-
-
-
 
 
 
 
 
 REGION_SERVER_REGION_SPLIT_LIMIT
-public static 

[14/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/regionserver/Region.BulkLoadListener.html
--
diff --git 
a/devapidocs/org/apache/hadoop/hbase/regionserver/Region.BulkLoadListener.html 
b/devapidocs/org/apache/hadoop/hbase/regionserver/Region.BulkLoadListener.html
index 10c76b7..115e76d 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/regionserver/Region.BulkLoadListener.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/regionserver/Region.BulkLoadListener.html
@@ -109,7 +109,7 @@ var activeTableTab = "activeTableTab";
 
 
 
-public static interface Region.BulkLoadListener
+public static interface Region.BulkLoadListener
 Listener class to enable callers of
  bulkLoadHFile() to perform any necessary
  pre/post processing of a given bulkload call
@@ -174,7 +174,7 @@ var activeTableTab = "activeTableTab";
 
 
 prepareBulkLoad
-http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">StringprepareBulkLoad(byte[]family,
+http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">StringprepareBulkLoad(byte[]family,
http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">StringsrcPath,
booleancopyFile)
 throws http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true;
 title="class or interface in java.io">IOException
@@ -196,7 +196,7 @@ var activeTableTab = "activeTableTab";
 
 
 doneBulkLoad
-voiddoneBulkLoad(byte[]family,
+voiddoneBulkLoad(byte[]family,
   http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">StringsrcPath)
throws http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true;
 title="class or interface in java.io">IOException
 Called after a successful HFile load
@@ -215,7 +215,7 @@ var activeTableTab = "activeTableTab";
 
 
 failedBulkLoad
-voidfailedBulkLoad(byte[]family,
+voidfailedBulkLoad(byte[]family,
 http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">StringsrcPath)
  throws http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true;
 title="class or interface in java.io">IOException
 Called after a failed HFile load

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/regionserver/Region.FlushResult.Result.html
--
diff --git 
a/devapidocs/org/apache/hadoop/hbase/regionserver/Region.FlushResult.Result.html
 
b/devapidocs/org/apache/hadoop/hbase/regionserver/Region.FlushResult.Result.html
index e9f05b0..a597c26 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/regionserver/Region.FlushResult.Result.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/regionserver/Region.FlushResult.Result.html
@@ -122,7 +122,7 @@ var activeTableTab = "activeTableTab";
 
 
 
-public static enum Region.FlushResult.Result
+public static enum Region.FlushResult.Result
 extends http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true;
 title="class or interface in java.lang">EnumRegion.FlushResult.Result
 
 
@@ -216,7 +216,7 @@ the order they are declared.
 
 
 FLUSHED_NO_COMPACTION_NEEDED
-public static finalRegion.FlushResult.Result FLUSHED_NO_COMPACTION_NEEDED
+public static finalRegion.FlushResult.Result FLUSHED_NO_COMPACTION_NEEDED
 
 
 
@@ -225,7 +225,7 @@ the order they are declared.
 
 
 FLUSHED_COMPACTION_NEEDED
-public static finalRegion.FlushResult.Result FLUSHED_COMPACTION_NEEDED
+public static finalRegion.FlushResult.Result FLUSHED_COMPACTION_NEEDED
 
 
 
@@ -234,7 +234,7 @@ the order they are declared.
 
 
 CANNOT_FLUSH_MEMSTORE_EMPTY
-public static finalRegion.FlushResult.Result CANNOT_FLUSH_MEMSTORE_EMPTY
+public static finalRegion.FlushResult.Result CANNOT_FLUSH_MEMSTORE_EMPTY
 
 
 
@@ -243,7 +243,7 @@ the order they are declared.
 
 
 CANNOT_FLUSH
-public static finalRegion.FlushResult.Result CANNOT_FLUSH
+public static finalRegion.FlushResult.Result CANNOT_FLUSH
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/regionserver/Region.FlushResult.html
--
diff --git 
a/devapidocs/org/apache/hadoop/hbase/regionserver/Region.FlushResult.html 
b/devapidocs/org/apache/hadoop/hbase/regionserver/Region.FlushResult.html
index f7508d0..2384cc4 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/Region.FlushResult.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/Region.FlushResult.html
@@ -109,7 +109,7 @@ 

[03/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/src-html/org/apache/hadoop/hbase/CompoundConfiguration.ImmutableConfigMap.html
--
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/CompoundConfiguration.ImmutableConfigMap.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/CompoundConfiguration.ImmutableConfigMap.html
index f14024b..8f9be71 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/CompoundConfiguration.ImmutableConfigMap.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/CompoundConfiguration.ImmutableConfigMap.html
@@ -36,7 +36,7 @@
 028import java.util.List;
 029import java.util.Map;
 030
-031import 
org.apache.commons.collections.iterators.UnmodifiableIterator;
+031import 
org.apache.commons.collections4.iterators.UnmodifiableIterator;
 032import 
org.apache.hadoop.conf.Configuration;
 033import 
org.apache.hadoop.hbase.classification.InterfaceAudience;
 034import 
org.apache.hadoop.hbase.util.Bytes;
@@ -396,7 +396,7 @@
 388  }
 389}
 390
-391return 
UnmodifiableIterator.decorate(ret.entrySet().iterator());
+391return 
UnmodifiableIterator.unmodifiableIterator(ret.entrySet().iterator());
 392  }
 393
 394  @Override
@@ -427,7 +427,7 @@
 419  public void writeXml(OutputStream out) 
throws IOException {
 420throw new 
UnsupportedOperationException("Immutable Configuration");
 421  }
-422};
+422}
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/src-html/org/apache/hadoop/hbase/CompoundConfiguration.html
--
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/CompoundConfiguration.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/CompoundConfiguration.html
index f14024b..8f9be71 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/CompoundConfiguration.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/CompoundConfiguration.html
@@ -36,7 +36,7 @@
 028import java.util.List;
 029import java.util.Map;
 030
-031import 
org.apache.commons.collections.iterators.UnmodifiableIterator;
+031import 
org.apache.commons.collections4.iterators.UnmodifiableIterator;
 032import 
org.apache.hadoop.conf.Configuration;
 033import 
org.apache.hadoop.hbase.classification.InterfaceAudience;
 034import 
org.apache.hadoop.hbase.util.Bytes;
@@ -396,7 +396,7 @@
 388  }
 389}
 390
-391return 
UnmodifiableIterator.decorate(ret.entrySet().iterator());
+391return 
UnmodifiableIterator.unmodifiableIterator(ret.entrySet().iterator());
 392  }
 393
 394  @Override
@@ -427,7 +427,7 @@
 419  public void writeXml(OutputStream out) 
throws IOException {
 420throw new 
UnsupportedOperationException("Immutable Configuration");
 421  }
-422};
+422}
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
--
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
index 755e3e8..ceb9268 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
@@ -16,11 +16,11 @@
 008@InterfaceAudience.Private
 009public class Version {
 010  public static final String version = 
"3.0.0-SNAPSHOT";
-011  public static final String revision = 
"df34300cd3f89c1efdea43b0b2ecb64c317e1a34";
+011  public static final String revision = 
"331910192af158aac33f883ae132fba444dda003";
 012  public static final String user = 
"jenkins";
-013  public static final String date = "Thu 
Sep  7 14:41:49 UTC 2017";
+013  public static final String date = "Fri 
Sep  8 14:41:46 UTC 2017";
 014  public static final String url = 
"git://asf920.gq1.ygridcore.net/home/jenkins/jenkins-slave/workspace/hbase_generate_website/hbase";
-015  public static final String srcChecksum 
= "608387887f97bfd196e0617733c97cc5";
+015  public static final String srcChecksum 
= "924dd88cbe5f897ba5811373373e52fe";
 016}
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableBase.html
--
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableBase.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableBase.html
index ecdbfdb..54568ec 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableBase.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableBase.html
@@ -29,16 +29,16 @@
 021import static 
org.apache.hadoop.hbase.client.ConnectionUtils.allOf;
 022import static 
org.apache.hadoop.hbase.client.ConnectionUtils.toCheckExistenceOnly;
 023
-024import 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
-025
-026import 

[45/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/apidocs/org/apache/hadoop/hbase/rest/client/RemoteHTable.html
--
diff --git a/apidocs/org/apache/hadoop/hbase/rest/client/RemoteHTable.html 
b/apidocs/org/apache/hadoop/hbase/rest/client/RemoteHTable.html
index e8579f5..273b324 100644
--- a/apidocs/org/apache/hadoop/hbase/rest/client/RemoteHTable.html
+++ b/apidocs/org/apache/hadoop/hbase/rest/client/RemoteHTable.html
@@ -18,7 +18,7 @@
 catch(err) {
 }
 //-->
-var methods = 
{"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":42,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":42,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":42,"i48":10};
+var methods = 
{"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":42,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":42,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10,"i49":10,"i50":42,"i51":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance 
Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -262,6 +262,18 @@ implements 
 
 boolean
+checkAndDelete(byte[]row,
+  byte[]family,
+  byte[]qualifier,
+  CompareOperatorcompareOp,
+  byte[]value,
+  Deletedelete)
+Atomically checks if a row/family/qualifier value matches 
the expected
+ value.
+
+
+
+boolean
 checkAndMutate(byte[]row,
   byte[]family,
   byte[]qualifier,
@@ -271,7 +283,18 @@ implements Atomically checks if a row/family/qualifier value matches 
the expected value.
 
 
-
+
+boolean
+checkAndMutate(byte[]row,
+  byte[]family,
+  byte[]qualifier,
+  CompareOperatorcompareOp,
+  byte[]value,
+  RowMutationsrm)
+Atomically checks if a row/family/qualifier value matches 
the expected value.
+
+
+
 boolean
 checkAndPut(byte[]row,
byte[]family,
@@ -282,7 +305,7 @@ implements 
 
 
-
+
 boolean
 checkAndPut(byte[]row,
byte[]family,
@@ -294,20 +317,32 @@ implements 
 
 
-
+
+boolean
+checkAndPut(byte[]row,
+   byte[]family,
+   byte[]qualifier,
+   CompareOperatorcompareOp,
+   byte[]value,
+   Putput)
+Atomically checks if a row/family/qualifier value matches 
the expected
+ value.
+
+
+
 void
 close()
 Releases any resources held or pending changes in internal 
buffers.
 
 
-
+
 CoprocessorRpcChannel
 coprocessorService(byte[]row)
 Creates and returns a RpcChannel instance 
connected to the
  table region containing the specified row.
 
 
-
+
 T extends 
com.google.protobuf.Service,Rhttp://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true;
 title="class or interface in java.util">Mapbyte[],R
 coprocessorService(http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true;
 title="class or interface in java.lang">ClassTservice,
   byte[]startKey,
@@ -319,7 +354,7 @@ implements Service instance.
 
 
-
+
 T extends 
com.google.protobuf.Service,Rvoid
 coprocessorService(http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true;
 title="class or interface in java.lang">ClassTservice,
   byte[]startKey,
@@ -332,131 +367,131 @@ implements Service instance.
 
 
-
+
 void
 delete(Deletedelete)
 Deletes the specified cells/row.
 
 
-
+
 void
 delete(http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true;
 title="class or interface in java.util">ListDeletedeletes)
 Deletes the specified cells/rows in bulk.
 
 
-
+
 boolean
 exists(Getget)
 Test for the existence of columns in the table, as 
specified by the Get.
 
 
-
+
 http://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">Boolean[]
 exists(http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true;
 title="class or interface in java.util">ListGetgets)
 Deprecated.
 
 
-
+
 boolean[]
 existsAll(http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true;
 title="class or interface in java.util">ListGetgets)
 exists(List) is really a list of get() calls.
 
 
-
+
 void
 flushCommits()
 
-
+
 Result
 get(Getget)
 Extracts certain cells from a given row.
 
 
-
+
 Result[]
 

[46/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/apidocs/org/apache/hadoop/hbase/client/class-use/Operation.html
--
diff --git a/apidocs/org/apache/hadoop/hbase/client/class-use/Operation.html 
b/apidocs/org/apache/hadoop/hbase/client/class-use/Operation.html
index 359e750..22907e5 100644
--- a/apidocs/org/apache/hadoop/hbase/client/class-use/Operation.html
+++ b/apidocs/org/apache/hadoop/hbase/client/class-use/Operation.html
@@ -144,7 +144,9 @@
 
 
 class
-Query
+Query
+Base class for HBase read operations; e.g.
+
 
 
 class

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/apidocs/org/apache/hadoop/hbase/client/class-use/OperationWithAttributes.html
--
diff --git 
a/apidocs/org/apache/hadoop/hbase/client/class-use/OperationWithAttributes.html 
b/apidocs/org/apache/hadoop/hbase/client/class-use/OperationWithAttributes.html
index 14d43c1..8946b7c 100644
--- 
a/apidocs/org/apache/hadoop/hbase/client/class-use/OperationWithAttributes.html
+++ 
b/apidocs/org/apache/hadoop/hbase/client/class-use/OperationWithAttributes.html
@@ -140,7 +140,9 @@
 
 
 class
-Query
+Query
+Base class for HBase read operations; e.g.
+
 
 
 class

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/apidocs/org/apache/hadoop/hbase/client/class-use/Put.html
--
diff --git a/apidocs/org/apache/hadoop/hbase/client/class-use/Put.html 
b/apidocs/org/apache/hadoop/hbase/client/class-use/Put.html
index 36e243b..e3a1f18 100644
--- a/apidocs/org/apache/hadoop/hbase/client/class-use/Put.html
+++ b/apidocs/org/apache/hadoop/hbase/client/class-use/Put.html
@@ -311,29 +311,43 @@ Input/OutputFormats, a table indexing MapReduce job, and 
utility methods.
 
 
 
-http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true;
 title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">Boolean
-AsyncTableBase.checkAndPut(byte[]row,
+boolean
+Table.checkAndPut(byte[]row,
byte[]family,
byte[]qualifier,
CompareFilter.CompareOpcompareOp,
byte[]value,
Putput)
-Atomically checks if a row/family/qualifier value matches 
the expected value.
+Deprecated.
+Since 2.0.0. Will be 
removed in 3.0.0. Use
+  Table.checkAndPut(byte[],
 byte[], byte[], CompareOperator, byte[], Put)}
+
 
 
 
+http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true;
 title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">Boolean
+AsyncTableBase.checkAndPut(byte[]row,
+   byte[]family,
+   byte[]qualifier,
+   CompareOperatorcompareOp,
+   byte[]value,
+   Putput)
+Atomically checks if a row/family/qualifier value matches 
the expected value.
+
+
+
 boolean
-Table.checkAndPut(byte[]row,
+Table.checkAndPut(byte[]row,
byte[]family,
byte[]qualifier,
-   CompareFilter.CompareOpcompareOp,
+   CompareOperatorop,
byte[]value,
Putput)
 Atomically checks if a row/family/qualifier value matches 
the expected
  value.
 
 
-
+
 boolean
 HTableMultiplexer.put(byte[]tableName,
Putput)
@@ -342,7 +356,7 @@ Input/OutputFormats, a table indexing MapReduce job, and 
utility methods.
 
 
 
-
+
 boolean
 HTableMultiplexer.put(byte[]tableName,
Putput,
@@ -352,26 +366,26 @@ Input/OutputFormats, a table indexing MapReduce job, and 
utility methods.
 
 
 
-
+
 http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true;
 title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Void.html?is-external=true;
 title="class or interface in java.lang">Void
 AsyncTableBase.put(Putput)
 Puts some data to the table.
 
 
-
+
 void
 Table.put(Putput)
 Puts some data in the table.
 
 
-
+
 boolean
 HTableMultiplexer.put(TableNametableName,
Putput)
 The put request will be buffered by its corresponding 
buffer queue.
 
 
-
+
 boolean
 HTableMultiplexer.put(TableNametableName,
Putput,
@@ -545,6 +559,15 @@ Input/OutputFormats, a table indexing MapReduce job, and 
utility methods.
Putput)
 
 
+boolean
+RemoteHTable.checkAndPut(byte[]row,
+   byte[]family,
+   byte[]qualifier,
+   CompareOperatorcompareOp,
+   byte[]value,
+   Putput)
+
+
 void
 RemoteHTable.put(Putput)
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/apidocs/org/apache/hadoop/hbase/client/class-use/RowMutations.html

[51/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

Published site at .


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

Branch: refs/heads/asf-site
Commit: 985cca067cb3bdf9d590a4b3c0a92c691c0fe773
Parents: 103621a
Author: jenkins 
Authored: Fri Sep 8 15:13:36 2017 +
Committer: jenkins 
Committed: Fri Sep 8 15:13:36 2017 +

--
 acid-semantics.html | 4 +-
 apache_hbase_reference_guide.pdf| 6 +-
 apidocs/allclasses-frame.html   | 2 +-
 apidocs/allclasses-noframe.html | 2 +-
 apidocs/deprecated-list.html|   256 +-
 apidocs/index-all.html  |67 +-
 .../org/apache/hadoop/hbase/ClusterStatus.html  | 4 +-
 .../apache/hadoop/hbase/CompareOperator.html|   429 +
 .../hadoop/hbase/DoNotRetryIOException.html | 4 +-
 .../hadoop/hbase/class-use/CompareOperator.html |   307 +
 .../apache/hadoop/hbase/client/AsyncTable.html  | 2 +-
 .../hadoop/hbase/client/AsyncTableBase.html |24 +-
 .../apache/hadoop/hbase/client/Consistency.html | 4 +-
 .../org/apache/hadoop/hbase/client/Query.html   |51 +-
 .../hadoop/hbase/client/RawAsyncTable.html  | 2 +-
 .../org/apache/hadoop/hbase/client/Table.html   |   325 +-
 .../hbase/client/class-use/Attributes.html  | 4 +-
 .../hadoop/hbase/client/class-use/Delete.html   |37 +-
 .../hbase/client/class-use/Operation.html   | 4 +-
 .../class-use/OperationWithAttributes.html  | 4 +-
 .../hadoop/hbase/client/class-use/Put.html  |45 +-
 .../hbase/client/class-use/RowMutations.html|37 +-
 .../hadoop/hbase/client/package-summary.html| 4 +-
 .../apache/hadoop/hbase/client/package-use.html | 4 +-
 .../hbase/filter/CompareFilter.CompareOp.html   |25 +-
 .../hadoop/hbase/filter/CompareFilter.html  |26 +-
 .../hadoop/hbase/filter/Filter.ReturnCode.html  | 4 +-
 .../class-use/CompareFilter.CompareOp.html  |50 +-
 .../org/apache/hadoop/hbase/package-frame.html  | 1 +
 .../apache/hadoop/hbase/package-summary.html|10 +-
 .../org/apache/hadoop/hbase/package-tree.html   | 1 +
 .../org/apache/hadoop/hbase/package-use.html|83 +-
 .../hadoop/hbase/rest/client/RemoteHTable.html  |   274 +-
 .../org/apache/hadoop/hbase/util/Counter.html   | 4 +-
 .../hadoop/hbase/util/EncryptionTest.html   |   308 -
 .../hbase/util/FileSystemVersionException.html  | 4 +-
 .../hbase/util/class-use/EncryptionTest.html|   125 -
 .../apache/hadoop/hbase/util/package-frame.html | 1 -
 .../hadoop/hbase/util/package-summary.html  |24 +-
 .../apache/hadoop/hbase/util/package-tree.html  | 1 -
 apidocs/overview-tree.html  | 2 +-
 .../apache/hadoop/hbase/CompareOperator.html|   116 +
 .../hadoop/hbase/client/AsyncTableBase.html |32 +-
 .../org/apache/hadoop/hbase/client/Query.html   |   409 +-
 .../org/apache/hadoop/hbase/client/Table.html   |  1298 +-
 .../hbase/filter/CompareFilter.CompareOp.html   |   389 +-
 .../hadoop/hbase/filter/CompareFilter.html  |   389 +-
 .../hadoop/hbase/rest/client/RemoteHTable.html  |   435 +-
 .../hadoop/hbase/util/EncryptionTest.html   |   227 -
 book.html   | 2 +-
 bulk-loads.html | 4 +-
 checkstyle-aggregate.html   | 21624 +
 checkstyle.rss  |48 +-
 coc.html| 4 +-
 cygwin.html | 4 +-
 dependencies.html   | 4 +-
 dependency-convergence.html | 8 +-
 dependency-info.html| 4 +-
 dependency-management.html  |34 +-
 devapidocs/allclasses-frame.html| 1 +
 devapidocs/allclasses-noframe.html  | 1 +
 devapidocs/constant-values.html |39 +-
 devapidocs/deprecated-list.html |   542 +-
 devapidocs/index-all.html   |   171 +-
 .../hadoop/hbase/ClusterStatus.Options.html | 4 +-
 .../apache/hadoop/hbase/CompareOperator.html|   429 +
 .../hadoop/hbase/CompatibilityFactory.html  | 4 +-
 .../hadoop/hbase/backup/BackupObserver.html | 2 +-
 .../hadoop/hbase/backup/package-tree.html   | 2 +-
 .../hadoop/hbase/class-use/CellScanner.html | 4 +-
 .../hadoop/hbase/class-use/CompareOperator.html |   736 +
 .../InterfaceAudience.LimitedPrivate.html   | 6 +-
 .../class-use/InterfaceAudience.Public.html |   

[21/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/package-tree.html
--
diff --git a/devapidocs/org/apache/hadoop/hbase/package-tree.html 
b/devapidocs/org/apache/hadoop/hbase/package-tree.html
index eeff7dd..4f364ef 100644
--- a/devapidocs/org/apache/hadoop/hbase/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/package-tree.html
@@ -435,16 +435,17 @@
 
 java.lang.http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true;
 title="class or interface in java.lang">EnumE (implements java.lang.http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true;
 title="class or interface in java.lang">ComparableT, java.io.http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true;
 title="class or interface in java.io">Serializable)
 
-org.apache.hadoop.hbase.Coprocessor.State
-org.apache.hadoop.hbase.MetaTableAccessor.QueryType
 org.apache.hadoop.hbase.MemoryCompactionPolicy
-org.apache.hadoop.hbase.ProcedureState
 org.apache.hadoop.hbase.CellBuilderType
+org.apache.hadoop.hbase.CompareOperator
+org.apache.hadoop.hbase.MetaTableAccessor.QueryType
 org.apache.hadoop.hbase.KeepDeletedCells
-org.apache.hadoop.hbase.HConstants.OperationStatusCode
-org.apache.hadoop.hbase.KeyValue.Type
+org.apache.hadoop.hbase.Coprocessor.State
 org.apache.hadoop.hbase.HealthChecker.HealthCheckerExitStatus
+org.apache.hadoop.hbase.KeyValue.Type
+org.apache.hadoop.hbase.HConstants.OperationStatusCode
 org.apache.hadoop.hbase.CompatibilitySingletonFactory.SingletonStorage
+org.apache.hadoop.hbase.ProcedureState
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/package-use.html
--
diff --git a/devapidocs/org/apache/hadoop/hbase/package-use.html 
b/devapidocs/org/apache/hadoop/hbase/package-use.html
index aae22f4..2070d12 100644
--- a/devapidocs/org/apache/hadoop/hbase/package-use.html
+++ b/devapidocs/org/apache/hadoop/hbase/package-use.html
@@ -550,112 +550,117 @@ service.
 
 
 
+CompareOperator
+Generic set of comparison operators.
+
+
+
 CompatibilityFactory
 Class that will create many instances of classes provided 
by the hbase-hadoop{1|2}-compat jars.
 
 
-
+
 CompatibilitySingletonFactory.SingletonStorage
 
-
+
 CompoundConfiguration
 Do a shallow merge of multiple KV configuration pools.
 
 
-
+
 CompoundConfiguration.ImmutableConfigMap
 
-
+
 CoordinatedStateManager
 Implementations of this interface will keep and return to 
clients
  implementations of classes providing API to execute
  coordinated operations.
 
 
-
+
 Coprocessor
 Coprocessor interface.
 
 
-
+
 Coprocessor.State
 Lifecycle state of a given coprocessor instance.
 
 
-
+
 CoprocessorEnvironment
 Coprocessor environment state.
 
 
-
+
 DoNotRetryIOException
 Subclass if exception is not meant to be retried: e.g.
 
 
-
+
 ExtendedCell
 Extension to Cell with server side required 
functions.
 
 
-
+
 ExtendedCellBuilder
 For internal purpose.
 
 
-
+
 ExtendedCellBuilderImpl
 
-
+
 HBaseIOException
 All hbase specific IOExceptions should be subclasses of 
HBaseIOException
 
 
-
+
 HColumnDescriptor
 Deprecated.
 
 
-
+
 HConstants.OperationStatusCode
 Status codes used for return values of bulk 
operations.
 
 
-
+
 HDFSBlocksDistribution
 Data structure to describe the distribution of HDFS blocks 
among hosts.
 
 
-
+
 HDFSBlocksDistribution.HostAndWeight
 Stores the hostname and weight for that hostname.
 
 
-
+
 HealthChecker
 A utility for executing an external script that checks the 
health of
  the node.
 
 
-
+
 HealthChecker.HealthCheckerExitStatus
 
-
+
 HealthReport
 The Class HealthReport containing information about health 
of the node.
 
 
-
+
 HRegionInfo
 Information about a region.
 
 
-
+
 HRegionLocation
 Data structure to hold HRegionInfo and the address for the 
hosting
  HRegionServer.
 
 
-
+
 HTableDescriptor
 Deprecated.
 As of release 2.0.0, this 
will be removed in HBase 3.0.0.
@@ -663,158 +668,158 @@ service.
 
 
 
-
+
 KeepDeletedCells
 Ways to keep cells marked for delete around.
 
 
-
+
 KeyValue
 An HBase Key/Value.
 
 
-
+
 KeyValue.KeyOnlyKeyValue
 A simple form of KeyValue that creates a keyvalue with only 
the key part of the byte[]
  Mainly used in places where we need to compare two cells.
 
 
-
+
 KeyValue.KVComparator
 Deprecated.
 : Use CellComparator.
 
 
 
-
+
 KeyValue.SamePrefixComparator
 Avoids redundant comparisons for better performance.
 
 
-
+
 KeyValue.Type
 Key type.
 
 
-
+
 MemoryCompactionPolicy
 Enum describing all possible memory compaction 
policies
 
 
-
+
 MetaTableAccessor.CollectingVisitor
 A MetaTableAccessor.Visitor that 
collects content out of passed Result.
 
 
-
+
 MetaTableAccessor.DefaultVisitorBase
 A Visitor that skips offline regions and split parents
 
 
-
+
 

hbase-site git commit: INFRA-10751 Empty commit

[git-site-role]

Repository: hbase-site
Updated Branches:
  refs/heads/asf-site 985cca067 -> f8a3cc55a


INFRA-10751 Empty commit


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

Branch: refs/heads/asf-site
Commit: f8a3cc55a5dcc667b38ec93e1e856da80960ea29
Parents: 985cca0
Author: jenkins 
Authored: Fri Sep 8 15:14:15 2017 +
Committer: jenkins 
Committed: Fri Sep 8 15:14:15 2017 +

--

--

[41/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/apidocs/src-html/org/apache/hadoop/hbase/rest/client/RemoteHTable.html
--
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/rest/client/RemoteHTable.html 
b/apidocs/src-html/org/apache/hadoop/hbase/rest/client/RemoteHTable.html
index 1067d9a..f8fb8f1 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/rest/client/RemoteHTable.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/rest/client/RemoteHTable.html
@@ -27,61 +27,61 @@
 019
 020package 
org.apache.hadoop.hbase.rest.client;
 021
-022import java.io.IOException;
-023import java.io.InterruptedIOException;
-024import 
java.io.UnsupportedEncodingException;
-025import java.net.URLEncoder;
-026import java.util.ArrayList;
-027import java.util.Collection;
-028import java.util.Iterator;
-029import java.util.List;
-030import java.util.Map;
-031import java.util.Set;
-032import java.util.TreeMap;
-033
-034import org.apache.commons.logging.Log;
-035import 
org.apache.commons.logging.LogFactory;
-036import 
org.apache.hadoop.conf.Configuration;
-037import org.apache.hadoop.hbase.Cell;
-038import 
org.apache.hadoop.hbase.CellUtil;
-039import 
org.apache.hadoop.hbase.HBaseConfiguration;
-040import 
org.apache.hadoop.hbase.HConstants;
-041import 
org.apache.hadoop.hbase.HTableDescriptor;
-042import 
org.apache.hadoop.hbase.KeyValue;
-043import 
org.apache.hadoop.hbase.TableName;
-044import 
org.apache.hadoop.hbase.classification.InterfaceAudience;
-045import 
org.apache.hadoop.hbase.client.Append;
-046import 
org.apache.hadoop.hbase.client.Delete;
-047import 
org.apache.hadoop.hbase.client.Durability;
-048import 
org.apache.hadoop.hbase.client.Get;
-049import 
org.apache.hadoop.hbase.client.Increment;
-050import 
org.apache.hadoop.hbase.client.Put;
-051import 
org.apache.hadoop.hbase.client.Result;
-052import 
org.apache.hadoop.hbase.client.ResultScanner;
-053import 
org.apache.hadoop.hbase.client.Row;
-054import 
org.apache.hadoop.hbase.client.RowMutations;
-055import 
org.apache.hadoop.hbase.client.Scan;
-056import 
org.apache.hadoop.hbase.client.Table;
-057import 
org.apache.hadoop.hbase.client.TableDescriptor;
-058import 
org.apache.hadoop.hbase.client.coprocessor.Batch;
-059import 
org.apache.hadoop.hbase.client.coprocessor.Batch.Callback;
-060import 
org.apache.hadoop.hbase.client.metrics.ScanMetrics;
-061import 
org.apache.hadoop.hbase.filter.CompareFilter.CompareOp;
-062import 
org.apache.hadoop.hbase.io.TimeRange;
-063import 
org.apache.hadoop.hbase.ipc.CoprocessorRpcChannel;
-064import 
org.apache.hadoop.hbase.rest.Constants;
-065import 
org.apache.hadoop.hbase.rest.model.CellModel;
-066import 
org.apache.hadoop.hbase.rest.model.CellSetModel;
-067import 
org.apache.hadoop.hbase.rest.model.RowModel;
-068import 
org.apache.hadoop.hbase.rest.model.ScannerModel;
-069import 
org.apache.hadoop.hbase.rest.model.TableSchemaModel;
-070import 
org.apache.hadoop.hbase.util.Bytes;
-071import 
org.apache.hadoop.util.StringUtils;
-072
-073import com.google.protobuf.Descriptors;
-074import com.google.protobuf.Message;
-075import com.google.protobuf.Service;
-076import 
com.google.protobuf.ServiceException;
+022import com.google.protobuf.Descriptors;
+023import com.google.protobuf.Message;
+024import com.google.protobuf.Service;
+025import 
com.google.protobuf.ServiceException;
+026import org.apache.commons.logging.Log;
+027import 
org.apache.commons.logging.LogFactory;
+028import 
org.apache.hadoop.conf.Configuration;
+029import org.apache.hadoop.hbase.Cell;
+030import 
org.apache.hadoop.hbase.CellUtil;
+031import 
org.apache.hadoop.hbase.CompareOperator;
+032import 
org.apache.hadoop.hbase.HBaseConfiguration;
+033import 
org.apache.hadoop.hbase.HConstants;
+034import 
org.apache.hadoop.hbase.HTableDescriptor;
+035import 
org.apache.hadoop.hbase.KeyValue;
+036import 
org.apache.hadoop.hbase.TableName;
+037import 
org.apache.hadoop.hbase.classification.InterfaceAudience;
+038import 
org.apache.hadoop.hbase.client.Append;
+039import 
org.apache.hadoop.hbase.client.Delete;
+040import 
org.apache.hadoop.hbase.client.Durability;
+041import 
org.apache.hadoop.hbase.client.Get;
+042import 
org.apache.hadoop.hbase.client.Increment;
+043import 
org.apache.hadoop.hbase.client.Put;
+044import 
org.apache.hadoop.hbase.client.Result;
+045import 
org.apache.hadoop.hbase.client.ResultScanner;
+046import 
org.apache.hadoop.hbase.client.Row;
+047import 
org.apache.hadoop.hbase.client.RowMutations;
+048import 
org.apache.hadoop.hbase.client.Scan;
+049import 
org.apache.hadoop.hbase.client.Table;
+050import 
org.apache.hadoop.hbase.client.TableDescriptor;
+051import 
org.apache.hadoop.hbase.client.coprocessor.Batch;
+052import 
org.apache.hadoop.hbase.client.coprocessor.Batch.Callback;
+053import 
org.apache.hadoop.hbase.client.metrics.ScanMetrics;
+054import 
org.apache.hadoop.hbase.filter.CompareFilter.CompareOp;
+055import 

[47/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/apidocs/org/apache/hadoop/hbase/client/Table.html
--
diff --git a/apidocs/org/apache/hadoop/hbase/client/Table.html 
b/apidocs/org/apache/hadoop/hbase/client/Table.html
index ccf491d..d1b58c5 100644
--- a/apidocs/org/apache/hadoop/hbase/client/Table.html
+++ b/apidocs/org/apache/hadoop/hbase/client/Table.html
@@ -18,7 +18,7 @@
 catch(err) {
 }
 //-->
-var methods = 
{"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6,"i9":6,"i10":6,"i11":6,"i12":6,"i13":6,"i14":6,"i15":6,"i16":6,"i17":6,"i18":6,"i19":6,"i20":6,"i21":6,"i22":6,"i23":6,"i24":6,"i25":38,"i26":6,"i27":6,"i28":6,"i29":38,"i30":6,"i31":6,"i32":6,"i33":6,"i34":6,"i35":6,"i36":6,"i37":38,"i38":38,"i39":38,"i40":38};
+var methods = 
{"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":38,"i7":6,"i8":38,"i9":6,"i10":6,"i11":38,"i12":6,"i13":6,"i14":6,"i15":6,"i16":6,"i17":6,"i18":6,"i19":6,"i20":6,"i21":6,"i22":6,"i23":6,"i24":6,"i25":6,"i26":6,"i27":6,"i28":38,"i29":6,"i30":6,"i31":6,"i32":38,"i33":6,"i34":6,"i35":6,"i36":6,"i37":6,"i38":6,"i39":6,"i40":38,"i41":38,"i42":38,"i43":38};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance 
Methods"],4:["t3","Abstract Methods"],32:["t6","Deprecated Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -110,7 +110,7 @@ var activeTableTab = "activeTableTab";
 
 
 @InterfaceAudience.Public
-public interface Table
+public interface Table
 extends http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html?is-external=true;
 title="class or interface in java.io">Closeable
 Used to communicate with a single HBase table.
  Obtain an instance from a Connection 
and call close()
 afterwards.
@@ -208,11 +208,25 @@ extends http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html
   CompareFilter.CompareOpcompareOp,
   byte[]value,
   Deletedelete)
+Deprecated.
+Since 2.0.0. Will be 
removed in 3.0.0. Use
+  checkAndDelete(byte[],
 byte[], byte[], byte[], Delete)
+
+
+
+
+boolean
+checkAndDelete(byte[]row,
+  byte[]family,
+  byte[]qualifier,
+  CompareOperatorop,
+  byte[]value,
+  Deletedelete)
 Atomically checks if a row/family/qualifier value matches 
the expected
  value.
 
 
-
+
 boolean
 checkAndMutate(byte[]row,
   byte[]family,
@@ -220,10 +234,24 @@ extends http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html
   CompareFilter.CompareOpcompareOp,
   byte[]value,
   RowMutationsmutation)
+Deprecated.
+Since 2.0.0. Will be 
removed in 3.0.0. Use
+ checkAndMutate(byte[],
 byte[], byte[], CompareOperator, byte[], RowMutations)
+
+
+
+
+boolean
+checkAndMutate(byte[]row,
+  byte[]family,
+  byte[]qualifier,
+  CompareOperatorop,
+  byte[]value,
+  RowMutationsmutation)
 Atomically checks if a row/family/qualifier value matches 
the expected value.
 
 
-
+
 boolean
 checkAndPut(byte[]row,
byte[]family,
@@ -234,7 +262,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html
  value.
 
 
-
+
 boolean
 checkAndPut(byte[]row,
byte[]family,
@@ -242,24 +270,38 @@ extends http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html
CompareFilter.CompareOpcompareOp,
byte[]value,
Putput)
+Deprecated.
+Since 2.0.0. Will be 
removed in 3.0.0. Use
+  checkAndPut(byte[],
 byte[], byte[], CompareOperator, byte[], Put)}
+
+
+
+
+boolean
+checkAndPut(byte[]row,
+   byte[]family,
+   byte[]qualifier,
+   CompareOperatorop,
+   byte[]value,
+   Putput)
 Atomically checks if a row/family/qualifier value matches 
the expected
  value.
 
 
-
+
 void
 close()
 Releases any resources held or pending changes in internal 
buffers.
 
 
-
+
 CoprocessorRpcChannel
 coprocessorService(byte[]row)
 Creates and returns a RpcChannel instance 
connected to the
  table region containing the specified row.
 
 
-
+
 T extends 
com.google.protobuf.Service,Rhttp://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true;
 title="class or interface in java.util">Mapbyte[],R
 coprocessorService(http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true;
 title="class or interface in java.lang">ClassTservice,
   byte[]startKey,
@@ -271,7 +313,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html
  with each Service instance.
 
 
-
+
 T extends 
com.google.protobuf.Service,Rvoid
 coprocessorService(http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true;
 title="class or interface in java.lang">ClassTservice,
   byte[]startKey,
@@ -284,73 +326,73 @@ extends http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html
  with each 

[44/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/apidocs/org/apache/hadoop/hbase/util/package-summary.html
--
diff --git a/apidocs/org/apache/hadoop/hbase/util/package-summary.html 
b/apidocs/org/apache/hadoop/hbase/util/package-summary.html
index 0e815a3..7f6263c 100644
--- a/apidocs/org/apache/hadoop/hbase/util/package-summary.html
+++ b/apidocs/org/apache/hadoop/hbase/util/package-summary.html
@@ -176,74 +176,70 @@
 
 
 
-EncryptionTest
-
-
-
 JsonMapper
 
 Utility class for converting objects to JSON
 
 
-
+
 MD5Hash
 
 Utility class for MD5
  MD5 hash produces a 128-bit digest.
 
 
-
+
 OrderedBytes
 
 Utility class that handles ordered byte arrays.
 
 
-
+
 PairT1,T2
 
 A generic class for pairs.
 
 
-
+
 PairOfSameTypeT
 
 A generic, immutable class for pairs of objects both of 
type T.
 
 
-
+
 RegionMover
 
 Tool for loading/unloading regions to/from given 
regionserver This tool can be run from Command
  line directly as a utility.
 
 
-
+
 SimpleByteRange
 
 A read only version of the ByteRange.
 
 
-
+
 SimpleMutableByteRange
 
 A basic mutable ByteRange 
implementation.
 
 
-
+
 SimplePositionedByteRange
 
 Extends the basic SimpleMutableByteRange 
implementation with position
  support and it is a readonly version.
 
 
-
+
 SimplePositionedMutableByteRange
 
 Extends the basic AbstractPositionedByteRange 
implementation with
  position support and it is a mutable version.
 
 
-
+
 VersionInfo
 
 This class finds the Version information for HBase.

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/apidocs/org/apache/hadoop/hbase/util/package-tree.html
--
diff --git a/apidocs/org/apache/hadoop/hbase/util/package-tree.html 
b/apidocs/org/apache/hadoop/hbase/util/package-tree.html
index 426961f..ae73e28 100644
--- a/apidocs/org/apache/hadoop/hbase/util/package-tree.html
+++ b/apidocs/org/apache/hadoop/hbase/util/package-tree.html
@@ -109,7 +109,6 @@
 
 org.apache.hadoop.hbase.util.ConfigurationUtil
 org.apache.hadoop.hbase.util.Counter
-org.apache.hadoop.hbase.util.EncryptionTest
 java.io.http://docs.oracle.com/javase/8/docs/api/java/io/InputStream.html?is-external=true;
 title="class or interface in java.io">InputStream (implements java.io.http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html?is-external=true;
 title="class or interface in java.io">Closeable)
 
 java.io.http://docs.oracle.com/javase/8/docs/api/java/io/FilterInputStream.html?is-external=true;
 title="class or interface in java.io">FilterInputStream

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/apidocs/overview-tree.html
--
diff --git a/apidocs/overview-tree.html b/apidocs/overview-tree.html
index c42554e..33b044c 100644
--- a/apidocs/overview-tree.html
+++ b/apidocs/overview-tree.html
@@ -231,7 +231,6 @@
 org.apache.hadoop.hbase.client.Cursor
 org.apache.hadoop.hbase.io.crypto.DefaultCipherProvider (implements 
org.apache.hadoop.hbase.io.crypto.CipherProvider)
 org.apache.hadoop.hbase.io.crypto.Encryption
-org.apache.hadoop.hbase.util.EncryptionTest
 org.apache.hadoop.hbase.client.locking.EntityLock
 org.apache.hadoop.hbase.client.backoff.ExponentialClientBackoffPolicy (implements 
org.apache.hadoop.hbase.client.backoff.ClientBackoffPolicy)
 org.apache.hadoop.mapred.FileOutputFormatK,V 
(implements org.apache.hadoop.mapred.OutputFormatK,V)
@@ -899,6 +898,7 @@
 org.apache.hadoop.hbase.KeepDeletedCells
 org.apache.hadoop.hbase.ProcedureState
 org.apache.hadoop.hbase.CellBuilderType
+org.apache.hadoop.hbase.CompareOperator
 org.apache.hadoop.hbase.filter.FilterList.Operator
 org.apache.hadoop.hbase.filter.CompareFilter.CompareOp
 org.apache.hadoop.hbase.filter.BitComparator.BitwiseOp

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/apidocs/src-html/org/apache/hadoop/hbase/CompareOperator.html
--
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/CompareOperator.html 
b/apidocs/src-html/org/apache/hadoop/hbase/CompareOperator.html
new file mode 100644
index 000..3833c73
--- /dev/null
+++ b/apidocs/src-html/org/apache/hadoop/hbase/CompareOperator.html
@@ -0,0 +1,116 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+Source code
+
+
+
+
+001/*
+002 * Licensed to the Apache Software 
Foundation (ASF) under one
+003 * or more contributor license 
agreements.  See the NOTICE file
+004 * distributed with this work for 
additional information
+005 * regarding copyright ownership.  The 
ASF licenses this file
+006 * to you under the Apache License, 
Version 2.0 (the
+007 * "License"); you may not use this file 
except in compliance
+008 * with the License.  You may obtain a 
copy of the License at
+009 *
+010 * 
http://www.apache.org/licenses/LICENSE-2.0
+011 *
+012 * Unless required by 

[19/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/regionserver/HRegion.ObservedExceptionsInBatch.html
--
diff --git 
a/devapidocs/org/apache/hadoop/hbase/regionserver/HRegion.ObservedExceptionsInBatch.html
 
b/devapidocs/org/apache/hadoop/hbase/regionserver/HRegion.ObservedExceptionsInBatch.html
index 7201f5e..cbdc32e 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/regionserver/HRegion.ObservedExceptionsInBatch.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/regionserver/HRegion.ObservedExceptionsInBatch.html
@@ -113,7 +113,7 @@ var activeTableTab = "activeTableTab";
 
 
 
-static class HRegion.ObservedExceptionsInBatch
+static class HRegion.ObservedExceptionsInBatch
 extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true;
 title="class or interface in java.lang">Object
 A class that tracks exceptions that have been observed in 
one batch. Not thread safe.
 
@@ -236,7 +236,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 wrongRegion
-privateboolean wrongRegion
+privateboolean wrongRegion
 
 
 
@@ -245,7 +245,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 failedSanityCheck
-privateboolean failedSanityCheck
+privateboolean failedSanityCheck
 
 
 
@@ -254,7 +254,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 wrongFamily
-privateboolean wrongFamily
+privateboolean wrongFamily
 
 
 
@@ -271,7 +271,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 ObservedExceptionsInBatch
-ObservedExceptionsInBatch()
+ObservedExceptionsInBatch()
 
 
 
@@ -288,7 +288,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 hasSeenWrongRegion
-booleanhasSeenWrongRegion()
+booleanhasSeenWrongRegion()
 
 Returns:
 If a WrongRegionException has 
been observed.
@@ -301,7 +301,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 sawWrongRegion
-voidsawWrongRegion()
+voidsawWrongRegion()
 Records that a WrongRegionException has 
been observed.
 
 
@@ -311,7 +311,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 hasSeenFailedSanityCheck
-booleanhasSeenFailedSanityCheck()
+booleanhasSeenFailedSanityCheck()
 
 Returns:
 If a FailedSanityCheckException 
has been observed.
@@ -324,7 +324,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 sawFailedSanityCheck
-voidsawFailedSanityCheck()
+voidsawFailedSanityCheck()
 Records that a FailedSanityCheckException 
has been observed.
 
 
@@ -334,7 +334,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 hasSeenNoSuchFamily
-booleanhasSeenNoSuchFamily()
+booleanhasSeenNoSuchFamily()
 
 Returns:
 If a NoSuchColumnFamilyException
 has been observed.
@@ -347,7 +347,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 sawNoSuchFamily
-voidsawNoSuchFamily()
+voidsawNoSuchFamily()
 Records that a NoSuchColumnFamilyException
 has been observed.
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/regionserver/HRegion.PrepareFlushResult.html
--
diff --git 
a/devapidocs/org/apache/hadoop/hbase/regionserver/HRegion.PrepareFlushResult.html
 
b/devapidocs/org/apache/hadoop/hbase/regionserver/HRegion.PrepareFlushResult.html
index abb16bf..ac4cb87 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/regionserver/HRegion.PrepareFlushResult.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/regionserver/HRegion.PrepareFlushResult.html
@@ -113,7 +113,7 @@ var activeTableTab = "activeTableTab";
 
 
 
-static class HRegion.PrepareFlushResult
+static class HRegion.PrepareFlushResult
 extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true;
 title="class or interface in java.lang">Object
 A result object from prepare flush cache stage
 
@@ -258,7 +258,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 result
-finalRegion.FlushResult result
+finalRegion.FlushResult result
 
 
 
@@ -267,7 +267,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 storeFlushCtxs
-finalhttp://docs.oracle.com/javase/8/docs/api/java/util/TreeMap.html?is-external=true;
 title="class or interface in java.util">TreeMapbyte[],StoreFlushContext storeFlushCtxs
+finalhttp://docs.oracle.com/javase/8/docs/api/java/util/TreeMap.html?is-external=true;
 title="class or interface in java.util">TreeMapbyte[],StoreFlushContext storeFlushCtxs
 
 
 
@@ -276,7 +276,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 committedFiles
-finalhttp://docs.oracle.com/javase/8/docs/api/java/util/TreeMap.html?is-external=true;
 title="class or interface in 

[40/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/checkstyle-aggregate.html
--
diff --git a/checkstyle-aggregate.html b/checkstyle-aggregate.html
index 441eb90..e3c916b 100644
--- a/checkstyle-aggregate.html
+++ b/checkstyle-aggregate.html
@@ -7,7 +7,7 @@
   
 
 
-
+
 
 Apache HBase  Checkstyle Results
 
@@ -286,10 +286,10 @@
 Warnings
 Errors
 
-2038
+2039
 0
 0
-12895
+12943
 
 Files
 
@@ -902,12 +902,12 @@
 org/apache/hadoop/hbase/client/AsyncTableBase.java
 0
 0
-1
+2
 
 org/apache/hadoop/hbase/client/AsyncTableImpl.java
 0
 0
-3
+5
 
 org/apache/hadoop/hbase/client/BatchErrors.java
 0
@@ -1022,7 +1022,7 @@
 org/apache/hadoop/hbase/client/HTable.java
 0
 0
-30
+63
 
 org/apache/hadoop/hbase/client/HTableMultiplexer.java
 0
@@ -1032,7 +1032,7 @@
 org/apache/hadoop/hbase/client/HTableWrapper.java
 0
 0
-7
+8
 
 org/apache/hadoop/hbase/client/ImmutableHColumnDescriptor.java
 0
@@ -1129,5896 +1129,5901 @@
 0
 1
 
+org/apache/hadoop/hbase/client/RawAsyncTableImpl.java
+0
+0
+2
+
 org/apache/hadoop/hbase/client/RawScanResultConsumer.java
 0
 0
 1
-
+
 org/apache/hadoop/hbase/client/RegionAdminServiceCallable.java
 0
 0
 3
-
+
 org/apache/hadoop/hbase/client/RegionCoprocessorRpcChannel.java
 0
 0
 2
-
+
 org/apache/hadoop/hbase/client/RegionCoprocessorServiceExec.java
 0
 0
 2
-
+
 org/apache/hadoop/hbase/client/RegionReplicaUtil.java
 0
 0
 6
-
+
 org/apache/hadoop/hbase/client/RegionServerCallable.java
 0
 0
 2
-
+
 org/apache/hadoop/hbase/client/RegionServerCoprocessorRpcChannelImpl.java
 0
 0
 1
-
+
 org/apache/hadoop/hbase/client/Registry.java
 0
 0
 3
-
+
 org/apache/hadoop/hbase/client/RegistryFactory.java
 0
 0
 1
-
+
 org/apache/hadoop/hbase/client/RequestController.java
 0
 0
 4
-
+
 org/apache/hadoop/hbase/client/RequestControllerFactory.java
 0
 0
 2
-
+
 org/apache/hadoop/hbase/client/Result.java
 0
 0
 11
-
+
 org/apache/hadoop/hbase/client/ResultBoundedCompletionService.java
 0
 0
 6
-
+
 org/apache/hadoop/hbase/client/ResultScanner.java
 0
 0
 2
-
+
 org/apache/hadoop/hbase/client/RetriesExhaustedException.java
 0
 0
 1
-
+
 org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.java
 0
 0
 2
-
+
 org/apache/hadoop/hbase/client/RetryingCallerInterceptor.java
 0
 0
 4
-
+
 org/apache/hadoop/hbase/client/ReversedClientScanner.java
 0
 0
 7
-
+
 org/apache/hadoop/hbase/client/ReversedScannerCallable.java
 0
 0
 10
-
+
 org/apache/hadoop/hbase/client/RowAccess.java
 0
 0
 3
-
+
 org/apache/hadoop/hbase/client/RowMutations.java
 0
 0
 3
-
+
 org/apache/hadoop/hbase/client/RpcRetryingCaller.java
 0
 0
 1
-
+
 org/apache/hadoop/hbase/client/RpcRetryingCallerFactory.java
 0
 0
 1
-
+
 org/apache/hadoop/hbase/client/RpcRetryingCallerImpl.java
 0
 0
 2
-
+
 org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.java
 0
 0
 5
-
+
 org/apache/hadoop/hbase/client/Scan.java
 0
 0
 6
-
+
 org/apache/hadoop/hbase/client/ScannerCallable.java
 0
 0
 6
-
+
 org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
 0
 0
 5
-
+
 org/apache/hadoop/hbase/client/SecureBulkLoadClient.java
 0
 0
 18
-
+
 org/apache/hadoop/hbase/client/ServerStatisticTracker.java
 0
 0
 1
-
+
 org/apache/hadoop/hbase/client/ShortCircuitMasterConnection.java
 0
 0
 2
-
+
 org/apache/hadoop/hbase/client/SimpleRequestController.java
 0
 0
 9
-
+
 org/apache/hadoop/hbase/client/Table.java
 0
 0
 14
-
+
 org/apache/hadoop/hbase/client/TableDescriptor.java
 0
 0
 7
-
+
 org/apache/hadoop/hbase/client/TableDescriptorBuilder.java
 0
 0
 41
-
+
 org/apache/hadoop/hbase/client/TableSnapshotScanner.java
 0
 0
 4
-
+
 org/apache/hadoop/hbase/client/TableState.java
 0
 0
 35
-
+
 org/apache/hadoop/hbase/client/VersionInfoUtil.java
 0
 0
 1
-
+
 org/apache/hadoop/hbase/client/ZooKeeperRegistry.java
 0
 0
 6
-
+
 org/apache/hadoop/hbase/client/backoff/ClientBackoffPolicyFactory.java
 0
 0
 1
-
+
 org/apache/hadoop/hbase/client/backoff/ServerStatistics.java
 0
 0
 3
-
+
 org/apache/hadoop/hbase/client/coprocessor/AggregationClient.java
 0
 0
 93
-
+
 org/apache/hadoop/hbase/client/coprocessor/AggregationHelper.java
 0
 0
 4
-
+
 org/apache/hadoop/hbase/client/coprocessor/AsyncAggregationClient.java
 0
 0
 11
-
+
 org/apache/hadoop/hbase/client/coprocessor/DoubleColumnInterpreter.java
 0
 0
 2
-
+
 org/apache/hadoop/hbase/client/coprocessor/LongColumnInterpreter.java
 0
 0
 5
-
+
 org/apache/hadoop/hbase/client/coprocessor/RowProcessorClient.java
 0
 0
 4
-
+
 org/apache/hadoop/hbase/client/coprocessor/package-info.java
 0
 0
 8
-
+
 org/apache/hadoop/hbase/client/example/BufferedMutatorExample.java
 0
 0
 1
-
+
 org/apache/hadoop/hbase/client/example/ExportEndpointExample.java
 0
 0
 3
-
+
 org/apache/hadoop/hbase/client/example/HttpProxyExample.java
 0
 0
 1
-
+
 org/apache/hadoop/hbase/client/example/MultiThreadedClientExample.java
 0
 0
 2
-
+
 org/apache/hadoop/hbase/client/example/RefreshHFilesClient.java
 0
 

[37/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/index-all.html
--
diff --git a/devapidocs/index-all.html b/devapidocs/index-all.html
index 5c28fda..10debf0 100644
--- a/devapidocs/index-all.html
+++ b/devapidocs/index-all.html
@@ -9866,11 +9866,11 @@
 
 Atomically checks if a row/family/qualifier value equals to 
the expected value.
 
-checkAndDelete(byte[],
 byte[], byte[], CompareFilter.CompareOp, byte[], Delete) - Method 
in interface org.apache.hadoop.hbase.client.AsyncTableBase
+checkAndDelete(byte[],
 byte[], byte[], CompareOperator, byte[], Delete) - Method in 
interface org.apache.hadoop.hbase.client.AsyncTableBase
 
 Atomically checks if a row/family/qualifier value matches 
the expected value.
 
-checkAndDelete(byte[],
 byte[], byte[], CompareFilter.CompareOp, byte[], Delete) - Method 
in class org.apache.hadoop.hbase.client.AsyncTableImpl
+checkAndDelete(byte[],
 byte[], byte[], CompareOperator, byte[], Delete) - Method in class 
org.apache.hadoop.hbase.client.AsyncTableImpl
 
 checkAndDelete(byte[],
 byte[], byte[], byte[], Delete) - Method in class 
org.apache.hadoop.hbase.client.HTable
 
@@ -9882,11 +9882,18 @@
 Atomically checks if a row/family/qualifier value matches 
the expected
  value.
 
+checkAndDelete(byte[],
 byte[], byte[], CompareOperator, byte[], Delete) - Method in class 
org.apache.hadoop.hbase.client.HTable
+
+Atomically checks if a row/family/qualifier value matches 
the expected
+ value.
+
 checkAndDelete(byte[],
 byte[], byte[], byte[], Delete) - Method in class 
org.apache.hadoop.hbase.client.HTableWrapper
 
 checkAndDelete(byte[],
 byte[], byte[], CompareFilter.CompareOp, byte[], Delete) - Method 
in class org.apache.hadoop.hbase.client.HTableWrapper
 
-checkAndDelete(byte[],
 byte[], byte[], CompareFilter.CompareOp, byte[], Delete) - Method 
in class org.apache.hadoop.hbase.client.RawAsyncTableImpl
+checkAndDelete(byte[],
 byte[], byte[], CompareOperator, byte[], Delete) - Method in class 
org.apache.hadoop.hbase.client.HTableWrapper
+
+checkAndDelete(byte[],
 byte[], byte[], CompareOperator, byte[], Delete) - Method in class 
org.apache.hadoop.hbase.client.RawAsyncTableImpl
 
 checkAndDelete(byte[],
 byte[], byte[], byte[], Delete) - Method in interface 
org.apache.hadoop.hbase.client.Table
 
@@ -9895,6 +9902,13 @@
 
 checkAndDelete(byte[],
 byte[], byte[], CompareFilter.CompareOp, byte[], Delete) - Method 
in interface org.apache.hadoop.hbase.client.Table
 
+Deprecated.
+Since 2.0.0. Will be 
removed in 3.0.0. Use
+  Table.checkAndDelete(byte[],
 byte[], byte[], byte[], Delete)
+
+
+checkAndDelete(byte[],
 byte[], byte[], CompareOperator, byte[], Delete) - Method in 
interface org.apache.hadoop.hbase.client.Table
+
 Atomically checks if a row/family/qualifier value matches 
the expected
  value.
 
@@ -9902,6 +9916,8 @@
 
 checkAndDelete(byte[],
 byte[], byte[], CompareFilter.CompareOp, byte[], Delete) - Method 
in class org.apache.hadoop.hbase.rest.client.RemoteHTable
 
+checkAndDelete(byte[],
 byte[], byte[], CompareOperator, byte[], Delete) - Method in class 
org.apache.hadoop.hbase.rest.client.RemoteHTable
+
 checkAndDelete(CellSetModel)
 - Method in class org.apache.hadoop.hbase.rest.RowResource
 
 Validates the input request parameters, parses columns from 
CellSetModel,
@@ -9952,33 +9968,48 @@
 
 Atomically checks if a row/family/qualifier value equals to 
the expected value.
 
-checkAndMutate(byte[],
 byte[], byte[], CompareFilter.CompareOp, byte[], RowMutations) - 
Method in interface org.apache.hadoop.hbase.client.AsyncTableBase
+checkAndMutate(byte[],
 byte[], byte[], CompareOperator, byte[], RowMutations) - Method in 
interface org.apache.hadoop.hbase.client.AsyncTableBase
 
 Atomically checks if a row/family/qualifier value matches 
the expected value.
 
-checkAndMutate(byte[],
 byte[], byte[], CompareFilter.CompareOp, byte[], RowMutations) - 
Method in class org.apache.hadoop.hbase.client.AsyncTableImpl
+checkAndMutate(byte[],
 byte[], byte[], CompareOperator, byte[], RowMutations) - Method in 
class org.apache.hadoop.hbase.client.AsyncTableImpl
 
 checkAndMutate(byte[],
 byte[], byte[], CompareFilter.CompareOp, byte[], RowMutations) - 
Method in class org.apache.hadoop.hbase.client.HTable
 
 Atomically checks if a row/family/qualifier value matches 
the expected value.
 
+checkAndMutate(byte[],
 byte[], byte[], CompareOperator, byte[], RowMutations) - Method in 
class org.apache.hadoop.hbase.client.HTable
+
+Atomically checks if a row/family/qualifier value matches 
the expected value.
+
 checkAndMutate(byte[],
 byte[], byte[], CompareFilter.CompareOp, byte[], RowMutations) - 
Method in class org.apache.hadoop.hbase.client.HTableWrapper
 
-checkAndMutate(byte[],
 byte[], byte[], CompareFilter.CompareOp, byte[], RowMutations) - 
Method in class org.apache.hadoop.hbase.client.RawAsyncTableImpl
+checkAndMutate(byte[],
 byte[], byte[], CompareOperator, byte[], 

[27/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/coprocessor/RegionObserver.html
--
diff --git a/devapidocs/org/apache/hadoop/hbase/coprocessor/RegionObserver.html 
b/devapidocs/org/apache/hadoop/hbase/coprocessor/RegionObserver.html
index 960ba59..77f7651 100644
--- a/devapidocs/org/apache/hadoop/hbase/coprocessor/RegionObserver.html
+++ b/devapidocs/org/apache/hadoop/hbase/coprocessor/RegionObserver.html
@@ -111,7 +111,7 @@ var activeTableTab = "activeTableTab";
 
 @InterfaceAudience.LimitedPrivate(value="Coprocesssor")
  @InterfaceStability.Evolving
-public interface RegionObserver
+public interface RegionObserver
 extends Coprocessor
 Coprocessors implement this interface to observe and 
mediate client actions
  on the region.
@@ -244,11 +244,11 @@ extends 
 
 default boolean
-postCheckAndDelete(ObserverContextRegionCoprocessorEnvironmentc,
+postCheckAndDelete(ObserverContextRegionCoprocessorEnvironmentc,
   byte[]row,
   byte[]family,
   byte[]qualifier,
-  CompareFilter.CompareOpcompareOp,
+  CompareOperatorop,
   ByteArrayComparablecomparator,
   Deletedelete,
   booleanresult)
@@ -257,11 +257,11 @@ extends 
 
 default boolean
-postCheckAndPut(ObserverContextRegionCoprocessorEnvironmentc,
+postCheckAndPut(ObserverContextRegionCoprocessorEnvironmentc,
byte[]row,
byte[]family,
byte[]qualifier,
-   CompareFilter.CompareOpcompareOp,
+   CompareOperatorop,
ByteArrayComparablecomparator,
Putput,
booleanresult)
@@ -580,11 +580,11 @@ extends 
 
 default boolean
-preCheckAndDelete(ObserverContextRegionCoprocessorEnvironmentc,
+preCheckAndDelete(ObserverContextRegionCoprocessorEnvironmentc,
  byte[]row,
  byte[]family,
  byte[]qualifier,
- CompareFilter.CompareOpcompareOp,
+ CompareOperatorop,
  ByteArrayComparablecomparator,
  Deletedelete,
  booleanresult)
@@ -593,11 +593,11 @@ extends 
 
 default boolean
-preCheckAndDeleteAfterRowLock(ObserverContextRegionCoprocessorEnvironmentc,
+preCheckAndDeleteAfterRowLock(ObserverContextRegionCoprocessorEnvironmentc,
  byte[]row,
  byte[]family,
  byte[]qualifier,
- CompareFilter.CompareOpcompareOp,
+ CompareOperatorop,
  ByteArrayComparablecomparator,
  Deletedelete,
  booleanresult)
@@ -606,11 +606,11 @@ extends 
 
 default boolean
-preCheckAndPut(ObserverContextRegionCoprocessorEnvironmentc,
+preCheckAndPut(ObserverContextRegionCoprocessorEnvironmentc,
   byte[]row,
   byte[]family,
   byte[]qualifier,
-  CompareFilter.CompareOpcompareOp,
+  CompareOperatorop,
   ByteArrayComparablecomparator,
   Putput,
   booleanresult)
@@ -619,11 +619,11 @@ extends 
 
 default boolean
-preCheckAndPutAfterRowLock(ObserverContextRegionCoprocessorEnvironmentc,
+preCheckAndPutAfterRowLock(ObserverContextRegionCoprocessorEnvironmentc,
   byte[]row,
   byte[]family,
   byte[]qualifier,
-  CompareFilter.CompareOpcompareOp,
+  CompareOperatorop,
   ByteArrayComparablecomparator,
   Putput,
   booleanresult)
@@ -1011,7 +1011,7 @@ extends 
 
 preOpen
-defaultvoidpreOpen(ObserverContextRegionCoprocessorEnvironmentc)
+defaultvoidpreOpen(ObserverContextRegionCoprocessorEnvironmentc)
   throws http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true;
 title="class or interface in java.io">IOException
 Called before the region is reported as open to the 
master.
 
@@ -1028,7 +1028,7 @@ extends 
 
 postOpen
-defaultvoidpostOpen(ObserverContextRegionCoprocessorEnvironmentc)
+defaultvoidpostOpen(ObserverContextRegionCoprocessorEnvironmentc)
 Called after the region is reported as open to the 
master.
 
 Parameters:
@@ -1042,7 +1042,7 @@ extends 
 
 postLogReplay
-defaultvoidpostLogReplay(ObserverContextRegionCoprocessorEnvironmentc)
+defaultvoidpostLogReplay(ObserverContextRegionCoprocessorEnvironmentc)
 Called after the log replay on the region is over.
 
 Parameters:
@@ -1057,7 +1057,7 @@ extends 
 preFlushScannerOpen
 http://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true;
 title="class or interface in java.lang">@Deprecated

[49/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/apidocs/org/apache/hadoop/hbase/CompareOperator.html
--
diff --git a/apidocs/org/apache/hadoop/hbase/CompareOperator.html 
b/apidocs/org/apache/hadoop/hbase/CompareOperator.html
new file mode 100644
index 000..ca4a781
--- /dev/null
+++ b/apidocs/org/apache/hadoop/hbase/CompareOperator.html
@@ -0,0 +1,429 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+
+
+
+CompareOperator (Apache HBase 3.0.0-SNAPSHOT API)
+
+
+
+
+
+var methods = {"i0":9,"i1":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static 
Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+Skip navigation links
+
+
+
+
+Overview
+Package
+Class
+Use
+Tree
+Deprecated
+Index
+Help
+
+
+
+
+PrevClass
+NextClass
+
+
+Frames
+NoFrames
+
+
+AllClasses
+
+
+
+
+
+
+
+Summary:
+Nested|
+Enum Constants|
+Field|
+Method
+
+
+Detail:
+Enum Constants|
+Field|
+Method
+
+
+
+
+
+
+
+
+org.apache.hadoop.hbase
+Enum CompareOperator
+
+
+
+http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true;
 title="class or interface in java.lang">java.lang.Object
+
+
+http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true;
 title="class or interface in java.lang">java.lang.EnumCompareOperator
+
+
+org.apache.hadoop.hbase.CompareOperator
+
+
+
+
+
+
+
+
+
+All Implemented Interfaces:
+http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true;
 title="class or interface in java.io">Serializable, http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true;
 title="class or interface in java.lang">ComparableCompareOperator
+
+
+
+@InterfaceAudience.Public
+public enum CompareOperator
+extends http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true;
 title="class or interface in java.lang">EnumCompareOperator
+Generic set of comparison operators.
+
+Since:
+2.0.0
+
+
+
+
+
+
+
+
+
+
+
+
+Enum Constant Summary
+
+Enum Constants
+
+Enum Constant and Description
+
+
+EQUAL
+equals
+
+
+
+GREATER
+greater than
+
+
+
+GREATER_OR_EQUAL
+greater than or equal to
+
+
+
+LESS
+less than
+
+
+
+LESS_OR_EQUAL
+less than or equal to
+
+
+
+NO_OP
+no operation
+
+
+
+NOT_EQUAL
+not equal
+
+
+
+
+
+
+
+
+
+
+Method Summary
+
+All MethodsStatic MethodsConcrete Methods
+
+Modifier and Type
+Method and Description
+
+
+static CompareOperator
+valueOf(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">Stringname)
+Returns the enum constant of this type with the specified 
name.
+
+
+
+static CompareOperator[]
+values()
+Returns an array containing the constants of this enum 
type, in
+the order they are declared.
+
+
+
+
+
+
+
+Methods inherited from classjava.lang.http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true;
 title="class or interface in java.lang">Enum
+http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true#clone--;
 title="class or interface in java.lang">clone, http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true#compareTo-E-;
 title="class or interface in java.lang">compareTo, http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true#equals-java.lang.Object-;
 title="class or interface in java.lang">equals, http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true#finalize--;
 title="class or interface in java.lang">finalize, http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true#getDeclaringClass--;
 title="class or interface in java.lang">getDeclaringClass, http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true#hashCode--;
 title="class or interface in java.lang">hashCode, http://docs.oracle.com/javase/8/docs/
 api/java/lang/Enum.html?is-external=true#name--" title="class or interface in 
java.lang">name, http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true#ordinal--;
 title="class or interface in java.lang">ordinal, http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true#toString--;
 title="class or interface in java.lang">toString, http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true#valueOf-java.lang.Class-java.lang.String-;
 

[06/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/security/access/AccessController.html
--
diff --git 
a/devapidocs/org/apache/hadoop/hbase/security/access/AccessController.html 
b/devapidocs/org/apache/hadoop/hbase/security/access/AccessController.html
index 8bff3ba..955f7a4 100644
--- a/devapidocs/org/apache/hadoop/hbase/security/access/AccessController.html
+++ b/devapidocs/org/apache/hadoop/hbase/security/access/AccessController.html
@@ -114,7 +114,7 @@ var activeTableTab = "activeTableTab";
 
 
 @InterfaceAudience.LimitedPrivate(value="Configuration")
-public class AccessController
+public class AccessController
 extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true;
 title="class or interface in java.lang">Object
 implements MasterObserver, 
RegionObserver, 
RegionServerObserver, 
org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.AccessControlService.Interface,
 CoprocessorService, EndpointObserver, 
BulkLoadObserver
 Provides basic authorization checks for data access and 
administrative
@@ -787,11 +787,11 @@ implements 
 boolean
-preCheckAndDelete(ObserverContextRegionCoprocessorEnvironmentc,
+preCheckAndDelete(ObserverContextRegionCoprocessorEnvironmentc,
  byte[]row,
  byte[]family,
  byte[]qualifier,
- CompareFilter.CompareOpcompareOp,
+ CompareOperatorop,
  ByteArrayComparablecomparator,
  Deletedelete,
  booleanresult)
@@ -800,11 +800,11 @@ implements 
 boolean
-preCheckAndDeleteAfterRowLock(ObserverContextRegionCoprocessorEnvironmentc,
+preCheckAndDeleteAfterRowLock(ObserverContextRegionCoprocessorEnvironmentc,
  byte[]row,
  byte[]family,
  byte[]qualifier,
- CompareFilter.CompareOpcompareOp,
+ CompareOperatorop,
  ByteArrayComparablecomparator,
  Deletedelete,
  booleanresult)
@@ -813,11 +813,11 @@ implements 
 boolean
-preCheckAndPut(ObserverContextRegionCoprocessorEnvironmentc,
+preCheckAndPut(ObserverContextRegionCoprocessorEnvironmentc,
   byte[]row,
   byte[]family,
   byte[]qualifier,
-  CompareFilter.CompareOpcompareOp,
+  CompareOperatorop,
   ByteArrayComparablecomparator,
   Putput,
   booleanresult)
@@ -826,11 +826,11 @@ implements 
 boolean
-preCheckAndPutAfterRowLock(ObserverContextRegionCoprocessorEnvironmentc,
+preCheckAndPutAfterRowLock(ObserverContextRegionCoprocessorEnvironmentc,
   byte[]row,
   byte[]family,
   byte[]qualifier,
-  CompareFilter.CompareOpcompareOp,
+  CompareOperatoropp,
   ByteArrayComparablecomparator,
   Putput,
   booleanresult)
@@ -1508,7 +1508,7 @@ implements RegionObserver
-postAppend,
 postBatchMutate,
 postBatchMutateIndispensably,
 postBulkLoadHFile,
 postBulkLoadHFile,
 postCheckAndDelete,
 postCheckAndPut,
 postClose, postCloseRegionOperation,
 postCommitStoreFile,
 postCompact,
 postCompact,
 postCompactSelection,
 postCompactSelection,
 postCompleteSplit,
 postExists,
 postFlush,
 postFlush,
 postGetOp,
 postIncrement, postIncrementColumnValue,
 postInstantiateDeleteTracker,
 postReplayWALs,
 postRollBackSplit,
 postScannerFilterRow,
 postScannerNext,
 postSplit,
 postStartRegionOperation,
 postStoreFileReaderOpen,
 postWALRestore,
 preCommitStoreFile,
 preCompact,
 preCompactScannerOpen,
 preCompactScannerOpen, preCompactScannerOpen,
 preCompactSelection,
 preComp
 actSelection, preFlush,
 preFlushScannerOpen,
 preFlushScannerOpen,
 preFlushScannerOpen,
 prePrepareTimeStampForDeleteVersion,
 preReplayWALs,
 preRollBackSplit,
 preSplit,
 preSplit,
 preSplitAfterPONR,
 preSplitBeforePONR,
 preStoreFileReaderOpen,
 preStoreScannerOpen,
 preStoreScannerOpen,
 preWALRestore
+postAppend,
 postBatchMutate,
 postBatchMutateIndispensably,
 postBulkLoadHFile,
 postBulkLoadHFile,
 postCheckAndDelete,
 postCheckAndPut,
 postClose, postCloseRegionOperation,
 postCommitStoreFile,
 postCompact,
 postCompact,
 postCompactSelection,
 postCompactSelection,
 postCompleteSplit,
 postExists,
 postFlush,
 postFlush,
 postGetOp,
 po
 stIncrement, postIncrementColumnValue,
 postInstantiateDeleteTracker,
 postReplayWALs,
 postRollBackSplit,
 postScannerFilterRow,
 postScannerNext,
 postSplit,
 postStartRegionOperation,
 postStoreFileReaderOpen,
 postWALRestore,
 preCommitStoreFile,
 preCompact,
 preCompactScannerOpen,
 preCompac
 tScannerOpen, preCompactScannerOpen,
 

[48/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/apidocs/org/apache/hadoop/hbase/client/Query.html
--
diff --git a/apidocs/org/apache/hadoop/hbase/client/Query.html 
b/apidocs/org/apache/hadoop/hbase/client/Query.html
index 075850e..b9976f4 100644
--- a/apidocs/org/apache/hadoop/hbase/client/Query.html
+++ b/apidocs/org/apache/hadoop/hbase/client/Query.html
@@ -128,8 +128,9 @@ var activeTableTab = "activeTableTab";
 
 
 @InterfaceAudience.Public
-public abstract class Query
+public abstract class Query
 extends OperationWithAttributes
+Base class for HBase read operations; e.g. Scan and 
Get.
 
 
 
@@ -348,7 +349,7 @@ extends 
 
 filter
-protectedFilter filter
+protectedFilter filter
 
 
 
@@ -357,7 +358,7 @@ extends 
 
 targetReplicaId
-protectedint targetReplicaId
+protectedint targetReplicaId
 
 
 
@@ -366,7 +367,7 @@ extends 
 
 consistency
-protectedConsistency consistency
+protectedConsistency consistency
 
 
 
@@ -375,7 +376,7 @@ extends 
 
 colFamTimeRangeMap
-protectedhttp://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true;
 title="class or interface in java.util">Mapbyte[],TimeRange colFamTimeRangeMap
+protectedhttp://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true;
 title="class or interface in java.util">Mapbyte[],TimeRange colFamTimeRangeMap
 
 
 
@@ -384,7 +385,7 @@ extends 
 
 loadColumnFamiliesOnDemand
-protectedhttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">Boolean loadColumnFamiliesOnDemand
+protectedhttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">Boolean loadColumnFamiliesOnDemand
 
 
 
@@ -401,7 +402,7 @@ extends 
 
 Query
-publicQuery()
+publicQuery()
 
 
 
@@ -418,7 +419,7 @@ extends 
 
 getFilter
-publicFiltergetFilter()
+publicFiltergetFilter()
 
 Returns:
 Filter
@@ -431,7 +432,7 @@ extends 
 
 setFilter
-publicQuerysetFilter(Filterfilter)
+publicQuerysetFilter(Filterfilter)
 Apply the specified server-side filter when performing the 
Query. Only
  Filter.filterKeyValue(org.apache.hadoop.hbase.Cell)
 is called AFTER all tests for ttl,
  column match, deletes and column family's max versions have been run.
@@ -449,7 +450,7 @@ extends 
 
 setAuthorizations
-publicQuerysetAuthorizations(org.apache.hadoop.hbase.security.visibility.Authorizationsauthorizations)
+publicQuerysetAuthorizations(org.apache.hadoop.hbase.security.visibility.Authorizationsauthorizations)
 Sets the authorizations to be used by this Query
 
 Parameters:
@@ -463,7 +464,7 @@ extends 
 
 getAuthorizations
-publicorg.apache.hadoop.hbase.security.visibility.AuthorizationsgetAuthorizations()
+publicorg.apache.hadoop.hbase.security.visibility.AuthorizationsgetAuthorizations()
  
throws org.apache.hadoop.hbase.exceptions.DeserializationException
 
 Returns:
@@ -479,7 +480,7 @@ extends 
 
 getACL
-publicbyte[]getACL()
+publicbyte[]getACL()
 
 Returns:
 The serialized ACL for this operation, or null if none
@@ -492,7 +493,7 @@ extends 
 
 setACL
-publicQuerysetACL(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">Stringuser,
+publicQuerysetACL(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">Stringuser,
 
org.apache.hadoop.hbase.security.access.Permissionperms)
 
 Parameters:
@@ -507,7 +508,7 @@ extends 
 
 setACL
-publicQuerysetACL(http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true;
 title="class or interface in java.util">Maphttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in 
java.lang">String,org.apache.hadoop.hbase.security.access.Permissionperms)
+publicQuerysetACL(http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true;
 title="class or interface in java.util">Maphttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in 
java.lang">String,org.apache.hadoop.hbase.security.access.Permissionperms)
 
 Parameters:
 perms - A map of permissions for a user or users
@@ -520,7 +521,7 @@ extends 
 
 getConsistency
-publicConsistencygetConsistency()
+publicConsistencygetConsistency()
 Returns the consistency level for this operation
 
 Returns:
@@ -534,7 +535,7 @@ extends 
 
 setConsistency
-publicQuerysetConsistency(Consistencyconsistency)
+publicQuerysetConsistency(Consistencyconsistency)
 Sets the consistency level for this operation
 
 Parameters:
@@ -548,7 +549,7 @@ extends 
 
 setReplicaId
-publicQuerysetReplicaId(intId)
+publicQuerysetReplicaId(intId)
 Specify region replica id where Query will fetch data from. 
Use this together with
  

[07/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/rest/client/RemoteHTable.html
--
diff --git a/devapidocs/org/apache/hadoop/hbase/rest/client/RemoteHTable.html 
b/devapidocs/org/apache/hadoop/hbase/rest/client/RemoteHTable.html
index e60bd68..a7f1dde 100644
--- a/devapidocs/org/apache/hadoop/hbase/rest/client/RemoteHTable.html
+++ b/devapidocs/org/apache/hadoop/hbase/rest/client/RemoteHTable.html
@@ -18,7 +18,7 @@
 catch(err) {
 }
 //-->
-var methods = 
{"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":42,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":42,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":42,"i49":10,"i50":9};
+var methods = 
{"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":42,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":42,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10,"i49":10,"i50":10,"i51":42,"i52":10,"i53":9};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static 
Methods"],2:["t2","Instance Methods"],8:["t4","Concrete 
Methods"],32:["t6","Deprecated Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -320,6 +320,18 @@ implements 
 
 boolean
+checkAndDelete(byte[]row,
+  byte[]family,
+  byte[]qualifier,
+  CompareOperatorcompareOp,
+  byte[]value,
+  Deletedelete)
+Atomically checks if a row/family/qualifier value matches 
the expected
+ value.
+
+
+
+boolean
 checkAndMutate(byte[]row,
   byte[]family,
   byte[]qualifier,
@@ -329,7 +341,18 @@ implements Atomically checks if a row/family/qualifier value matches 
the expected value.
 
 
-
+
+boolean
+checkAndMutate(byte[]row,
+  byte[]family,
+  byte[]qualifier,
+  CompareOperatorcompareOp,
+  byte[]value,
+  RowMutationsrm)
+Atomically checks if a row/family/qualifier value matches 
the expected value.
+
+
+
 boolean
 checkAndPut(byte[]row,
byte[]family,
@@ -340,7 +363,7 @@ implements 
 
 
-
+
 boolean
 checkAndPut(byte[]row,
byte[]family,
@@ -352,20 +375,32 @@ implements 
 
 
-
+
+boolean
+checkAndPut(byte[]row,
+   byte[]family,
+   byte[]qualifier,
+   CompareOperatorcompareOp,
+   byte[]value,
+   Putput)
+Atomically checks if a row/family/qualifier value matches 
the expected
+ value.
+
+
+
 void
 close()
 Releases any resources held or pending changes in internal 
buffers.
 
 
-
+
 CoprocessorRpcChannel
 coprocessorService(byte[]row)
 Creates and returns a RpcChannel instance 
connected to the
  table region containing the specified row.
 
 
-
+
 T extends 
com.google.protobuf.Service,Rhttp://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true;
 title="class or interface in java.util">Mapbyte[],R
 coprocessorService(http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true;
 title="class or interface in java.lang">ClassTservice,
   byte[]startKey,
@@ -377,7 +412,7 @@ implements Service instance.
 
 
-
+
 T extends 
com.google.protobuf.Service,Rvoid
 coprocessorService(http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true;
 title="class or interface in java.lang">ClassTservice,
   byte[]startKey,
@@ -390,135 +425,135 @@ implements Service instance.
 
 
-
+
 void
 delete(Deletedelete)
 Deletes the specified cells/row.
 
 
-
+
 void
 delete(http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true;
 title="class or interface in java.util">ListDeletedeletes)
 Deletes the specified cells/rows in bulk.
 
 
-
+
 boolean
 exists(Getget)
 Test for the existence of columns in the table, as 
specified by the Get.
 
 
-
+
 http://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">Boolean[]
 exists(http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true;
 title="class or interface in java.util">ListGetgets)
 Deprecated.
 
 
-
+
 boolean[]
 existsAll(http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true;
 title="class or interface in java.util">ListGetgets)
 exists(List) is really a list of get() calls.
 
 
-
+
 void
 flushCommits()
 
-
+
 Result
 get(Getget)
 Extracts certain cells from a given row.
 
 
-
+
 Result[]
 

[30/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/client/Table.html
--
diff --git a/devapidocs/org/apache/hadoop/hbase/client/Table.html 
b/devapidocs/org/apache/hadoop/hbase/client/Table.html
index 7ccdc18..007483b 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/Table.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/Table.html
@@ -18,7 +18,7 @@
 catch(err) {
 }
 //-->
-var methods = 
{"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6,"i9":6,"i10":6,"i11":6,"i12":6,"i13":6,"i14":6,"i15":6,"i16":6,"i17":6,"i18":6,"i19":6,"i20":6,"i21":6,"i22":6,"i23":6,"i24":6,"i25":38,"i26":6,"i27":6,"i28":6,"i29":38,"i30":6,"i31":6,"i32":6,"i33":6,"i34":6,"i35":6,"i36":6,"i37":38,"i38":38,"i39":38,"i40":38};
+var methods = 
{"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":38,"i7":6,"i8":38,"i9":6,"i10":6,"i11":38,"i12":6,"i13":6,"i14":6,"i15":6,"i16":6,"i17":6,"i18":6,"i19":6,"i20":6,"i21":6,"i22":6,"i23":6,"i24":6,"i25":6,"i26":6,"i27":6,"i28":38,"i29":6,"i30":6,"i31":6,"i32":38,"i33":6,"i34":6,"i35":6,"i36":6,"i37":6,"i38":6,"i39":6,"i40":38,"i41":38,"i42":38,"i43":38};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance 
Methods"],4:["t3","Abstract Methods"],32:["t6","Deprecated Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -110,7 +110,7 @@ var activeTableTab = "activeTableTab";
 
 
 @InterfaceAudience.Public
-public interface Table
+public interface Table
 extends http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html?is-external=true;
 title="class or interface in java.io">Closeable
 Used to communicate with a single HBase table.
  Obtain an instance from a Connection 
and call close()
 afterwards.
@@ -208,11 +208,25 @@ extends http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html
   CompareFilter.CompareOpcompareOp,
   byte[]value,
   Deletedelete)
+Deprecated.
+Since 2.0.0. Will be 
removed in 3.0.0. Use
+  checkAndDelete(byte[],
 byte[], byte[], byte[], Delete)
+
+
+
+
+boolean
+checkAndDelete(byte[]row,
+  byte[]family,
+  byte[]qualifier,
+  CompareOperatorop,
+  byte[]value,
+  Deletedelete)
 Atomically checks if a row/family/qualifier value matches 
the expected
  value.
 
 
-
+
 boolean
 checkAndMutate(byte[]row,
   byte[]family,
@@ -220,10 +234,24 @@ extends http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html
   CompareFilter.CompareOpcompareOp,
   byte[]value,
   RowMutationsmutation)
+Deprecated.
+Since 2.0.0. Will be 
removed in 3.0.0. Use
+ checkAndMutate(byte[],
 byte[], byte[], CompareOperator, byte[], RowMutations)
+
+
+
+
+boolean
+checkAndMutate(byte[]row,
+  byte[]family,
+  byte[]qualifier,
+  CompareOperatorop,
+  byte[]value,
+  RowMutationsmutation)
 Atomically checks if a row/family/qualifier value matches 
the expected value.
 
 
-
+
 boolean
 checkAndPut(byte[]row,
byte[]family,
@@ -234,7 +262,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html
  value.
 
 
-
+
 boolean
 checkAndPut(byte[]row,
byte[]family,
@@ -242,24 +270,38 @@ extends http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html
CompareFilter.CompareOpcompareOp,
byte[]value,
Putput)
+Deprecated.
+Since 2.0.0. Will be 
removed in 3.0.0. Use
+  checkAndPut(byte[],
 byte[], byte[], CompareOperator, byte[], Put)}
+
+
+
+
+boolean
+checkAndPut(byte[]row,
+   byte[]family,
+   byte[]qualifier,
+   CompareOperatorop,
+   byte[]value,
+   Putput)
 Atomically checks if a row/family/qualifier value matches 
the expected
  value.
 
 
-
+
 void
 close()
 Releases any resources held or pending changes in internal 
buffers.
 
 
-
+
 CoprocessorRpcChannel
 coprocessorService(byte[]row)
 Creates and returns a RpcChannel instance 
connected to the
  table region containing the specified row.
 
 
-
+
 T extends 
com.google.protobuf.Service,Rhttp://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true;
 title="class or interface in java.util">Mapbyte[],R
 coprocessorService(http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true;
 title="class or interface in java.lang">ClassTservice,
   byte[]startKey,
@@ -271,7 +313,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html
  with each Service instance.
 
 
-
+
 T extends 
com.google.protobuf.Service,Rvoid
 coprocessorService(http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true;
 title="class or interface in java.lang">ClassTservice,
   byte[]startKey,
@@ -284,73 +326,73 @@ extends http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html
 

[17/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/regionserver/HRegion.html
--
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/HRegion.html 
b/devapidocs/org/apache/hadoop/hbase/regionserver/HRegion.html
index aa914b6..6541c46 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/HRegion.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/HRegion.html
@@ -114,7 +114,7 @@ var activeTableTab = "activeTableTab";
 
 
 @InterfaceAudience.Private
-public class HRegion
+public class HRegion
 extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true;
 title="class or interface in java.lang">Object
 implements HeapSize, PropagatingConfigurationObserver, Region
 
@@ -779,10 +779,10 @@ implements 
 
 boolean
-checkAndMutate(byte[]row,
+checkAndMutate(byte[]row,
   byte[]family,
   byte[]qualifier,
-  CompareFilter.CompareOpcompareOp,
+  CompareOperatorop,
   ByteArrayComparablecomparator,
   Mutationmutation,
   booleanwriteToWAL)
@@ -799,10 +799,10 @@ implements 
 
 boolean
-checkAndRowMutate(byte[]row,
+checkAndRowMutate(byte[]row,
  byte[]family,
  byte[]qualifier,
- CompareFilter.CompareOpcompareOp,
+ CompareOperatorop,
  ByteArrayComparablecomparator,
  RowMutationsrm,
  booleanwriteToWAL)
@@ -1047,10 +1047,10 @@ implements 
 
 private boolean
-doCheckAndRowMutate(byte[]row,
+doCheckAndRowMutate(byte[]row,
byte[]family,
byte[]qualifier,
-   CompareFilter.CompareOpcompareOp,
+   CompareOperatorop,
ByteArrayComparablecomparator,
RowMutationsrowMutations,
Mutationmutation,
@@ -1701,7 +1701,7 @@ implements 
 
 private boolean
-matches(CompareFilter.CompareOpcompareOp,
+matches(CompareOperatorop,
intcompareResult)
 
 
@@ -2330,7 +2330,7 @@ implements 
 
 LOG
-private static finalorg.apache.commons.logging.Log LOG
+private static finalorg.apache.commons.logging.Log LOG
 
 
 
@@ -2339,7 +2339,7 @@ implements 
 
 LOAD_CFS_ON_DEMAND_CONFIG_KEY
-public static finalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String LOAD_CFS_ON_DEMAND_CONFIG_KEY
+public static finalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String LOAD_CFS_ON_DEMAND_CONFIG_KEY
 
 See Also:
 Constant
 Field Values
@@ -2352,7 +2352,7 @@ implements 
 
 HREGION_UNASSIGN_FOR_FNFE
-public static finalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String HREGION_UNASSIGN_FOR_FNFE
+public static finalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String HREGION_UNASSIGN_FOR_FNFE
 
 See Also:
 Constant
 Field Values
@@ -2365,7 +2365,7 @@ implements 
 
 DEFAULT_HREGION_UNASSIGN_FOR_FNFE
-public static finalboolean DEFAULT_HREGION_UNASSIGN_FOR_FNFE
+public static finalboolean DEFAULT_HREGION_UNASSIGN_FOR_FNFE
 
 See Also:
 Constant
 Field Values
@@ -2378,7 +2378,7 @@ implements 
 
 HBASE_MAX_CELL_SIZE_KEY
-public static finalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String HBASE_MAX_CELL_SIZE_KEY
+public static finalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String HBASE_MAX_CELL_SIZE_KEY
 
 See Also:
 Constant
 Field Values
@@ -2391,7 +2391,7 @@ implements 
 
 DEFAULT_MAX_CELL_SIZE
-public static finalint DEFAULT_MAX_CELL_SIZE
+public static finalint DEFAULT_MAX_CELL_SIZE
 
 See Also:
 Constant
 Field Values
@@ -2404,7 +2404,7 @@ implements 
 
 DEFAULT_DURABILITY
-private static finalDurability DEFAULT_DURABILITY
+private static finalDurability DEFAULT_DURABILITY
 This is the global default value for durability. All 
tables/mutations not
  defining a durability or using USE_DEFAULT will default to this value.
 
@@ -2415,7 +2415,7 @@ implements 
 
 closed
-finalhttp://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicBoolean.html?is-external=true;
 title="class or interface in java.util.concurrent.atomic">AtomicBoolean closed
+finalhttp://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicBoolean.html?is-external=true;
 title="class or interface in java.util.concurrent.atomic">AtomicBoolean closed
 
 
 
@@ -2424,7 +2424,7 @@ implements 
 
 closing
-finalhttp://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicBoolean.html?is-external=true;
 title="class or 

[08/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/replication/TableBasedReplicationQueuesImpl.html
--
diff --git 
a/devapidocs/org/apache/hadoop/hbase/replication/TableBasedReplicationQueuesImpl.html
 
b/devapidocs/org/apache/hadoop/hbase/replication/TableBasedReplicationQueuesImpl.html
index 388e227..32acc62 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/replication/TableBasedReplicationQueuesImpl.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/replication/TableBasedReplicationQueuesImpl.html
@@ -119,7 +119,7 @@ var activeTableTab = "activeTableTab";
 
 
 @InterfaceAudience.Private
-public class TableBasedReplicationQueuesImpl
+public class TableBasedReplicationQueuesImpl
 extends ReplicationTableBase
 implements ReplicationQueues
 This class provides an implementation of the 
ReplicationQueues interface using an HBase table
@@ -410,7 +410,7 @@ implements 
 
 LOG
-private static finalorg.apache.commons.logging.Log LOG
+private static finalorg.apache.commons.logging.Log LOG
 
 
 
@@ -419,7 +419,7 @@ implements 
 
 INITIAL_OFFSET_BYTES
-private static finalbyte[] INITIAL_OFFSET_BYTES
+private static finalbyte[] INITIAL_OFFSET_BYTES
 
 
 
@@ -428,7 +428,7 @@ implements 
 
 EMPTY_STRING_BYTES
-private static finalbyte[] EMPTY_STRING_BYTES
+private static finalbyte[] EMPTY_STRING_BYTES
 
 
 
@@ -437,7 +437,7 @@ implements 
 
 serverName
-privatehttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String serverName
+privatehttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String serverName
 
 
 
@@ -446,7 +446,7 @@ implements 
 
 serverNameBytes
-privatebyte[] serverNameBytes
+privatebyte[] serverNameBytes
 
 
 
@@ -455,7 +455,7 @@ implements 
 
 replicationState
-privateReplicationStateZKBase replicationState
+privateReplicationStateZKBase replicationState
 
 
 
@@ -472,7 +472,7 @@ implements 
 
 TableBasedReplicationQueuesImpl
-publicTableBasedReplicationQueuesImpl(ReplicationQueuesArgumentsargs)
+publicTableBasedReplicationQueuesImpl(ReplicationQueuesArgumentsargs)
 throws http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true;
 title="class or interface in java.io">IOException
 
 Throws:
@@ -486,7 +486,7 @@ implements 
 
 TableBasedReplicationQueuesImpl
-publicTableBasedReplicationQueuesImpl(org.apache.hadoop.conf.Configurationconf,
+publicTableBasedReplicationQueuesImpl(org.apache.hadoop.conf.Configurationconf,
Abortableabort,
ZooKeeperWatcherzkw)
 throws http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true;
 title="class or interface in java.io">IOException
@@ -510,7 +510,7 @@ implements 
 
 init
-publicvoidinit(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">StringserverName)
+publicvoidinit(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">StringserverName)
   throws ReplicationException
 Description copied from 
interface:ReplicationQueues
 Initialize the region server replication queue 
interface.
@@ -531,7 +531,7 @@ implements 
 
 getListOfReplicators
-publichttp://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true;
 title="class or interface in java.util">Listhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">StringgetListOfReplicators()
+publichttp://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true;
 title="class or interface in java.util">Listhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">StringgetListOfReplicators()
 Description copied from 
class:ReplicationTableBase
 Get a list of all region servers that have outstanding 
replication queues. These servers could
  be alive, dead or from a previous run of the cluster.
@@ -551,7 +551,7 @@ implements 
 
 removeQueue
-publicvoidremoveQueue(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">StringqueueId)
+publicvoidremoveQueue(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">StringqueueId)
 Description copied from 
interface:ReplicationQueues
 Remove a replication queue.
 
@@ -568,7 +568,7 @@ implements 
 
 addLog
-publicvoidaddLog(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">StringqueueId,

[50/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/apidocs/deprecated-list.html
--
diff --git a/apidocs/deprecated-list.html b/apidocs/deprecated-list.html
index 3d2c333..a95c297 100644
--- a/apidocs/deprecated-list.html
+++ b/apidocs/deprecated-list.html
@@ -270,92 +270,110 @@
 
 
 
+org.apache.hadoop.hbase.client.Table.checkAndDelete(byte[],
 byte[], byte[], CompareFilter.CompareOp, byte[], Delete)
+Since 2.0.0. Will be 
removed in 3.0.0. Use
+  Table.checkAndDelete(byte[],
 byte[], byte[], byte[], Delete)
+
+
+
+org.apache.hadoop.hbase.client.Table.checkAndMutate(byte[],
 byte[], byte[], CompareFilter.CompareOp, byte[], RowMutations)
+Since 2.0.0. Will be 
removed in 3.0.0. Use
+ Table.checkAndMutate(byte[],
 byte[], byte[], CompareOperator, byte[], RowMutations)
+
+
+
+org.apache.hadoop.hbase.client.Table.checkAndPut(byte[],
 byte[], byte[], CompareFilter.CompareOp, byte[], Put)
+Since 2.0.0. Will be 
removed in 3.0.0. Use
+  Table.checkAndPut(byte[],
 byte[], byte[], CompareOperator, byte[], Put)}
+
+
+
 org.apache.hadoop.hbase.client.AsyncAdmin.closeRegion(byte[],
 OptionalServerName)
 As of release 2.0.0, this 
will be removed in HBase 3.0.0
  (https://issues.apache.org/jira/browse/HBASE-18231;>HBASE-18231).
  Use AsyncAdmin.unassign(byte[],
 boolean).
 
 
-
+
 org.apache.hadoop.hbase.client.Admin.closeRegion(byte[],
 String)
 As of release 2.0.0, this 
will be removed in HBase 3.0.0
  (https://issues.apache.org/jira/browse/HBASE-18231;>HBASE-18231).
  Use Admin.unassign(byte[],
 boolean).
 
 
-
+
 org.apache.hadoop.hbase.client.Admin.closeRegion(ServerName,
 HRegionInfo)
 As of release 2.0.0, this 
will be removed in HBase 3.0.0
  (https://issues.apache.org/jira/browse/HBASE-18231;>HBASE-18231).
  Use Admin.unassign(byte[],
 boolean).
 
 
-
+
 org.apache.hadoop.hbase.client.Admin.closeRegion(String,
 String)
 As of release 2.0.0, this 
will be removed in HBase 3.0.0
  (https://issues.apache.org/jira/browse/HBASE-18231;>HBASE-18231).
  Use Admin.unassign(byte[],
 boolean).
 
 
-
+
 org.apache.hadoop.hbase.client.Admin.closeRegionWithEncodedRegionName(String,
 String)
 As of release 2.0.0, this 
will be removed in HBase 3.0.0
  (https://issues.apache.org/jira/browse/HBASE-18231;>HBASE-18231).
  Use Admin.unassign(byte[],
 boolean).
 
 
-
+
 org.apache.hadoop.hbase.mapreduce.CellCreator.create(byte[],
 int, int, byte[], int, int, byte[], int, int, long, byte[], int, int, 
String)
 
-
+
 org.apache.hadoop.hbase.CellUtil.createCell(byte[])
 As of release 2.0.0, this 
will be removed in HBase 3.0.0.
  Use CellBuilder 
instead
 
 
-
+
 org.apache.hadoop.hbase.CellUtil.createCell(byte[],
 byte[])
 As of release 2.0.0, this 
will be removed in HBase 3.0.0.
  Use CellBuilder 
instead
 
 
-
+
 org.apache.hadoop.hbase.CellUtil.createCell(byte[],
 byte[], byte[])
 As of release 2.0.0, this 
will be removed in HBase 3.0.0.
  Use CellBuilder 
instead
 
 
-
+
 org.apache.hadoop.hbase.CellUtil.createCell(byte[],
 byte[], byte[], long, byte, byte[])
 As of release 2.0.0, this 
will be removed in HBase 3.0.0.
  Use CellBuilder 
instead
 
 
-
+
 org.apache.hadoop.hbase.CellUtil.createCell(byte[],
 byte[], byte[], long, byte, byte[], byte[], long)
 As of release 2.0.0, this 
will be removed in HBase 3.0.0.
  Use ExtendedCellBuilder instead
 
 
-
+
 org.apache.hadoop.hbase.CellUtil.createCell(byte[],
 byte[], byte[], long, byte, byte[], long)
 As of release 2.0.0, this 
will be removed in HBase 3.0.0.
  Use ExtendedCellBuilder instead
 
 
-
+
 org.apache.hadoop.hbase.CellUtil.createCell(byte[],
 byte[], byte[], long, KeyValue.Type, byte[], byte[])
 As of release 2.0.0, this 
will be removed in HBase 3.0.0.
  Use ExtendedCellBuilder instead
 
 
-
+
 org.apache.hadoop.hbase.CellUtil.createCell(byte[],
 int, int, byte[], int, int, byte[], int, int)
 As of release 2.0.0, this 
will be removed in HBase 3.0.0.
  Use CellBuilder 
instead
 
 
-
+
 org.apache.hadoop.hbase.client.Admin.deleteColumn(TableName,
 byte[])
 As of release 2.0.0.
  (https://issues.apache.org/jira/browse/HBASE-1989;>HBASE-1989).
@@ -363,7 +381,7 @@
  Use Admin.deleteColumnFamily(TableName,
 byte[])}.
 
 
-
+
 org.apache.hadoop.hbase.client.Admin.deleteTables(Pattern)
 since 2.0 version and will 
be removed in 3.0 version
  This is just a trivial helper method without any magic.
@@ -371,7 +389,7 @@
  and Admin.enableTable(org.apache.hadoop.hbase.TableName)
 
 
-
+
 org.apache.hadoop.hbase.client.Admin.deleteTables(String)
 since 2.0 version and will 
be removed in 3.0 version
  This is just a trivial helper method without any magic.
@@ -379,19 +397,19 @@
  and 

[36/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/ClusterStatus.Options.html
--
diff --git a/devapidocs/org/apache/hadoop/hbase/ClusterStatus.Options.html 
b/devapidocs/org/apache/hadoop/hbase/ClusterStatus.Options.html
index 665cdfa..65a3342 100644
--- a/devapidocs/org/apache/hadoop/hbase/ClusterStatus.Options.html
+++ b/devapidocs/org/apache/hadoop/hbase/ClusterStatus.Options.html
@@ -50,7 +50,7 @@ var activeTableTab = "activeTableTab";
 
 
 PrevClass
-NextClass
+NextClass
 
 
 Frames
@@ -700,7 +700,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 PrevClass
-NextClass
+NextClass
 
 
 Frames

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/CompareOperator.html
--
diff --git a/devapidocs/org/apache/hadoop/hbase/CompareOperator.html 
b/devapidocs/org/apache/hadoop/hbase/CompareOperator.html
new file mode 100644
index 000..533f9c6
--- /dev/null
+++ b/devapidocs/org/apache/hadoop/hbase/CompareOperator.html
@@ -0,0 +1,429 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+
+
+
+CompareOperator (Apache HBase 3.0.0-SNAPSHOT API)
+
+
+
+
+
+var methods = {"i0":9,"i1":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static 
Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+Skip navigation links
+
+
+
+
+Overview
+Package
+Class
+Use
+Tree
+Deprecated
+Index
+Help
+
+
+
+
+PrevClass
+NextClass
+
+
+Frames
+NoFrames
+
+
+AllClasses
+
+
+
+
+
+
+
+Summary:
+Nested|
+Enum Constants|
+Field|
+Method
+
+
+Detail:
+Enum Constants|
+Field|
+Method
+
+
+
+
+
+
+
+
+org.apache.hadoop.hbase
+Enum CompareOperator
+
+
+
+http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true;
 title="class or interface in java.lang">java.lang.Object
+
+
+http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true;
 title="class or interface in java.lang">java.lang.EnumCompareOperator
+
+
+org.apache.hadoop.hbase.CompareOperator
+
+
+
+
+
+
+
+
+
+All Implemented Interfaces:
+http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true;
 title="class or interface in java.io">Serializable, http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true;
 title="class or interface in java.lang">ComparableCompareOperator
+
+
+
+@InterfaceAudience.Public
+public enum CompareOperator
+extends http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true;
 title="class or interface in java.lang">EnumCompareOperator
+Generic set of comparison operators.
+
+Since:
+2.0.0
+
+
+
+
+
+
+
+
+
+
+
+
+Enum Constant Summary
+
+Enum Constants
+
+Enum Constant and Description
+
+
+EQUAL
+equals
+
+
+
+GREATER
+greater than
+
+
+
+GREATER_OR_EQUAL
+greater than or equal to
+
+
+
+LESS
+less than
+
+
+
+LESS_OR_EQUAL
+less than or equal to
+
+
+
+NO_OP
+no operation
+
+
+
+NOT_EQUAL
+not equal
+
+
+
+
+
+
+
+
+
+
+Method Summary
+
+All MethodsStatic MethodsConcrete Methods
+
+Modifier and Type
+Method and Description
+
+
+static CompareOperator
+valueOf(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">Stringname)
+Returns the enum constant of this type with the specified 
name.
+
+
+
+static CompareOperator[]
+values()
+Returns an array containing the constants of this enum 
type, in
+the order they are declared.
+
+
+
+
+
+
+
+Methods inherited from classjava.lang.http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true;
 title="class or interface in java.lang">Enum
+http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true#clone--;
 title="class or interface in java.lang">clone, http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true#compareTo-E-;
 title="class or interface in java.lang">compareTo, http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true#equals-java.lang.Object-;
 title="class or interface in java.lang">equals, http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true#finalize--;
 title="class or interface in java.lang">finalize, 

[29/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/client/class-use/Delete.html
--
diff --git a/devapidocs/org/apache/hadoop/hbase/client/class-use/Delete.html 
b/devapidocs/org/apache/hadoop/hbase/client/class-use/Delete.html
index bb27b8a..f77dd89 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/class-use/Delete.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/class-use/Delete.html
@@ -451,90 +451,134 @@ service.
   CompareFilter.CompareOpcompareOp,
   byte[]value,
   Deletedelete)
+Deprecated.
+Since 2.0.0. Will be 
removed in 3.0.0. Use
+  Table.checkAndDelete(byte[],
 byte[], byte[], byte[], Delete)
+
+
+
+
+boolean
+HTable.checkAndDelete(byte[]row,
+  byte[]family,
+  byte[]qualifier,
+  CompareFilter.CompareOpcompareOp,
+  byte[]value,
+  Deletedelete)
 Atomically checks if a row/family/qualifier value matches 
the expected
  value.
 
 
-
-http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true;
 title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">Boolean
-AsyncTableImpl.checkAndDelete(byte[]row,
+
+boolean
+HTableWrapper.checkAndDelete(byte[]row,
   byte[]family,
   byte[]qualifier,
   CompareFilter.CompareOpcompareOp,
   byte[]value,
   Deletedelete)
 
+
+boolean
+Table.checkAndDelete(byte[]row,
+  byte[]family,
+  byte[]qualifier,
+  CompareOperatorop,
+  byte[]value,
+  Deletedelete)
+Atomically checks if a row/family/qualifier value matches 
the expected
+ value.
+
+
 
 http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true;
 title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">Boolean
-RawAsyncTableImpl.checkAndDelete(byte[]row,
+AsyncTableImpl.checkAndDelete(byte[]row,
   byte[]family,
   byte[]qualifier,
-  CompareFilter.CompareOpcompareOp,
+  CompareOperatorop,
   byte[]value,
   Deletedelete)
 
 
+http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true;
 title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">Boolean
+RawAsyncTableImpl.checkAndDelete(byte[]row,
+  byte[]family,
+  byte[]qualifier,
+  CompareOperatorop,
+  byte[]value,
+  Deletedelete)
+
+
 boolean
-HTable.checkAndDelete(byte[]row,
+HTable.checkAndDelete(byte[]row,
   byte[]family,
   byte[]qualifier,
-  CompareFilter.CompareOpcompareOp,
+  CompareOperatorop,
   byte[]value,
   Deletedelete)
 Atomically checks if a row/family/qualifier value matches 
the expected
  value.
 
 
-
+
 http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true;
 title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">Boolean
-AsyncTableBase.checkAndDelete(byte[]row,
+AsyncTableBase.checkAndDelete(byte[]row,
   byte[]family,
   byte[]qualifier,
-  CompareFilter.CompareOpcompareOp,
+  CompareOperatorcompareOp,
   byte[]value,
   Deletedelete)
 Atomically checks if a row/family/qualifier value matches 
the expected value.
 
 
-
+
 boolean
-HTableWrapper.checkAndDelete(byte[]row,
+HTableWrapper.checkAndDelete(byte[]row,
   byte[]family,
   byte[]qualifier,
-  CompareFilter.CompareOpcompareOp,
+  CompareOperatorop,
   byte[]value,
   Deletedelete)
 
-
+
 void
 Table.delete(Deletedelete)
 Deletes the specified cells/row.
 
 
-
+
 http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true;
 title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Void.html?is-external=true;
 title="class or interface in java.lang">Void
 AsyncTableImpl.delete(Deletedelete)
 
-
+
 http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true;
 title="class or interface in 

[02/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/src-html/org/apache/hadoop/hbase/client/HTable.html
--
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HTable.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/HTable.html
index 0e9a950..7a22b63 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HTable.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HTable.html
@@ -26,1228 +26,1283 @@
 018 */
 019package org.apache.hadoop.hbase.client;
 020
-021import static 
org.apache.hadoop.hbase.client.ConnectionUtils.checkHasFamilies;
-022
-023import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
-024// DO NOT MAKE USE OF THESE IMPORTS! THEY 
ARE HERE FOR COPROCESSOR ENDPOINTS ONLY.
-025// Internally, we use shaded protobuf. 
This below are part of our public API.
-026import com.google.protobuf.Descriptors;
-027import com.google.protobuf.Message;
-028import com.google.protobuf.Service;
-029import 
com.google.protobuf.ServiceException;
-030
-031import java.io.IOException;
-032import java.io.InterruptedIOException;
-033import java.util.ArrayList;
-034import java.util.Collections;
-035import java.util.List;
-036import java.util.Map;
-037import java.util.TreeMap;
-038import java.util.concurrent.Callable;
-039import 
java.util.concurrent.ExecutionException;
-040import 
java.util.concurrent.ExecutorService;
-041import java.util.concurrent.Future;
-042import 
java.util.concurrent.SynchronousQueue;
-043import 
java.util.concurrent.ThreadPoolExecutor;
-044import java.util.concurrent.TimeUnit;
-045
-046import org.apache.commons.logging.Log;
-047import 
org.apache.commons.logging.LogFactory;
-048import 
org.apache.hadoop.conf.Configuration;
-049import org.apache.hadoop.hbase.Cell;
-050import 
org.apache.hadoop.hbase.HConstants;
-051import 
org.apache.hadoop.hbase.HRegionLocation;
-052import 
org.apache.hadoop.hbase.HTableDescriptor;
-053import 
org.apache.hadoop.hbase.KeyValueUtil;
-054import 
org.apache.hadoop.hbase.TableName;
-055import 
org.apache.hadoop.hbase.classification.InterfaceAudience;
-056import 
org.apache.hadoop.hbase.classification.InterfaceStability;
-057import 
org.apache.hadoop.hbase.client.coprocessor.Batch;
-058import 
org.apache.hadoop.hbase.client.coprocessor.Batch.Callback;
-059import 
org.apache.hadoop.hbase.filter.BinaryComparator;
-060import 
org.apache.hadoop.hbase.filter.CompareFilter.CompareOp;
-061import 
org.apache.hadoop.hbase.ipc.CoprocessorRpcChannel;
-062import 
org.apache.hadoop.hbase.ipc.RpcControllerFactory;
-063//SEE ABOVE NOTE!
-064import 
org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
-065import 
org.apache.hadoop.hbase.shaded.protobuf.RequestConverter;
-066import 
org.apache.hadoop.hbase.shaded.protobuf.ResponseConverter;
-067import 
org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos;
-068import 
org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MultiRequest;
-069import 
org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MutateRequest;
-070import 
org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MutateResponse;
-071import 
org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.RegionAction;
-072import 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.CompareType;
-073import 
org.apache.hadoop.hbase.util.Bytes;
-074import 
org.apache.hadoop.hbase.util.Pair;
-075import 
org.apache.hadoop.hbase.util.ReflectionUtils;
-076import 
org.apache.hadoop.hbase.util.Threads;
-077
-078/**
-079 * An implementation of {@link Table}. 
Used to communicate with a single HBase table.
-080 * Lightweight. Get as needed and just 
close when done.
-081 * Instances of this class SHOULD NOT be 
constructed directly.
-082 * Obtain an instance via {@link 
Connection}. See {@link ConnectionFactory}
-083 * class comment for an example of how.
-084 *
-085 * pThis class is thread safe 
since 2.0.0 if not invoking any of the setter methods.
-086 * All setters are moved into {@link 
TableBuilder} and reserved here only for keeping
-087 * backward compatibility, and TODO will 
be removed soon.
-088 *
-089 * pHTable is no longer a client 
API. Use {@link Table} instead. It is marked
-090 * InterfaceAudience.Private indicating 
that this is an HBase-internal class as defined in
-091 * a 
href="https://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-common/InterfaceClassification.html"Hadoop
-092 * Interface Classification/a
-093 * There are no guarantees for backwards 
source / binary compatibility and methods or class can
-094 * change or go away without 
deprecation.
-095 *
-096 * @see Table
-097 * @see Admin
-098 * @see Connection
-099 * @see ConnectionFactory
-100 */
-101@InterfaceAudience.Private
-102@InterfaceStability.Stable
-103public class HTable implements Table {
-104  private static final Log LOG = 
LogFactory.getLog(HTable.class);
-105  private 

[01/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

Repository: hbase-site
Updated Branches:
  refs/heads/asf-site 103621a61 -> 985cca067


http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/src-html/org/apache/hadoop/hbase/client/HTableWrapper.html
--
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/HTableWrapper.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/HTableWrapper.html
index 965105d..9a5534d 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HTableWrapper.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HTableWrapper.html
@@ -38,302 +38,320 @@
 030import 
java.util.concurrent.ExecutorService;
 031
 032import 
org.apache.hadoop.conf.Configuration;
-033import 
org.apache.hadoop.hbase.HBaseInterfaceAudience;
-034import 
org.apache.hadoop.hbase.HTableDescriptor;
-035import 
org.apache.hadoop.hbase.TableName;
-036import 
org.apache.hadoop.hbase.classification.InterfaceAudience;
-037import 
org.apache.hadoop.hbase.classification.InterfaceStability;
-038import 
org.apache.hadoop.hbase.client.coprocessor.Batch;
-039import 
org.apache.hadoop.hbase.client.coprocessor.Batch.Callback;
-040import 
org.apache.hadoop.hbase.coprocessor.CoprocessorHost.Environment;
-041import 
org.apache.hadoop.hbase.filter.CompareFilter.CompareOp;
-042import 
org.apache.hadoop.hbase.ipc.CoprocessorRpcChannel;
-043import 
org.apache.hadoop.io.MultipleIOException;
-044
-045/**
-046 * A wrapper for HTable. Can be used to 
restrict privilege.
-047 *
-048 * Currently it just helps to track 
tables opened by a Coprocessor and
-049 * facilitate close of them if it is 
aborted.
-050 *
-051 * We also disallow row locking.
-052 *
-053 * There is nothing now that will stop a 
coprocessor from using HTable
-054 * objects directly instead of this API, 
but in the future we intend to
-055 * analyze coprocessor implementations as 
they are loaded and reject those
-056 * which attempt to use objects and 
methods outside the Environment
-057 * sandbox.
-058 */
-059@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.COPROC)
-060@InterfaceStability.Stable
-061public final class HTableWrapper 
implements Table {
-062
-063  private final Table table;
-064  private final ClusterConnection 
connection;
-065  private final ListTable 
openTables;
-066
-067  /**
-068   * @param openTables External list of 
tables used for tracking wrappers.
-069   * @throws IOException
-070   */
-071  public static Table 
createWrapper(ListTable openTables,
-072  TableName tableName, Environment 
env, ExecutorService pool) throws IOException {
-073return new HTableWrapper(openTables, 
tableName,
-074
CoprocessorHConnection.getConnectionForEnvironment(env), pool);
-075  }
-076
-077  private HTableWrapper(ListTable 
openTables, TableName tableName,
-078  ClusterConnection connection, 
ExecutorService pool)
-079  throws IOException {
-080this.table = 
connection.getTable(tableName, pool);
-081this.connection = connection;
-082this.openTables = openTables;
-083this.openTables.add(this);
-084  }
-085
-086  public void internalClose() throws 
IOException {
-087ListIOException exceptions = 
new ArrayList(2);
-088try {
-089  table.close();
-090} catch (IOException e) {
-091  exceptions.add(e);
-092}
-093try {
-094  // have to self-manage our 
connection, as per the HTable contract
-095  if (this.connection != null) {
-096this.connection.close();
-097  }
-098} catch (IOException e) {
-099  exceptions.add(e);
-100}
-101if (!exceptions.isEmpty()) {
-102  throw 
MultipleIOException.createIOException(exceptions);
-103}
-104  }
-105
-106  public Configuration getConfiguration() 
{
-107return table.getConfiguration();
-108  }
-109
-110  public void close() throws IOException 
{
-111try {
-112  internalClose();
-113} finally {
-114  openTables.remove(this);
-115}
-116  }
-117
-118  public Result get(Get get) throws 
IOException {
-119return table.get(get);
-120  }
-121
-122  public boolean exists(Get get) throws 
IOException {
-123return table.exists(get);
-124  }
-125
-126  public boolean[] 
existsAll(ListGet gets) throws IOException{
-127return table.existsAll(gets);
-128  }
-129
-130  /**
-131   * @deprecated Use {@link 
#existsAll(java.util.List)}  instead. since 2.0.  remove in 3.0
-132   */
-133  @Deprecated
-134  public Boolean[] exists(ListGet 
gets) throws IOException {
-135// Do convertion.
-136boolean [] exists = 
table.existsAll(gets);
-137if (exists == null) {
-138  return null;
-139}
-140Boolean [] results = new Boolean 
[exists.length];
-141for (int i = 0; i  exists.length; 
i++) {
-142  results[i] = exists[i]? 
Boolean.TRUE: Boolean.FALSE;
-143}
-144return results;
-145  }
-146
-147  public void put(Put put) throws 
IOException {
-148table.put(put);
-149  }
-150
-151  public void 

[23/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/filter/class-use/CompareFilter.CompareOp.html
--
diff --git 
a/devapidocs/org/apache/hadoop/hbase/filter/class-use/CompareFilter.CompareOp.html
 
b/devapidocs/org/apache/hadoop/hbase/filter/class-use/CompareFilter.CompareOp.html
index 84b7edc..27c72f8 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/filter/class-use/CompareFilter.CompareOp.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/filter/class-use/CompareFilter.CompareOp.html
@@ -89,31 +89,17 @@
 
 
 
-org.apache.hadoop.hbase.coprocessor
-
-Table of Contents
-
-
-
 org.apache.hadoop.hbase.filter
 
 Provides row-level filters applied to HRegion scan results 
during calls to
  ResultScanner.next().
 
 
-
-org.apache.hadoop.hbase.regionserver
-
-
 
 org.apache.hadoop.hbase.rest.client
 
 
 
-org.apache.hadoop.hbase.security.access
-
-
-
 org.apache.hadoop.hbase.thrift2
 
 Provides an HBase http://thrift.apache.org/;>Thrift
@@ -144,29 +130,13 @@ service.
   CompareFilter.CompareOpcompareOp,
   byte[]value,
   Deletedelete)
-Atomically checks if a row/family/qualifier value matches 
the expected
- value.
+Deprecated.
+Since 2.0.0. Will be 
removed in 3.0.0. Use
+  Table.checkAndDelete(byte[],
 byte[], byte[], byte[], Delete)
+
 
 
 
-http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true;
 title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">Boolean
-AsyncTableImpl.checkAndDelete(byte[]row,
-  byte[]family,
-  byte[]qualifier,
-  CompareFilter.CompareOpcompareOp,
-  byte[]value,
-  Deletedelete)
-
-
-http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true;
 title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">Boolean
-RawAsyncTableImpl.checkAndDelete(byte[]row,
-  byte[]family,
-  byte[]qualifier,
-  CompareFilter.CompareOpcompareOp,
-  byte[]value,
-  Deletedelete)
-
-
 boolean
 HTable.checkAndDelete(byte[]row,
   byte[]family,
@@ -179,17 +149,6 @@ service.
 
 
 
-http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true;
 title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">Boolean
-AsyncTableBase.checkAndDelete(byte[]row,
-  byte[]family,
-  byte[]qualifier,
-  CompareFilter.CompareOpcompareOp,
-  byte[]value,
-  Deletedelete)
-Atomically checks if a row/family/qualifier value matches 
the expected value.
-
-
-
 boolean
 HTableWrapper.checkAndDelete(byte[]row,
   byte[]family,
@@ -198,7 +157,7 @@ service.
   byte[]value,
   Deletedelete)
 
-
+
 boolean
 Table.checkAndMutate(byte[]row,
   byte[]family,
@@ -206,28 +165,13 @@ service.
   CompareFilter.CompareOpcompareOp,
   byte[]value,
   RowMutationsmutation)
-Atomically checks if a row/family/qualifier value matches 
the expected value.
+Deprecated.
+Since 2.0.0. Will be 
removed in 3.0.0. Use
+ Table.checkAndMutate(byte[],
 byte[], byte[], CompareOperator, byte[], RowMutations)
+
 
 
-
-http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true;
 title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">Boolean
-AsyncTableImpl.checkAndMutate(byte[]row,
-  byte[]family,
-  byte[]qualifier,
-  CompareFilter.CompareOpcompareOp,
-  byte[]value,
-  RowMutationsmutation)
-
 
-http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true;
 title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true;
 title="class or interface in java.lang">Boolean
-RawAsyncTableImpl.checkAndMutate(byte[]row,
-  byte[]family,
-  byte[]qualifier,
-  CompareFilter.CompareOpcompareOp,
-  byte[]value,
-  RowMutationsmutation)
-
-
 boolean
 HTable.checkAndMutate(byte[]row,
   byte[]family,
@@ -238,17 +182,6 @@ service.
 Atomically checks if a row/family/qualifier value matches 
the expected 

[22/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html
--
diff --git 
a/devapidocs/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html
 
b/devapidocs/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html
index a9bf535..abda360 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html
@@ -18,7 +18,7 @@
 catch(err) {
 }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10};
+var methods = {"i0":10,"i1":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance 
Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -108,18 +108,13 @@ var activeTableTab = "activeTableTab";
 
 
 
-All Implemented Interfaces:
-http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true;
 title="class or interface in java.lang">ComparableHFileCleaner.HFileDeleteTask
-
-
 Enclosing class:
 HFileCleaner
 
 
 
-static class HFileCleaner.HFileDeleteTask
-extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true;
 title="class or interface in java.lang">Object
-implements http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true;
 title="class or interface in java.lang">ComparableHFileCleaner.HFileDeleteTask
+private static final class HFileCleaner.HFileDeleteTask
+extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true;
 title="class or interface in java.lang">Object
 
 
 
@@ -195,22 +190,10 @@ implements http://docs.oracle.com/javase/8/docs/api/java/lang/Comparabl
 Method and Description
 
 
-int
-compareTo(HFileCleaner.HFileDeleteTasko)
-
-
-boolean
-equals(http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true;
 title="class or interface in java.lang">Objecto)
-
-
 boolean
 getResult()
 
-
-int
-hashCode()
-
-
+
 void
 setResult(booleanresult)
 
@@ -220,7 +203,7 @@ implements http://docs.oracle.com/javase/8/docs/api/java/lang/Comparabl
 
 
 Methods inherited from classjava.lang.http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true;
 title="class or interface in java.lang">Object
-http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--;
 title="class or interface in java.lang">clone, http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--;
 title="class or interface in java.lang">finalize, http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--;
 title="class or interface in java.lang">getClass, http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--;
 title="class or interface in java.lang">notify, http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notifyAll--;
 title="class or interface in java.lang">notifyAll, http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#toString--;
 title="class or interface in java.lang">toString, http://docs.oracle.com/javase/8/docs/api/java/lang/Object.ht
 ml?is-external=true#wait--" title="class or interface in java.lang">wait, 
http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-;
 title="class or interface in java.lang">wait, http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-;
 title="class or interface in java.lang">wait
+http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--;
 title="class or interface in java.lang">clone, http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-;
 title="class or interface in java.lang">equals, http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--;
 title="class or interface in java.lang">finalize, http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--;
 title="class or interface in java.lang">getClass, http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--;
 title="class or interface in java.lang">hashCode, http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--;
 title="class or interface in java.lang">notify, http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in 
java.lang">notifyAll, http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#toString--;
 title="class or interface in java.lang">toString, http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--;
 title="class or interface in 

[13/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/regionserver/Region.html
--
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/Region.html 
b/devapidocs/org/apache/hadoop/hbase/regionserver/Region.html
index f5016f9..de524bb 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/Region.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/Region.html
@@ -111,7 +111,7 @@ var activeTableTab = "activeTableTab";
 
 @InterfaceAudience.LimitedPrivate(value="Coprocesssor")
  @InterfaceStability.Evolving
-public interface Region
+public interface Region
 extends ConfigurationObserver
 Regions store data for a certain region of a table.  It 
stores all columns
  for each row. A given table consists of one or more Regions.
@@ -226,10 +226,10 @@ extends 
 boolean
-checkAndMutate(byte[]row,
+checkAndMutate(byte[]row,
   byte[]family,
   byte[]qualifier,
-  CompareFilter.CompareOpcompareOp,
+  CompareOperatorop,
   ByteArrayComparablecomparator,
   Mutationmutation,
   booleanwriteToWAL)
@@ -239,10 +239,10 @@ extends 
 boolean
-checkAndRowMutate(byte[]row,
+checkAndRowMutate(byte[]row,
  byte[]family,
  byte[]qualifier,
- CompareFilter.CompareOpcompareOp,
+ CompareOperatorop,
  ByteArrayComparablecomparator,
  RowMutationsmutations,
  booleanwriteToWAL)
@@ -674,7 +674,7 @@ extends 
 
 getRegionInfo
-HRegionInfogetRegionInfo()
+HRegionInfogetRegionInfo()
 
 Returns:
 region information for this region
@@ -687,7 +687,7 @@ extends 
 
 getTableDescriptor
-TableDescriptorgetTableDescriptor()
+TableDescriptorgetTableDescriptor()
 
 Returns:
 table descriptor for this region
@@ -700,7 +700,7 @@ extends 
 
 isAvailable
-booleanisAvailable()
+booleanisAvailable()
 
 Returns:
 true if region is available (not closed and not closing)
@@ -713,7 +713,7 @@ extends 
 
 isClosed
-booleanisClosed()
+booleanisClosed()
 
 Returns:
 true if region is closed
@@ -726,7 +726,7 @@ extends 
 
 isClosing
-booleanisClosing()
+booleanisClosing()
 
 Returns:
 True if closing process has started
@@ -739,7 +739,7 @@ extends 
 
 isRecovering
-booleanisRecovering()
+booleanisRecovering()
 
 Returns:
 True if region is in recovering state
@@ -752,7 +752,7 @@ extends 
 
 isReadOnly
-booleanisReadOnly()
+booleanisReadOnly()
 
 Returns:
 True if region is read only
@@ -765,7 +765,7 @@ extends 
 
 isSplittable
-booleanisSplittable()
+booleanisSplittable()
 
 Returns:
 true if region is splittable
@@ -778,7 +778,7 @@ extends 
 
 isMergeable
-booleanisMergeable()
+booleanisMergeable()
 
 Returns:
 true if region is mergeable
@@ -791,7 +791,7 @@ extends 
 
 getStores
-http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true;
 title="class or interface in java.util">ListStoregetStores()
+http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true;
 title="class or interface in java.util">ListStoregetStores()
 Return the list of Stores managed by this region
  Use with caution.  Exposed for use of fixup utilities.
 
@@ -806,7 +806,7 @@ extends 
 
 getStore
-StoregetStore(byte[]family)
+StoregetStore(byte[]family)
 Return the Store for the given family
  Use with caution.  Exposed for use of fixup utilities.
 
@@ -821,7 +821,7 @@ extends 
 
 getStoreFileList
-http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true;
 title="class or interface in java.util">Listhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">StringgetStoreFileList(byte[][]columns)
+http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true;
 title="class or interface in java.util">Listhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">StringgetStoreFileList(byte[][]columns)
 
 Returns:
 list of store file names for the given families
@@ -834,7 +834,7 @@ extends 
 
 refreshStoreFiles
-booleanrefreshStoreFiles()
+booleanrefreshStoreFiles()
throws http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true;
 title="class or interface in java.io">IOException
 Check the region's underlying store files, open the files 
that have not
  been opened yet, and remove the store file readers for store files no
@@ -851,7 +851,7 @@ extends 
 
 getOpenSeqNum
-longgetOpenSeqNum()
+longgetOpenSeqNum()
 
 Returns:
 the latest sequence number that was read from storage when this region was 
opened
@@ -864,7 +864,7 @@ extends 
 
 getMaxFlushedSeqId
-longgetMaxFlushedSeqId()
+longgetMaxFlushedSeqId()
 
 Returns:
 the max sequence id of flushed data on this region; no edit in memory will 
have
@@ -879,7 +879,7 @@ extends 
 

[11/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/regionserver/Store.html
--
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/Store.html 
b/devapidocs/org/apache/hadoop/hbase/regionserver/Store.html
index f0080cc..b7d2f7b 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/Store.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/Store.html
@@ -664,7 +664,7 @@ extends 
 
 PRIORITY_USER
-static finalint PRIORITY_USER
+static finalint PRIORITY_USER
 
 See Also:
 Constant
 Field Values
@@ -677,7 +677,7 @@ extends 
 
 NO_PRIORITY
-static finalint NO_PRIORITY
+static finalint NO_PRIORITY
 
 See Also:
 Constant
 Field Values
@@ -698,7 +698,7 @@ extends 
 
 getComparator
-CellComparatorgetComparator()
+CellComparatorgetComparator()
 
 
 
@@ -707,7 +707,7 @@ extends 
 
 getStorefiles
-http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true;
 title="class or interface in java.util">CollectionStoreFilegetStorefiles()
+http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true;
 title="class or interface in java.util">CollectionStoreFilegetStorefiles()
 
 
 
@@ -716,7 +716,7 @@ extends 
 
 getCompactedFiles
-http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true;
 title="class or interface in java.util">CollectionStoreFilegetCompactedFiles()
+http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true;
 title="class or interface in java.util">CollectionStoreFilegetCompactedFiles()
 
 
 
@@ -725,7 +725,7 @@ extends 
 
 close
-http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true;
 title="class or interface in java.util">CollectionStoreFileclose()
+http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true;
 title="class or interface in java.util">CollectionStoreFileclose()
  throws http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true;
 title="class or interface in java.io">IOException
 Close all the readers We don't need to worry about 
subsequent requests because the Region
  holds a write lock that will prevent any more reads or writes.
@@ -743,7 +743,7 @@ extends 
 
 getScanner
-KeyValueScannergetScanner(Scanscan,
+KeyValueScannergetScanner(Scanscan,
http://docs.oracle.com/javase/8/docs/api/java/util/NavigableSet.html?is-external=true;
 title="class or interface in 
java.util">NavigableSetbyte[]targetCols,
longreadPt)
 throws http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true;
 title="class or interface in java.io">IOException
@@ -766,7 +766,7 @@ extends 
 
 getScanners
-defaulthttp://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true;
 title="class or interface in java.util">ListKeyValueScannergetScanners(booleancacheBlocks,
+defaulthttp://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true;
 title="class or interface in java.util">ListKeyValueScannergetScanners(booleancacheBlocks,
   booleanisGet,
   booleanusePread,
   booleanisCompaction,
@@ -798,7 +798,7 @@ extends 
 
 getScanners
-http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true;
 title="class or interface in java.util">ListKeyValueScannergetScanners(booleancacheBlocks,
+http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true;
 title="class or interface in java.util">ListKeyValueScannergetScanners(booleancacheBlocks,
   booleanusePread,
   booleanisCompaction,
   ScanQueryMatchermatcher,
@@ -833,7 +833,7 @@ extends 
 
 recreateScanners
-http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true;
 title="class or interface in java.util">ListKeyValueScannerrecreateScanners(http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true;
 title="class or interface in java.util">ListKeyValueScannercurrentFileScanners,
+http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true;
 title="class or interface in java.util">ListKeyValueScannerrecreateScanners(http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true;
 title="class or interface in java.util">ListKeyValueScannercurrentFileScanners,
booleancacheBlocks,
booleanusePread,
booleanisCompaction,
@@ -872,7 +872,7 @@ extends 
 
 getScanners
-defaulthttp://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true;
 title="class or interface in 

[16/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/regionserver/RSRpcServices.LogDelegate.html
--
diff --git 
a/devapidocs/org/apache/hadoop/hbase/regionserver/RSRpcServices.LogDelegate.html
 
b/devapidocs/org/apache/hadoop/hbase/regionserver/RSRpcServices.LogDelegate.html
index eaeba94..8f72748 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/regionserver/RSRpcServices.LogDelegate.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/regionserver/RSRpcServices.LogDelegate.html
@@ -105,7 +105,7 @@ var activeTableTab = "activeTableTab";
 
 
 
-static interface RSRpcServices.LogDelegate
+static interface RSRpcServices.LogDelegate
 
 
 
@@ -151,7 +151,7 @@ var activeTableTab = "activeTableTab";
 
 
 logBatchWarning
-voidlogBatchWarning(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">StringfirstRegionName,
+voidlogBatchWarning(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">StringfirstRegionName,
  intsum,
  introwSizeWarnThreshold)
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/regionserver/RSRpcServices.RegionScannerCloseCallBack.html
--
diff --git 
a/devapidocs/org/apache/hadoop/hbase/regionserver/RSRpcServices.RegionScannerCloseCallBack.html
 
b/devapidocs/org/apache/hadoop/hbase/regionserver/RSRpcServices.RegionScannerCloseCallBack.html
index edd6266..8234a37 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/regionserver/RSRpcServices.RegionScannerCloseCallBack.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/regionserver/RSRpcServices.RegionScannerCloseCallBack.html
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
 
 
 
-private static final class RSRpcServices.RegionScannerCloseCallBack
+private static final class RSRpcServices.RegionScannerCloseCallBack
 extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true;
 title="class or interface in java.lang">Object
 implements RpcCallback
 An Rpc callback for closing a RegionScanner.
@@ -209,7 +209,7 @@ implements 
 
 scanner
-private finalRegionScanner scanner
+private finalRegionScanner scanner
 
 
 
@@ -226,7 +226,7 @@ implements 
 
 RegionScannerCloseCallBack
-publicRegionScannerCloseCallBack(RegionScannerscanner)
+publicRegionScannerCloseCallBack(RegionScannerscanner)
 
 
 
@@ -243,7 +243,7 @@ implements 
 
 run
-publicvoidrun()
+publicvoidrun()
  throws http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true;
 title="class or interface in java.io">IOException
 Description copied from 
interface:RpcCallback
 Called at the end of an Rpc Call RpcCallContext

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/regionserver/RSRpcServices.RegionScannerHolder.html
--
diff --git 
a/devapidocs/org/apache/hadoop/hbase/regionserver/RSRpcServices.RegionScannerHolder.html
 
b/devapidocs/org/apache/hadoop/hbase/regionserver/RSRpcServices.RegionScannerHolder.html
index 9392abf..a084b74 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/regionserver/RSRpcServices.RegionScannerHolder.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/regionserver/RSRpcServices.RegionScannerHolder.html
@@ -113,7 +113,7 @@ var activeTableTab = "activeTableTab";
 
 
 
-private static final class RSRpcServices.RegionScannerHolder
+private static final class RSRpcServices.RegionScannerHolder
 extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true;
 title="class or interface in java.lang">Object
 Holder class which holds the RegionScanner, nextCallSeq and 
RpcCallbacks together.
 
@@ -239,7 +239,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 nextCallSeq
-private finalhttp://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicLong.html?is-external=true;
 title="class or interface in java.util.concurrent.atomic">AtomicLong nextCallSeq
+private finalhttp://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicLong.html?is-external=true;
 title="class or interface in java.util.concurrent.atomic">AtomicLong nextCallSeq
 
 
 
@@ -248,7 +248,7 @@ extends http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 
 
 scannerName
-private finalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String scannerName
+private finalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">String scannerName
 
 
 
@@ -257,7 +257,7 @@ extends 

[25/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/coprocessor/example/ExampleRegionObserverWithMetrics.html
--
diff --git 
a/devapidocs/org/apache/hadoop/hbase/coprocessor/example/ExampleRegionObserverWithMetrics.html
 
b/devapidocs/org/apache/hadoop/hbase/coprocessor/example/ExampleRegionObserverWithMetrics.html
index e3f4bdb..31dc277 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/coprocessor/example/ExampleRegionObserverWithMetrics.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/coprocessor/example/ExampleRegionObserverWithMetrics.html
@@ -255,7 +255,7 @@ implements RegionObserver
-postAppend,
 postBatchMutate,
 postBatchMutateIndispensably,
 postBulkLoadHFile,
 postBulkLoadHFile,
 postCheckAndDelete,
 postCheckAndPut,
 postClose, postCloseRegionOperation,
 postCommitStoreFile,
 postCompact,
 postCompact,
 postCompactSelection,
 postCompactSelection,
 postCompleteSplit,
 postDelete,
 postExists,
 postFlush,
 postFlush,
 postIncrement,
 postIncrementColumnValue,
 postInstantiateDeleteTracker,
 postLogReplay,
 postMutationBeforeWAL,
 postOpen,
 postPut,
 postReplayWALs,
 postRollBackSplit, href="../../../../../../org/apache/hadoop/hbase/coprocessor/RegionObserver.html#postScannerClose-org.apache.hadoop.hbase.coprocessor.ObserverContext-org.apache.hadoop.hbase.regionserver.InternalScanner-">postScannerClose,
 > href="../../../../../../org/apache/hadoop/hbase/coprocessor/RegionObserver.html#postScannerFilterRow-org.apache.hadoop.hbase.coprocessor.ObserverContext-org.apache.hadoop.hbase.regionserver.InternalScanner-byte:A-int-short-boolean-">postScannerFilterRow,
 > href="../../../../../../org/apache/hadoop/hbase/coprocessor/RegionObserver.html#postScannerFilterRow-org.apache.hadoop.hbase.coprocessor.ObserverContext-org.apache.hadoop.hbase.regionserver.InternalScanner-org.apache.hadoop.hbase.Cell-boolean-">postScannerFilterRow,
 > href="../../../../../../org/apache/hadoop/hbase/coprocessor/RegionObserver.html#postScannerNext-org.apache.hadoop.hbase.coprocessor.ObserverContext-org.apache.hadoop.hbase.regionserver.InternalScanner-java.util.List-int-boolea
 n-">postScannerNext, postScannerOpen,
 postSplit,
 postStartRegionOperation,
 postStoreFileReaderOpen,
 postWALRestore,
 preAppend,
 preAppendAfterRowLock,
 preBatchMutate,
 preBulkLoadHFile,
 preCheckAndDelete,
 preCheckAndDeleteAfterRowLock,
 preCheckAndPut,
 preCheckAndPutAfterRowLock,
 preClose,
 preCommitStoreFile,
 preCompact,
 preCompact,
 preCompactScannerOpen,
 preCompactScannerOpen,
 preCompactScannerOpen, preCompactSelection,
 preCompactSelection,
 preDelete,
 preExists,
 preFlush,
 preFlush,
 preFlushScannerOpen,
 preFlushScannerOpen,
 preFlushScannerOpen,
 preIncrement,
 preIncrementAfterRowLock,
 preIncrementColumnValue,
 preOpen,
 prePrepareTimeStampForDeleteVersion,
 prePut,
 preReplayWALs,
 preRollBackSplit,
 preScannerClose,
 preScannerNext,
 preScannerOpen, preSplit,
 preSplit,
 preSplitAfterPONR,
 preSplitBeforePONR,
 preStoreFileReaderOpen,
 preStoreScannerOpen,
 preStoreScannerOpen,
 preWALRestore
+postAppend,
 postBatchMutate,
 postBatchMutateIndispensably,
 postBulkLoadHFile,
 postBulkLoadHFile,
 postCheckAndDelete,
 postCheckAndPut,
 postClose, postCloseRegionOperation,
 postCommitStoreFile,
 postCompact,
 postCompact,
 postCompactSelection,
 postCompactSelection,
 postCompleteSplit,
 postDelete,
 postExists,
 postFlush,
 postFlush,
 postIncrement,
 postIncrementColumnValue,
 postInstantiateDeleteTracker,
 postLogReplay,
 postMutationBeforeWAL,
 postOpen,
 postPut,
 postReplayWALs,
 postRollBackSplit,
 postScannerClose,
 postScannerFilterRow,
 postScannerFilterRow,
 postScannerNext,
 postScannerOpen,
 postSplit,
 postStartRegionOperation,
 postStoreFileReaderOpen,
 postWALRestore,
 preAppend,
 preAppendAfterRowLock,
 preBatchMutate,
 preBulkLoadHFile,
 preCheckAndDelete,
 preCheckAndDeleteAfterRowLock, preCheckAndPut,
 preCheckAndPutAfterRowLock,
 preClose,
 preCommitStoreFile,
 preCompact,
 preCompact,
 preCompactScannerOpen,
 preCompactScannerOpen,
 preCompactScannerOpen,
 preCompactSelection,
 preCompactSelection,
 preDelete,
 preExist
 s, preFlush,
 preFlush,
 preFlushScannerOpen,
 preFlushScannerOpen, preFlushScannerOpen,
 preIncrement,
 preIncrementAfterRowLock,
 preIncr
 ementColumnValue, preOpen,
 prePrepareTimeStampForDeleteVersion,
 prePut,
 preReplayWALs, preRollBackSplit,
 preScannerClose,
 preScannerNext,
 preScannerOpen,
 preSplit,
 preSplit,
 preSplitAfterPONR,
 preSplitBeforePONR,
 preStoreFileReaderOpen,
 preStoreScannerOpen,
 preStoreScannerOpen,
 preWALRestore
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/coprocessor/example/ZooKeeperScanPolicyObserver.html
--
diff --git 
a/devapidocs/org/apache/hadoop/hbase/coprocessor/example/ZooKeeperScanPolicyObserver.html
 

[34/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/985cca06/devapidocs/org/apache/hadoop/hbase/classification/class-use/InterfaceAudience.Public.html
--
diff --git 
a/devapidocs/org/apache/hadoop/hbase/classification/class-use/InterfaceAudience.Public.html
 
b/devapidocs/org/apache/hadoop/hbase/classification/class-use/InterfaceAudience.Public.html
index 7799fc6..85b1540 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/classification/class-use/InterfaceAudience.Public.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/classification/class-use/InterfaceAudience.Public.html
@@ -353,61 +353,67 @@ Input/OutputFormats, a table indexing MapReduce job, and 
utility methods.
 
 
 class
+CompareOperator
+Generic set of comparison operators.
+
+
+
+class
 DoNotRetryIOException
 Subclass if exception is not meant to be retried: e.g.
 
 
-
+
 class
 DroppedSnapshotException
 Thrown during flush if the possibility snapshot content was 
not properly
  persisted into store files.
 
 
-
+
 class
 HBaseConfiguration
 Adds HBase configuration files to a Configuration
 
 
-
+
 class
 HBaseInterfaceAudience
 This class defines constants for different classes of hbase 
limited private apis
 
 
-
+
 class
 HBaseIOException
 All hbase specific IOExceptions should be subclasses of 
HBaseIOException
 
 
-
+
 class
 HColumnDescriptor
 Deprecated.
 
 
-
+
 class
 HConstants
 HConstants holds a bunch of HBase-related constants
 
 
-
+
 class
 HRegionInfo
 Information about a region.
 
 
-
+
 class
 HRegionLocation
 Data structure to hold HRegionInfo and the address for the 
hosting
  HRegionServer.
 
 
-
+
 class
 HTableDescriptor
 Deprecated.
@@ -416,79 +422,79 @@ Input/OutputFormats, a table indexing MapReduce job, and 
utility methods.
 
 
 
-
+
 class
 InvalidFamilyOperationException
 Thrown if a request is table schema modification is 
requested but
  made for an invalid family name.
 
 
-
+
 class
 KeepDeletedCells
 Ways to keep cells marked for delete around.
 
 
-
+
 class
 LocalHBaseCluster
 This class creates a single process HBase cluster.
 
 
-
+
 class
 MasterNotRunningException
 Thrown if the master is not running
 
 
-
+
 class
 MemoryCompactionPolicy
 Enum describing all possible memory compaction 
policies
 
 
-
+
 class
 MultiActionResultTooLarge
 Exception thrown when the result needs to be chunked on the 
server side.
 
 
-
+
 class
 NamespaceDescriptor
 Namespace POJO class.
 
 
-
+
 static class
 NamespaceDescriptor.Builder
 
-
+
 class
 NamespaceExistException
 Thrown when a namespace exists but should not
 
 
-
+
 class
 NamespaceNotFoundException
 Thrown when a namespace can not be located
 
 
-
+
 class
 NotAllMetaRegionsOnlineException
 Thrown when an operation requires the root and all meta 
regions to be online
 
 
-
+
 class
 NotServingRegionException
 Thrown by a region server if it is sent a request for a 
region it is not
  serving.
 
 
-
+
 class
 PleaseHoldException
 This exception is thrown by the master when a region server 
was shut down and
@@ -497,119 +503,119 @@ Input/OutputFormats, a table indexing MapReduce job, 
and utility methods.
  operations, or when an operation is performed on a region server that is 
still starting.
 
 
-
+
 class
 ProcedureInfo
 Procedure information
 
 
-
+
 class
 ProcedureState
 POJO representing Procedure State
 
 
-
+
 class
 RegionException
 Thrown when something happens related to region 
handling.
 
 
-
+
 class
 RegionLoad
 Encapsulates per-region load metrics.
 
 
-
+
 class
 RegionTooBusyException
 Thrown by a region server if it will block and wait to 
serve a request.
 
 
-
+
 class
 ReplicationPeerNotFoundException
 Thrown when a replication peer can not be found
 
 
-
+
 class
 RetryImmediatelyException
 
-
+
 class
 ScheduledChore
 ScheduledChore is a task performed on a period in 
hbase.
 
 
-
+
 class
 ServerLoad
 This class is used for exporting current state of load on a 
RegionServer.
 
 
-
+
 class
 ServerName
 Name of a particular incarnation of an HBase Server.
 
 
-
+
 interface
 Stoppable
 Implementers are Stoppable.
 
 
-
+
 class
 TableExistsException
 Thrown when a table exists but should not
 
 
-
+
 class
 TableInfoMissingException
 Failed to find .tableinfo file under table dir
 
 
-
+
 class
 TableName
 Immutable POJO class for representing a table name.
 
 
-
+
 class
 TableNotDisabledException
 Thrown if a table should be offline but is not
 
 
-
+
 class
 TableNotEnabledException
 Thrown if a table should be enabled but is not
 
 
-
+
 class
 TableNotFoundException
 Thrown when a table can not be located
 
 
-
+
 class
 UnknownRegionException
 Thrown when we are asked to operate on a region we know 
nothing about.
 
 
-
+
 class
 UnknownScannerException
 Thrown if a region server is passed an unknown scanner 
id.
 
 
-
+
 class
 ZooKeeperConnectionException
 Thrown if the client can't connect to zookeeper
@@ -887,7 +893,9 @@ Input/OutputFormats, a table indexing 

hbase git commit: HBASE-18778 Use Comparator for StealJobQueue

[zhangduo]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 7b2ce38b4 -> 4ad47ccd9


HBASE-18778 Use Comparator for StealJobQueue


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

Branch: refs/heads/branch-2
Commit: 4ad47ccd93a5e763cc5521b338704bf7173658c5
Parents: 7b2ce38
Author: zhangduo 
Authored: Fri Sep 8 18:12:04 2017 +0800
Committer: zhangduo 
Committed: Fri Sep 8 21:27:19 2017 +0800

--
 .../hbase/master/cleaner/HFileCleaner.java  | 50 +---
 .../hadoop/hbase/regionserver/CompactSplit.java | 83 +++-
 .../apache/hadoop/hbase/regionserver/Store.java |  3 +-
 .../compactions/CompactionRequest.java  | 46 ++-
 .../apache/hadoop/hbase/util/StealJobQueue.java | 20 +++--
 .../hadoop/hbase/util/TestStealJobQueue.java|  5 +-
 6 files changed, 108 insertions(+), 99 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/4ad47ccd/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.java
index 5f80e81..6f952f2 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.java
@@ -19,6 +19,7 @@ package org.apache.hadoop.hbase.master.cleaner;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.BlockingQueue;
@@ -26,13 +27,13 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hbase.classification.InterfaceAudience;
-import org.apache.hadoop.hbase.conf.ConfigurationObserver;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.Stoppable;
+import org.apache.hadoop.hbase.classification.InterfaceAudience;
+import org.apache.hadoop.hbase.conf.ConfigurationObserver;
 import org.apache.hadoop.hbase.io.HFileLink;
 import org.apache.hadoop.hbase.regionserver.StoreFileInfo;
 import org.apache.hadoop.hbase.util.StealJobQueue;
@@ -111,7 +112,7 @@ public class HFileCleaner extends 
CleanerChore impleme
 conf.getInt(LARGE_HFILE_QUEUE_INIT_SIZE, 
DEFAULT_LARGE_HFILE_QUEUE_INIT_SIZE);
 smallQueueInitSize =
 conf.getInt(SMALL_HFILE_QUEUE_INIT_SIZE, 
DEFAULT_SMALL_HFILE_QUEUE_INIT_SIZE);
-largeFileQueue = new StealJobQueue<>(largeQueueInitSize, 
smallQueueInitSize);
+largeFileQueue = new StealJobQueue<>(largeQueueInitSize, 
smallQueueInitSize, COMPARATOR);
 smallFileQueue = largeFileQueue.getStealFromQueue();
 largeFileDeleteThreadNumber =
 conf.getInt(LARGE_HFILE_DELETE_THREAD_NUMBER, 
DEFAULT_LARGE_HFILE_DELETE_THREAD_NUMBER);
@@ -299,7 +300,21 @@ public class HFileCleaner extends 
CleanerChore impleme
 }
   }
 
-  static class HFileDeleteTask implements Comparable {
+  private static final Comparator COMPARATOR = new 
Comparator() {
+
+@Override
+public int compare(HFileDeleteTask o1, HFileDeleteTask o2) {
+  // larger file first so reverse compare
+  int cmp = Long.compare(o2.fileLength, o1.fileLength);
+  if (cmp != 0) {
+return cmp;
+  }
+  // just use hashCode to generate a stable result.
+  return System.identityHashCode(o1) - System.identityHashCode(o2);
+}
+  };
+
+  private static final class HFileDeleteTask {
 private static final long MAX_WAIT = 60 * 1000L;
 private static final long WAIT_UNIT = 1000L;
 
@@ -341,31 +356,6 @@ public class HFileCleaner extends 
CleanerChore impleme
   }
   return this.result;
 }
-
-@Override
-public int compareTo(HFileDeleteTask o) {
-  long sub = this.fileLength - o.fileLength;
-  // smaller value with higher priority in PriorityQueue, and we intent to 
delete the larger
-  // file first.
-  return (sub > 0) ? -1 : (sub < 0 ? 1 : 0);
-}
-
-@Override
-public boolean equals(Object o) {
-  if (this == o) {
-return true;
-  }
-  if (o == null || !(o instanceof HFileDeleteTask)) {
-return false;
-  }
-  HFileDeleteTask otherTask = (HFileDeleteTask) o;
-  return this.filePath.equals(otherTask.filePath) && 

hbase git commit: HBASE-18778 Use Comparator for StealJobQueue

[zhangduo]

Repository: hbase
Updated Branches:
  refs/heads/master e69b05d10 -> 331910192


HBASE-18778 Use Comparator for StealJobQueue


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

Branch: refs/heads/master
Commit: 331910192af158aac33f883ae132fba444dda003
Parents: e69b05d
Author: zhangduo 
Authored: Fri Sep 8 18:12:04 2017 +0800
Committer: zhangduo 
Committed: Fri Sep 8 21:27:12 2017 +0800

--
 .../hbase/master/cleaner/HFileCleaner.java  | 50 +---
 .../hadoop/hbase/regionserver/CompactSplit.java | 83 +++-
 .../apache/hadoop/hbase/regionserver/Store.java |  3 +-
 .../compactions/CompactionRequest.java  | 46 ++-
 .../apache/hadoop/hbase/util/StealJobQueue.java | 20 +++--
 .../hadoop/hbase/util/TestStealJobQueue.java|  5 +-
 6 files changed, 108 insertions(+), 99 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/33191019/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.java
index 5f80e81..6f952f2 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.java
@@ -19,6 +19,7 @@ package org.apache.hadoop.hbase.master.cleaner;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.BlockingQueue;
@@ -26,13 +27,13 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hbase.classification.InterfaceAudience;
-import org.apache.hadoop.hbase.conf.ConfigurationObserver;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.Stoppable;
+import org.apache.hadoop.hbase.classification.InterfaceAudience;
+import org.apache.hadoop.hbase.conf.ConfigurationObserver;
 import org.apache.hadoop.hbase.io.HFileLink;
 import org.apache.hadoop.hbase.regionserver.StoreFileInfo;
 import org.apache.hadoop.hbase.util.StealJobQueue;
@@ -111,7 +112,7 @@ public class HFileCleaner extends 
CleanerChore impleme
 conf.getInt(LARGE_HFILE_QUEUE_INIT_SIZE, 
DEFAULT_LARGE_HFILE_QUEUE_INIT_SIZE);
 smallQueueInitSize =
 conf.getInt(SMALL_HFILE_QUEUE_INIT_SIZE, 
DEFAULT_SMALL_HFILE_QUEUE_INIT_SIZE);
-largeFileQueue = new StealJobQueue<>(largeQueueInitSize, 
smallQueueInitSize);
+largeFileQueue = new StealJobQueue<>(largeQueueInitSize, 
smallQueueInitSize, COMPARATOR);
 smallFileQueue = largeFileQueue.getStealFromQueue();
 largeFileDeleteThreadNumber =
 conf.getInt(LARGE_HFILE_DELETE_THREAD_NUMBER, 
DEFAULT_LARGE_HFILE_DELETE_THREAD_NUMBER);
@@ -299,7 +300,21 @@ public class HFileCleaner extends 
CleanerChore impleme
 }
   }
 
-  static class HFileDeleteTask implements Comparable {
+  private static final Comparator COMPARATOR = new 
Comparator() {
+
+@Override
+public int compare(HFileDeleteTask o1, HFileDeleteTask o2) {
+  // larger file first so reverse compare
+  int cmp = Long.compare(o2.fileLength, o1.fileLength);
+  if (cmp != 0) {
+return cmp;
+  }
+  // just use hashCode to generate a stable result.
+  return System.identityHashCode(o1) - System.identityHashCode(o2);
+}
+  };
+
+  private static final class HFileDeleteTask {
 private static final long MAX_WAIT = 60 * 1000L;
 private static final long WAIT_UNIT = 1000L;
 
@@ -341,31 +356,6 @@ public class HFileCleaner extends 
CleanerChore impleme
   }
   return this.result;
 }
-
-@Override
-public int compareTo(HFileDeleteTask o) {
-  long sub = this.fileLength - o.fileLength;
-  // smaller value with higher priority in PriorityQueue, and we intent to 
delete the larger
-  // file first.
-  return (sub > 0) ? -1 : (sub < 0 ? 1 : 0);
-}
-
-@Override
-public boolean equals(Object o) {
-  if (this == o) {
-return true;
-  }
-  if (o == null || !(o instanceof HFileDeleteTask)) {
-return false;
-  }
-  HFileDeleteTask otherTask = (HFileDeleteTask) o;
-  return this.filePath.equals(otherTask.filePath) && 

hbase git commit: HBASE-15607 - Deprecating SnapShotInfo (Ram)

[ramkrishna]

Repository: hbase
Updated Branches:
  refs/heads/branch-1.4 1cca36b3b -> 93fbf25e3


HBASE-15607 - Deprecating SnapShotInfo (Ram)


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

Branch: refs/heads/branch-1.4
Commit: 93fbf25e3162d79a697450a64c7a56b56c3d3179
Parents: 1cca36b
Author: Ramkrishna 
Authored: Fri Sep 8 17:29:47 2017 +0530
Committer: Ramkrishna 
Committed: Fri Sep 8 17:33:10 2017 +0530

--
 .../main/java/org/apache/hadoop/hbase/snapshot/SnapshotInfo.java   | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/93fbf25e/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotInfo.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotInfo.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotInfo.java
index e4c4c59..6fe8db7 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotInfo.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotInfo.java
@@ -63,9 +63,11 @@ import org.apache.hadoop.hbase.util.FSUtils;
  *  List of hfiles and wals
  *  Stats about hfiles and logs sizes, percentage of shared with the 
source table, ...
  * 
+ * @deprecated All the protos references will be changed to standalone POJOs 
from 2.0 onwards
  */
 @InterfaceAudience.Public
 @InterfaceStability.Evolving
+@Deprecated
 public final class SnapshotInfo extends Configured implements Tool {
   private static final Log LOG = LogFactory.getLog(SnapshotInfo.class);
 

hbase git commit: HBASE-15607 - Deprecating SnapShotInfo (Ram)

[ramkrishna]

Repository: hbase
Updated Branches:
  refs/heads/branch-1.3 6fcb15fd3 -> ae6ff50dc


HBASE-15607 - Deprecating SnapShotInfo (Ram)


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

Branch: refs/heads/branch-1.3
Commit: ae6ff50dc4ff0ccae92b6ad3eed12916675920cc
Parents: 6fcb15f
Author: Ramkrishna 
Authored: Fri Sep 8 17:29:47 2017 +0530
Committer: Ramkrishna 
Committed: Fri Sep 8 17:32:01 2017 +0530

--
 .../main/java/org/apache/hadoop/hbase/snapshot/SnapshotInfo.java   | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/ae6ff50d/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotInfo.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotInfo.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotInfo.java
index 2e9a8d9..80b180b 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotInfo.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotInfo.java
@@ -63,9 +63,11 @@ import org.apache.hadoop.hbase.util.FSUtils;
  *  List of hfiles and wals
  *  Stats about hfiles and logs sizes, percentage of shared with the 
source table, ...
  * 
+ * @deprecated All the protos references will be changed to standalone POJOs 
from 2.0 onwards
  */
 @InterfaceAudience.Public
 @InterfaceStability.Evolving
+@Deprecated
 public final class SnapshotInfo extends Configured implements Tool {
   private static final Log LOG = LogFactory.getLog(SnapshotInfo.class);