Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-11872 Avoid usage of KeyValueUtil#ensureKeyValue from Compactor.

This commit is contained in:
anoopsjohn 2014-09-22 10:25:51 +05:30
parent f5305c6039
commit ee5978d8f0
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/Compactor.java
View File

@ -30,7 +30,6 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.KeyValueUtil;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.io.compress.Compression;
@ -232,7 +231,7 @@ public abstract class Compactor {
int bytesWritten = 0;
// Since scanner.next() can return 'false' but still be delivering data,
// we have to use a do/while loop.
List<Cell> kvs = new ArrayList<Cell>();
List<Cell> cells = new ArrayList<Cell>();
int closeCheckInterval = HStore.getCloseCheckInterval();
long lastMillis;
if (LOG.isDebugEnabled()) {
@ -242,20 +241,19 @@ public abstract class Compactor {
}
boolean hasMore;
do {
hasMore = scanner.next(kvs, compactionKVMax);
hasMore = scanner.next(cells, compactionKVMax);
// output to writer:
for (Cell c : kvs) {
KeyValue kv = KeyValueUtil.ensureKeyValue(c);
if (cleanSeqId && kv.getSequenceId() <= smallestReadPoint) {
CellUtil.setSequenceId(kv, 0);
for (Cell c : cells) {
if (cleanSeqId && c.getSequenceId() <= smallestReadPoint) {
CellUtil.setSequenceId(c, 0);
}
writer.append(kv);
writer.append(c);
++progress.currentCompactedKVs;
progress.totalCompactedSize += kv.getLength();
progress.totalCompactedSize += KeyValueUtil.length(c);
// check periodically to see if a system stop is requested
if (closeCheckInterval > 0) {
bytesWritten += kv.getLength();
bytesWritten += KeyValueUtil.length(c);
if (bytesWritten > closeCheckInterval) {
// Log the progress of long running compactions every minute if
// logging at DEBUG level
@ -275,7 +273,7 @@ public abstract class Compactor {
}
}
}
kvs.clear();
cells.clear();
} while (hasMore);
progress.complete();
return true;