You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2013/01/16 22:36:57 UTC
svn commit: r1434415 - in
/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver:
HRegion.java HRegionServer.java
Author: stack
Date: Wed Jan 16 21:36:57 2013
New Revision: 1434415
URL: http://svn.apache.org/viewvc?rev=1434415&view=rev
Log:
HBASE-6066 some low hanging read path improvement ideas
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1434415&r1=1434414&r2=1434415&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Wed Jan 16 21:36:57 2013
@@ -3434,7 +3434,6 @@ public class HRegion implements HeapSize
private final KeyValue KV_LIMIT = new KeyValue();
private final byte [] stopRow;
private Filter filter;
- private List<KeyValue> results = new ArrayList<KeyValue>();
private int batch;
private int isScan;
private boolean filterClosed = false;
@@ -3561,11 +3560,16 @@ public class HRegion implements HeapSize
@Override
public boolean nextRaw(List<KeyValue> outResults, int limit,
String metric) throws IOException {
- results.clear();
-
- boolean returnResult = nextInternal(limit, metric);
-
- outResults.addAll(results);
+ boolean returnResult;
+ if (outResults.isEmpty()) {
+ // Usually outResults is empty. This is true when next is called
+ // to handle scan or get operation.
+ returnResult = nextInternal(outResults, limit, metric);
+ } else {
+ List<KeyValue> tmpList = new ArrayList<KeyValue>();
+ returnResult = nextInternal(tmpList, limit, metric);
+ outResults.addAll(tmpList);
+ }
resetFilters();
if (isFilterDone()) {
return false;
@@ -3587,10 +3591,12 @@ public class HRegion implements HeapSize
return next(outResults, batch, metric);
}
- private void populateFromJoinedHeap(int limit, String metric) throws IOException {
+ private void populateFromJoinedHeap(List<KeyValue> results, int limit, String metric)
+ throws IOException {
assert joinedContinuationRow != null;
- KeyValue kv = populateResult(this.joinedHeap, limit, joinedContinuationRow.getBuffer(),
- joinedContinuationRow.getRowOffset(), joinedContinuationRow.getRowLength(), metric);
+ KeyValue kv = populateResult(results, this.joinedHeap, limit,
+ joinedContinuationRow.getBuffer(), joinedContinuationRow.getRowOffset(),
+ joinedContinuationRow.getRowLength(), metric);
if (kv != KV_LIMIT) {
// We are done with this row, reset the continuation.
joinedContinuationRow = null;
@@ -3602,6 +3608,7 @@ public class HRegion implements HeapSize
/**
* Fetches records with currentRow into results list, until next row or limit (if not -1).
+ * @param results
* @param heap KeyValueHeap to fetch data from.It must be positioned on correct row before call.
* @param limit Max amount of KVs to place in result list, -1 means no limit.
* @param currentRow Byte array with key we are fetching.
@@ -3610,8 +3617,8 @@ public class HRegion implements HeapSize
* @param metric Metric key to be passed into KeyValueHeap::next().
* @return KV_LIMIT if limit reached, next KeyValue otherwise.
*/
- private KeyValue populateResult(KeyValueHeap heap, int limit, byte[] currentRow, int offset,
- short length, String metric) throws IOException {
+ private KeyValue populateResult(List<KeyValue> results, KeyValueHeap heap, int limit,
+ byte[] currentRow, int offset, short length, String metric) throws IOException {
KeyValue nextKv;
do {
heap.next(results, limit - results.size(), metric);
@@ -3631,7 +3638,11 @@ public class HRegion implements HeapSize
return this.filter != null && this.filter.filterAllRemaining();
}
- private boolean nextInternal(int limit, String metric) throws IOException {
+ private boolean nextInternal(List<KeyValue> results, int limit, String metric)
+ throws IOException {
+ if (!results.isEmpty()) {
+ throw new IllegalArgumentException("First parameter should be an empty list");
+ }
RpcCallContext rpcCall = HBaseServer.getCurrentCall();
// The loop here is used only when at some point during the next we determine
// that due to effects of filters or otherwise, we have an empty row in the result.
@@ -3674,11 +3685,12 @@ public class HRegion implements HeapSize
// Technically, if we hit limits before on this row, we don't need this call.
if (filterRowKey(currentRow, offset, length)) {
nextRow(currentRow, offset, length);
+ results.clear();
continue;
}
- KeyValue nextKv = populateResult(this.storeHeap, limit, currentRow, offset, length,
- metric);
+ KeyValue nextKv = populateResult(results, this.storeHeap, limit, currentRow, offset,
+ length, metric);
// Ok, we are good, let's try to get some results from the main heap.
if (nextKv == KV_LIMIT) {
if (this.filter != null && filter.hasFilterRow()) {
@@ -3699,13 +3711,8 @@ public class HRegion implements HeapSize
filter.filterRow(results);
}
if (isEmptyRow) {
- // this seems like a redundant step - we already consumed the row
- // there're no left overs.
- // the reasons for calling this method are:
- // 1. reset the filters.
- // 2. provide a hook to fast forward the row (used by subclasses)
nextRow(currentRow, offset, length);
-
+ results.clear();
// This row was totally filtered out, if this is NOT the last row,
// we should continue on. Otherwise, nothing else to do.
if (!stopRow) continue;
@@ -3725,12 +3732,12 @@ public class HRegion implements HeapSize
|| this.joinedHeap.seek(KeyValue.createFirstOnRow(currentRow, offset, length));
if (mayHaveData) {
joinedContinuationRow = current;
- populateFromJoinedHeap(limit, metric);
+ populateFromJoinedHeap(results, limit, metric);
}
}
} else {
// Populating from the joined heap was stopped by limits, populate some more.
- populateFromJoinedHeap(limit, metric);
+ populateFromJoinedHeap(results, limit, metric);
}
// We may have just called populateFromJoinedMap and hit the limits. If that is
@@ -3763,7 +3770,6 @@ public class HRegion implements HeapSize
while ((next = this.storeHeap.peek()) != null && next.matchingRow(currentRow, offset, length)) {
this.storeHeap.next(MOCKED_LIST);
}
- results.clear();
resetFilters();
}
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1434415&r1=1434414&r2=1434415&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Wed Jan 16 21:36:57 2013
@@ -3019,8 +3019,10 @@ public class HRegionServer implements C
scanner, results, rows);
if (!results.isEmpty()) {
for (Result r : results) {
- for (KeyValue kv : r.raw()) {
- currentScanResultSize += kv.heapSize();
+ if (maxScannerResultSize < Long.MAX_VALUE){
+ for (KeyValue kv : r.raw()) {
+ currentScanResultSize += kv.heapSize();
+ }
}
}
}
@@ -3045,8 +3047,10 @@ public class HRegionServer implements C
// Collect values to be returned here
boolean moreRows = scanner.nextRaw(values);
if (!values.isEmpty()) {
- for (KeyValue kv : values) {
- currentScanResultSize += kv.heapSize();
+ if (maxScannerResultSize < Long.MAX_VALUE){
+ for (KeyValue kv : values) {
+ currentScanResultSize += kv.heapSize();
+ }
}
results.add(new Result(values));
}