addressing another round of reviews and spotless failures

Change-Id: I992f3eebe00943c4f073d1c7ea96010db21d07e6

Author: wchevreuil

hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileWriterImpl.java

@@ -598,7 +598,8 @@ private BlockCacheKey buildCacheBlockKey(long offset, BlockType blockType) {
   }
 
   private boolean shouldCacheBlock(BlockCache cache, BlockCacheKey key) {
-    Optional<Boolean> result = cache.shouldCacheBlock(key, timeRangeTrackerForTiering.get().getMax(), conf);
+    Optional<Boolean> result =
+      cache.shouldCacheBlock(key, timeRangeTrackerForTiering.get().getMax(), conf);
     return result.orElse(true);
   }
 

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CustomTieredStoreEngine.java

@@ -44,7 +44,8 @@ protected void createComponents(Configuration conf, HStore store, CellComparator
     CompoundConfiguration config = new CompoundConfiguration();
     config.add(conf);
     config.add(store.conf);
-    config.set(DEFAULT_COMPACTION_POLICY_CLASS_KEY, CustomDateTieredCompactionPolicy.class.getName());
+    config.set(DEFAULT_COMPACTION_POLICY_CLASS_KEY,
+      CustomDateTieredCompactionPolicy.class.getName());
     createCompactionPolicy(config, store);
     this.storeFileManager = new DefaultStoreFileManager(kvComparator,
       StoreFileComparators.SEQ_ID_MAX_TIMESTAMP, config, compactionPolicy.getConf());

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CustomCellTieringValueProvider.java

@@ -18,12 +18,12 @@
 package org.apache.hadoop.hbase.regionserver.compactions;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.ArrayBackedTag;
 import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellUtil;
 import org.apache.hadoop.hbase.ExtendedCell;
 import org.apache.hadoop.hbase.PrivateCellUtil;
 import org.apache.hadoop.hbase.Tag;
@@ -52,13 +52,8 @@ public List<ExtendedCell> decorateCells(List<ExtendedCell> cells) {
       byte[] tieringValue = null;
       // first iterates through the cells within a row, to find the tiering value for the row
       for (Cell cell : cells) {
-        byte[] qualifier = new byte[cell.getQualifierLength()];
-        System.arraycopy(cell.getQualifierArray(), cell.getQualifierOffset(), qualifier, 0,
-          cell.getQualifierLength());
-        if (Arrays.equals(qualifier, tieringQualifier)) {
-          tieringValue = new byte[cell.getValueLength()];
-          System.arraycopy(cell.getValueArray(), cell.getValueOffset(), tieringValue, 0,
-            cell.getValueLength());
+        if (CellUtil.matchingQualifier(cell, tieringQualifier)) {
+          tieringValue = CellUtil.cloneValue(cell);
           break;
         }
       }

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CustomDateTieredCompactionPolicy.java

@@ -57,8 +57,8 @@ public class CustomDateTieredCompactionPolicy extends DateTieredCompactionPolicy
 
   private long cutOffTimestamp;
 
-  public CustomDateTieredCompactionPolicy(Configuration conf, StoreConfigInformation storeConfigInfo)
-    throws IOException {
+  public CustomDateTieredCompactionPolicy(Configuration conf,
+    StoreConfigInformation storeConfigInfo) throws IOException {
     super(conf, storeConfigInfo);
     cutOffTimestamp = EnvironmentEdgeManager.currentTime()
       - conf.getLong(AGE_LIMIT_MILLIS, DEFAULT_AGE_LIMIT_MILLIS);

hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCustomCellTieredCompactionPolicy.java

@@ -86,7 +86,8 @@ private CustomDateTieredCompactionPolicy mockAndCreatePolicy() throws Exception
     return mockAndCreatePolicy(mockedRegionInfo);
   }
 
-  private CustomDateTieredCompactionPolicy mockAndCreatePolicy(RegionInfo regionInfo) throws Exception {
+  private CustomDateTieredCompactionPolicy mockAndCreatePolicy(RegionInfo regionInfo)
+    throws Exception {
     StoreConfigInformation mockedStoreConfig = mock(StoreConfigInformation.class);
     when(mockedStoreConfig.getRegionInfo()).thenReturn(regionInfo);
     CustomDateTieredCompactionPolicy policy =