Revert "HBASE-22723 Have CatalogJanitor report holes and overlaps; i.…

…e. problems it sees when doing its regular scan of hbase:meta"

This reverts commit 65a6b27.

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

@@ -810,7 +810,7 @@ private static RegionInfo getClosestRegionInfo(Connection connection,
    * Returns the column family used for meta columns.
    * @return HConstants.CATALOG_FAMILY.
    */
-  public static byte[] getCatalogFamily() {
+  private static byte[] getCatalogFamily() {
     return HConstants.CATALOG_FAMILY;
   }
 
@@ -826,7 +826,7 @@ private static byte[] getTableFamily() {
    * Returns the column qualifier for serialized region info
    * @return HConstants.REGIONINFO_QUALIFIER
    */
-  public static byte[] getRegionInfoColumn() {
+  private static byte[] getRegionInfoColumn() {
     return HConstants.REGIONINFO_QUALIFIER;
   }
 
@@ -1025,7 +1025,7 @@ public static RegionInfo getRegionInfo(Result data) {
    * @return An RegionInfo instance or null.
    */
   @Nullable
-  public static RegionInfo getRegionInfo(final Result r, byte [] qualifier) {
+  private static RegionInfo getRegionInfo(final Result r, byte [] qualifier) {
     Cell cell = r.getColumnLatestCell(getCatalogFamily(), qualifier);
     if (cell == null) return null;
     return RegionInfo.parseFromOrNull(cell.getValueArray(),

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

@@ -70,8 +70,6 @@
  */
 @InterfaceAudience.Public
 public interface RegionInfo {
-  public static final RegionInfo UNDEFINED =
-      RegionInfoBuilder.newBuilder(TableName.valueOf("__UNDEFINED__")).build();
   /**
    * Separator used to demarcate the encodedName in a region name
    * in the new format. See description on new format above.
@@ -777,55 +775,4 @@ static List<RegionInfo> parseDelimitedFrom(final byte[] bytes, final int offset,
     }
     return ris;
   }
-
-
-  /**
-   * @return True if this is first Region in Table
-   */
-  default boolean isFirst() {
-    return Bytes.equals(getStartKey(), HConstants.EMPTY_START_ROW);
-  }
-
-  /**
-   * @return True if this is last Region in Table
-   */
-  default boolean isLast() {
-    return Bytes.equals(getEndKey(), HConstants.EMPTY_START_ROW);
-  }
-
-  /**
-   * @return True if regions are adjacent, if 'after' next. Does not do tablename compare.
-   */
-  default boolean isNext(RegionInfo after) {
-    return Bytes.equals(getEndKey(), after.getStartKey());
-  }
-
-  /**
-   * @return True if RegionInfo is degenerate... if startKey > endKey.
-   */
-  default boolean isDegenerate() {
-    return !isLast() && Bytes.compareTo(getStartKey(), getEndKey()) > 0;
-  }
-
-  /**
-   * @return True if an overlap in region range. Does not do tablename compare.
-   *   Does not check if <code>other</code> has degenerate range.
-   * @see #isDegenerate()
-   */
-  default boolean isOverlap(RegionInfo other) {
-    int startKeyCompare = Bytes.compareTo(getStartKey(), other.getStartKey());
-    if (startKeyCompare == 0) {
-      return true;
-    }
-    if (startKeyCompare < 0) {
-      if (isLast()) {
-        return true;
-      }
-      return Bytes.compareTo(getEndKey(), other.getStartKey()) > 0;
-    }
-    if (other.isLast()) {
-      return true;
-    }
-    return Bytes.compareTo(getStartKey(), other.getEndKey()) < 0;
-  }
 }

hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java

@@ -1359,7 +1359,7 @@ public static long readAsVLong(final byte [] buffer, final int offset) {
    */
   public static int compareTo(final byte [] left, final byte [] right) {
     return LexicographicalComparerHolder.BEST_COMPARER.
-      compareTo(left, 0, left == null? 0: left.length, right, 0, right == null? 0: right.length);
+      compareTo(left, 0, left.length, right, 0, right.length);
   }
 
   /**