HBASE-8377 IntegrationTestBigLinkedList calculates wrap for linked list size incorrectly
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1470048 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
3e6047f5d5
commit
f22a9ce1ac
|
@ -321,7 +321,7 @@ public class IntegrationTestBigLinkedList extends Configured implements Tool {
|
||||||
table = new HTable(conf, getTableName(conf));
|
table = new HTable(conf, getTableName(conf));
|
||||||
table.setAutoFlush(false);
|
table.setAutoFlush(false);
|
||||||
table.setWriteBufferSize(4 * 1024 * 1024);
|
table.setWriteBufferSize(4 * 1024 * 1024);
|
||||||
numNodes = context.getConfiguration().getLong(GENERATOR_NUM_MAPPERS_KEY, 25000000);
|
numNodes = context.getConfiguration().getLong(GENERATOR_NUM_ROWS_PER_MAP_KEY, 25000000);
|
||||||
if (numNodes < 25000000) {
|
if (numNodes < 25000000) {
|
||||||
wrap = numNodes;
|
wrap = numNodes;
|
||||||
}
|
}
|
||||||
|
@ -373,8 +373,8 @@ public class IntegrationTestBigLinkedList extends Configured implements Tool {
|
||||||
Put put = new Put(Bytes.toBytes(current[i]));
|
Put put = new Put(Bytes.toBytes(current[i]));
|
||||||
put.add(FAMILY_NAME, COLUMN_PREV, Bytes.toBytes(prev == null ? -1 : prev[i]));
|
put.add(FAMILY_NAME, COLUMN_PREV, Bytes.toBytes(prev == null ? -1 : prev[i]));
|
||||||
|
|
||||||
if (count > 0) {
|
if (count >= 0) {
|
||||||
put.add(FAMILY_NAME, COLUMN_COUNT, Bytes.toBytes(count + 1));
|
put.add(FAMILY_NAME, COLUMN_COUNT, Bytes.toBytes(count + i));
|
||||||
}
|
}
|
||||||
if (id != null) {
|
if (id != null) {
|
||||||
put.add(FAMILY_NAME, COLUMN_CLIENT, id);
|
put.add(FAMILY_NAME, COLUMN_CLIENT, id);
|
||||||
|
@ -900,12 +900,18 @@ public class IntegrationTestBigLinkedList extends Configured implements Tool {
|
||||||
node.key = Bytes.toLong(result.getRow());
|
node.key = Bytes.toLong(result.getRow());
|
||||||
if (result.containsColumn(FAMILY_NAME, COLUMN_PREV)) {
|
if (result.containsColumn(FAMILY_NAME, COLUMN_PREV)) {
|
||||||
node.prev = Bytes.toLong(result.getValue(FAMILY_NAME, COLUMN_PREV));
|
node.prev = Bytes.toLong(result.getValue(FAMILY_NAME, COLUMN_PREV));
|
||||||
|
} else {
|
||||||
|
node.prev = -1;
|
||||||
}
|
}
|
||||||
if (result.containsColumn(FAMILY_NAME, COLUMN_COUNT)) {
|
if (result.containsColumn(FAMILY_NAME, COLUMN_COUNT)) {
|
||||||
node.count = Bytes.toLong(result.getValue(FAMILY_NAME, COLUMN_COUNT));
|
node.count = Bytes.toLong(result.getValue(FAMILY_NAME, COLUMN_COUNT));
|
||||||
|
} else {
|
||||||
|
node.count = -1;
|
||||||
}
|
}
|
||||||
if (result.containsColumn(FAMILY_NAME, COLUMN_CLIENT)) {
|
if (result.containsColumn(FAMILY_NAME, COLUMN_CLIENT)) {
|
||||||
node.client = Bytes.toString(result.getValue(FAMILY_NAME, COLUMN_CLIENT));
|
node.client = Bytes.toString(result.getValue(FAMILY_NAME, COLUMN_CLIENT));
|
||||||
|
} else {
|
||||||
|
node.client = "";
|
||||||
}
|
}
|
||||||
return node;
|
return node;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue