mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

{{{

Browse source 
Added DB_SECONDARY_BAD to db.h
Added DB_CURRENT to db.h

    DB->get         (now returns DB_SECONDARY_BAD when appropriate)
    DB->pget        (now returns DB_SECONDARY_BAD when appropriate)
    ** DBC->c_get   (works with associate)
    ** DBC->c_pget  (added function, works with associate, but not in header yet)
    ** *DBC->c_del  (works with associate)
    *DB->del        (works with associate)

*   May not work properly with duplicates.
*   Question: Do I have to use
        search_val.flags = DB_DBT_MALLOC;
            and
        free(search_val.data);
**  Requires DB_CURRENT to be supported in toku_brt_cursor_get
}}}
addresses #48


git-svn-id: file:///svn/tokudb@890 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Yoni Fogel 2007-12-03 05:01:43 +00:00
parent 46907c25ed
commit 68e02ebb0c
4 changed files with 140 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
buildheader/db.h_4_4
View file

@ -64,12 +64,14 @@ typedef enum {
#define DB_KEYEXIST -30996
#define DB_LOCK_DEADLOCK -30995
#define DB_NOTFOUND -30989
#define DB_SECONDARY_BAD -30973
#define DB_DONOTINDEX -30998
#define DB_BADFORMAT -30500
#define DB_DELETE_ANY 65536
#define DB_FIRST 9
#define DB_GET_BOTH 10
#define DB_LAST 17
#define DB_CURRENT 7
#define DB_NEXT 18
#define DB_NEXT_DUP 19
#define DB_PREV 25

2
buildheader/make_db_h.c
View file

@ -70,6 +70,7 @@ void print_defines (void) {
dodefine(DB_KEYEXIST);
dodefine(DB_LOCK_DEADLOCK);
dodefine(DB_NOTFOUND);
dodefine(DB_SECONDARY_BAD);
dodefine(DB_DONOTINDEX);
printf("#define DB_BADFORMAT -30500\n"); // private tokudb
@ -78,6 +79,7 @@ void print_defines (void) {
dodefine(DB_FIRST);
dodefine(DB_GET_BOTH);
dodefine(DB_LAST);
dodefine(DB_CURRENT);
dodefine(DB_NEXT);
dodefine(DB_NEXT_DUP);
dodefine(DB_PREV);

2
include/db.h
View file

@ -64,12 +64,14 @@ typedef enum {
#define DB_KEYEXIST -30996
#define DB_LOCK_DEADLOCK -30995
#define DB_NOTFOUND -30989
#define DB_SECONDARY_BAD -30973
#define DB_DONOTINDEX -30998
#define DB_BADFORMAT -30500
#define DB_DELETE_ANY 65536
#define DB_FIRST 9
#define DB_GET_BOTH 10
#define DB_LAST 17
#define DB_CURRENT 7
#define DB_NEXT 18
#define DB_NEXT_DUP 19
#define DB_PREV 25

141
src/ydb.c
View file

@ -569,8 +569,43 @@ struct __toku_dbc_internal {
DB_TXN *txn;
};
// Internal flag for when doing a get/del, don't do the work for associate.
#define DB_NO_ASSOCIATE 42
static int toku_c_get(DBC * c, DBT * key, DBT * data, u_int32_t flag) {
DB *db = c->i->db;
if (db->i->primary != 0 &&
((flag & DB_GET_BOTH) /* Uncomment when/if implemented || (flag & DB_GET_BOTH_RANGE)*/) &&
!(flag & DB_NO_ASSOCIATE)) return EINVAL;
int r = toku_brt_cursor_get(c->i->c, key, data, flag, c->i->txn ? c->i->txn->i->tokutxn : 0);
if (db->i->primary != 0 && !(flag & DB_NO_ASSOCIATE)) {
DB *pdb = db->i->primary;
DBT pkey;
if (r != 0) return r;
pkey = *data;
r = pdb->get(pdb, c->i->txn, &pkey, data, 0);
if (r == DB_NOTFOUND) return DB_SECONDARY_BAD;
}
return r;
}
static int toku_c_pget(DBC * c, DBT *key, DBT *pkey, DBT *data, u_int32_t flag) {
int r;
DB *db = c->i->db;
DB *pdb = db->i->primary;
if ((flag & DB_GET_BOTH) /*Uncomment when/if implemented || (flag & DB_GET_BOTH_RANGE)*/) return EINVAL;
//Not ready for this yet.
if (!db->i->primary) return EINVAL; //c_pget does not work on a primary.
r = toku_brt_cursor_get(c->i->c, key, pkey, flag, c->i->txn ? c->i->txn->i->tokutxn : 0);
if (r != 0) return r;
r = pdb->get(pdb, c->i->txn, pkey, data, 0);
if (r == DB_NOTFOUND) return DB_SECONDARY_BAD;
return r;
}
@ -581,8 +616,66 @@ static int toku_c_close(DBC * c) {
return r;
}
static int do_associated_deletes(DB_TXN *txn, DBT *key, DBT *data, DB *secondary) {
DBT idx;
memset(&idx, 0, sizeof(idx));
int r = secondary->i->associate_callback(secondary, key, data, &idx);
if (r==DB_DONOTINDEX) return 0;
#ifdef DB_DBT_MULTIPLE
if (idx.flags & DB_DBT_MULTIPLE) {
return EINVAL; // We aren't ready for this
}
#endif
r = secondary->del(secondary, txn, &idx, DB_NO_ASSOCIATE | DB_DELETE_ANY);
if (idx.flags & DB_DBT_APPMALLOC) {
free(idx.data);
}
return r;
}
static int toku_c_del(DBC * c, u_int32_t flags) {
int r = toku_brt_cursor_delete(c->i->c, flags);
int r;
DB* db = c->i->db;
//It is a primary with secondaries.
if ((db->i->primary == 0 && !list_empty(&db->i->associated)) ||
db->i->primary != 0) {
DB* pdb;
DBT key;
DBT pkey;
DBT data;
struct list *h;
memset(&pkey, 0, sizeof(pkey));
memset(&data, 0, sizeof(data));
if (db->i->primary == 0) {
pdb = db;
r = c->c_get(c, &pkey, &data, DB_CURRENT);
}
else {
pdb = db->i->primary;
//TODO: replace toku_c_pget( with c->c_pget(c,
memset(&key, 0, sizeof(key));
r = toku_c_pget(c, &key, &pkey, &data, DB_CURRENT);
}
if (r != 0) return r;
for (h = list_head(&pdb->i->associated); h != &pdb->i->associated; h = h->next) {
struct __toku_db_internal *dbi = list_struct(h, struct __toku_db_internal, associated);
if (dbi->db == db) continue; //Skip current db (if its primary or secondary)
r = do_associated_deletes(c->i->txn, &pkey, &data, dbi->db);
if (r!=0) return r;
}
if (db->i->primary != 0) {
//If this is a secondary, we did not delete from the primary.
r = pdb->del(pdb, c->i->txn, &pkey, DB_DELETE_ANY);
if (r!=0) return r;
}
}
//Do the actual deleting.
r = toku_brt_cursor_delete(c->i->c, flags);
return r;
}
@ -607,8 +700,45 @@ static int toku_db_cursor(DB * db, DB_TXN * txn, DBC ** c, u_int32_t flags) {
static int toku_db_del(DB * db, DB_TXN * txn, DBT * key, u_int32_t flags) {
int r;
/* DB_DELETE_ANY supresses the BDB DB->del return value indicating that the key was not found prior to the delete */
if (!(flags & DB_DELETE_ANY)) {
if (!(flags & DB_NO_ASSOCIATE) &&
((db->i->primary == 0 && !list_empty(&db->i->associated)) ||
db->i->primary != 0)) {
DB* pdb;
DBT data;
struct list *h;
memset(&data, 0, sizeof(data));
if (db->i->primary == 0) {
pdb = db;
r = db->get(db, txn, key, &data, 0);
}
else {
DBT pkey;
memset(&pkey, 0, sizeof(pkey));
pdb = db->i->primary;
r = db->pget(db, txn, key, &pkey, &data, 0);
key = &pkey;
}
if (r != 0) return r;
for (h = list_head(&pdb->i->associated); h != &pdb->i->associated; h = h->next) {
struct __toku_db_internal *dbi = list_struct(h, struct __toku_db_internal, associated);
if (dbi->db == db) continue; //Skip current db (if its primary or secondary)
r = do_associated_deletes(txn, key, &data, dbi->db);
if (r!=0) return r;
}
if (db->i->primary != 0) {
//If this is a secondary, we did not delete from the primary.
r = pdb->del(pdb, txn, key, DB_DELETE_ANY);
if (r!=0) return r;
}
}
/*
* DB_DELETE_ANY supresses the BDB DB->del return value indicating that the key was not found prior to the delete
* If we are dealing with associated databases, we skip since we already know for certain it was found at this point.
*/
else if (!(flags & DB_DELETE_ANY)) {
DBT search_val; memset(&search_val, 0, sizeof search_val);
search_val.flags = DB_DBT_MALLOC;
r = db->get(db, txn, key, &search_val, 0);
@ -616,14 +746,11 @@ static int toku_db_del(DB * db, DB_TXN * txn, DBT * key, u_int32_t flags) {
return r;
free(search_val.data);
}
//Do the actual deleting.
r = toku_brt_delete(db->i->brt, key);
return r;
}
// Internal flag for when doing a get, don't do the work for associate.
#define DB_NO_ASSOCIATE 42
static int toku_db_get (DB * db, DB_TXN * txn, DBT * key, DBT * data, u_int32_t flags) {
int r;
unsigned int brtflags;