upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simpler mdb_node_add()

Browse source
This commit is contained in:
Hallvard Furuseth 2015-07-11 21:09:36 +02:00
parent 6318038138
commit 490243424c
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
libraries/liblmdb/mdb.c
View file

@ -6924,6 +6924,7 @@ mdb_node_add(MDB_cursor *mc, indx_t indx,
MDB_node *node; MDB_node *node;
MDB_page *mp = mc->mc_pg[mc->mc_top]; MDB_page *mp = mc->mc_pg[mc->mc_top];
MDB_page *ofp = NULL; /* overflow page */ MDB_page *ofp = NULL; /* overflow page */
void *ndata;
DKBUF; DKBUF;
mdb_cassert(mc, mp->mp_upper >= mp->mp_lower); mdb_cassert(mc, mp->mp_upper >= mp->mp_lower);
@ -6954,7 +6955,7 @@ mdb_node_add(MDB_cursor *mc, indx_t indx,
if (key != NULL) if (key != NULL)
node_size += key->mv_size; node_size += key->mv_size;
if (IS_LEAF(mp)) { if (IS_LEAF(mp)) {
mdb_cassert(mc, data); mdb_cassert(mc, key && data);
if (F_ISSET(flags, F_BIGDATA)) { if (F_ISSET(flags, F_BIGDATA)) {
/* Data already on overflow page. */ /* Data already on overflow page. */
node_size += sizeof(pgno_t); node_size += sizeof(pgno_t);
@ -7005,23 +7006,21 @@ update:
memcpy(NODEKEY(node), key->mv_data, key->mv_size); memcpy(NODEKEY(node), key->mv_data, key->mv_size);
if (IS_LEAF(mp)) { if (IS_LEAF(mp)) {
mdb_cassert(mc, key); ndata = NODEDATA(node);
if (ofp == NULL) { if (ofp == NULL) {
if (F_ISSET(flags, F_BIGDATA)) if (F_ISSET(flags, F_BIGDATA))
memcpy(node->mn_data + key->mv_size, data->mv_data, memcpy(ndata, data->mv_data, sizeof(pgno_t));
sizeof(pgno_t));
else if (F_ISSET(flags, MDB_RESERVE)) else if (F_ISSET(flags, MDB_RESERVE))
data->mv_data = node->mn_data + key->mv_size; data->mv_data = ndata;
else else
memcpy(node->mn_data + key->mv_size, data->mv_data, memcpy(ndata, data->mv_data, data->mv_size);
data->mv_size);
} else { } else {
memcpy(node->mn_data + key->mv_size, &ofp->mp_pgno, memcpy(ndata, &ofp->mp_pgno, sizeof(pgno_t));
sizeof(pgno_t)); ndata = METADATA(ofp);
if (F_ISSET(flags, MDB_RESERVE)) if (F_ISSET(flags, MDB_RESERVE))
data->mv_data = METADATA(ofp); data->mv_data = ndata;
else else
memcpy(METADATA(ofp), data->mv_data, data->mv_size); memcpy(ndata, data->mv_data, data->mv_size);
} }
} }