Skip to content

M
MariaDB
Commit 22d8e86b authored by Bradley C. Kuszmaul's avatar Bradley C. Kuszmaul
Browse files
Options

Fix the DBT problem for duplicate keys. Fixes #101. 

git-svn-id: file:///svn/tokudb@857 c7de825b-a66e-492c-adef-691d508d4ae1
parent 52b60202
Hide whitespace changes
Inline Side-by-side
Showing with 113 additions and 105 deletions
newbrt/brt.c
View file @ 22d8e86b
...@@ -2449,7 +2449,7 @@ static int brtcurs_set_position_last (BRT_CURSOR cursor, DISKOFF off, DBT *key, ...@@ -2449,7 +2449,7 @@ static int brtcurs_set_position_last (BRT_CURSOR cursor, DISKOFF off, DBT *key,
cursor->path_len--; cursor->path_len--;
goto died0; goto died0;
} else { } else {
r=toku_pma_cursor(node->u.l.buffer, &cursor->pmacurs); r=toku_pma_cursor(node->u.l.buffer, &cursor->pmacurs, &cursor->brt->skey, &cursor->brt->sval);
if (r!=0) { if (r!=0) {
if (0) { died10: toku_pma_cursor_free(&cursor->pmacurs); } if (0) { died10: toku_pma_cursor_free(&cursor->pmacurs); }
cursor->path_len--; cursor->path_len--;
...@@ -2512,7 +2512,7 @@ static int brtcurs_set_position_first (BRT_CURSOR cursor, DISKOFF off, DBT *key, ...@@ -2512,7 +2512,7 @@ static int brtcurs_set_position_first (BRT_CURSOR cursor, DISKOFF off, DBT *key,
cursor->path_len--; cursor->path_len--;
goto died0; goto died0;
} else { } else {
r=toku_pma_cursor(node->u.l.buffer, &cursor->pmacurs); r=toku_pma_cursor(node->u.l.buffer, &cursor->pmacurs, &cursor->brt->skey, &cursor->brt->sval);
if (r!=0) { if (r!=0) {
if (0) { died10: toku_pma_cursor_free(&cursor->pmacurs); } if (0) { died10: toku_pma_cursor_free(&cursor->pmacurs); }
cursor->path_len--; cursor->path_len--;
...@@ -2681,7 +2681,7 @@ static int brtcurs_set_key(BRT_CURSOR cursor, DISKOFF off, DBT *key, DBT *val, i ...@@ -2681,7 +2681,7 @@ static int brtcurs_set_key(BRT_CURSOR cursor, DISKOFF off, DBT *key, DBT *val, i
} else { } else {
cursor->path_len += 1; cursor->path_len += 1;
cursor->path[cursor->path_len-1] = node; cursor->path[cursor->path_len-1] = node;
r = toku_pma_cursor(node->u.l.buffer, &cursor->pmacurs); r = toku_pma_cursor(node->u.l.buffer, &cursor->pmacurs, &cursor->brt->skey, &cursor->brt->sval);
if (r == 0) { if (r == 0) {
if (flag == DB_SET) if (flag == DB_SET)
r = toku_pma_cursor_set_key(cursor->pmacurs, key); r = toku_pma_cursor_set_key(cursor->pmacurs, key);
...@@ -2752,7 +2752,7 @@ static int brtcurs_set_range(BRT_CURSOR cursor, DISKOFF off, DBT *key, TOKUTXN t ...@@ -2752,7 +2752,7 @@ static int brtcurs_set_range(BRT_CURSOR cursor, DISKOFF off, DBT *key, TOKUTXN t
} else { } else {
cursor->path_len += 1; cursor->path_len += 1;
cursor->path[cursor->path_len-1] = node; cursor->path[cursor->path_len-1] = node;
r = toku_pma_cursor(node->u.l.buffer, &cursor->pmacurs); r = toku_pma_cursor(node->u.l.buffer, &cursor->pmacurs, &cursor->brt->skey, &cursor->brt->sval);
if (r == 0) { if (r == 0) {
r = toku_pma_cursor_set_range(cursor->pmacurs, key); r = toku_pma_cursor_set_range(cursor->pmacurs, key);
if (r != 0) { if (r != 0) {
......
newbrt/pma-internal.h
View file @ 22d8e86b
...@@ -7,7 +7,7 @@ struct pma_cursor { ...@@ -7,7 +7,7 @@ struct pma_cursor {
PMA pma; PMA pma;
int position; /* -1 if the position is undefined. */ int position; /* -1 if the position is undefined. */
struct list next; struct list next;
void *skey, *sval; /* used in dbts. */ void **sskey, *ssval; /* Used in dbts. When a cursor is created, you must provide a void** to return results in. */
}; };
struct pma { struct pma {
......
newbrt/pma-test.c
View file @ 22d8e86b
...@@ -18,6 +18,15 @@ static const FILENUM null_filenum = {0}; ...@@ -18,6 +18,15 @@ static const FILENUM null_filenum = {0};
#define NULL_ARGS null_txn, null_diskoff #define NULL_ARGS null_txn, null_diskoff
void *skey=0, *sval=0;
void local_memory_check_all_free(void) {
if (skey) toku_free(skey);
if (sval) toku_free(sval);
skey = sval = 0;
toku_memory_check_all_free();
}
static void test_make_space_at (void) { static void test_make_space_at (void) {
PMA pma; PMA pma;
char *key; char *key;
...@@ -472,7 +481,7 @@ static void test_pma_cursor_0 (void) { ...@@ -472,7 +481,7 @@ static void test_pma_cursor_0 (void) {
PMA_CURSOR c=0; PMA_CURSOR c=0;
int r; int r;
r=toku_pma_create(&pma, toku_default_compare_fun, null_db, null_filenum, 0); assert(r==0); r=toku_pma_create(&pma, toku_default_compare_fun, null_db, null_filenum, 0); assert(r==0);
r=toku_pma_cursor(pma, &c); assert(r==0); assert(c!=0); r=toku_pma_cursor(pma, &c, &skey, &sval); assert(r==0); assert(c!=0);
printf("%s:%d\n", __FILE__, __LINE__); printf("%s:%d\n", __FILE__, __LINE__);
r=toku_pma_free(&pma); assert(r!=0); /* didn't deallocate the cursor. */ r=toku_pma_free(&pma); assert(r!=0); /* didn't deallocate the cursor. */
printf("%s:%d\n", __FILE__, __LINE__); printf("%s:%d\n", __FILE__, __LINE__);
...@@ -490,9 +499,9 @@ static void test_pma_cursor_1 (void) { ...@@ -490,9 +499,9 @@ static void test_pma_cursor_1 (void) {
int order; int order;
for (order=0; order<6; order++) { for (order=0; order<6; order++) {
r=toku_pma_create(&pma, toku_default_compare_fun, null_db, null_filenum, 0); assert(r==0); r=toku_pma_create(&pma, toku_default_compare_fun, null_db, null_filenum, 0); assert(r==0);
r=toku_pma_cursor(pma, &c0); assert(r==0); assert(c0!=0); r=toku_pma_cursor(pma, &c0, &skey, &sval); assert(r==0); assert(c0!=0);
r=toku_pma_cursor(pma, &c1); assert(r==0); assert(c1!=0); r=toku_pma_cursor(pma, &c1, &skey, &sval); assert(r==0); assert(c1!=0);
r=toku_pma_cursor(pma, &c2); assert(r==0); assert(c2!=0); r=toku_pma_cursor(pma, &c2, &skey, &sval); assert(r==0); assert(c2!=0);
r=toku_pma_free(&pma); assert(r!=0); r=toku_pma_free(&pma); assert(r!=0);
...@@ -521,7 +530,7 @@ static void test_pma_cursor_2 (void) { ...@@ -521,7 +530,7 @@ static void test_pma_cursor_2 (void) {
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;
r=toku_pma_create(&pma, toku_default_compare_fun, null_db, null_filenum, 0); assert(r==0); r=toku_pma_create(&pma, toku_default_compare_fun, null_db, null_filenum, 0); assert(r==0);
r=toku_pma_cursor(pma, &c); assert(r==0); assert(c!=0); r=toku_pma_cursor(pma, &c, &skey, &sval); assert(r==0); assert(c!=0);
r=toku_pma_cursor_set_position_last(c); assert(r==DB_NOTFOUND); r=toku_pma_cursor_set_position_last(c); assert(r==DB_NOTFOUND);
r=toku_pma_cursor_free(&c); assert(r==0); r=toku_pma_cursor_free(&c); assert(r==0);
r=toku_pma_free(&pma); assert(r==0); r=toku_pma_free(&pma); assert(r==0);
...@@ -543,7 +552,7 @@ static void test_pma_cursor_3 (void) { ...@@ -543,7 +552,7 @@ static void test_pma_cursor_3 (void) {
do_insert(pma, "aa", 3, "a", 2, rand4fingerprint, &sum, &expect_fingerprint); do_insert(pma, "aa", 3, "a", 2, rand4fingerprint, &sum, &expect_fingerprint);
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;
r=toku_pma_cursor(pma, &c); assert(r==0); assert(c!=0); r=toku_pma_cursor(pma, &c, &skey, &sval); assert(r==0); assert(c!=0);
r=toku_pma_cursor_set_position_first(c); assert(r==0); r=toku_pma_cursor_set_position_first(c); assert(r==0);
r=toku_pma_cursor_get_current(c, &key, &val); assert(r==0); r=toku_pma_cursor_get_current(c, &key, &val); assert(r==0);
...@@ -616,13 +625,13 @@ static void test_pma_cursor_4 (void) { ...@@ -616,13 +625,13 @@ static void test_pma_cursor_4 (void) {
assert(toku_pma_n_entries(pma) == 4); assert(toku_pma_n_entries(pma) == 4);
printf("a:"); toku_print_pma(pma); printf("a:"); toku_print_pma(pma);
error = toku_pma_cursor(pma, &cursora); error = toku_pma_cursor(pma, &cursora, &skey, &sval);
assert(error == 0); assert(error == 0);
error = toku_pma_cursor_set_position_first(cursora); error = toku_pma_cursor_set_position_first(cursora);
assert(error == 0); assert(error == 0);
assert_cursor_val(cursora, 1); assert_cursor_val(cursora, 1);
error = toku_pma_cursor(pma, &cursorb); error = toku_pma_cursor(pma, &cursorb, &skey, &sval);
assert(error == 0); assert(error == 0);
error = toku_pma_cursor_set_position_first(cursorb); error = toku_pma_cursor_set_position_first(cursorb);
assert(error == 0); assert(error == 0);
...@@ -631,7 +640,7 @@ static void test_pma_cursor_4 (void) { ...@@ -631,7 +640,7 @@ static void test_pma_cursor_4 (void) {
assert(error == 0); assert(error == 0);
assert_cursor_val(cursorb, 2); assert_cursor_val(cursorb, 2);
error = toku_pma_cursor(pma, &cursorc); error = toku_pma_cursor(pma, &cursorc, &skey, &sval);
assert(error == 0); assert(error == 0);
error = toku_pma_cursor_set_position_last(cursorc); error = toku_pma_cursor_set_position_last(cursorc);
assert(error == 0); assert(error == 0);
...@@ -685,7 +694,7 @@ static void test_pma_cursor_delete(int n) { ...@@ -685,7 +694,7 @@ static void test_pma_cursor_delete(int n) {
/* point the cursor to the first kv */ /* point the cursor to the first kv */
PMA_CURSOR cursor; PMA_CURSOR cursor;
error = toku_pma_cursor(pma, &cursor); error = toku_pma_cursor(pma, &cursor, &skey, &sval);
assert(error == 0); assert(error == 0);
DBT cursorkey, cursorval; DBT cursorkey, cursorval;
...@@ -789,7 +798,7 @@ static void test_pma_compare_fun (int wrong_endian_p) { ...@@ -789,7 +798,7 @@ static void test_pma_compare_fun (int wrong_endian_p) {
do_insert(pma, "11", 3, "11v", 4, rand4fingerprint, &sum, &expect_fingerprint); do_insert(pma, "11", 3, "11v", 4, rand4fingerprint, &sum, &expect_fingerprint);
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;
r=toku_pma_cursor(pma, &c); assert(r==0); assert(c!=0); r=toku_pma_cursor(pma, &c, &skey, &sval); assert(r==0); assert(c!=0);
for (i=0; i<4; i++) { for (i=0; i<4; i++) {
if (i==0) { if (i==0) {
...@@ -1111,14 +1120,14 @@ static void test_pma_split_cursor(void) { ...@@ -1111,14 +1120,14 @@ static void test_pma_split_cursor(void) {
assert(toku_pma_n_entries(pmaa) == 16); assert(toku_pma_n_entries(pmaa) == 16);
printf("a:"); toku_print_pma(pmaa); printf("a:"); toku_print_pma(pmaa);
error = toku_pma_cursor(pmaa, &cursora); error = toku_pma_cursor(pmaa, &cursora, &skey, &sval);
assert(error == 0); assert(error == 0);
error = toku_pma_cursor_set_position_first(cursora); error = toku_pma_cursor_set_position_first(cursora);
assert(error == 0); assert(error == 0);
// print_cursor("cursora", cursora); // print_cursor("cursora", cursora);
assert_cursor_val(cursora, 1); assert_cursor_val(cursora, 1);
error = toku_pma_cursor(pmaa, &cursorb); error = toku_pma_cursor(pmaa, &cursorb, &skey, &sval);
assert(error == 0); assert(error == 0);
error = toku_pma_cursor_set_position_first(cursorb); error = toku_pma_cursor_set_position_first(cursorb);
assert(error == 0); assert(error == 0);
...@@ -1127,7 +1136,7 @@ static void test_pma_split_cursor(void) { ...@@ -1127,7 +1136,7 @@ static void test_pma_split_cursor(void) {
// print_cursor("cursorb", cursorb); // print_cursor("cursorb", cursorb);
assert_cursor_val(cursorb, 2); assert_cursor_val(cursorb, 2);
error = toku_pma_cursor(pmaa, &cursorc); error = toku_pma_cursor(pmaa, &cursorc, &skey, &sval);
assert(error == 0); assert(error == 0);
error = toku_pma_cursor_set_position_last(cursorc); error = toku_pma_cursor_set_position_last(cursorc);
assert(error == 0); assert(error == 0);
...@@ -1182,17 +1191,17 @@ static void test_pma_split_cursor(void) { ...@@ -1182,17 +1191,17 @@ static void test_pma_split_cursor(void) {
} }
static void test_pma_split(void) { static void test_pma_split(void) {
test_pma_split_n(0); toku_memory_check_all_free(); test_pma_split_n(0); local_memory_check_all_free();
test_pma_split_n(1); toku_memory_check_all_free(); test_pma_split_n(1); local_memory_check_all_free();
test_pma_split_n(2); toku_memory_check_all_free(); test_pma_split_n(2); local_memory_check_all_free();
test_pma_split_n(4); toku_memory_check_all_free(); test_pma_split_n(4); local_memory_check_all_free();
test_pma_split_n(8); toku_memory_check_all_free(); test_pma_split_n(8); local_memory_check_all_free();
test_pma_split_n(9); toku_memory_check_all_free(); test_pma_split_n(9); local_memory_check_all_free();
test_pma_dup_split_n(0, TOKU_DB_DUP); toku_memory_check_all_free(); test_pma_dup_split_n(0, TOKU_DB_DUP); local_memory_check_all_free();
test_pma_dup_split_n(1, TOKU_DB_DUP); toku_memory_check_all_free(); test_pma_dup_split_n(1, TOKU_DB_DUP); local_memory_check_all_free();
test_pma_dup_split_n(9, TOKU_DB_DUP); toku_memory_check_all_free(); test_pma_dup_split_n(9, TOKU_DB_DUP); local_memory_check_all_free();
test_pma_split_varkey(); toku_memory_check_all_free(); test_pma_split_varkey(); local_memory_check_all_free();
test_pma_split_cursor(); toku_memory_check_all_free(); test_pma_split_cursor(); local_memory_check_all_free();
} }
/* /*
...@@ -1277,14 +1286,14 @@ static void test_pma_bulk_insert_n(int n) { ...@@ -1277,14 +1286,14 @@ static void test_pma_bulk_insert_n(int n) {
} }
static void test_pma_bulk_insert(void) { static void test_pma_bulk_insert(void) {
test_pma_bulk_insert_n(0); toku_memory_check_all_free(); test_pma_bulk_insert_n(0); local_memory_check_all_free();
test_pma_bulk_insert_n(1); toku_memory_check_all_free(); test_pma_bulk_insert_n(1); local_memory_check_all_free();
test_pma_bulk_insert_n(2); toku_memory_check_all_free(); test_pma_bulk_insert_n(2); local_memory_check_all_free();
test_pma_bulk_insert_n(3); toku_memory_check_all_free(); test_pma_bulk_insert_n(3); local_memory_check_all_free();
test_pma_bulk_insert_n(4); toku_memory_check_all_free(); test_pma_bulk_insert_n(4); local_memory_check_all_free();
test_pma_bulk_insert_n(5); toku_memory_check_all_free(); test_pma_bulk_insert_n(5); local_memory_check_all_free();
test_pma_bulk_insert_n(8); toku_memory_check_all_free(); test_pma_bulk_insert_n(8); local_memory_check_all_free();
test_pma_bulk_insert_n(32); toku_memory_check_all_free(); test_pma_bulk_insert_n(32); local_memory_check_all_free();
} }
static void test_pma_insert_or_replace(void) { static void test_pma_insert_or_replace(void) {
...@@ -1477,7 +1486,7 @@ static void test_pma_delete_cursor(int n) { ...@@ -1477,7 +1486,7 @@ static void test_pma_delete_cursor(int n) {
PMA_CURSOR pmacursor; PMA_CURSOR pmacursor;
r = toku_pma_cursor(pma, &pmacursor); r = toku_pma_cursor(pma, &pmacursor, &skey, &sval);
assert(r == 0); assert(r == 0);
r = toku_pma_cursor_set_position_last(pmacursor); r = toku_pma_cursor_set_position_last(pmacursor);
...@@ -1530,7 +1539,7 @@ static void test_pma_delete_insert() { ...@@ -1530,7 +1539,7 @@ static void test_pma_delete_insert() {
PMA_CURSOR pmacursor; PMA_CURSOR pmacursor;
error = toku_pma_cursor(pma, &pmacursor); error = toku_pma_cursor(pma, &pmacursor, &skey, &sval);
assert(error == 0); assert(error == 0);
DBT key, val; DBT key, val;
...@@ -1579,7 +1588,7 @@ static void test_pma_double_delete() { ...@@ -1579,7 +1588,7 @@ static void test_pma_double_delete() {
PMA_CURSOR pmacursor; PMA_CURSOR pmacursor;
error = toku_pma_cursor(pma, &pmacursor); error = toku_pma_cursor(pma, &pmacursor, &skey, &sval);
assert(error == 0); assert(error == 0);
DBT key; DBT key;
...@@ -1634,7 +1643,7 @@ static void test_pma_cursor_first_delete_last() { ...@@ -1634,7 +1643,7 @@ static void test_pma_cursor_first_delete_last() {
PMA_CURSOR pmacursor; PMA_CURSOR pmacursor;
error = toku_pma_cursor(pma, &pmacursor); error = toku_pma_cursor(pma, &pmacursor, &skey, &sval);
assert(error == 0); assert(error == 0);
error = toku_pma_cursor_set_position_first(pmacursor); error = toku_pma_cursor_set_position_first(pmacursor);
...@@ -1681,7 +1690,7 @@ static void test_pma_cursor_last_delete_first() { ...@@ -1681,7 +1690,7 @@ static void test_pma_cursor_last_delete_first() {
PMA_CURSOR pmacursor; PMA_CURSOR pmacursor;
error = toku_pma_cursor(pma, &pmacursor); error = toku_pma_cursor(pma, &pmacursor, &skey, &sval);
assert(error == 0); assert(error == 0);
error = toku_pma_cursor_set_position_last(pmacursor); error = toku_pma_cursor_set_position_last(pmacursor);
...@@ -1704,13 +1713,13 @@ static void test_pma_cursor_last_delete_first() { ...@@ -1704,13 +1713,13 @@ static void test_pma_cursor_last_delete_first() {
} }
static void test_pma_delete() { static void test_pma_delete() {
test_pma_delete_shrink(256); toku_memory_check_all_free(); test_pma_delete_shrink(256); local_memory_check_all_free();
test_pma_delete_random(256); toku_memory_check_all_free(); test_pma_delete_random(256); local_memory_check_all_free();
test_pma_delete_cursor(32); toku_memory_check_all_free(); test_pma_delete_cursor(32); local_memory_check_all_free();
test_pma_delete_insert(); toku_memory_check_all_free(); test_pma_delete_insert(); local_memory_check_all_free();
test_pma_double_delete(); toku_memory_check_all_free(); test_pma_double_delete(); local_memory_check_all_free();
test_pma_cursor_first_delete_last(); toku_memory_check_all_free(); test_pma_cursor_first_delete_last(); local_memory_check_all_free();
test_pma_cursor_last_delete_first(); toku_memory_check_all_free(); test_pma_cursor_last_delete_first(); local_memory_check_all_free();
} }
static void test_pma_already_there() { static void test_pma_already_there() {
...@@ -1767,7 +1776,7 @@ static void test_pma_cursor_set_key() { ...@@ -1767,7 +1776,7 @@ static void test_pma_cursor_set_key() {
} }
PMA_CURSOR cursor; PMA_CURSOR cursor;
error = toku_pma_cursor(pma, &cursor); error = toku_pma_cursor(pma, &cursor, &skey, &sval);
assert(error == 0); assert(error == 0);
for (i=0; i<n; i += 1) { for (i=0; i<n; i += 1) {
...@@ -1824,7 +1833,7 @@ static void test_pma_cursor_set_range() { ...@@ -1824,7 +1833,7 @@ static void test_pma_cursor_set_range() {
} }
PMA_CURSOR cursor; PMA_CURSOR cursor;
error = toku_pma_cursor(pma, &cursor); error = toku_pma_cursor(pma, &cursor, &skey, &sval);
assert(error == 0); assert(error == 0);
for (i=0; i<100; i += 1) { for (i=0; i<100; i += 1) {
...@@ -1872,7 +1881,7 @@ static void test_pma_cursor_delete_under() { ...@@ -1872,7 +1881,7 @@ static void test_pma_cursor_delete_under() {
assert(error == 0); assert(error == 0);
PMA_CURSOR cursor; PMA_CURSOR cursor;
error = toku_pma_cursor(pma, &cursor); error = toku_pma_cursor(pma, &cursor, &skey, &sval);
assert(error == 0); assert(error == 0);
int kvsize; int kvsize;
...@@ -1944,7 +1953,7 @@ static void test_pma_cursor_set_both() { ...@@ -1944,7 +1953,7 @@ static void test_pma_cursor_set_both() {
assert(error == 0); assert(error == 0);
PMA_CURSOR cursor; PMA_CURSOR cursor;
error = toku_pma_cursor(pma, &cursor); error = toku_pma_cursor(pma, &cursor, &skey, &sval);
assert(error == 0); assert(error == 0);
DBT key, val; DBT key, val;
...@@ -2082,7 +2091,7 @@ static void test_dup_key_insert(int n) { ...@@ -2082,7 +2091,7 @@ static void test_dup_key_insert(int n) {
/* cursor walk from key k should find values 0, 1, .. n-1 */ /* cursor walk from key k should find values 0, 1, .. n-1 */
PMA_CURSOR cursor; PMA_CURSOR cursor;
r = toku_pma_cursor(pma, &cursor); r = toku_pma_cursor(pma, &cursor, &skey, &sval);
assert(r == 0); assert(r == 0);
k = htonl(2); k = htonl(2);
...@@ -2182,7 +2191,7 @@ static void test_dup_key_delete(int n, int mode) { ...@@ -2182,7 +2191,7 @@ static void test_dup_key_delete(int n, int mode) {
/* cursor walk should find keys 1, 3 */ /* cursor walk should find keys 1, 3 */
PMA_CURSOR cursor; PMA_CURSOR cursor;
r = toku_pma_cursor(pma, &cursor); r = toku_pma_cursor(pma, &cursor, &skey, &sval);
assert(r == 0); assert(r == 0);
r = toku_pma_cursor_set_position_first(cursor); r = toku_pma_cursor_set_position_first(cursor);
...@@ -2275,7 +2284,7 @@ static void test_dupsort_key_insert(int n, int dup_data) { ...@@ -2275,7 +2284,7 @@ static void test_dupsort_key_insert(int n, int dup_data) {
/* cursor walk from key k should find values 0, 1, .. n-1 */ /* cursor walk from key k should find values 0, 1, .. n-1 */
PMA_CURSOR cursor; PMA_CURSOR cursor;
r = toku_pma_cursor(pma, &cursor); r = toku_pma_cursor(pma, &cursor, &skey, &sval);
assert(r == 0); assert(r == 0);
toku_fill_dbt(&key, &k, sizeof k); toku_fill_dbt(&key, &k, sizeof k);
...@@ -2384,48 +2393,48 @@ static void test_dup_key_lookup(int n, int mode) { ...@@ -2384,48 +2393,48 @@ static void test_dup_key_lookup(int n, int mode) {
} }
static void test_dup() { static void test_dup() {
test_nodup_key_insert(2); toku_memory_check_all_free(); test_nodup_key_insert(2); local_memory_check_all_free();
test_dup_key_insert(0); toku_memory_check_all_free(); test_dup_key_insert(0); local_memory_check_all_free();
test_dup_key_insert(2); toku_memory_check_all_free(); test_dup_key_insert(2); local_memory_check_all_free();
test_dup_key_insert(1000); toku_memory_check_all_free(); test_dup_key_insert(1000); local_memory_check_all_free();
test_dup_key_delete(0, TOKU_DB_DUP); toku_memory_check_all_free(); test_dup_key_delete(0, TOKU_DB_DUP); local_memory_check_all_free();
test_dup_key_delete(1000, TOKU_DB_DUP); toku_memory_check_all_free(); test_dup_key_delete(1000, TOKU_DB_DUP); local_memory_check_all_free();
test_dupsort_key_insert(2, 0); toku_memory_check_all_free(); test_dupsort_key_insert(2, 0); local_memory_check_all_free();
test_dupsort_key_insert(1000, 0); toku_memory_check_all_free(); test_dupsort_key_insert(1000, 0); local_memory_check_all_free();
test_dupsort_key_insert(2, 1); toku_memory_check_all_free(); test_dupsort_key_insert(2, 1); local_memory_check_all_free();
test_dupsort_key_insert(1000, 1); toku_memory_check_all_free(); test_dupsort_key_insert(1000, 1); local_memory_check_all_free();
test_dup_key_delete(0, TOKU_DB_DUP+TOKU_DB_DUPSORT); toku_memory_check_all_free(); test_dup_key_delete(0, TOKU_DB_DUP+TOKU_DB_DUPSORT); local_memory_check_all_free();
test_dup_key_delete(1000, TOKU_DB_DUP+TOKU_DB_DUPSORT); toku_memory_check_all_free(); test_dup_key_delete(1000, TOKU_DB_DUP+TOKU_DB_DUPSORT); local_memory_check_all_free();
test_dup_key_lookup(32, TOKU_DB_DUP); toku_memory_check_all_free(); test_dup_key_lookup(32, TOKU_DB_DUP); local_memory_check_all_free();
test_dup_key_lookup(32, TOKU_DB_DUP+TOKU_DB_DUPSORT); toku_memory_check_all_free(); test_dup_key_lookup(32, TOKU_DB_DUP+TOKU_DB_DUPSORT); local_memory_check_all_free();
} }
static void pma_tests (void) { static void pma_tests (void) {
toku_memory_check=1; toku_memory_check=1;
toku_test_keycompare(); toku_memory_check_all_free(); toku_test_keycompare(); local_memory_check_all_free();
test_pma_compare_fun(0); toku_memory_check_all_free(); test_pma_compare_fun(0); local_memory_check_all_free();
test_pma_compare_fun(1); toku_memory_check_all_free(); test_pma_compare_fun(1); local_memory_check_all_free();
test_pma_iterate(); test_pma_iterate();
test_pma_iterate2(); toku_memory_check_all_free(); test_pma_iterate2(); local_memory_check_all_free();
test_make_space_at(); toku_memory_check_all_free(); test_make_space_at(); local_memory_check_all_free();
test_smooth_region(); toku_memory_check_all_free(); test_smooth_region(); local_memory_check_all_free();
test_find_insert(); toku_memory_check_all_free(); test_find_insert(); local_memory_check_all_free();
test_pma_find(); toku_memory_check_all_free(); test_pma_find(); local_memory_check_all_free();
test_calculate_parameters(); toku_memory_check_all_free(); test_calculate_parameters(); local_memory_check_all_free();
test_count_region(); toku_memory_check_all_free(); test_count_region(); local_memory_check_all_free();
test_pma_random_pick(); toku_memory_check_all_free(); test_pma_random_pick(); local_memory_check_all_free();
test_pma_cursor(); toku_memory_check_all_free(); test_pma_cursor(); local_memory_check_all_free();
test_pma_split(); toku_memory_check_all_free(); test_pma_split(); local_memory_check_all_free();
test_pma_bulk_insert(); toku_memory_check_all_free(); test_pma_bulk_insert(); local_memory_check_all_free();
test_pma_insert_or_replace(); toku_memory_check_all_free(); test_pma_insert_or_replace(); local_memory_check_all_free();
test_pma_delete(); test_pma_delete();
test_pma_already_there(); toku_memory_check_all_free(); test_pma_already_there(); local_memory_check_all_free();
test_pma_cursor_set_key(); toku_memory_check_all_free(); test_pma_cursor_set_key(); local_memory_check_all_free();
test_pma_cursor_set_range(); toku_memory_check_all_free(); test_pma_cursor_set_range(); local_memory_check_all_free();
test_pma_cursor_delete_under(); toku_memory_check_all_free(); test_pma_cursor_delete_under(); local_memory_check_all_free();
test_pma_cursor_set_both(); toku_memory_check_all_free(); test_pma_cursor_set_both(); local_memory_check_all_free();
test_dup(); test_dup();
} }
......
newbrt/pma.c
View file @ 22d8e86b
...@@ -665,14 +665,14 @@ int toku_pma_set_dup_compare(PMA pma, pma_compare_fun_t dup_compare_fun) { ...@@ -665,14 +665,14 @@ int toku_pma_set_dup_compare(PMA pma, pma_compare_fun_t dup_compare_fun) {
return 0; return 0;
} }
int toku_pma_cursor (PMA pma, PMA_CURSOR *cursp) { int toku_pma_cursor (PMA pma, PMA_CURSOR *cursp, void **sskey, void **ssval) {
PMA_CURSOR MALLOC(curs); PMA_CURSOR MALLOC(curs);
assert(curs!=0); assert(curs!=0);
if (errno!=0) return errno; if (errno!=0) return errno;
curs->position=-1; /* undefined */ curs->position=-1; /* undefined */
curs->pma = pma; curs->pma = pma;
curs->skey = 0; curs->sskey = sskey;
curs->sval=0; curs->ssval = ssval;
list_push(&pma->cursors, &curs->next); list_push(&pma->cursors, &curs->next);
*cursp=curs; *cursp=curs;
return 0; return 0;
...@@ -758,7 +758,7 @@ int toku_pma_cursor_get_current_data(PMA_CURSOR c, DBT *data) { ...@@ -758,7 +758,7 @@ int toku_pma_cursor_get_current_data(PMA_CURSOR c, DBT *data) {
struct kv_pair *pair = pma->pairs[c->position]; struct kv_pair *pair = pma->pairs[c->position];
if (!kv_pair_valid(pair)) if (!kv_pair_valid(pair))
return BRT_KEYEMPTY; return BRT_KEYEMPTY;
toku_dbt_set_value(data, kv_pair_val(pair), kv_pair_vallen(pair), &c->sval); toku_dbt_set_value(data, kv_pair_val(pair), kv_pair_vallen(pair), c->ssval);
return 0; return 0;
} }
...@@ -769,8 +769,8 @@ int toku_pma_cursor_get_current(PMA_CURSOR c, DBT *key, DBT *val) { ...@@ -769,8 +769,8 @@ int toku_pma_cursor_get_current(PMA_CURSOR c, DBT *key, DBT *val) {
struct kv_pair *pair = pma->pairs[c->position]; struct kv_pair *pair = pma->pairs[c->position];
if (!kv_pair_valid(pair)) if (!kv_pair_valid(pair))
return BRT_KEYEMPTY; return BRT_KEYEMPTY;
toku_dbt_set_value(key, kv_pair_key(pair), kv_pair_keylen(pair), &c->skey); toku_dbt_set_value(key, kv_pair_key(pair), kv_pair_keylen(pair), c->sskey);
toku_dbt_set_value(val, kv_pair_val(pair), kv_pair_vallen(pair), &c->sval); toku_dbt_set_value(val, kv_pair_val(pair), kv_pair_vallen(pair), c->ssval);
return 0; return 0;
} }
...@@ -863,8 +863,7 @@ int toku_pma_cursor_free (PMA_CURSOR *cursp) { ...@@ -863,8 +863,7 @@ int toku_pma_cursor_free (PMA_CURSOR *cursp) {
__pma_count_cursor_refs(pma, curs->position) == 0) { __pma_count_cursor_refs(pma, curs->position) == 0) {
__pma_delete_finish(pma, curs->position); __pma_delete_finish(pma, curs->position);
} }
if (curs->skey) toku_free(curs->skey); // It's not our job to free the sskey and ssval blocks.
if (curs->sval) toku_free(curs->sval);
toku_free(curs); toku_free(curs);
*cursp=0; *cursp=0;
return 0; return 0;
......
newbrt/pma.h
View file @ 22d8e86b
...@@ -91,7 +91,7 @@ int toku_pma_split(PMA origpma, unsigned int *origpma_size, DBT *splitk, ...@@ -91,7 +91,7 @@ int toku_pma_split(PMA origpma, unsigned int *origpma_size, DBT *splitk,
int toku_pma_bulk_insert(PMA pma, DBT *keys, DBT *vals, int n_newpairs, u_int32_t rand4sem, u_int32_t *fingerprint); int toku_pma_bulk_insert(PMA pma, DBT *keys, DBT *vals, int n_newpairs, u_int32_t rand4sem, u_int32_t *fingerprint);
/* Move the cursor to the beginning or the end or to a key */ /* Move the cursor to the beginning or the end or to a key */
int toku_pma_cursor (PMA, PMA_CURSOR *); int toku_pma_cursor (PMA, PMA_CURSOR *, void** /*sskey*/, void ** /*ssval*/); // the sskey and ssval point to variables that hold blocks that can be used to return values for zero'd DBTS.
int toku_pma_cursor_free (PMA_CURSOR*); int toku_pma_cursor_free (PMA_CURSOR*);
/* get the pma that a pma cursor is bound to */ /* get the pma that a pma cursor is bound to */
......
src/tests/test_env_close_flags.c
View file @ 22d8e86b
...@@ -24,8 +24,8 @@ int main (int argc __attribute__((__unused__)), char *argv[] __attribute__((__u ...@@ -24,8 +24,8 @@ int main (int argc __attribute__((__unused__)), char *argv[] __attribute__((__u
r=mkdir(DIR, 0777); assert(r==0); r=mkdir(DIR, 0777); assert(r==0);
r=db_env_create(&env, 0); assert(r==0); r=db_env_create(&env, 0); assert(r==0);
r=env->close (env, 1); r=env->close (env, 1);
//BDB does not check this. //BDB does not check this in some versions
#ifdef USE_TDB #if defined(USE_TDB) ||
assert(r==EINVAL); assert(r==EINVAL);
#else #else
assert(r==0); assert(r==0);
......
src/ydb.c
View file @ 22d8e86b
...@@ -811,7 +811,7 @@ static int toku_db_put(DB * db, DB_TXN * txn, DBT * key, DBT * data, u_int32_t f ...@@ -811,7 +811,7 @@ static int toku_db_put(DB * db, DB_TXN * txn, DBT * key, DBT * data, u_int32_t f
if (r!=0) return r; if (r!=0) return r;
// For each secondary add the relevant records. // For each secondary add the relevant records.
if (db->i->associate_callback) { if (db->i->primary==0) { // Only do it if it is a primary. This loop would run an unknown number of times if we tried it on a secondary.
struct list *h; struct list *h;
for (h=list_head(&db->i->associated); h!=&db->i->associated; h=h->next) { for (h=list_head(&db->i->associated); h!=&db->i->associated; h=h->next) {
struct __toku_db_internal *dbi=list_struct(h, struct __toku_db_internal, associated); struct __toku_db_internal *dbi=list_struct(h, struct __toku_db_internal, associated);
......
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