Commit 9e741558 authored by Rich Prohaska's avatar Rich Prohaska Committed by Yoni Fogel

test error from generate key callback refs[t:2603]

git-svn-id: file:///svn/toku/tokudb@20305 c7de825b-a66e-492c-adef-691d508d4ae1
parent e3d629fb
...@@ -883,7 +883,15 @@ static int process_primary_rows_internal (BRTLOADER bl, struct rowset *primary_r ...@@ -883,7 +883,15 @@ static int process_primary_rows_internal (BRTLOADER bl, struct rowset *primary_r
{ {
int r = bl->generate_row_for_put(bl->dbs[i], bl->src_db, &skey, &sval, &pkey, &pval, NULL); int r = bl->generate_row_for_put(bl->dbs[i], bl->src_db, &skey, &sval, &pkey, &pval, NULL);
lazy_assert(r==0); // LAZY if (r != 0) {
error_codes[i] = r;
#if defined(__cilkplusplus)
__sync_fetch_and_add(&error_count, 1);
#else
error_count++;
#endif
break;
}
} }
if (row_wont_fit(rows, skey.size + sval.size)) { if (row_wont_fit(rows, skey.size + sval.size)) {
...@@ -937,7 +945,7 @@ static int process_primary_rows_internal (BRTLOADER bl, struct rowset *primary_r ...@@ -937,7 +945,7 @@ static int process_primary_rows_internal (BRTLOADER bl, struct rowset *primary_r
for (int i=0; i<bl->N; i++) { for (int i=0; i<bl->N; i++) {
if (error_codes[i]) r = error_codes[i]; if (error_codes[i]) r = error_codes[i];
} }
lazy_assert(r); // found the error invariant(r); // found the error
} }
toku_free(error_codes); toku_free(error_codes);
BL_TRACE(blt_extractor); BL_TRACE(blt_extractor);
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#ident "Copyright (c) 2010 Tokutek Inc. All rights reserved." #ident "Copyright (c) 2010 Tokutek Inc. All rights reserved."
#ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it." #ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
// The purpose of this test is to test the extractor component of the brt loader // The purpose of this test is to test the error return from the generate callback
#define DONT_DEPRECATE_MALLOC #define DONT_DEPRECATE_MALLOC
#define DONT_DEPRECATE_WRITES #define DONT_DEPRECATE_WRITES
......
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