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

HBASE-1781 Weird behavior of WildcardColumnTracker.checkColumn(), 

looks like recursive loop


git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@832659 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jean-Daniel Cryans 2009-11-04 05:10:56 +00:00
parent 88c5a74d7c
commit c25e5e20e1
3 changed files with 149 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -92,6 +92,8 @@ Release 0.21.0 - Unreleased
HBASE-1919 code: HRS.delete seems to ignore exceptions it shouldnt
HBASE-1951 Stack overflow when calling HTable.checkAndPut()
when deleting a lot of values
HBASE-1781 Weird behavior of WildcardColumnTracker.checkColumn(),
looks like recursive loop
IMPROVEMENTS
HBASE-1760 Cleanup TODOs in HTable

239
src/java/org/apache/hadoop/hbase/regionserver/WildcardColumnTracker.java
View File

@ -89,93 +89,56 @@ public class WildcardColumnTracker implements ColumnTracker {
* @return MatchCode telling QueryMatcher what action to take
*/
public MatchCode checkColumn(byte [] bytes, int offset, int length) {
boolean recursive = false;
do {
// Nothing to match against, add to new and include
if(this.column == null && this.newColumn == null) {
newColumns.add(new ColumnCount(bytes, offset, length, 1));
this.newColumn = newColumns.get(newIndex);
return MatchCode.INCLUDE;
}
// Nothing old, compare against new
if(this.column == null && this.newColumn != null) {
int ret = Bytes.compareTo(newColumn.getBuffer(), newColumn.getOffset(),
newColumn.getLength(), bytes, offset, length);
// Same column
if(ret == 0) {
if(newColumn.increment() > this.maxVersions) {
return MatchCode.SKIP;
}
return MatchCode.INCLUDE;
}
// Specified column is bigger than current column
// Move down current column and check again
if(ret <= -1) {
if(++newIndex == newColumns.size()) {
// No more, add to end and include
newColumns.add(new ColumnCount(bytes, offset, length, 1));
this.newColumn = newColumns.get(newIndex);
return MatchCode.INCLUDE;
}
// Nothing to match against, add to new and include
if(this.column == null && this.newColumn == null) {
newColumns.add(new ColumnCount(bytes, offset, length, 1));
this.newColumn = newColumns.get(newIndex);
return checkColumn(bytes, offset, length);
}
// ret >= 1
// Specified column is smaller than current column
// Nothing to match against, add to new and include
newColumns.add(new ColumnCount(bytes, offset, length, 1));
this.newColumn = newColumns.get(++newIndex);
return MatchCode.INCLUDE;
}
// Nothing new, compare against old
if(this.newColumn == null && this.column != null) {
int ret = Bytes.compareTo(column.getBuffer(), column.getOffset(),
column.getLength(), bytes, offset, length);
// Same column
if(ret == 0) {
if(column.increment() > this.maxVersions) {
return MatchCode.SKIP;
}
return MatchCode.INCLUDE;
}
// Specified column is bigger than current column
// Move down current column and check again
if(ret <= -1) {
if(++index == columns.size()) {
// No more, add to new and include (new was empty prior to this)
newColumns.add(new ColumnCount(bytes, offset, length, 1));
this.newColumn = newColumns.get(newIndex);
this.column = null;
// Nothing old, compare against new
if(this.column == null && this.newColumn != null) {
int ret = Bytes.compareTo(newColumn.getBuffer(), newColumn.getOffset(),
newColumn.getLength(), bytes, offset, length);
// Same column
if(ret == 0) {
if(newColumn.increment() > this.maxVersions) {
return MatchCode.SKIP;
}
return MatchCode.INCLUDE;
}
this.column = columns.get(index);
return checkColumn(bytes, offset, length);
// Specified column is bigger than current column
// Move down current column and check again
if(ret <= -1) {
if(++newIndex == newColumns.size()) {
// No more, add to end and include
newColumns.add(new ColumnCount(bytes, offset, length, 1));
this.newColumn = newColumns.get(newIndex);
return MatchCode.INCLUDE;
}
this.newColumn = newColumns.get(newIndex);
//return checkColumn(bytes, offset, length);
recursive = true;
continue;
}
// ret >= 1
// Specified column is smaller than current column
// Nothing to match against, add to new and include
newColumns.add(new ColumnCount(bytes, offset, length, 1));
this.newColumn = newColumns.get(++newIndex);
return MatchCode.INCLUDE;
}
// ret >= 1
// Specified column is smaller than current column
// Nothing to match against, add to new and include
newColumns.add(new ColumnCount(bytes, offset, length, 1));
this.newColumn = newColumns.get(newIndex);
return MatchCode.INCLUDE;
}
if (column != null && newColumn != null) {
// There are new and old, figure which to check first
int ret = Bytes.compareTo(column.getBuffer(), column.getOffset(),
column.getLength(), newColumn.getBuffer(), newColumn.getOffset(),
newColumn.getLength());
// Old is smaller than new, compare against old
if(ret <= -1) {
ret = Bytes.compareTo(column.getBuffer(), column.getOffset(),
column.getLength(), bytes, offset, length);
// Nothing new, compare against old
if(this.newColumn == null && this.column != null) {
int ret = Bytes.compareTo(column.getBuffer(), column.getOffset(),
column.getLength(), bytes, offset, length);
// Same column
if(ret == 0) {
@ -189,11 +152,91 @@ public class WildcardColumnTracker implements ColumnTracker {
// Move down current column and check again
if(ret <= -1) {
if(++index == columns.size()) {
// No more, add to new and include (new was empty prior to this)
newColumns.add(new ColumnCount(bytes, offset, length, 1));
this.newColumn = newColumns.get(newIndex);
this.column = null;
} else {
this.column = columns.get(index);
return MatchCode.INCLUDE;
}
return checkColumn(bytes, offset, length);
this.column = columns.get(index);
//return checkColumn(bytes, offset, length);
recursive = true;
continue;
}
// ret >= 1
// Specified column is smaller than current column
// Nothing to match against, add to new and include
newColumns.add(new ColumnCount(bytes, offset, length, 1));
this.newColumn = newColumns.get(newIndex);
return MatchCode.INCLUDE;
}
if (column != null && newColumn != null) {
// There are new and old, figure which to check first
int ret = Bytes.compareTo(column.getBuffer(), column.getOffset(),
column.getLength(), newColumn.getBuffer(), newColumn.getOffset(),
newColumn.getLength());
// Old is smaller than new, compare against old
if(ret <= -1) {
ret = Bytes.compareTo(column.getBuffer(), column.getOffset(),
column.getLength(), bytes, offset, length);
// Same column
if(ret == 0) {
if(column.increment() > this.maxVersions) {
return MatchCode.SKIP;
}
return MatchCode.INCLUDE;
}
// Specified column is bigger than current column
// Move down current column and check again
if(ret <= -1) {
if(++index == columns.size()) {
this.column = null;
} else {
this.column = columns.get(index);
}
//return checkColumn(bytes, offset, length);
recursive = true;
continue;
}
// ret >= 1
// Specified column is smaller than current column
// Nothing to match against, add to new and include
newColumns.add(new ColumnCount(bytes, offset, length, 1));
return MatchCode.INCLUDE;
}
}
if (newColumn != null) {
// Cannot be equal, so ret >= 1
// New is smaller than old, compare against new
int ret = Bytes.compareTo(newColumn.getBuffer(), newColumn.getOffset(),
newColumn.getLength(), bytes, offset, length);
// Same column
if(ret == 0) {
if(newColumn.increment() > this.maxVersions) {
return MatchCode.SKIP;
}
return MatchCode.INCLUDE;
}
// Specified column is bigger than current column
// Move down current column and check again
if(ret <= -1) {
if(++newIndex == newColumns.size()) {
this.newColumn = null;
} else {
this.newColumn = newColumns.get(newIndex);
}
//return checkColumn(bytes, offset, length);
recursive = true;
continue;
}
// ret >= 1
@ -202,39 +245,7 @@ public class WildcardColumnTracker implements ColumnTracker {
newColumns.add(new ColumnCount(bytes, offset, length, 1));
return MatchCode.INCLUDE;
}
}
if (newColumn != null) {
// Cannot be equal, so ret >= 1
// New is smaller than old, compare against new
int ret = Bytes.compareTo(newColumn.getBuffer(), newColumn.getOffset(),
newColumn.getLength(), bytes, offset, length);
// Same column
if(ret == 0) {
if(newColumn.increment() > this.maxVersions) {
return MatchCode.SKIP;
}
return MatchCode.INCLUDE;
}
// Specified column is bigger than current column
// Move down current column and check again
if(ret <= -1) {
if(++newIndex == newColumns.size()) {
this.newColumn = null;
} else {
this.newColumn = newColumns.get(newIndex);
}
return checkColumn(bytes, offset, length);
}
// ret >= 1
// Specified column is smaller than current column
// Nothing to match against, add to new and include
newColumns.add(new ColumnCount(bytes, offset, length, 1));
return MatchCode.INCLUDE;
}
} while(recursive);
// No match happened, add to new and include
newColumns.add(new ColumnCount(bytes, offset, length, 1));

17
src/test/org/apache/hadoop/hbase/regionserver/TestWildcardColumnTracker.java
View File

@ -330,6 +330,23 @@ implements HConstants {
}
}
// HBASE-1781
public void testStackOverflow(){
int maxVersions = 1;
ColumnTracker wild = new WildcardColumnTracker(maxVersions);
for(int i = 0; i < 100000; i+=2) {
byte [] col = Bytes.toBytes("col"+i);
wild.checkColumn(col, 0, col.length);
}
wild.update();
for(int i = 1; i < 100000; i+=2) {
byte [] col = Bytes.toBytes("col"+i);
wild.checkColumn(col, 0, col.length);
}
}
}