You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by an...@apache.org on 2015/05/22 16:45:53 UTC
hbase git commit: HBASE-13739 Remove
KeyValueUtil.ensureKeyValue(cell) from MOB code.(Jingcheng)
Repository: hbase
Updated Branches:
refs/heads/hbase-11339 5098f365b -> 132f65ea1
HBASE-13739 Remove KeyValueUtil.ensureKeyValue(cell) from MOB code.(Jingcheng)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/132f65ea
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/132f65ea
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/132f65ea
Branch: refs/heads/hbase-11339
Commit: 132f65ea1f7b4681809dd5e545b3b3b802f0c469
Parents: 5098f36
Author: anoopsjohn <an...@gmail.com>
Authored: Fri May 22 20:15:22 2015 +0530
Committer: anoopsjohn <an...@gmail.com>
Committed: Fri May 22 20:15:22 2015 +0530
----------------------------------------------------------------------
.../hadoop/hbase/mob/DefaultMobStoreFlusher.java | 14 ++++++--------
.../filecompactions/PartitionedMobFileCompactor.java | 10 +++-------
.../hadoop/hbase/mob/mapreduce/MemStoreWrapper.java | 5 +----
.../hadoop/hbase/mob/mapreduce/SweepReducer.java | 4 ++--
4 files changed, 12 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/132f65ea/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.java
index 44387f5..608f4e2 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.java
@@ -31,7 +31,6 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.KeyValueUtil;
import org.apache.hadoop.hbase.Tag;
import org.apache.hadoop.hbase.TagType;
import org.apache.hadoop.hbase.monitoring.MonitoredTask;
@@ -175,19 +174,18 @@ public class DefaultMobStoreFlusher extends DefaultStoreFlusher {
// If we know that this KV is going to be included always, then let us
// set its memstoreTS to 0. This will help us save space when writing to
// disk.
- KeyValue kv = KeyValueUtil.ensureKeyValue(c);
- if (kv.getValueLength() <= mobCellValueSizeThreshold || MobUtils.isMobReferenceCell(kv)
- || kv.getTypeByte() != KeyValue.Type.Put.getCode()) {
- writer.append(kv);
+ if (c.getValueLength() <= mobCellValueSizeThreshold || MobUtils.isMobReferenceCell(c)
+ || c.getTypeByte() != KeyValue.Type.Put.getCode()) {
+ writer.append(c);
} else {
// append the original keyValue in the mob file.
- mobFileWriter.append(kv);
- mobSize += kv.getValueLength();
+ mobFileWriter.append(c);
+ mobSize += c.getValueLength();
mobCount++;
// append the tags to the KeyValue.
// The key is same, the value is the filename of the mob file
- KeyValue reference = MobUtils.createMobRefKeyValue(kv, fileName, tableNameTag);
+ KeyValue reference = MobUtils.createMobRefKeyValue(c, fileName, tableNameTag);
writer.append(reference);
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/132f65ea/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/filecompactions/PartitionedMobFileCompactor.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/filecompactions/PartitionedMobFileCompactor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/filecompactions/PartitionedMobFileCompactor.java
index f02da48..e8729ce 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/filecompactions/PartitionedMobFileCompactor.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/filecompactions/PartitionedMobFileCompactor.java
@@ -361,12 +361,10 @@ public class PartitionedMobFileCompactor extends MobFileCompactor {
do {
hasMore = scanner.next(cells, scannerContext);
for (Cell cell : cells) {
- // TODO remove this after the new code are introduced.
- KeyValue kv = KeyValueUtil.ensureKeyValue(cell);
// write the mob cell to the mob file.
- writer.append(kv);
+ writer.append(cell);
// write the new reference cell to the store file.
- KeyValue reference = MobUtils.createMobRefKeyValue(kv, fileName, tableNameTag);
+ KeyValue reference = MobUtils.createMobRefKeyValue(cell, fileName, tableNameTag);
refFileWriter.append(reference);
mobCells++;
}
@@ -468,9 +466,7 @@ public class PartitionedMobFileCompactor extends MobFileCompactor {
do {
hasMore = scanner.next(cells, scannerContext);
for (Cell cell : cells) {
- // TODO remove this after the new code are introduced.
- KeyValue kv = KeyValueUtil.ensureKeyValue(cell);
- writer.append(kv);
+ writer.append(cell);
}
cells.clear();
} while (hasMore);
http://git-wip-us.apache.org/repos/asf/hbase/blob/132f65ea/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/mapreduce/MemStoreWrapper.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/mapreduce/MemStoreWrapper.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/mapreduce/MemStoreWrapper.java
index 37d4461..38b4d6f 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/mapreduce/MemStoreWrapper.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/mapreduce/MemStoreWrapper.java
@@ -34,9 +34,7 @@ import org.apache.hadoop.hbase.KeyValueUtil;
import org.apache.hadoop.hbase.Tag;
import org.apache.hadoop.hbase.TagType;
import org.apache.hadoop.hbase.client.BufferedMutator;
-import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Put;
-import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.io.hfile.CacheConfig;
import org.apache.hadoop.hbase.mob.MobConstants;
import org.apache.hadoop.hbase.mob.MobUtils;
@@ -140,8 +138,7 @@ public class MemStoreWrapper {
KeyValueScanner scanner = snapshot.getScanner();
Cell cell = null;
while (null != (cell = scanner.next())) {
- KeyValue kv = KeyValueUtil.ensureKeyValue(cell);
- mobFileWriter.append(kv);
+ mobFileWriter.append(cell);
}
scanner.close();
// Write out the log sequence number that corresponds to this output
http://git-wip-us.apache.org/repos/asf/hbase/blob/132f65ea/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/mapreduce/SweepReducer.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/mapreduce/SweepReducer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/mapreduce/SweepReducer.java
index f1060ba..787b242 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/mapreduce/SweepReducer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/mapreduce/SweepReducer.java
@@ -73,8 +73,8 @@ import org.apache.zookeeper.KeeperException;
* This reducer merges the small mob files into bigger ones, and write visited
* names of mob files to a sequence file which is used by the sweep job to delete
* the unused mob files.
- * The key of the input is a file name, the value is a collection of KeyValue where
- * the KeyValue is the actual cell (its format is valueLength + fileName) in HBase.
+ * The key of the input is a file name, the value is a collection of KeyValues
+ * (the value format of KeyValue is valueLength + fileName) in HBase.
* In this reducer, we could know how many cells exist in HBase for a mob file.
* If the existCellSize/mobFileSize < compactionRatio, this mob
* file needs to be merged.