X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fidl.c;h=28c9a725e6e499beb5333a4e55d5bc5005358275;hb=5d9479a3e82cc1ed5260f26878bf710a3b65faec;hp=efc1a61a5497d46eabd445a4d3f4db1638afc722;hpb=a61d2b914dafe2326a0336c87c530b93333e5eef;p=openldap diff --git a/servers/slapd/back-bdb/idl.c b/servers/slapd/back-bdb/idl.c index efc1a61a54..28c9a725e6 100644 --- a/servers/slapd/back-bdb/idl.c +++ b/servers/slapd/back-bdb/idl.c @@ -36,9 +36,9 @@ static void idl_dump( ID *ids ) { if( BDB_IDL_IS_RANGE( ids ) ) { #ifdef NEW_LOGGING - LDAP_LOG(( "idl", LDAP_LEVEL_INFO, "IDL: range (%ld - %ld)\n", + LDAP_LOG( INDEX, INFO, "IDL: range (%ld - %ld)\n", (long) BDB_IDL_RANGE_FIRST( ids ), - (long) BDB_IDL_RANGE_LAST( ids ) )); + (long) BDB_IDL_RANGE_LAST( ids ), 0 ); #else Debug( LDAP_DEBUG_ANY, "IDL: range ( %ld - %ld )\n", @@ -49,8 +49,7 @@ static void idl_dump( ID *ids ) } else { ID i; #ifdef NEW_LOGGING - LDAP_LOG(( "idl", LDAP_LEVEL_INFO, "IDL: size %ld", - (long) ids[0] )); + LDAP_LOG( INDEX, INFO, "IDL: size %ld", (long) ids[0], 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "IDL: size %ld", (long) ids[0], 0, 0 ); #endif @@ -60,7 +59,7 @@ static void idl_dump( ID *ids ) Debug( LDAP_DEBUG_ANY, "\n", 0, 0, 0 ); } #ifdef NEW_LOGGING - LDAP_LOG(( "idl", LDAP_LEVEL_INFO, "%02lx",(long)ids[i] )); + LDAP_LOG( INDEX, INFO, "%02lx",(long)ids[i], 0, 0 ); #else Debug( LDAP_DEBUG_ANY, " %02lx", (long) ids[i], 0, 0 ); #endif @@ -139,8 +138,7 @@ int bdb_idl_insert( ID *ids, ID id ) #if IDL_DEBUG > 1 #ifdef NEW_LOGGING - LDAP_LOG(( "idl", LDAP_LEVEL_DETAIL1, "insert: %04lx at %d\n", - (long) id, x )); + LDAP_LOG( INDEX, DETAIL1, "insert: %04lx at %d\n", (long) id, x, 0 ); #else Debug( LDAP_DEBUG_ANY, "insert: %04lx at %d\n", (long) id, x, 0 ); idl_dump( ids ); @@ -193,8 +191,7 @@ static int idl_delete( ID *ids, ID id ) #if IDL_DEBUG > 1 #ifdef NEW_LOGGING - LDAP_LOG(( "idl", LDAP_LEVEL_DETAIL1, "delete: %04lx at %d\n", - (long) id, x )); + LDAP_LOG( INDEX, DETAIL1, "delete: %04lx at %d\n", (long) id, x, 0 ); #else Debug( LDAP_DEBUG_ANY, "delete: %04lx at %d\n", (long) id, x, 0 ); idl_dump( ids ); @@ -251,7 +248,7 @@ bdb_idl_fetch_key( #ifdef BDB_IDL_MULTI { DBC *cursor; - ID buf[BDB_IDL_DB_SIZE]; + ID buf[BDB_PAGESIZE*4]; ID *i; void *ptr; size_t len; @@ -267,7 +264,9 @@ bdb_idl_fetch_key( rc = db->cursor( db, tid, &cursor, bdb->bi_db_opflags ); if( rc != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_fetch_key: cursor failed: %s (%d)\n", db_strerror(rc), rc )); + LDAP_LOG( INDEX, ERR, + "bdb_idl_fetch_key: cursor failed: %s (%d)\n", + db_strerror(rc), rc, 0 ); #else Debug( LDAP_DEBUG_ANY, "=> bdb_idl_fetch_key: " "cursor failed: %s (%d)\n", db_strerror(rc), rc, 0 ); @@ -296,10 +295,13 @@ bdb_idl_fetch_key( if (ids[1] == 0) { if (ids[0] != BDB_IDL_RANGE_SIZE) { #ifdef NEW_LOGGING - LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "=> bdb_idl_fetch_key: range size mismatch: expected %ld, got %ld\n", BDB_IDL_RANGE_SIZE, ids[0] )); + LDAP_LOG( INDEX, ERR, + "=> bdb_idl_fetch_key: range size mismatch: " + "expected %ld, got %ld\n", + BDB_IDL_RANGE_SIZE, ids[0], 0 ); #else Debug( LDAP_DEBUG_ANY, "=> bdb_idl_fetch_key: " - "range size mismatch: expected %ld, got %ld\n", + "range size mismatch: expected %d, got %ld\n", BDB_IDL_RANGE_SIZE, ids[0], 0 ); #endif cursor->c_close( cursor ); @@ -312,10 +314,12 @@ bdb_idl_fetch_key( rc2 = cursor->c_close( cursor ); if (rc2) { #ifdef NEW_LOGGING - LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_fetch_key: close failed: %s (%d)\n", db_strerror(rc2), rc2 )); + LDAP_LOG( INDEX, ERR, + "bdb_idl_fetch_key: close failed: %s (%d)\n", + db_strerror(rc2), rc2, 0 ); #else Debug( LDAP_DEBUG_ANY, "=> bdb_idl_fetch_key: " - "close failed: %s (%d)\n", db_strerror(rc2), rc2, 0 ) + "close failed: %s (%d)\n", db_strerror(rc2), rc2, 0 ); #endif return rc2; } @@ -333,7 +337,9 @@ bdb_idl_fetch_key( } else if( rc != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_fetch_key: get failed: %s (%d)\n", db_strerror(rc), rc )); + LDAP_LOG( INDEX, ERR, + "bdb_idl_fetch_key: get failed: %s (%d)\n", + db_strerror(rc), rc, 0 ); #else Debug( LDAP_DEBUG_ANY, "=> bdb_idl_fetch_key: " "get failed: %s (%d)\n", @@ -344,7 +350,9 @@ bdb_idl_fetch_key( } else if ( data.size == 0 || data.size % sizeof( ID ) ) { /* size not multiple of ID size */ #ifdef NEW_LOGGING - LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_fetch_key: odd size: expected %ld multiple, got %ld\n", (long) sizeof( ID ), (long) data.size )); + LDAP_LOG( INDEX, ERR, + "bdb_idl_fetch_key: odd size: expected %ld multiple, got %ld\n", + (long) sizeof( ID ), (long) data.size, 0 ); #else Debug( LDAP_DEBUG_ANY, "=> bdb_idl_fetch_key: " "odd size: expected %ld multiple, got %ld\n", @@ -355,7 +363,9 @@ bdb_idl_fetch_key( } else if ( data.size != BDB_IDL_SIZEOF(ids) ) { /* size mismatch */ #ifdef NEW_LOGGING - LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_fetch_key: get size mismatch: expected %ld, got %ld\n", (long) ((1 + ids[0]) * sizeof( ID )), (long) data.size )); + LDAP_LOG( INDEX, ERR, + "bdb_idl_fetch_key: get size mismatch: expected %ld, got %ld\n", + (long) ((1 + ids[0]) * sizeof( ID )), (long) data.size, 0 ); #else Debug( LDAP_DEBUG_ANY, "=> bdb_idl_fetch_key: " "get size mismatch: expected %ld, got %ld\n", @@ -385,7 +395,8 @@ bdb_idl_insert_key( #if 0 /* for printable keys only */ #ifdef NEW_LOGGING - LDAP_LOG(( "idl", LDAP_LEVEL_ARGS, "bdb_idl_insert_key: %s %ld\n", (char *)key->data, (long) id )); + LDAP_LOG( INDEX, ARGS, "bdb_idl_insert_key: %s %ld\n", + (char *)key->data, (long) id, 0 ); #else Debug( LDAP_DEBUG_ARGS, "=> bdb_idl_insert_key: %s %ld\n", @@ -398,123 +409,159 @@ bdb_idl_insert_key( DBTzero( &data ); #ifdef BDB_IDL_MULTI { - ID buf[BDB_IDL_DB_SIZE]; DBC *cursor; - ID lo, hi; + ID lo, hi, tmp; char *err; data.size = sizeof( ID ); data.ulen = data.size; data.flags = DB_DBT_USERMEM; - rc = bdb_idl_fetch_key( be, db, tid, key, buf ); - if ( rc && rc != DB_NOTFOUND ) - return rc; - - /* If it never existed, or there's room in the current key, - * just store it. - */ - if ( rc == DB_NOTFOUND || ( !BDB_IDL_IS_RANGE(buf) && - BDB_IDL_N(buf) < BDB_IDL_DB_MAX ) ) { - data.data = &id; - rc = db->put( db, tid, key, &data, DB_NODUPDATA ); - } else if ( BDB_IDL_IS_RANGE(buf) ) { - /* If it's a range and we're outside the boundaries, - * rewrite the range boundaries. - */ - if ( id < BDB_IDL_RANGE_FIRST(buf) || - id > BDB_IDL_RANGE_LAST(buf) ) { - rc = db->cursor( db, tid, &cursor, bdb->bi_db_opflags ); - if ( rc != 0 ) { + rc = db->cursor( db, tid, &cursor, bdb->bi_db_opflags ); + if ( rc != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_insert_key: cursor failed: %s (%d)\n", db_strerror(rc), rc )); + LDAP_LOG( INDEX, ERR, + "bdb_idl_insert_key: cursor failed: %s (%d)\n", + db_strerror(rc), rc, 0 ); #else - Debug( LDAP_DEBUG_ANY, "=> bdb_idl_insert_key: " - "cursor failed: %s (%d)\n", db_strerror(rc), rc, 0 ); + Debug( LDAP_DEBUG_ANY, "=> bdb_idl_insert_key: " + "cursor failed: %s (%d)\n", db_strerror(rc), rc, 0 ); #endif - return rc; + return rc; + } + data.data = &tmp; + /* Fetch the first data item for this key, to see if it + * exists and if it's a range. + */ + rc = cursor->c_get( cursor, key, &data, DB_SET | DB_RMW ); + err = "c_get"; + if ( rc == 0 ) { + if ( tmp != 0 ) { + /* not a range, count the number of items */ + db_recno_t count; + rc = cursor->c_count( cursor, &count, 0 ); + if ( rc != 0 ) { + err = "c_count"; + goto fail; } - if ( id < BDB_IDL_RANGE_FIRST(buf) ) { - data.data = buf+1; + if ( count >= BDB_IDL_DB_SIZE ) { + /* No room, convert to a range */ + DBT key2 = *key; + + key2.dlen = key2.ulen; + key2.flags |= DB_DBT_PARTIAL; + + lo = tmp; + data.data = &hi; + rc = cursor->c_get( cursor, &key2, &data, DB_NEXT_NODUP ); + if ( rc != 0 && rc != DB_NOTFOUND ) { + err = "c_get next_nodup"; + goto fail; + } + if ( rc == DB_NOTFOUND ) { + rc = cursor->c_get( cursor, key, &data, DB_LAST ); + if ( rc != 0 ) { + err = "c_get last"; + goto fail; + } + } else { + rc = cursor->c_get( cursor, key, &data, DB_PREV ); + if ( rc != 0 ) { + err = "c_get prev"; + goto fail; + } + } + if ( id < lo ) + lo = id; + else if ( id > hi ) + hi = id; + rc = db->del( db, tid, key, 0 ); + if ( rc != 0 ) { + err = "del"; + goto fail; + } + data.data = &id; + id = 0; + rc = cursor->c_put( cursor, key, &data, DB_KEYFIRST ); + if ( rc != 0 ) { + err = "c_put 0"; + goto fail; + } + id = lo; + rc = cursor->c_put( cursor, key, &data, DB_KEYLAST ); + if ( rc != 0 ) { + err = "c_put lo"; + goto fail; + } + id = hi; + rc = cursor->c_put( cursor, key, &data, DB_KEYLAST ); + if ( rc != 0 ) { + err = "c_put hi"; + goto fail; + } } else { - data.data = buf+2; + /* There's room, just store it */ + goto put1; } - rc = cursor->c_get( cursor, key, &data, DB_GET_BOTH | DB_RMW ); - if ( rc != 0 ) { - err = "c_get"; -fail: -#ifdef NEW_LOGGING - LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_insert_key: %s failed: %s (%d)\n", err, db_strerror(rc), rc )); -#else - Debug( LDAP_DEBUG_ANY, "=> bdb_idl_insert_key: " - "%s failed: %s (%d)\n", err, db_strerror(rc), rc ); -#endif - if ( cursor ) cursor->c_close( cursor ); - return rc; - } - data.data = &id; - /* We should have been able to just overwrite the old - * value with the new, but apparently we have to delete - * it first. + } else { + /* It's a range, see if we need to rewrite + * the boundaries */ - rc = cursor->c_del( cursor, 0 ); - if ( rc ) { - err = "c_del"; + hi = id; + data.data = &lo; + rc = cursor->c_get( cursor, key, &data, DB_NEXT_DUP ); + if ( rc != 0 ) { + err = "c_get lo"; goto fail; } - rc = cursor->c_put( cursor, key, &data, DB_KEYFIRST ); - if ( rc ) { - err = "c_put"; - goto fail; + if ( id > lo ) { + data.data = &hi; + rc = cursor->c_get( cursor, key, &data, DB_NEXT_DUP ); + if ( rc != 0 ) { + err = "c_get hi"; + goto fail; + } } - rc = cursor->c_close( cursor ); - if ( rc ) { - cursor = NULL; - err = "c_close"; - goto fail; + if ( id < lo || id > hi ) { + /* Delete the current lo/hi */ + rc = cursor->c_del( cursor, 0 ); + if ( rc != 0 ) { + err = "c_del"; + goto fail; + } + data.data = &id; + rc = cursor->c_put( cursor, key, &data, DB_KEYFIRST ); + if ( rc != 0 ) { + err = "c_put lo/hi"; + goto fail; + } } } - } else { /* convert to a range */ - lo = BDB_IDL_FIRST(buf); - hi = BDB_IDL_LAST(buf); - - if (id < lo) - lo = id; - else if (id > hi) - hi = id; - - cursor = NULL; - - /* Delete all of the old IDL so we can replace with a range */ - rc = db->del( db, tid, key, 0 ); - if ( rc ) { - err = "del"; - goto fail; - } - - /* Write the range */ - data.data = &id; - id = 0; - rc = db->put( db, tid, key, &data, 0 ); - if ( rc ) { - err = "put #1"; - goto fail; - } - id = lo; - rc = db->put( db, tid, key, &data, 0 ); - if ( rc ) { - err = "put #2"; - goto fail; - } - id = hi; - rc = db->put( db, tid, key, &data, 0 ); - if ( rc ) { - err = "put #3"; + } else if ( rc == DB_NOTFOUND ) { +put1: data.data = &id; + rc = cursor->c_put( cursor, key, &data, DB_KEYFIRST ); + /* Don't worry if it's already there */ + if ( rc != 0 && rc != DB_KEYEXIST ) { + err = "c_put id"; goto fail; } + } else { + /* initial c_get failed, nothing was done */ +fail: +#ifdef NEW_LOGGING + LDAP_LOG( INDEX, ERR, + "bdb_idl_insert_key: %s failed: %s (%d)\n", + err, db_strerror(rc), rc ); +#else + Debug( LDAP_DEBUG_ANY, "=> bdb_idl_insert_key: " + "%s failed: %s (%d)\n", err, db_strerror(rc), rc ); +#endif + cursor->c_close( cursor ); + return rc; } + rc = cursor->c_close( cursor ); } -#else +#else /* !BDB_IDL_MULTI */ data.data = ids; data.ulen = sizeof ids; data.flags = DB_DBT_USERMEM; @@ -529,7 +576,8 @@ fail: } else if ( rc != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_insert_key: get failed: %s (%d)\n", db_strerror(rc), rc )); + LDAP_LOG( INDEX, ERR, "bdb_idl_insert_key: get failed: %s (%d)\n", + db_strerror(rc), rc, 0 ); #else Debug( LDAP_DEBUG_ANY, "=> bdb_idl_insert_key: " "get failed: %s (%d)\n", @@ -540,7 +588,9 @@ fail: } else if ( data.size == 0 || data.size % sizeof( ID ) ) { /* size not multiple of ID size */ #ifdef NEW_LOGGING - LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_insert_key: odd size: expected %ld multiple, got %ld\n", (long) sizeof( ID ), (long) data.size )); + LDAP_LOG( INDEX, ERR, + "bdb_idl_insert_key: odd size: expected %ld multiple, got %ld\n", + (long) sizeof( ID ), (long) data.size, 0 ); #else Debug( LDAP_DEBUG_ANY, "=> bdb_idl_insert_key: " "odd size: expected %ld multiple, got %ld\n", @@ -551,7 +601,9 @@ fail: } else if ( data.size != BDB_IDL_SIZEOF(ids) ) { /* size mismatch */ #ifdef NEW_LOGGING - LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_insert_key: odd size: expected %ld multiple, got %ld\n", (long) ((1 + ids[0]) * sizeof( ID )), (long) data.size )); + LDAP_LOG( INDEX, ERR, + "bdb_idl_insert_key: odd size: expected %ld multiple, got %ld\n", + (long) ((1 + ids[0]) * sizeof( ID )), (long) data.size, 0 ); #else Debug( LDAP_DEBUG_ANY, "=> bdb_idl_insert_key: " "get size mismatch: expected %ld, got %ld\n", @@ -573,7 +625,7 @@ fail: if( rc == -1 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "idl", LDAP_LEVEL_DETAIL1, "bdb_idl_insert_key: dup\n" )); + LDAP_LOG( INDEX, DETAIL1, "bdb_idl_insert_key: dup\n", 0, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "=> bdb_idl_insert_key: dup\n", 0, 0, 0 ); @@ -582,7 +634,8 @@ fail: } if( rc != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_insert_key: insert failed: (%d)\n", rc )); + LDAP_LOG( INDEX, ERR, + "bdb_idl_insert_key: insert failed: (%d)\n", rc, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "=> bdb_idl_insert_key: " "bdb_idl_insert failed (%d)\n", @@ -602,7 +655,9 @@ fail: if( rc != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_insert_key: put failed: (%d)\n", db_strerror(rc), rc )); + LDAP_LOG( INDEX, ERR, + "bdb_idl_insert_key: put failed: %s (%d)\n", + db_strerror(rc), rc, 0 ); #else Debug( LDAP_DEBUG_ANY, "=> bdb_idl_insert_key: " "put failed: %s (%d)\n", @@ -630,7 +685,8 @@ bdb_idl_delete_key( #if 0 /* for printable keys only */ #ifdef NEW_LOGGING - LDAP_LOG(( "idl", LDAP_LEVEL_ARGS, "bdb_idl_delete_key: %s %ld\n", (char *)key->data, (long) id )); + LDAP_LOG( INDEX, ARGS, "bdb_idl_delete_key: %s %ld\n", + (char *)key->data, (long) id, 0 ); #else Debug( LDAP_DEBUG_ARGS, "=> bdb_idl_delete_key: %s %ld\n", @@ -644,17 +700,112 @@ bdb_idl_delete_key( #ifdef BDB_IDL_MULTI { DBC *cursor; + ID lo, hi, tmp; + char *err; - data.data = &id; + data.data = &tmp; data.size = sizeof( id ); data.ulen = data.size; data.flags = DB_DBT_USERMEM; rc = db->cursor( db, tid, &cursor, bdb->bi_db_opflags ); - rc = cursor->c_get( cursor, key, &data, bdb->bi_db_opflags | - DB_GET_BOTH | DB_RMW ); - if (rc == 0) - rc = cursor->c_del( cursor, 0 ); + if ( rc != 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG( INDEX, ERR, + "bdb_idl_delete_key: cursor failed: %s (%d)\n", + db_strerror(rc), rc, 0 ); +#else + Debug( LDAP_DEBUG_ANY, "=> bdb_idl_delete_key: " + "cursor failed: %s (%d)\n", db_strerror(rc), rc, 0 ); +#endif + return rc; + } + /* Fetch the first data item for this key, to see if it + * exists and if it's a range. + */ + rc = cursor->c_get( cursor, key, &data, DB_SET | DB_RMW ); + err = "c_get"; + if ( rc == 0 ) { + if ( tmp != 0 ) { + /* Not a range, just delete it */ + if (tmp != id) { + /* position to correct item */ + tmp = id; + rc = cursor->c_get( cursor, key, &data, + DB_GET_BOTH | DB_RMW ); + } + if ( rc == 0 ) { + rc = cursor->c_del( cursor, 0 ); + if ( rc != 0 ) { + err = "c_del id"; + goto fail; + } + } + } else { + /* It's a range, see if we need to rewrite + * the boundaries + */ + hi = 0; + data.data = &lo; + rc = cursor->c_get( cursor, key, &data, DB_NEXT_DUP ); + if ( rc != 0 ) { + err = "c_get lo"; + goto fail; + } + if ( id > lo ) { + data.data = &hi; + rc = cursor->c_get( cursor, key, &data, DB_NEXT_DUP ); + if ( rc != 0 ) { + err = "c_get hi"; + goto fail; + } + } + if ( id == lo || id == hi ) { + if ( id == lo ) { + id++; + lo = id; + } else if ( id == hi ) { + id--; + hi = id; + } + if ( lo >= hi ) { + /* The range has collapsed... */ + rc = db->del( db, tid, key, 0 ); + if ( rc != 0 ) { + err = "del"; + goto fail; + } + } else { + rc = cursor->c_del( cursor, 0 ); + if ( rc != 0 ) { + err = "c_del"; + goto fail; + } + } + if ( lo <= hi ) { + data.data = &id; + rc = cursor->c_put( cursor, key, &data, DB_KEYFIRST ); + if ( rc != 0 ) { + err = "c_put lo/hi"; + goto fail; + } + } + } + } + } else { + /* initial c_get failed, nothing was done */ +fail: +#ifdef NEW_LOGGING + LDAP_LOG( INDEX, ERR, + "bdb_idl_delete_key: %s failed: %s (%d)\n", + err, db_strerror(rc), rc ); +#else + Debug( LDAP_DEBUG_ANY, "=> bdb_idl_delete_key: " + "%s failed: %s (%d)\n", err, db_strerror(rc), rc ); +#endif + cursor->c_close( cursor ); + return rc; + } rc = cursor->c_close( cursor ); } #else @@ -667,7 +818,8 @@ bdb_idl_delete_key( if ( rc != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_delete_key: get failed: %s (%d)\n", db_strerror(rc), rc )); + LDAP_LOG( INDEX, ERR, "bdb_idl_delete_key: get failed: %s (%d)\n", + db_strerror(rc), rc, 0 ); #else Debug( LDAP_DEBUG_ANY, "=> bdb_idl_delete_key: " "get failed: %s (%d)\n", @@ -678,7 +830,9 @@ bdb_idl_delete_key( } else if ( data.size == 0 || data.size % sizeof( ID ) ) { /* size not multiple of ID size */ #ifdef NEW_LOGGING - LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_delete_key: odd size: expected: %ld multiple, got %ld\n", (long) sizeof( ID ), (long) data.size )); + LDAP_LOG( INDEX, ERR, + "bdb_idl_delete_key: odd size: expected: %ld multiple, got %ld\n", + (long) sizeof( ID ), (long) data.size, 0 ); #else Debug( LDAP_DEBUG_ANY, "=> bdb_idl_delete_key: " "odd size: expected %ld multiple, got %ld\n", @@ -692,7 +846,9 @@ bdb_idl_delete_key( } else if ( data.size != (1 + ids[0]) * sizeof( ID ) ) { /* size mismatch */ #ifdef NEW_LOGGING - LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_delete_key: get size mismatch: expected: %ld, got %ld\n", (long) ((1 + ids[0]) * sizeof( ID )), (long) data.size )); + LDAP_LOG( INDEX, ERR, + "bdb_idl_delete_key: get size mismatch: expected: %ld, got %ld\n", + (long) ((1 + ids[0]) * sizeof( ID )), (long) data.size, 0 ); #else Debug( LDAP_DEBUG_ANY, "=> bdb_idl_delete_key: " "get size mismatch: expected %ld, got %ld\n", @@ -705,7 +861,8 @@ bdb_idl_delete_key( if( rc != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_delete_key: delete failed: (%d)\n", rc )); + LDAP_LOG( INDEX, ERR, + "bdb_idl_delete_key: delete failed: (%d)\n", rc, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "=> bdb_idl_delete_key: " "idl_delete failed (%d)\n", @@ -719,7 +876,9 @@ bdb_idl_delete_key( rc = db->del( db, tid, key, 0 ); if( rc != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_delete_key: delete failed: %s (%d)\n", db_strerror(rc), rc )); + LDAP_LOG( INDEX, ERR, + "bdb_idl_delete_key: delete failed: %s (%d)\n", + db_strerror(rc), rc, 0 ); #else Debug( LDAP_DEBUG_ANY, "=> bdb_idl_delete_key: " "delete failed: %s (%d)\n", @@ -739,7 +898,8 @@ bdb_idl_delete_key( if( rc != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "idl", LDAP_LEVEL_ERR, "bdb_idl_delete_key: put failed: %s (%d)\n", db_strerror(rc), rc )); + LDAP_LOG( INDEX, ERR, "bdb_idl_delete_key: put failed: %s (%d)\n", + db_strerror(rc), rc, 0 ); #else Debug( LDAP_DEBUG_ANY, "=> bdb_idl_delete_key: put failed: %s (%d)\n", @@ -854,8 +1014,11 @@ bdb_idl_union( } if ( BDB_IDL_IS_RANGE( a ) || BDB_IDL_IS_RANGE(b) ) { -over: a[1] = IDL_MIN( BDB_IDL_FIRST(a), BDB_IDL_FIRST(b) ); - a[2] = IDL_MAX( BDB_IDL_LAST(a), BDB_IDL_LAST(b) ); +over: ida = IDL_MIN( BDB_IDL_FIRST(a), BDB_IDL_FIRST(b) ); + idb = IDL_MAX( BDB_IDL_LAST(a), BDB_IDL_LAST(b) ); + a[0] = NOID; + a[1] = ida; + a[2] = idb; return 0; } @@ -868,7 +1031,6 @@ over: a[1] = IDL_MIN( BDB_IDL_FIRST(a), BDB_IDL_FIRST(b) ); while( ida != NOID || idb != NOID ) { if ( ida < idb ) { if( ++cursorc > BDB_IDL_UM_MAX ) { - a[0] = NOID; goto over; } b[cursorc] = ida;