Repository: hbase Updated Branches: refs/heads/hbase-11339 5428c9fdd -> 6388b3baf
HBASE-13762 Use the same HFileContext with store files in mob files. (Jingcheng) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6388b3ba Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6388b3ba Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6388b3ba Branch: refs/heads/hbase-11339 Commit: 6388b3baf68f399f2c83c99da9687fd1cf4dcf66 Parents: 5428c9f Author: anoopsjohn <anoopsamj...@gmail.com> Authored: Mon May 25 23:27:45 2015 +0530 Committer: anoopsjohn <anoopsamj...@gmail.com> Committed: Mon May 25 23:27:45 2015 +0530 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/mob/MobUtils.java | 14 ++++++++------ .../apache/hadoop/hbase/regionserver/HMobStore.java | 13 +++++++------ .../org/apache/hadoop/hbase/regionserver/HStore.java | 6 +++--- 3 files changed, 18 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/6388b3ba/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobUtils.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobUtils.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobUtils.java index 527aef2..bbdc47a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobUtils.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobUtils.java @@ -59,7 +59,6 @@ import org.apache.hadoop.hbase.io.compress.Compression; import org.apache.hadoop.hbase.io.crypto.Cipher; import org.apache.hadoop.hbase.io.crypto.Encryption; import org.apache.hadoop.hbase.io.hfile.CacheConfig; -import org.apache.hadoop.hbase.io.hfile.HFile; import org.apache.hadoop.hbase.io.hfile.HFileContext; import org.apache.hadoop.hbase.io.hfile.HFileContextBuilder; import org.apache.hadoop.hbase.master.TableLockManager; @@ -72,7 +71,7 @@ import org.apache.hadoop.hbase.regionserver.StoreFile; import org.apache.hadoop.hbase.security.EncryptionUtil; import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hadoop.hbase.util.ChecksumType; +import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.util.ReflectionUtils; import org.apache.hadoop.hbase.util.Threads; @@ -493,7 +492,8 @@ public class MobUtils { .withCompressTags(family.isCompressTags()).withChecksumType(HStore.getChecksumType(conf)) .withBytesPerCheckSum(HStore.getBytesPerChecksum(conf)).withBlockSize(family.getBlocksize()) .withHBaseCheckSum(true).withDataBlockEncoding(family.getDataBlockEncoding()) - .withEncryptionContext(cryptoContext).build(); + .withEncryptionContext(cryptoContext).withCreateTime(EnvironmentEdgeManager.currentTime()) + .build(); Path tempPath = new Path(basePath, UUID.randomUUID().toString().replaceAll("-", "")); StoreFile.Writer w = new StoreFile.WriterBuilder(conf, cacheConfig, fs).withFilePath(tempPath) .withComparator(CellComparator.COMPARATOR).withBloomType(family.getBloomFilterType()) @@ -574,10 +574,12 @@ public class MobUtils { throws IOException { HFileContext hFileContext = new HFileContextBuilder().withCompression(compression) .withIncludesMvcc(true).withIncludesTags(true) - .withChecksumType(ChecksumType.getDefaultChecksumType()) - .withBytesPerCheckSum(HFile.DEFAULT_BYTES_PER_CHECKSUM).withBlockSize(family.getBlocksize()) + .withCompressTags(family.isCompressTags()) + .withChecksumType(HStore.getChecksumType(conf)) + .withBytesPerCheckSum(HStore.getBytesPerChecksum(conf)).withBlockSize(family.getBlocksize()) .withHBaseCheckSum(true).withDataBlockEncoding(family.getDataBlockEncoding()) - .withEncryptionContext(cryptoContext).build(); + .withEncryptionContext(cryptoContext) + .withCreateTime(EnvironmentEdgeManager.currentTime()).build(); StoreFile.Writer w = new StoreFile.WriterBuilder(conf, cacheConfig, fs) .withFilePath(new Path(basePath, mobFileName.getFileName())) http://git-wip-us.apache.org/repos/asf/hbase/blob/6388b3ba/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HMobStore.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HMobStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HMobStore.java index a667582..dd5d895 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HMobStore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HMobStore.java @@ -46,7 +46,6 @@ import org.apache.hadoop.hbase.filter.Filter; import org.apache.hadoop.hbase.filter.FilterList; import org.apache.hadoop.hbase.io.compress.Compression; import org.apache.hadoop.hbase.io.hfile.CacheConfig; -import org.apache.hadoop.hbase.io.hfile.HFile; import org.apache.hadoop.hbase.io.hfile.HFileContext; import org.apache.hadoop.hbase.io.hfile.HFileContextBuilder; import org.apache.hadoop.hbase.master.TableLockManager; @@ -60,7 +59,7 @@ import org.apache.hadoop.hbase.mob.MobUtils; import org.apache.hadoop.hbase.regionserver.compactions.CompactionContext; import org.apache.hadoop.hbase.regionserver.compactions.CompactionThroughputController; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hadoop.hbase.util.ChecksumType; +import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.HFileArchiveUtil; import org.apache.hadoop.hbase.util.IdLock; @@ -250,11 +249,13 @@ public class HMobStore extends HStore { final CacheConfig writerCacheConf = mobCacheConfig; HFileContext hFileContext = new HFileContextBuilder().withCompression(compression) .withIncludesMvcc(true).withIncludesTags(true) - .withChecksumType(ChecksumType.getDefaultChecksumType()) - .withBytesPerCheckSum(HFile.DEFAULT_BYTES_PER_CHECKSUM) - .withBlockSize(getFamily().getBlocksize()) + .withCompressTags(family.isCompressTags()) + .withChecksumType(checksumType) + .withBytesPerCheckSum(bytesPerChecksum) + .withBlockSize(blocksize) .withHBaseCheckSum(true).withDataBlockEncoding(getFamily().getDataBlockEncoding()) - .withEncryptionContext(cryptoContext).build(); + .withEncryptionContext(cryptoContext) + .withCreateTime(EnvironmentEdgeManager.currentTime()).build(); StoreFile.Writer w = new StoreFile.WriterBuilder(conf, writerCacheConf, region.getFilesystem()) .withFilePath(new Path(basePath, mobFileName.getFileName())) http://git-wip-us.apache.org/repos/asf/hbase/blob/6388b3ba/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java index 552ffd2..3837522 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java @@ -172,12 +172,12 @@ public class HStore implements Store { private final Set<ChangedReadersObserver> changedReaderObservers = Collections.newSetFromMap(new ConcurrentHashMap<ChangedReadersObserver, Boolean>()); - private final int blocksize; + protected final int blocksize; private HFileDataBlockEncoder dataBlockEncoder; /** Checksum configuration */ - private ChecksumType checksumType; - private int bytesPerChecksum; + protected ChecksumType checksumType; + protected int bytesPerChecksum; // Comparing KeyValues private final CellComparator comparator;
