Address comments from stack

- rename HStoreContext to StoreContext
- rewrite the getChecksumType
- fix one more style issues

Author: Stephen Wu

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

@@ -234,7 +234,7 @@ public class HStore implements Store, HeapSize, StoreConfigInformation,
   private AtomicLong compactedCellsSize = new AtomicLong();
   private AtomicLong majorCompactedCellsSize = new AtomicLong();
 
-  private HStoreContext storeContext;
+  private StoreContext storeContext;
 
   /**
    * Constructor
@@ -331,8 +331,8 @@ protected HStore(final HRegion region, final ColumnFamilyDescriptor family,
     cacheOnWriteLogged = false;
   }
 
-  private HStoreContext initializeStoreContext(ColumnFamilyDescriptor family) throws IOException {
-    return new HStoreContext.Builder()
+  private StoreContext initializeStoreContext(ColumnFamilyDescriptor family) throws IOException {
+    return new StoreContext.Builder()
         .withBloomType(family.getBloomFilterType())
         .withCacheConfig(createCacheConf(family))
         .withCellComparator(region.getCellComparator())

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStoreContext.java renamed to hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreContext.java

@@ -35,7 +35,7 @@
  * need of passing around the complete store.
  */
 @InterfaceAudience.Private
-public class HStoreContext implements HeapSize {
+public final class StoreContext implements HeapSize {
   public static final long FIXED_OVERHEAD = ClassSize.estimateBase(HStore.class, false);
 
   private final HFileContext defaultFileContext;
@@ -49,7 +49,7 @@ public class HStoreContext implements HeapSize {
   private final Path familyStoreDirectoryPath;
   private final RegionCoprocessorHost coprocessorHost;
 
-  private HStoreContext(Builder builder) {
+  private StoreContext(Builder builder) {
     this.defaultFileContext = builder.defaultFileContext;
     this.cacheConf = builder.cacheConf;
     this.regionFileSystem = builder.regionFileSystem;
@@ -174,8 +174,8 @@ public Builder withRegionCoprocessorHost(RegionCoprocessorHost coprocessorHost)
       return this;
     }
 
-    public HStoreContext build() {
-      return new HStoreContext(this);
+    public StoreContext build() {
+      return new StoreContext(this);
     }
   }
 

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

@@ -147,9 +147,8 @@ static Optional<byte[]> getSplitPoint(Collection<HStoreFile> storefiles,
    * @return The checksum algorithm that is set in the configuration
    */
   public static ChecksumType getChecksumType(Configuration conf) {
-    String checksumName = conf.get(HConstants.CHECKSUM_TYPE_NAME);
-    return checksumName == null ? ChecksumType.getDefaultChecksumType() :
-        ChecksumType.nameToType(checksumName);
+    return ChecksumType.nameToType(
+      conf.get(HConstants.CHECKSUM_TYPE_NAME, ChecksumType.getDefaultChecksumType().getName()));
   }
 
   /**

hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java

@@ -58,7 +58,7 @@
 import org.apache.hadoop.hbase.regionserver.DefaultMemStore;
 import org.apache.hadoop.hbase.regionserver.HRegion;
 import org.apache.hadoop.hbase.regionserver.HStore;
-import org.apache.hadoop.hbase.regionserver.HStoreContext;
+import org.apache.hadoop.hbase.regionserver.StoreContext;
 import org.apache.hadoop.hbase.regionserver.ImmutableSegment;
 import org.apache.hadoop.hbase.regionserver.MemStoreCompactor;
 import org.apache.hadoop.hbase.regionserver.MutableSegment;
@@ -607,7 +607,7 @@ public void testObjectSize() throws IOException {
   @Test
   public void testAutoCalcFixedOverHead() {
     Class[] classList = new Class[] { HFileContext.class, HRegion.class, BlockCacheKey.class,
-      HFileBlock.class, HStore.class, LruBlockCache.class, HStoreContext.class };
+      HFileBlock.class, HStore.class, LruBlockCache.class, StoreContext.class };
     for (Class cl : classList) {
       // do estimate in advance to ensure class is loaded
       ClassSize.estimateBase(cl, false);