Skip to content

M
mariadb
Commit 99b75cab authored by Bradley C. Kuszmaul's avatar Bradley C. Kuszmaul
Browse files
Options

Deal with the multithreaded cursor DBT memory allocaiton problem. Addresses... 

Deal with the multithreaded cursor DBT memory allocaiton problem.  Addresses #538.  (I'm going to write a few more tests before calling it fixed.)

git-svn-id: file:///svn/tokudb@2854 c7de825b-a66e-492c-adef-691d508d4ae1
parent d3a49aaa
Show whitespace changes
Inline Side-by-side
Showing with 58 additions and 50 deletions
newbrt/brt-internal.h
View file @ 99b75cab
...@@ -173,6 +173,8 @@ struct brt_cursor { ...@@ -173,6 +173,8 @@ struct brt_cursor {
BRT brt; BRT brt;
DBT key; DBT key;
DBT val; DBT val;
int is_temporary_cursor; // If it is a temporary cursor then use the following skey and sval to return tokudb-managed values in dbts. Otherwise use the brt's skey and skval.
void *skey, *sval;
}; };
int toku_create_new_brtnode (BRT t, BRTNODE *result, int height, TOKULOGGER logger); int toku_create_new_brtnode (BRT t, BRTNODE *result, int height, TOKULOGGER logger);
......
newbrt/brt-test-cursor-2.c
View file @ 99b75cab
...@@ -54,7 +54,7 @@ static void test_multiple_brt_cursor_dbts(int n, DB *db) { ...@@ -54,7 +54,7 @@ static void test_multiple_brt_cursor_dbts(int n, DB *db) {
} }
for (i=0; i<n; i++) { for (i=0; i<n; i++) {
r = toku_brt_cursor(brt, &cursors[i]); r = toku_brt_cursor(brt, &cursors[i], 0);
assert(r == 0); assert(r == 0);
} }
......
newbrt/brt-test-cursor.c
View file @ 99b75cab
...@@ -34,7 +34,7 @@ static void assert_cursor_notfound(BRT brt, int position) { ...@@ -34,7 +34,7 @@ static void assert_cursor_notfound(BRT brt, int position) {
int r; int r;
DBT kbt, vbt; DBT kbt, vbt;
r = toku_brt_cursor(brt, &cursor); r = toku_brt_cursor(brt, &cursor, 0);
assert(r==0); assert(r==0);
toku_init_dbt(&kbt); kbt.flags = DB_DBT_MALLOC; toku_init_dbt(&kbt); kbt.flags = DB_DBT_MALLOC;
...@@ -52,7 +52,7 @@ static void assert_cursor_value(BRT brt, int position, long long value) { ...@@ -52,7 +52,7 @@ static void assert_cursor_value(BRT brt, int position, long long value) {
DBT kbt, vbt; DBT kbt, vbt;
long long v; long long v;
r = toku_brt_cursor(brt, &cursor); r = toku_brt_cursor(brt, &cursor, 0);
assert(r==0); assert(r==0);
if (test_cursor_debug && verbose) printf("key: "); if (test_cursor_debug && verbose) printf("key: ");
...@@ -78,7 +78,7 @@ static void assert_cursor_first_last(BRT brt, long long firstv, long long lastv) ...@@ -78,7 +78,7 @@ static void assert_cursor_first_last(BRT brt, long long firstv, long long lastv)
DBT kbt, vbt; DBT kbt, vbt;
long long v; long long v;
r = toku_brt_cursor(brt, &cursor); r = toku_brt_cursor(brt, &cursor, 0);
assert(r==0); assert(r==0);
if (test_cursor_debug && verbose) printf("first key: "); if (test_cursor_debug && verbose) printf("first key: ");
...@@ -285,7 +285,7 @@ static void assert_cursor_walk(BRT brt, int n) { ...@@ -285,7 +285,7 @@ static void assert_cursor_walk(BRT brt, int n) {
int i; int i;
int r; int r;
r = toku_brt_cursor(brt, &cursor); r = toku_brt_cursor(brt, &cursor, 0);
assert(r==0); assert(r==0);
if (test_cursor_debug && verbose) printf("key: "); if (test_cursor_debug && verbose) printf("key: ");
...@@ -357,7 +357,7 @@ static void assert_cursor_rwalk(BRT brt, int n) { ...@@ -357,7 +357,7 @@ static void assert_cursor_rwalk(BRT brt, int n) {
int i; int i;
int r; int r;
r = toku_brt_cursor(brt, &cursor); r = toku_brt_cursor(brt, &cursor, 0);
assert(r==0); assert(r==0);
if (test_cursor_debug && verbose) printf("key: "); if (test_cursor_debug && verbose) printf("key: ");
...@@ -430,7 +430,7 @@ static void assert_cursor_walk_inorder(BRT brt, int n) { ...@@ -430,7 +430,7 @@ static void assert_cursor_walk_inorder(BRT brt, int n) {
int r; int r;
char *prevkey; char *prevkey;
r = toku_brt_cursor(brt, &cursor); r = toku_brt_cursor(brt, &cursor, 0);
assert(r==0); assert(r==0);
prevkey = 0; prevkey = 0;
...@@ -542,7 +542,7 @@ static void test_brt_cursor_split(int n, DB *db) { ...@@ -542,7 +542,7 @@ static void test_brt_cursor_split(int n, DB *db) {
assert(r==0); assert(r==0);
} }
r = toku_brt_cursor(brt, &cursor); r = toku_brt_cursor(brt, &cursor, 0);
assert(r==0); assert(r==0);
if (test_cursor_debug && verbose) printf("key: "); if (test_cursor_debug && verbose) printf("key: ");
...@@ -609,7 +609,7 @@ static void test_multiple_brt_cursors(int n, DB *db) { ...@@ -609,7 +609,7 @@ static void test_multiple_brt_cursors(int n, DB *db) {
int i; int i;
for (i=0; i<n; i++) { for (i=0; i<n; i++) {
r = toku_brt_cursor(brt, &cursors[i]); r = toku_brt_cursor(brt, &cursors[i], 0);
assert(r == 0); assert(r == 0);
} }
...@@ -659,7 +659,7 @@ static void test_multiple_brt_cursor_walk(int n, DB *db) { ...@@ -659,7 +659,7 @@ static void test_multiple_brt_cursor_walk(int n, DB *db) {
int c; int c;
/* create the cursors */ /* create the cursors */
for (c=0; c<ncursors; c++) { for (c=0; c<ncursors; c++) {
r = toku_brt_cursor(brt, &cursors[c]); r = toku_brt_cursor(brt, &cursors[c], 0);
assert(r == 0); assert(r == 0);
} }
...@@ -751,7 +751,7 @@ static void test_brt_cursor_set(int n, int cursor_op, DB *db) { ...@@ -751,7 +751,7 @@ static void test_brt_cursor_set(int n, int cursor_op, DB *db) {
assert(r == 0); assert(r == 0);
} }
r = toku_brt_cursor(brt, &cursor); r = toku_brt_cursor(brt, &cursor, 0);
assert(r==0); assert(r==0);
/* set cursor to random keys in set { 0, 10, 20, .. 10*(n-1) } */ /* set cursor to random keys in set { 0, 10, 20, .. 10*(n-1) } */
...@@ -824,7 +824,7 @@ static void test_brt_cursor_set_range(int n, DB *db) { ...@@ -824,7 +824,7 @@ static void test_brt_cursor_set_range(int n, DB *db) {
assert(r == 0); assert(r == 0);
} }
r = toku_brt_cursor(brt, &cursor); r = toku_brt_cursor(brt, &cursor, 0);
assert(r==0); assert(r==0);
/* pick random keys v in 0 <= v < 10*n, the cursor should point /* pick random keys v in 0 <= v < 10*n, the cursor should point
...@@ -875,7 +875,7 @@ static void test_brt_cursor_delete(int n, DB *db) { ...@@ -875,7 +875,7 @@ static void test_brt_cursor_delete(int n, DB *db) {
error = toku_open_brt(fname, 0, 1, &brt, 1<<12, ct, null_txn, test_brt_cursor_keycompare, db); error = toku_open_brt(fname, 0, 1, &brt, 1<<12, ct, null_txn, test_brt_cursor_keycompare, db);
assert(error == 0); assert(error == 0);
error = toku_brt_cursor(brt, &cursor); error = toku_brt_cursor(brt, &cursor, 0);
assert(error == 0); assert(error == 0);
DBT key, val; DBT key, val;
...@@ -936,7 +936,7 @@ static void test_brt_cursor_get_both(int n, DB *db) { ...@@ -936,7 +936,7 @@ static void test_brt_cursor_get_both(int n, DB *db) {
error = toku_open_brt(fname, 0, 1, &brt, 1<<12, ct, null_txn, test_brt_cursor_keycompare, db); error = toku_open_brt(fname, 0, 1, &brt, 1<<12, ct, null_txn, test_brt_cursor_keycompare, db);
assert(error == 0); assert(error == 0);
error = toku_brt_cursor(brt, &cursor); error = toku_brt_cursor(brt, &cursor, 0);
assert(error == 0); assert(error == 0);
DBT key, val; DBT key, val;
......
newbrt/brt-test.c
View file @ 99b75cab
...@@ -565,7 +565,7 @@ static void test_cursor_last_empty(void) { ...@@ -565,7 +565,7 @@ static void test_cursor_last_empty(void) {
//printf("%s:%d %d alloced\n", __FILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items(); //printf("%s:%d %d alloced\n", __FILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items();
r = toku_open_brt(n, 0, 1, &brt, 1<<12, ct, null_txn, toku_default_compare_fun, null_db); assert(r==0); r = toku_open_brt(n, 0, 1, &brt, 1<<12, ct, null_txn, toku_default_compare_fun, null_db); assert(r==0);
//printf("%s:%d %d alloced\n", __FILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items(); //printf("%s:%d %d alloced\n", __FILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items();
r = toku_brt_cursor(brt, &cursor); assert(r==0); r = toku_brt_cursor(brt, &cursor, 0); assert(r==0);
toku_init_dbt(&kbt); toku_init_dbt(&kbt);
//printf("%s:%d %d alloced\n", __FILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items(); //printf("%s:%d %d alloced\n", __FILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items();
toku_init_dbt(&vbt); toku_init_dbt(&vbt);
...@@ -600,7 +600,7 @@ static void test_cursor_next (void) { ...@@ -600,7 +600,7 @@ static void test_cursor_next (void) {
r = toku_brt_insert(brt, toku_fill_dbt(&kbt, "hello", 6), toku_fill_dbt(&vbt, "there", 6), null_txn); r = toku_brt_insert(brt, toku_fill_dbt(&kbt, "hello", 6), toku_fill_dbt(&vbt, "there", 6), null_txn);
r = toku_brt_insert(brt, toku_fill_dbt(&kbt, "byebye", 7), toku_fill_dbt(&vbt, "byenow", 7), null_txn); r = toku_brt_insert(brt, toku_fill_dbt(&kbt, "byebye", 7), toku_fill_dbt(&vbt, "byenow", 7), null_txn);
if (verbose) printf("%s:%d calling toku_brt_cursor(...)\n", __FILE__, __LINE__); if (verbose) printf("%s:%d calling toku_brt_cursor(...)\n", __FILE__, __LINE__);
r = toku_brt_cursor(brt, &cursor); assert(r==0); r = toku_brt_cursor(brt, &cursor, 0); assert(r==0);
toku_init_dbt(&kbt); toku_init_dbt(&kbt);
//printf("%s:%d %d alloced\n", __FILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items(); //printf("%s:%d %d alloced\n", __FILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items();
toku_init_dbt(&vbt); toku_init_dbt(&vbt);
...@@ -691,7 +691,7 @@ static void test_wrongendian_compare (int wrong_p, unsigned int N) { ...@@ -691,7 +691,7 @@ static void test_wrongendian_compare (int wrong_p, unsigned int N) {
r = toku_brt_insert(brt, &kbt, &vbt, null_txn); r = toku_brt_insert(brt, &kbt, &vbt, null_txn);
assert(r==0); assert(r==0);
} }
r = toku_brt_cursor(brt, &cursor); assert(r==0); r = toku_brt_cursor(brt, &cursor, 0); assert(r==0);
for (i=0; i<2; i++) { for (i=0; i<2; i++) {
toku_init_dbt(&kbt); toku_init_dbt(&vbt); toku_init_dbt(&kbt); toku_init_dbt(&vbt);
...@@ -728,7 +728,7 @@ static void test_wrongendian_compare (int wrong_p, unsigned int N) { ...@@ -728,7 +728,7 @@ static void test_wrongendian_compare (int wrong_p, unsigned int N) {
assert(r==0); assert(r==0);
toku_cachetable_verify(ct); toku_cachetable_verify(ct);
} }
r = toku_brt_cursor(brt, &cursor); assert(r==0); r = toku_brt_cursor(brt, &cursor, 0); assert(r==0);
int prev=-1; int prev=-1;
for (i=0; i<N; i++) { for (i=0; i<N; i++) {
...@@ -882,7 +882,7 @@ static void test_brt_delete_present(int n) { ...@@ -882,7 +882,7 @@ static void test_brt_delete_present(int n) {
/* cursor should not find anything */ /* cursor should not find anything */
BRT_CURSOR cursor; BRT_CURSOR cursor;
r = toku_brt_cursor(t, &cursor); r = toku_brt_cursor(t, &cursor, 0);
assert(r == 0); assert(r == 0);
toku_init_dbt(&key); key.flags = DB_DBT_MALLOC; toku_init_dbt(&key); key.flags = DB_DBT_MALLOC;
...@@ -1009,7 +1009,7 @@ static void test_brt_delete_cursor_first(int n) { ...@@ -1009,7 +1009,7 @@ static void test_brt_delete_cursor_first(int n) {
/* cursor should find the last key: n-1 */ /* cursor should find the last key: n-1 */
BRT_CURSOR cursor; BRT_CURSOR cursor;
r = toku_brt_cursor(t, &cursor); r = toku_brt_cursor(t, &cursor, 0);
assert(r == 0); assert(r == 0);
toku_init_dbt(&key); key.flags = DB_DBT_MALLOC; toku_init_dbt(&key); key.flags = DB_DBT_MALLOC;
...@@ -1133,7 +1133,7 @@ static void test_brt_delete_both(int n) { ...@@ -1133,7 +1133,7 @@ static void test_brt_delete_both(int n) {
/* cursor should find only odd pairs */ /* cursor should find only odd pairs */
BRT_CURSOR cursor; BRT_CURSOR cursor;
r = toku_brt_cursor(t, &cursor); assert(r == 0); r = toku_brt_cursor(t, &cursor, 0); assert(r == 0);
for (i=1; ; i += 2) { for (i=1; ; i += 2) {
toku_init_dbt(&key); key.flags = DB_DBT_MALLOC; toku_init_dbt(&key); key.flags = DB_DBT_MALLOC;
...@@ -1180,7 +1180,7 @@ static void test_new_brt_cursor_create_close() { ...@@ -1180,7 +1180,7 @@ static void test_new_brt_cursor_create_close() {
int i; int i;
for (i=0; i<n; i++) { for (i=0; i<n; i++) {
r = toku_brt_cursor(brt, &cursors[i]); assert(r == 0); r = toku_brt_cursor(brt, &cursors[i], 0); assert(r == 0);
} }
for (i=0; i<n; i++) { for (i=0; i<n; i++) {
...@@ -1216,7 +1216,7 @@ static void test_new_brt_cursor_first(int n, int dup_mode) { ...@@ -1216,7 +1216,7 @@ static void test_new_brt_cursor_first(int n, int dup_mode) {
BRT_CURSOR cursor; BRT_CURSOR cursor;
r = toku_brt_cursor(t, &cursor); assert(r == 0); r = toku_brt_cursor(t, &cursor, 0); assert(r == 0);
toku_init_dbt(&key); key.flags = DB_DBT_REALLOC; toku_init_dbt(&key); key.flags = DB_DBT_REALLOC;
toku_init_dbt(&val); val.flags = DB_DBT_REALLOC; toku_init_dbt(&val); val.flags = DB_DBT_REALLOC;
...@@ -1271,7 +1271,7 @@ static void test_new_brt_cursor_last(int n, int dup_mode) { ...@@ -1271,7 +1271,7 @@ static void test_new_brt_cursor_last(int n, int dup_mode) {
BRT_CURSOR cursor; BRT_CURSOR cursor;
r = toku_brt_cursor(t, &cursor); assert(r == 0); r = toku_brt_cursor(t, &cursor, 0); assert(r == 0);
toku_init_dbt(&key); key.flags = DB_DBT_REALLOC; toku_init_dbt(&key); key.flags = DB_DBT_REALLOC;
toku_init_dbt(&val); val.flags = DB_DBT_REALLOC; toku_init_dbt(&val); val.flags = DB_DBT_REALLOC;
...@@ -1329,7 +1329,7 @@ static void test_new_brt_cursor_next(int n, int dup_mode) { ...@@ -1329,7 +1329,7 @@ static void test_new_brt_cursor_next(int n, int dup_mode) {
BRT_CURSOR cursor; BRT_CURSOR cursor;
r = toku_brt_cursor(t, &cursor); assert(r == 0); r = toku_brt_cursor(t, &cursor, 0); assert(r == 0);
for (i=0; ; i++) { for (i=0; ; i++) {
r = toku_brt_cursor_get(cursor, &key, &val, DB_NEXT, null_txn); r = toku_brt_cursor_get(cursor, &key, &val, DB_NEXT, null_txn);
...@@ -1379,7 +1379,7 @@ static void test_new_brt_cursor_prev(int n, int dup_mode) { ...@@ -1379,7 +1379,7 @@ static void test_new_brt_cursor_prev(int n, int dup_mode) {
BRT_CURSOR cursor; BRT_CURSOR cursor;
r = toku_brt_cursor(t, &cursor); assert(r == 0); r = toku_brt_cursor(t, &cursor, 0); assert(r == 0);
toku_init_dbt(&key); key.flags = DB_DBT_REALLOC; toku_init_dbt(&key); key.flags = DB_DBT_REALLOC;
toku_init_dbt(&val); val.flags = DB_DBT_REALLOC; toku_init_dbt(&val); val.flags = DB_DBT_REALLOC;
...@@ -1432,7 +1432,7 @@ static void test_new_brt_cursor_current(int n, int dup_mode) { ...@@ -1432,7 +1432,7 @@ static void test_new_brt_cursor_current(int n, int dup_mode) {
BRT_CURSOR cursor; BRT_CURSOR cursor;
r = toku_brt_cursor(t, &cursor); assert(r == 0); r = toku_brt_cursor(t, &cursor, 0); assert(r == 0);
toku_init_dbt(&key); key.flags = DB_DBT_REALLOC; toku_init_dbt(&key); key.flags = DB_DBT_REALLOC;
toku_init_dbt(&val); val.flags = DB_DBT_REALLOC; toku_init_dbt(&val); val.flags = DB_DBT_REALLOC;
...@@ -1515,7 +1515,7 @@ static void test_new_brt_cursor_set_range(int n, int dup_mode) { ...@@ -1515,7 +1515,7 @@ static void test_new_brt_cursor_set_range(int n, int dup_mode) {
r = toku_brt_insert(brt, toku_fill_dbt(&key, &k, sizeof k), toku_fill_dbt(&val, &v, sizeof v), 0); assert(r == 0); r = toku_brt_insert(brt, toku_fill_dbt(&key, &k, sizeof k), toku_fill_dbt(&val, &v, sizeof v), 0); assert(r == 0);
} }
r = toku_brt_cursor(brt, &cursor); assert(r==0); r = toku_brt_cursor(brt, &cursor, 0); assert(r==0);
/* pick random keys v in 0 <= v < 10*n, the cursor should point /* pick random keys v in 0 <= v < 10*n, the cursor should point
to the smallest key in the tree that is >= v */ to the smallest key in the tree that is >= v */
...@@ -1572,7 +1572,7 @@ static void test_new_brt_cursor_set(int n, int cursor_op, DB *db) { ...@@ -1572,7 +1572,7 @@ static void test_new_brt_cursor_set(int n, int cursor_op, DB *db) {
r = toku_brt_insert(brt, toku_fill_dbt(&key, &k, sizeof k), toku_fill_dbt(&val, &v, sizeof v), 0); assert(r == 0); r = toku_brt_insert(brt, toku_fill_dbt(&key, &k, sizeof k), toku_fill_dbt(&val, &v, sizeof v), 0); assert(r == 0);
} }
r = toku_brt_cursor(brt, &cursor); assert(r==0); r = toku_brt_cursor(brt, &cursor, 0); assert(r==0);
/* set cursor to random keys in set { 0, 10, 20, .. 10*(n-1) } */ /* set cursor to random keys in set { 0, 10, 20, .. 10*(n-1) } */
for (i=0; i<n; i++) { for (i=0; i<n; i++) {
......
newbrt/brt.c
View file @ 99b75cab
...@@ -1733,7 +1733,7 @@ int toku_brt_lookup (BRT brt, DBT *k, DBT *v) { ...@@ -1733,7 +1733,7 @@ int toku_brt_lookup (BRT brt, DBT *k, DBT *v) {
int r, rr; int r, rr;
BRT_CURSOR cursor; BRT_CURSOR cursor;
rr = toku_brt_cursor(brt, &cursor); rr = toku_brt_cursor(brt, &cursor, 1);
if (rr != 0) return rr; if (rr != 0) return rr;
int op = brt->flags & TOKU_DB_DUPSORT ? DB_GET_BOTH : DB_SET; int op = brt->flags & TOKU_DB_DUPSORT ? DB_GET_BOTH : DB_SET;
...@@ -2039,7 +2039,7 @@ static inline void brt_cursor_set_key_val(BRT_CURSOR cursor, DBT *newkey, DBT *n ...@@ -2039,7 +2039,7 @@ static inline void brt_cursor_set_key_val(BRT_CURSOR cursor, DBT *newkey, DBT *n
cursor->val = *newval; memset(newval, 0, sizeof *newval); cursor->val = *newval; memset(newval, 0, sizeof *newval);
} }
int toku_brt_cursor(BRT brt, BRT_CURSOR *cursorptr) { int toku_brt_cursor (BRT brt, BRT_CURSOR *cursorptr, int is_temporary_cursor) {
BRT_CURSOR cursor = toku_malloc(sizeof *cursor); BRT_CURSOR cursor = toku_malloc(sizeof *cursor);
if (cursor == 0) if (cursor == 0)
return ENOMEM; return ENOMEM;
...@@ -2047,12 +2047,16 @@ int toku_brt_cursor(BRT brt, BRT_CURSOR *cursorptr) { ...@@ -2047,12 +2047,16 @@ int toku_brt_cursor(BRT brt, BRT_CURSOR *cursorptr) {
toku_init_dbt(&cursor->key); toku_init_dbt(&cursor->key);
toku_init_dbt(&cursor->val); toku_init_dbt(&cursor->val);
list_push(&brt->cursors, &cursor->cursors_link); list_push(&brt->cursors, &cursor->cursors_link);
cursor->is_temporary_cursor=is_temporary_cursor;
cursor->skey = cursor->sval = 0;
*cursorptr = cursor; *cursorptr = cursor;
return 0; return 0;
} }
int toku_brt_cursor_close(BRT_CURSOR cursor) { int toku_brt_cursor_close(BRT_CURSOR cursor) {
brt_cursor_cleanup(cursor); brt_cursor_cleanup(cursor);
if (cursor->skey) toku_free(cursor->skey);
if (cursor->sval) toku_free(cursor->sval);
list_remove(&cursor->cursors_link); list_remove(&cursor->cursors_link);
toku_free_n(cursor, sizeof *cursor); toku_free_n(cursor, sizeof *cursor);
return 0; return 0;
...@@ -2076,9 +2080,9 @@ static inline int compare_kv_xy(BRT brt, DBT *k, DBT *v, DBT *x, DBT *y) { ...@@ -2076,9 +2080,9 @@ static inline int compare_kv_xy(BRT brt, DBT *k, DBT *v, DBT *x, DBT *y) {
static inline int brt_cursor_copyout(BRT_CURSOR cursor, DBT *key, DBT *val) { static inline int brt_cursor_copyout(BRT_CURSOR cursor, DBT *key, DBT *val) {
int r = 0; int r = 0;
if (key) if (key)
r = toku_dbt_set_value(key, cursor->key.data, cursor->key.size, &cursor->brt->skey); r = toku_dbt_set_value(key, cursor->key.data, cursor->key.size, cursor->is_temporary_cursor ? &cursor->brt->skey : &cursor->skey);
if (r == 0 && val) if (r == 0 && val)
r = toku_dbt_set_value(val, cursor->val.data, cursor->val.size, &cursor->brt->sval); r = toku_dbt_set_value(val, cursor->val.data, cursor->val.size, cursor->is_temporary_cursor ? &cursor->brt->sval : &cursor->sval);
return r; return r;
} }
......
newbrt/brt.h
View file @ 99b75cab
...@@ -47,7 +47,7 @@ int toku_verify_brt (BRT brt); ...@@ -47,7 +47,7 @@ int toku_verify_brt (BRT brt);
//int show_brt_blocknumbers(BRT); //int show_brt_blocknumbers(BRT);
typedef struct brt_cursor *BRT_CURSOR; typedef struct brt_cursor *BRT_CURSOR;
int toku_brt_cursor (BRT, BRT_CURSOR*); int toku_brt_cursor (BRT, BRT_CURSOR*, int is_temporary_cursor);
int toku_brt_cursor_get (BRT_CURSOR cursor, DBT *kbt, DBT *vbt, int brtc_flags, TOKUTXN); int toku_brt_cursor_get (BRT_CURSOR cursor, DBT *kbt, DBT *vbt, int brtc_flags, TOKUTXN);
int toku_brt_cursor_delete(BRT_CURSOR cursor, int flags, TOKUTXN); int toku_brt_cursor_delete(BRT_CURSOR cursor, int flags, TOKUTXN);
int toku_brt_cursor_close (BRT_CURSOR curs); int toku_brt_cursor_close (BRT_CURSOR curs);
......
newbrt/memory.c
View file @ 99b75cab
...@@ -177,6 +177,7 @@ void *toku_tagmalloc(size_t size, int typtag) { ...@@ -177,6 +177,7 @@ void *toku_tagmalloc(size_t size, int typtag) {
} }
void *toku_realloc(void *p, size_t size) { void *toku_realloc(void *p, size_t size) {
if (p==0) return toku_malloc(size);
void *newp; void *newp;
note_did_free(p); note_did_free(p);
errno=0; errno=0;
......
src/tests/test_cursor_2.c
View file @ 99b75cab
...@@ -26,6 +26,7 @@ void test_cursor() { ...@@ -26,6 +26,7 @@ void test_cursor() {
/* create the dup database file */ /* create the dup database file */
r = db_env_create(&env, 0); assert(r == 0); r = db_env_create(&env, 0); assert(r == 0);
env->set_errfile(env, stderr);
r = env->open(env, ENVDIR, DB_CREATE|DB_INIT_MPOOL|DB_THREAD|DB_PRIVATE, 0777); CKERR(r); r = env->open(env, ENVDIR, DB_CREATE|DB_INIT_MPOOL|DB_THREAD|DB_PRIVATE, 0777); CKERR(r);
r = db_create(&db, env, 0); assert(r == 0); r = db_create(&db, env, 0); assert(r == 0);
db->set_errfile(db,stderr); // Turn off those annoying errors db->set_errfile(db,stderr); // Turn off those annoying errors
......
src/tests/test_db_secondary.c
View file @ 99b75cab
...@@ -109,16 +109,16 @@ void insert_test() { ...@@ -109,16 +109,16 @@ void insert_test() {
/* Try to get it from primary. */ /* Try to get it from primary. */
r = dbp->get(dbp, null_txn, &key, &testdata, 0); CKERR(r); r = dbp->get(dbp, null_txn, &key, &testdata, 0); CKERR(r);
r = dbtcmp(&data, &testdata); CKERR(r); r = dbtcmp(&data, &testdata); assert(r == 0); // Not ckerr
/* Try to get it from secondary. */ /* Try to get it from secondary. */
r = sdbp->get(sdbp, null_txn, &skey, &testdata, 0); CKERR(r); r = sdbp->get(sdbp, null_txn, &skey, &testdata, 0); CKERR(r);
r = dbtcmp(&data, &testdata); CKERR(r); r = dbtcmp(&data, &testdata); assert(r == 0); // Not ckerr
/* Try to pget from secondary */ /* Try to pget from secondary */
r = sdbp->pget(sdbp, null_txn, &skey, &testkey, &testdata, 0); CKERR(r); r = sdbp->pget(sdbp, null_txn, &skey, &testkey, &testdata, 0); CKERR(r);
r = dbtcmp(&data, &testdata); CKERR(r); r = dbtcmp(&data, &testdata); assert(r == 0); // Not ckerr
r = dbtcmp(&testkey, &key); CKERR(r); r = dbtcmp(&testkey, &key); assert(r == 0); // Not ckerr
/* Make sure we fail 'pget' from primary */ /* Make sure we fail 'pget' from primary */
r = dbp->pget(dbp, null_txn, &key, &testkey, &data, 0); assert(r == EINVAL); r = dbp->pget(dbp, null_txn, &key, &testkey, &data, 0); assert(r == EINVAL);
......
src/ydb.c
View file @ 99b75cab
...@@ -77,7 +77,7 @@ static inline int db_opened(DB *db) { ...@@ -77,7 +77,7 @@ static inline int db_opened(DB *db) {
static int toku_db_put(DB * db, DB_TXN * txn, DBT * key, DBT * data, u_int32_t flags); static int toku_db_put(DB * db, DB_TXN * txn, DBT * key, DBT * data, u_int32_t flags);
static int toku_db_get (DB * db, DB_TXN * txn, DBT * key, DBT * data, u_int32_t flags); static int toku_db_get (DB * db, DB_TXN * txn, DBT * key, DBT * data, u_int32_t flags);
static int toku_db_pget (DB *db, DB_TXN *txn, DBT *key, DBT *pkey, DBT *data, u_int32_t flags); static int toku_db_pget (DB *db, DB_TXN *txn, DBT *key, DBT *pkey, DBT *data, u_int32_t flags);
static int toku_db_cursor(DB *db, DB_TXN * txn, DBC **c, u_int32_t flags); static int toku_db_cursor(DB *db, DB_TXN * txn, DBC **c, u_int32_t flags, int is_temporary_cursor);
/* txn methods */ /* txn methods */
...@@ -889,7 +889,7 @@ int log_compare(const DB_LSN * a, const DB_LSN * b) { ...@@ -889,7 +889,7 @@ int log_compare(const DB_LSN * a, const DB_LSN * b) {
static int maybe_do_associate_create (DB_TXN*txn, DB*primary, DB*secondary) { static int maybe_do_associate_create (DB_TXN*txn, DB*primary, DB*secondary) {
DBC *dbc; DBC *dbc;
int r = toku_db_cursor(secondary, txn, &dbc, 0); int r = toku_db_cursor(secondary, txn, &dbc, 0, 0);
if (r!=0) return r; if (r!=0) return r;
DBT key,data; DBT key,data;
r = toku_c_get(dbc, &key, &data, DB_FIRST); r = toku_c_get(dbc, &key, &data, DB_FIRST);
...@@ -900,7 +900,7 @@ static int maybe_do_associate_create (DB_TXN*txn, DB*primary, DB*secondary) { ...@@ -900,7 +900,7 @@ static int maybe_do_associate_create (DB_TXN*txn, DB*primary, DB*secondary) {
} }
} }
/* Now we know the secondary is empty. */ /* Now we know the secondary is empty. */
r = toku_db_cursor(primary, txn, &dbc, 0); r = toku_db_cursor(primary, txn, &dbc, 0, 0);
if (r!=0) return r; if (r!=0) return r;
for (r = toku_c_get(dbc, &key, &data, DB_FIRST); r==0; r = toku_c_get(dbc, &key, &data, DB_NEXT)) { for (r = toku_c_get(dbc, &key, &data, DB_FIRST); r==0; r = toku_c_get(dbc, &key, &data, DB_NEXT)) {
r = do_associated_inserts(txn, &key, &data, secondary); r = do_associated_inserts(txn, &key, &data, secondary);
...@@ -1457,7 +1457,7 @@ static int toku_c_count(DBC *cursor, db_recno_t *count, u_int32_t flags) { ...@@ -1457,7 +1457,7 @@ static int toku_c_count(DBC *cursor, db_recno_t *count, u_int32_t flags) {
r = toku_c_get(cursor, &currentkey, &currentval, DB_CURRENT_BINDING); r = toku_c_get(cursor, &currentkey, &currentval, DB_CURRENT_BINDING);
if (r != 0) goto finish; if (r != 0) goto finish;
r = toku_db_cursor(cursor->dbp, 0, &count_cursor, 0); r = toku_db_cursor(cursor->dbp, 0, &count_cursor, 0, 0);
if (r != 0) goto finish; if (r != 0) goto finish;
*count = 0; *count = 0;
...@@ -1489,7 +1489,7 @@ static int toku_db_get_noassociate(DB * db, DB_TXN * txn, DBT * key, DBT * data, ...@@ -1489,7 +1489,7 @@ static int toku_db_get_noassociate(DB * db, DB_TXN * txn, DBT * key, DBT * data,
if (flags!=0 && flags!=DB_GET_BOTH) return EINVAL; if (flags!=0 && flags!=DB_GET_BOTH) return EINVAL;
DBC *dbc; DBC *dbc;
r = toku_db_cursor(db, txn, &dbc, 0); r = toku_db_cursor(db, txn, &dbc, 0, 1);
if (r!=0) return r; if (r!=0) return r;
r = toku_c_get_noassociate(dbc, key, data, r = toku_c_get_noassociate(dbc, key, data,
(flags == 0) ? DB_SET : DB_GET_BOTH); (flags == 0) ? DB_SET : DB_GET_BOTH);
...@@ -1538,7 +1538,7 @@ static int do_associated_deletes(DB_TXN *txn, DBT *key, DBT *data, DB *secondary ...@@ -1538,7 +1538,7 @@ static int do_associated_deletes(DB_TXN *txn, DBT *key, DBT *data, DB *secondary
if (brtflags & TOKU_DB_DUPSORT) { if (brtflags & TOKU_DB_DUPSORT) {
//If the secondary has duplicates we need to use cursor deletes. //If the secondary has duplicates we need to use cursor deletes.
DBC *dbc; DBC *dbc;
r = toku_db_cursor(secondary, txn, &dbc, 0); r = toku_db_cursor(secondary, txn, &dbc, 0, 0);
if (r!=0) goto cursor_cleanup; if (r!=0) goto cursor_cleanup;
r = toku_c_get_noassociate(dbc, &idx, key, DB_GET_BOTH); r = toku_c_get_noassociate(dbc, &idx, key, DB_GET_BOTH);
if (r!=0) goto cursor_cleanup; if (r!=0) goto cursor_cleanup;
...@@ -1698,7 +1698,7 @@ static int locked_c_put(DBC *dbc, DBT *key, DBT *data, u_int32_t flags) { ...@@ -1698,7 +1698,7 @@ static int locked_c_put(DBC *dbc, DBT *key, DBT *data, u_int32_t flags) {
toku_ydb_lock(); int r = toku_c_put(dbc, key, data, flags); toku_ydb_unlock(); return r; toku_ydb_lock(); int r = toku_c_put(dbc, key, data, flags); toku_ydb_unlock(); return r;
} }
static int toku_db_cursor(DB * db, DB_TXN * txn, DBC ** c, u_int32_t flags) { static int toku_db_cursor(DB * db, DB_TXN * txn, DBC ** c, u_int32_t flags, int is_temporary_cursor) {
HANDLE_PANICKED_DB(db); HANDLE_PANICKED_DB(db);
if (flags != 0) if (flags != 0)
return EINVAL; return EINVAL;
...@@ -1716,7 +1716,7 @@ static int toku_db_cursor(DB * db, DB_TXN * txn, DBC ** c, u_int32_t flags) { ...@@ -1716,7 +1716,7 @@ static int toku_db_cursor(DB * db, DB_TXN * txn, DBC ** c, u_int32_t flags) {
assert(result->i); assert(result->i);
result->dbp = db; result->dbp = db;
result->i->txn = txn; result->i->txn = txn;
int r = toku_brt_cursor(db->i->brt, &result->i->c); int r = toku_brt_cursor(db->i->brt, &result->i->c, is_temporary_cursor);
assert(r == 0); assert(r == 0);
*c = result; *c = result;
return 0; return 0;
...@@ -1747,7 +1747,7 @@ static int toku_db_del(DB *db, DB_TXN *txn, DBT *key, u_int32_t flags) { ...@@ -1747,7 +1747,7 @@ static int toku_db_del(DB *db, DB_TXN *txn, DBT *key, u_int32_t flags) {
* We have to make certain we cascade all the deletes. */ * We have to make certain we cascade all the deletes. */
assert(db->i->primary!=0); //Primary cannot have duplicates. assert(db->i->primary!=0); //Primary cannot have duplicates.
r = toku_db_cursor(db, txn, &dbc, 0); r = toku_db_cursor(db, txn, &dbc, 0, 1);
if (r!=0) return r; if (r!=0) return r;
r = toku_c_get_noassociate(dbc, key, &data, DB_SET); r = toku_c_get_noassociate(dbc, key, &data, DB_SET);
while (r==0) { while (r==0) {
...@@ -1830,7 +1830,7 @@ static int toku_db_get (DB * db, DB_TXN * txn, DBT * key, DBT * data, u_int32_t ...@@ -1830,7 +1830,7 @@ static int toku_db_get (DB * db, DB_TXN * txn, DBT * key, DBT * data, u_int32_t
// We aren't ready to handle flags such as DB_READ_COMMITTED or DB_READ_UNCOMMITTED or DB_RMW // We aren't ready to handle flags such as DB_READ_COMMITTED or DB_READ_UNCOMMITTED or DB_RMW
DBC *dbc; DBC *dbc;
r = toku_db_cursor(db, txn, &dbc, 0); r = toku_db_cursor(db, txn, &dbc, 0, 1);
if (r!=0) return r; if (r!=0) return r;
r = toku_c_get(dbc, key, data, (flags == 0) ? DB_SET : DB_GET_BOTH); r = toku_c_get(dbc, key, data, (flags == 0) ? DB_SET : DB_GET_BOTH);
int r2 = toku_c_close(dbc); int r2 = toku_c_close(dbc);
...@@ -1850,7 +1850,7 @@ static int toku_db_pget (DB *db, DB_TXN *txn, DBT *key, DBT *pkey, DBT *data, u_ ...@@ -1850,7 +1850,7 @@ static int toku_db_pget (DB *db, DB_TXN *txn, DBT *key, DBT *pkey, DBT *data, u_
if ((db->i->open_flags & DB_THREAD) && (db_thread_need_flags(pkey) || db_thread_need_flags(data))) if ((db->i->open_flags & DB_THREAD) && (db_thread_need_flags(pkey) || db_thread_need_flags(data)))
return EINVAL; return EINVAL;
r = toku_db_cursor(db, txn, &dbc, 0); r = toku_db_cursor(db, txn, &dbc, 0, 1);
if (r!=0) return r; if (r!=0) return r;
r = toku_c_pget(dbc, key, pkey, data, DB_SET); r = toku_c_pget(dbc, key, pkey, data, DB_SET);
if (r==DB_KEYEMPTY) r = DB_NOTFOUND; if (r==DB_KEYEMPTY) r = DB_NOTFOUND;
...@@ -2335,7 +2335,7 @@ static inline int autotxn_db_cursor(DB *db, DB_TXN *txn, DBC **c, u_int32_t flag ...@@ -2335,7 +2335,7 @@ static inline int autotxn_db_cursor(DB *db, DB_TXN *txn, DBC **c, u_int32_t flag
return toku_ydb_do_error(db->dbenv, EINVAL, return toku_ydb_do_error(db->dbenv, EINVAL,
"Cursors in a transaction environment must have transactions.\n"); "Cursors in a transaction environment must have transactions.\n");
} }
return toku_db_cursor(db, txn, c, flags); return toku_db_cursor(db, txn, c, flags, 0);
} }
static int locked_db_cursor(DB *db, DB_TXN *txn, DBC **c, u_int32_t flags) { static int locked_db_cursor(DB *db, DB_TXN *txn, DBC **c, u_int32_t flags) {
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7