Review comments #1 [Contd.]

- Changed the package for HBCKMetaTableAccessor - Added comments for source of the copied methods
apache · Aug 15, 2019 · c5524eb · c5524eb
1 parent dcc7c5b
commit c5524eb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/...he/hbase/hbck1/HBCKMetaTableAccessor.java → ...g/apache/hbase/HBCKMetaTableAccessor.java b/...he/hbase/hbck1/HBCKMetaTableAccessor.java → ...g/apache/hbase/HBCKMetaTableAccessor.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.hbase.hbck1;
+package org.apache.hbase;
 
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellUtil;
@@ -39,12 +39,13 @@
  * hbck's local version of the MetaTableAccessor from the hbase repo
  */
 @InterfaceAudience.Private
-class HBCKMetaTableAccessor {
+public class HBCKMetaTableAccessor {
 
-  private static final Logger LOG = LoggerFactory.getLogger(HBCKMetaTableAccessor.class);
+  private static final Logger LOG = LoggerFactory.getLogger(
+      HBCKMetaTableAccessor.class);
 
   // Constants
-  public static final byte[] MERGE_QUALIFIER_PREFIX = Bytes.toBytes("merge");
+  private static final byte[] MERGE_QUALIFIER_PREFIX = Bytes.toBytes("merge");
 
   public static List<RegionInfo> getMergeRegions(Cell[] cells) {
     if (cells == null) {
@@ -85,6 +86,7 @@ public static void deleteRegionInfo(Connection connection, RegionInfo regionInfo
 
   // Private helper methods
 
+  // COPIED from MetaTableAccessor.isMergeQualifierPrefix()
   private static boolean isMergeQualifierPrefix(Cell cell) {
     // Check to see if has family and that qualifier starts with the MERGE_QUALIFIER_PREFIX
     return CellUtil.matchingFamily(cell, HConstants.CATALOG_FAMILY) && qualifierStartsWith(cell,
@@ -94,6 +96,7 @@ private static boolean isMergeQualifierPrefix(Cell cell) {
   /**
    * Finds if the start of the qualifier part of the Cell matches 'startsWith'
    *
+   * COPIED from PrivateCellUtil.qualifierStartsWith()
    * @param left       the cell with which we need to match the qualifier
    * @param startsWith the serialized keyvalue format byte[]
    * @return true if the qualifier have same staring characters, false otherwise
@@ -110,6 +113,7 @@ private static boolean qualifierStartsWith(final Cell left, final byte[] startsW
   /**
    * Delete the passed <code>d</code> from the <code>hbase:meta</code> table.
    *
+   * COPIED MetaTableAccessor.deleteFromMetaTable()
    * @param connection connection we're using
    * @param d          Delete to add to hbase:meta
    */

diff --git a/hbase-hbck2/src/main/java/org/apache/hbase/hbck1/HBaseFsck.java b/hbase-hbck2/src/main/java/org/apache/hbase/hbck1/HBaseFsck.java
@@ -148,6 +148,7 @@
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.hadoop.util.Tool;
+import org.apache.hbase.HBCKMetaTableAccessor;
 import org.apache.yetus.audience.InterfaceAudience;
 import org.apache.yetus.audience.InterfaceStability;
 import org.apache.zookeeper.KeeperException;

diff --git a/hbase-hbck2/src/main/java/org/apache/hbase/hbck1/HBaseFsckRepair.java b/hbase-hbck2/src/main/java/org/apache/hbase/hbck1/HBaseFsckRepair.java
@@ -43,6 +43,7 @@
 import org.apache.hadoop.hbase.master.ServerManager;
 import org.apache.hadoop.hbase.regionserver.HRegion;
 import org.apache.hadoop.hbase.util.FSUtils;
+import org.apache.hbase.HBCKMetaTableAccessor;
 import org.apache.zookeeper.KeeperException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;