Commit 12ac4494 authored by Leif Walsh's avatar Leif Walsh Committed by Yoni Fogel

[t:4145] merged too much, reverting

git-svn-id: file:///svn/toku/tokudb@37029 c7de825b-a66e-492c-adef-691d508d4ae1
parent 285f28d5
...@@ -150,7 +150,6 @@ struct scan_cb_extra { ...@@ -150,7 +150,6 @@ struct scan_cb_extra {
bool fast; bool fast;
int64_t curr_sum; int64_t curr_sum;
int64_t num_elements; int64_t num_elements;
int elts[20];
}; };
static int static int
...@@ -161,7 +160,6 @@ scan_cb(const DBT *a, const DBT *b, void *arg_v) { ...@@ -161,7 +160,6 @@ scan_cb(const DBT *a, const DBT *b, void *arg_v) {
assert(cb_extra); assert(cb_extra);
assert(b->size >= sizeof(int)); assert(b->size >= sizeof(int));
cb_extra->curr_sum += *(int *)b->data; cb_extra->curr_sum += *(int *)b->data;
cb_extra->elts[cb_extra->num_elements] = *(int*)b->data;
cb_extra->num_elements++; cb_extra->num_elements++;
return cb_extra->fast ? TOKUDB_CURSOR_CONTINUE : 0; return cb_extra->fast ? TOKUDB_CURSOR_CONTINUE : 0;
} }
...@@ -196,9 +194,6 @@ static int scan_op_and_maybe_check_sum(DB_ENV *UU(env), DB **dbp, DB_TXN *txn, A ...@@ -196,9 +194,6 @@ static int scan_op_and_maybe_check_sum(DB_ENV *UU(env), DB **dbp, DB_TXN *txn, A
} }
if (check_sum && e.curr_sum) { if (check_sum && e.curr_sum) {
printf("e.curr_sum: %"PRId64" e.num_elements: %"PRId64" \n", e.curr_sum, e.num_elements); printf("e.curr_sum: %"PRId64" e.num_elements: %"PRId64" \n", e.curr_sum, e.num_elements);
for (int i = 0; i < 20; ++i) {
printf("%d\t%d\n", i, e.elts[i]);
}
assert(false); assert(false);
} }
return r; return r;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment