Changes relevant for branch-2

Author: apurtell

hbase-client/src/main/java/org/apache/hadoop/hbase/AsyncMetaTableAccessor.java

@@ -408,25 +408,32 @@ private static Scan getMetaScan(AsyncTable<?> metaTable, int rowUpperLimit) {
    *         can't deserialize the result.
    */
   private static Optional<RegionLocations> getRegionLocations(final Result r) {
-    if (r == null) return Optional.empty();
+    if (r == null) {
+      return Optional.empty();
+    }
     Optional<RegionInfo> regionInfo = getHRegionInfo(r, getRegionInfoColumn());
-    if (!regionInfo.isPresent()) return Optional.empty();
+    if (!regionInfo.isPresent()) {
+      return Optional.empty();
+    }
 
     List<HRegionLocation> locations = new ArrayList<HRegionLocation>(1);
     NavigableMap<byte[], NavigableMap<byte[], byte[]>> familyMap = r.getNoVersionMap();
 
     locations.add(getRegionLocation(r, regionInfo.get(), 0));
 
     NavigableMap<byte[], byte[]> infoMap = familyMap.get(getCatalogFamily());
-    if (infoMap == null) return Optional.of(new RegionLocations(locations));
+    if (infoMap == null) {
+      return Optional.of(new RegionLocations(locations));
+    }
 
     // iterate until all serverName columns are seen
     int replicaId = 0;
     byte[] serverColumn = getServerColumn(replicaId);
-    SortedMap<byte[], byte[]> serverMap = null;
-    serverMap = infoMap.tailMap(serverColumn, false);
+    SortedMap<byte[], byte[]> serverMap = infoMap.tailMap(serverColumn, false);
 
-    if (serverMap.isEmpty()) return Optional.of(new RegionLocations(locations));
+    if (serverMap.isEmpty()) {
+      return Optional.of(new RegionLocations(locations));
+    }
 
     for (Map.Entry<byte[], byte[]> entry : serverMap.entrySet()) {
       replicaId = parseReplicaIdFromServerColumn(entry.getKey());

hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java

@@ -186,6 +186,7 @@ public List<RegionState> getRegionStatesInTransition() {
   }
 
   /** Returns the HBase version string as reported by the HMaster */
+  @Override
   public String getHBaseVersion() {
     return metrics.getHBaseVersion();
   }
@@ -279,6 +280,7 @@ public ServerLoad getLoad(final ServerName sn) {
     return serverMetrics == null ? null : new ServerLoad(serverMetrics);
   }
 
+  @Override
   public String getClusterId() {
     return metrics.getClusterId();
   }
@@ -289,6 +291,7 @@ public List<String> getMasterCoprocessorNames() {
   }
 
   /**
+   * Get the list of master coprocessor names.
    * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 Use
    *             {@link #getMasterCoprocessorNames} instead.
    */
@@ -299,6 +302,7 @@ public String[] getMasterCoprocessors() {
   }
 
   /**
+   * Get the last major compaction time for a given table.
    * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 Use
    *             {@link #getLastMajorCompactionTimestamp(TableName)} instead.
    */
@@ -308,6 +312,7 @@ public long getLastMajorCompactionTsForTable(TableName table) {
   }
 
   /**
+   * Get the last major compaction time for a given region.
    * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 Use
    *             {@link #getLastMajorCompactionTimestamp(byte[])} instead.
    */
@@ -317,6 +322,7 @@ public long getLastMajorCompactionTsForRegion(final byte[] region) {
   }
 
   /**
+   * Returns true if the balancer is enabled.
    * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 No flag in 2.0
    */
   @Deprecated

hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java

@@ -176,6 +176,7 @@ protected HColumnDescriptor(ModifyableColumnFamilyDescriptor delegate) {
   }
 
   /**
+   * Check if a given family name is allowed.
    * @param b Family name.
    * @return <code>b</code>
    * @throws IllegalArgumentException If not null and not a legitimate family name: i.e. 'printable'
@@ -205,19 +206,12 @@ public String getNameAsString() {
     return delegatee.getNameAsString();
   }
 
-  /**
-   * @param key The key.
-   * @return The value.
-   */
   @Override
   public byte[] getValue(byte[] key) {
     return delegatee.getValue(key);
   }
 
-  /**
-   * @param key The key.
-   * @return The value as a string.
-   */
+  @Override
   public String getValue(String key) {
     byte[] value = getValue(Bytes.toBytes(key));
     return value == null ? null : Bytes.toString(value);
@@ -228,35 +222,22 @@ public Map<Bytes, Bytes> getValues() {
     return delegatee.getValues();
   }
 
-  /**
-   * @param key   The key.
-   * @param value The value.
-   * @return this (for chained invocation)
-   */
   public HColumnDescriptor setValue(byte[] key, byte[] value) {
     getDelegateeForModification().setValue(key, value);
     return this;
   }
 
-  /**
-   * @param key Key whose key and value we're to remove from HCD parameters.
-   */
   public void remove(final byte[] key) {
     getDelegateeForModification().removeValue(new Bytes(key));
   }
 
-  /**
-   * @param key   The key.
-   * @param value The value.
-   * @return this (for chained invocation)
-   */
   public HColumnDescriptor setValue(String key, String value) {
     getDelegateeForModification().setValue(key, value);
     return this;
   }
 
   /**
-   * @return compression type being used for the column family
+   * Returns compression type being used for the column family
    * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0
    *             (<a href="https://issues.apache.org/jira/browse/HBASE-13655">HBASE-13655</a>). Use
    *             {@link #getCompressionType()}.
@@ -267,7 +248,7 @@ public Compression.Algorithm getCompression() {
   }
 
   /**
-   * @return compression type being used for the column family for major compaction
+   * Returns compression type being used for the column family for major compaction
    * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0
    *             (<a href="https://issues.apache.org/jira/browse/HBASE-13655">HBASE-13655</a>). Use
    *             {@link #getCompactionCompressionType()}.
@@ -283,6 +264,7 @@ public int getMaxVersions() {
   }
 
   /**
+   * Set maximum versions to keep
    * @param value maximum number of versions
    * @return this (for chained invocation)
    */
@@ -320,6 +302,7 @@ public int getBlocksize() {
   }
 
   /**
+   * Set block size to use when writing
    * @param value Blocksize to use when writing out storefiles/hfiles on this column family.
    * @return this (for chained invocation)
    */
@@ -423,6 +406,7 @@ public boolean isInMemory() {
   }
 
   /**
+   * Set or clear the in memory flag.
    * @param value True if we are to favor keeping all values for this column family in the
    *              HRegionServer cache
    * @return this (for chained invocation)
@@ -438,6 +422,7 @@ public MemoryCompactionPolicy getInMemoryCompaction() {
   }
 
   /**
+   * Set the in memory compaction policy.
    * @param value the prefered in-memory compaction policy for this column family
    * @return this (for chained invocation)
    */
@@ -452,6 +437,7 @@ public KeepDeletedCells getKeepDeletedCells() {
   }
 
   /**
+   * Set the keep deleted cells policy.
    * @param value True if deleted rows should not be collected immediately.
    * @return this (for chained invocation)
    */
@@ -481,6 +467,7 @@ public int getTimeToLive() {
   }
 
   /**
+   * Set the time to live of cell contents
    * @param value Time-to-live of cell contents, in seconds.
    * @return this (for chained invocation)
    */
@@ -490,6 +477,7 @@ public HColumnDescriptor setTimeToLive(int value) {
   }
 
   /**
+   * Set the time to live of cell contents
    * @param value Time to live of cell contents, in human readable format
    * @see org.apache.hadoop.hbase.util.PrettyPrinter#format(String, Unit)
    * @return this (for chained invocation)
@@ -505,6 +493,7 @@ public int getMinVersions() {
   }
 
   /**
+   * Set the minimum number of versions to keep.
    * @param value The minimum number of versions to keep. (used when timeToLive is set)
    * @return this (for chained invocation)
    */
@@ -519,6 +508,7 @@ public boolean isBlockCacheEnabled() {
   }
 
   /**
+   * Set or clear the block cache enabled flag.
    * @param value True if hfile DATA type blocks should be cached (We always cache INDEX and BLOOM
    *              blocks; you cannot turn this off).
    * @return this (for chained invocation)
@@ -534,6 +524,7 @@ public BloomType getBloomFilterType() {
   }
 
   /**
+   * Set the bloom filter type.
    * @param value bloom filter type
    * @return this (for chained invocation)
    */
@@ -547,10 +538,6 @@ public int getScope() {
     return delegatee.getScope();
   }
 
-  /**
-   * @param value the scope tag
-   * @return this (for chained invocation)
-   */
   public HColumnDescriptor setScope(int value) {
     getDelegateeForModification().setScope(value);
     return this;
@@ -562,6 +549,7 @@ public boolean isCacheDataOnWrite() {
   }
 
   /**
+   * Set or clear the cache data on write flag.
    * @param value true if we should cache data blocks on write
    * @return this (for chained invocation)
    */
@@ -571,7 +559,7 @@ public HColumnDescriptor setCacheDataOnWrite(boolean value) {
   }
 
   /**
-   * This is a noop call from HBase 2.0 onwards
+   * Set or clear the cache in L1 flag. This is a noop call from HBase 2.0 onwards
    * @return this (for chained invocation)
    * @deprecated Since 2.0 and will be removed in 3.0 with out any replacement. Caching data in on
    *             heap Cache, when there are both on heap LRU Cache and Bucket Cache will no longer
@@ -588,6 +576,7 @@ public boolean isCacheIndexesOnWrite() {
   }
 
   /**
+   * Set or clear the cache indexes on write flag.
    * @param value true if we should cache index blocks on write
    * @return this (for chained invocation)
    */
@@ -602,6 +591,7 @@ public boolean isCacheBloomsOnWrite() {
   }
 
   /**
+   * Set or clear the cache bloom filters on write flag.
    * @param value true if we should cache bloomfilter blocks on write
    * @return this (for chained invocation)
    */
@@ -616,6 +606,7 @@ public boolean isEvictBlocksOnClose() {
   }
 
   /**
+   * Set or clear the evict bloom filters on close flag.
    * @param value true if we should evict cached blocks from the blockcache on close
    * @return this (for chained invocation)
    */
@@ -630,6 +621,7 @@ public boolean isPrefetchBlocksOnOpen() {
   }
 
   /**
+   * Set or clear the prefetch on open flag.
    * @param value true if we should prefetch blocks into the blockcache on open
    * @return this (for chained invocation)
    */
@@ -638,9 +630,6 @@ public HColumnDescriptor setPrefetchBlocksOnOpen(boolean value) {
     return this;
   }
 
-  /**
-   * @see java.lang.Object#toString()
-   */
   @Override
   public String toString() {
     return delegatee.toString();
@@ -660,9 +649,6 @@ public static Map<String, String> getDefaultValues() {
     return ColumnFamilyDescriptorBuilder.getDefaultValues();
   }
 
-  /**
-   * @see java.lang.Object#equals(java.lang.Object)
-   */
   @Override
   public boolean equals(Object obj) {
     if (this == obj) {
@@ -674,9 +660,6 @@ public boolean equals(Object obj) {
     return false;
   }
 
-  /**
-   * @see java.lang.Object#hashCode()
-   */
   @Override
   public int hashCode() {
     return delegatee.hashCode();
@@ -688,14 +671,15 @@ public int compareTo(HColumnDescriptor other) {
   }
 
   /**
-   * @return This instance serialized with pb with pb magic prefix
+   * Returns This instance serialized with pb with pb magic prefix
    * @see #parseFrom(byte[])
    */
   public byte[] toByteArray() {
     return ColumnFamilyDescriptorBuilder.toByteArray(delegatee);
   }
 
   /**
+   * Parse a serialized representation of a {@link HColumnDescriptor}
    * @param bytes A pb serialized {@link HColumnDescriptor} instance with pb magic prefix
    * @return An instance of {@link HColumnDescriptor} made from <code>bytes</code> n * @see
    *         #toByteArray()