Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CC2391744F for ; Wed, 22 Jul 2015 19:52:23 +0000 (UTC) Received: (qmail 12726 invoked by uid 500); 22 Jul 2015 19:52:21 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 12221 invoked by uid 500); 22 Jul 2015 19:52:21 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 10763 invoked by uid 99); 22 Jul 2015 19:52:20 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Jul 2015 19:52:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 42D25E17FC; Wed, 22 Jul 2015 19:52:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jmhsieh@apache.org To: commits@hbase.apache.org Date: Wed, 22 Jul 2015 19:52:40 -0000 Message-Id: <6d371462121f4002b5b5cc6fabeff97a@git.apache.org> In-Reply-To: <050e2ac5b877409d8887a2750c63a417@git.apache.org> References: <050e2ac5b877409d8887a2750c63a417@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [22/50] [abbrv] hbase git commit: HBASE-13762 Use the same HFileContext with store files in mob files. (Jingcheng) 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/master Commit: 6388b3baf68f399f2c83c99da9687fd1cf4dcf66 Parents: 5428c9f Author: anoopsjohn Authored: Mon May 25 23:27:45 2015 +0530 Committer: anoopsjohn 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 changedReaderObservers = Collections.newSetFromMap(new ConcurrentHashMap()); - 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;