[Date Prev][Date Next] [Chronological] [Thread] [Top]

back-bdb resource leak (ITS#2040)



This is a multi-part message in MIME format.

------=_NextPart_000_01C6_01C24D44.86ABB4F0
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit

-----Original Message-----
From: Steven Wilton [mailto:steven.wilton@team.eftel.com]

Howard,

I did find the source of the locker leak using the attached copy of idl.c
coming up
with the following output.  You will notice that the leak occurs when "rc
= cursor->c_get( cursor, key, &data, flags | DB_NEXT_DUP );"  is run more
than once in the loop.

(&(uid=swilton2)(objectclass=posixAccount)) (no leak)

=> bdb_equality_candidates
=> key_read
=> bdb_key_read - lockers1 19
=> bdb_key_read - lockers2 19
=> bdb_key_read - lockers3 19
=> bdb_key_read - lockers3.1 19
=> bdb_key_read - lockers3.2 19
=> bdb_key_read - lockers4 19
=> bdb_key_read - lockers5 19
<= bdb_index_read 1 candidates
<= bdb_equality_candidates id=1, first=8860, last=8860
=> bdb_equality_candidates
=> key_read
=> bdb_key_read - lockers1 19
=> bdb_key_read - lockers2 19
=> bdb_key_read - lockers3 19
=> bdb_key_read - lockers3.1 19
=> bdb_key_read - lockers3.2 19
=> bdb_key_read - lockers3.1 19
=> bdb_key_read - lockers3.2 20
=> bdb_key_read - lockers3.1 20
=> bdb_key_read - lockers3.2 21
=> bdb_key_read - lockers3.1 21
=> bdb_key_read - lockers3.2 22
=> bdb_key_read - lockers3.1 22
=> bdb_key_read - lockers3.2 23
=> bdb_key_read - lockers3.1 23
=> bdb_key_read - lockers3.2 24
=> bdb_key_read - lockers4 24
=> bdb_key_read - lockers5 24
<= bdb_index_read 22467 candidates
<= bdb_equality_candidates id=1, first=8860, last=8860


    (&(gidNumber=200)(uidNumber=14396)) (leak)

=> bdb_equality_candidates
=> key_read
=> bdb_key_read - lockers1 24
=> bdb_key_read - lockers2 24
=> bdb_key_read - lockers3 24
=> bdb_key_read - lockers3.1 24
=> bdb_key_read - lockers3.2 24
=> bdb_key_read - lockers4 24
=> bdb_key_read - lockers5 24
<= bdb_index_read 20 candidates
<= bdb_equality_candidates id=20, first=5524, last=14848
=> bdb_equality_candidates
=> key_read
=> bdb_key_read - lockers1 24
=> bdb_key_read - lockers2 24
=> bdb_key_read - lockers3 24
=> bdb_key_read - lockers3.1 24
=> bdb_key_read - lockers3.2 24
=> bdb_key_read - lockers4 24
=> bdb_key_read - lockers5 24
<= bdb_index_read 1 candidates
<= bdb_equality_candidates id=1, first=8860, last=8860

Steven

------=_NextPart_000_01C6_01C24D44.86ABB4F0
Content-Type: text/x-c;
	name="idl.c"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="idl.c"

/* idl.c - ldap id list handling routines */
/* $OpenLDAP: pkg/ldap/servers/slapd/back-bdb/idl.c,v 1.41.2.4 =
2002/08/05 19:10:16 kurt Exp $ */
/*
 * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
 * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 */

#include "portable.h"

#include <stdio.h>
#include <ac/string.h>

#include "back-bdb.h"
#include "idl.h"

#define IDL_MAX(x,y)	( x > y ? x : y )
#define IDL_MIN(x,y)	( x < y ? x : y )

#define IDL_CMP(x,y)	( x < y ? -1 : ( x > y ? 1 : 0 ) )

#if IDL_DEBUG > 0
static void idl_check( ID *ids )
{
	if( BDB_IDL_IS_RANGE( ids ) ) {
		assert( BDB_IDL_RANGE_FIRST(ids) <=3D BDB_IDL_RANGE_LAST(ids) );
	} else {
		ID i;
		for( i=3D1; i < ids[0]; i++ ) {
			assert( ids[i+1] > ids[i] );
		}
	}
}

#if IDL_DEBUG > 1
static void idl_dump( ID *ids )
{
	if( BDB_IDL_IS_RANGE( ids ) ) {
#ifdef NEW_LOGGING
		LDAP_LOG( INDEX, INFO, "IDL: range (%ld - %ld)\n",
			(long) BDB_IDL_RANGE_FIRST( ids ),
			(long) BDB_IDL_RANGE_LAST( ids ), 0 );
#else
		Debug( LDAP_DEBUG_ANY,
			"IDL: range ( %ld - %ld )\n",
			(long) BDB_IDL_RANGE_FIRST( ids ),
			(long) BDB_IDL_RANGE_LAST( ids ) );
#endif

	} else {
		ID i;
#ifdef NEW_LOGGING
		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

		for( i=3D1; i<=3Dids[0]; i++ ) {
			if( i % 16 =3D=3D 1 ) {
				Debug( LDAP_DEBUG_ANY, "\n", 0, 0, 0 );
			}
#ifdef NEW_LOGGING
			LDAP_LOG( INDEX, INFO, "%02lx",(long)ids[i], 0, 0 );
#else
			Debug( LDAP_DEBUG_ANY, "  %02lx", (long) ids[i], 0, 0 );
#endif
		}

		Debug( LDAP_DEBUG_ANY, "\n", 0, 0, 0 );
	}

	idl_check( ids );
}
#endif /* IDL_DEBUG > 1 */
#endif /* IDL_DEBUG > 0 */

unsigned bdb_idl_search( ID *ids, ID id )
{
#define IDL_BINARY_SEARCH 1
#ifdef IDL_BINARY_SEARCH
	/*
	 * binary search of id in ids
	 * if found, returns position of id
	 * if not found, returns first postion greater than id
	 */
	unsigned base =3D 0;
	unsigned cursor =3D 0;
	int val =3D 0;
	unsigned n =3D ids[0];

#if IDL_DEBUG > 0
	idl_check( ids );
#endif

	while( 0 < n ) {
		int pivot =3D n >> 1;
		cursor =3D base + pivot;
		val =3D IDL_CMP( id, ids[cursor + 1] );

		if( val < 0 ) {
			n =3D pivot;

		} else if ( val > 0 ) {
			base =3D cursor + 1;
			n -=3D pivot + 1;

		} else {
			return cursor + 1;
		}
	}
=09
	if( val > 0 ) {
		return cursor + 2;
	} else {
		return cursor + 1;
	}

#else
	/* (reverse) linear search */
	int i;

#if IDL_DEBUG > 0
	idl_check( ids );
#endif

	for( i=3Dids[0]; i; i-- ) {
		if( id > ids[i] ) {
			break;
		}
	}

	return i+1;
#endif
}

int bdb_idl_insert( ID *ids, ID id )
{
	unsigned x =3D bdb_idl_search( ids, id );

#if IDL_DEBUG > 1
#ifdef NEW_LOGGING
	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 );
#endif
#elif IDL_DEBUG > 0
	idl_check( ids );
#endif

	assert( x > 0 );

	if( x < 1 ) {
		/* internal error */
		return -2;
	}

	if ( x <=3D ids[0] && ids[x] =3D=3D id ) {
		/* duplicate */
		return -1;
	}

	if ( ++ids[0] >=3D BDB_IDL_DB_MAX ) {
		if( id < ids[1] ) {
			ids[1] =3D id;
			ids[2] =3D ids[ids[0]-1];
		} else if ( ids[ids[0]-1] < id ) {
			ids[2] =3D id;
		} else {
			ids[2] =3D ids[ids[0]-1];
		}
		ids[0] =3D NOID;
=09
	} else {
		/* insert id */
		AC_MEMCPY( &ids[x+1], &ids[x], (ids[0]-x) * sizeof(ID) );
		ids[x] =3D id;
	}

#if IDL_DEBUG > 1
	idl_dump( ids );
#elif IDL_DEBUG > 0
	idl_check( ids );
#endif

	return 0;
}

static int idl_delete( ID *ids, ID id )
{
	unsigned x =3D bdb_idl_search( ids, id );

#if IDL_DEBUG > 1
#ifdef NEW_LOGGING
	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 );
#endif
#elif IDL_DEBUG > 0
	idl_check( ids );
#endif

	assert( x > 0 );

	if( x <=3D 0 ) {
		/* internal error */
		return -2;
	}

	if( x > ids[0] || ids[x] !=3D id ) {
		/* not found */
		return -1;

	} else if ( --ids[0] =3D=3D 0 ) {
		if( x !=3D 1 ) {
			return -3;
		}

	} else {
		AC_MEMCPY( &ids[x], &ids[x+1], (1+ids[0]-x) * sizeof(ID) );
	}

#if IDL_DEBUG > 1
	idl_dump( ids );
#elif IDL_DEBUG > 0
	idl_check( ids );
#endif

	return 0;
}

int
bdb_idl_fetch_key(
	BackendDB	*be,
	DB			*db,
	DB_TXN		*tid,
	DBT			*key,
	ID			*ids )
{
	struct bdb_info *bdb =3D (struct bdb_info *) be->be_private;
	int rc;
	DBT data;
	DB_LOCK_STAT *sp;

	assert( ids !=3D NULL );

	DBTzero( &data );

#ifdef BDB_IDL_MULTI
	{
		DBC *cursor;
		ID buf[BDB_PAGESIZE*4];
		ID *i;
		void *ptr;
		size_t len;
		int rc2;
		int flags =3D bdb->bi_db_opflags | DB_MULTIPLE;
		data.data =3D buf;
		data.ulen =3D sizeof(buf);
		data.flags =3D DB_DBT_USERMEM;

		if ( tid )
			flags |=3D DB_RMW;

		bdb->bi_dbenv->lock_stat(bdb->bi_dbenv,&sp,0);
		Debug( LDAP_DEBUG_TRACE, "=3D> bdb_key_read - lockers1 %lu\n", =
(u_long)sp->st_nlockers, 0, 0 );
		rc =3D db->cursor( db, tid, &cursor, bdb->bi_db_opflags );
		bdb->bi_dbenv->lock_stat(bdb->bi_dbenv,&sp,0);
		Debug( LDAP_DEBUG_TRACE, "=3D> bdb_key_read - lockers2 %lu\n", =
(u_long)sp->st_nlockers, 0, 0 );
		if( rc !=3D 0 ) {
#ifdef NEW_LOGGING
			LDAP_LOG( INDEX, ERR,=20
				"bdb_idl_fetch_key: cursor failed: %s (%d)\n",=20
				db_strerror(rc), rc, 0 );
#else
			Debug( LDAP_DEBUG_ANY, "=3D> bdb_idl_fetch_key: "
				"cursor failed: %s (%d)\n", db_strerror(rc), rc, 0 );
#endif
			return rc;
		}
		rc =3D cursor->c_get( cursor, key, &data, flags | DB_SET );
		if (rc =3D=3D 0) {
			i =3D ids;
			bdb->bi_dbenv->lock_stat(bdb->bi_dbenv,&sp,0);
			Debug( LDAP_DEBUG_TRACE, "=3D> bdb_key_read - lockers3 %lu\n", =
(u_long)sp->st_nlockers, 0, 0 );
			while (rc =3D=3D 0) {
				u_int8_t *j;

				DB_MULTIPLE_INIT( ptr, &data );
				while (ptr) {
					DB_MULTIPLE_NEXT(ptr, &data, j, len);
					if (j) {
						++i;
						AC_MEMCPY( i, j, sizeof(ID) );
					}
				}
				bdb->bi_dbenv->lock_stat(bdb->bi_dbenv,&sp,0);
				Debug( LDAP_DEBUG_TRACE, "=3D> bdb_key_read - lockers3.1 %lu\n", =
(u_long)sp->st_nlockers, 0, 0 );
				rc =3D cursor->c_get( cursor, key, &data, flags | DB_NEXT_DUP );
				bdb->bi_dbenv->lock_stat(bdb->bi_dbenv,&sp,0);
				Debug( LDAP_DEBUG_TRACE, "=3D> bdb_key_read - lockers3.2 %lu\n", =
(u_long)sp->st_nlockers, 0, 0 );
			}
			bdb->bi_dbenv->lock_stat(bdb->bi_dbenv,&sp,0);
			Debug( LDAP_DEBUG_TRACE, "=3D> bdb_key_read - lockers4 %lu\n", =
(u_long)sp->st_nlockers, 0, 0 );
			if ( rc =3D=3D DB_NOTFOUND ) rc =3D 0;
			ids[0] =3D i - ids;
			/* On disk, a range is denoted by 0 in the first element */
			if (ids[1] =3D=3D 0) {
				if (ids[0] !=3D BDB_IDL_RANGE_SIZE) {
#ifdef NEW_LOGGING
					LDAP_LOG( INDEX, ERR,=20
						"=3D> bdb_idl_fetch_key: range size mismatch: "
						"expected %ld, got %ld\n",=20
						BDB_IDL_RANGE_SIZE, ids[0], 0 );
#else
					Debug( LDAP_DEBUG_ANY, "=3D> bdb_idl_fetch_key: "
						"range size mismatch: expected %d, got %ld\n",
						BDB_IDL_RANGE_SIZE, ids[0], 0 );
#endif
					cursor->c_close( cursor );
					return -1;
				}
				BDB_IDL_RANGE( ids, ids[2], ids[3] );
			}
			data.size =3D BDB_IDL_SIZEOF(ids);
			bdb->bi_dbenv->lock_stat(bdb->bi_dbenv,&sp,0);
			Debug( LDAP_DEBUG_TRACE, "=3D> bdb_key_read - lockers5 %lu\n", =
(u_long)sp->st_nlockers, 0, 0 );
		}
		rc2 =3D cursor->c_close( cursor );
		if (rc2) {
#ifdef NEW_LOGGING
			LDAP_LOG( INDEX, ERR,=20
				"bdb_idl_fetch_key: close failed: %s (%d)\n",=20
				db_strerror(rc2), rc2, 0 );
#else
			Debug( LDAP_DEBUG_ANY, "=3D> bdb_idl_fetch_key: "
				"close failed: %s (%d)\n", db_strerror(rc2), rc2, 0 );
#endif
			return rc2;
		}
	}
#else
	data.data =3D ids;
	data.ulen =3D BDB_IDL_UM_SIZEOF;
	data.flags =3D DB_DBT_USERMEM;
	/* fetch it */
	rc =3D db->get( db, tid, key, &data, bdb->bi_db_opflags );
#endif

	if( rc =3D=3D DB_NOTFOUND ) {
		return rc;

	} else if( rc !=3D 0 ) {
#ifdef NEW_LOGGING
		LDAP_LOG( INDEX, ERR,=20
			"bdb_idl_fetch_key: get failed: %s (%d)\n",=20
			db_strerror(rc), rc, 0 );
#else
		Debug( LDAP_DEBUG_ANY, "=3D> bdb_idl_fetch_key: "
			"get failed: %s (%d)\n",
			db_strerror(rc), rc, 0 );
#endif
		return rc;

	} else if ( data.size =3D=3D 0 || data.size % sizeof( ID ) ) {
		/* size not multiple of ID size */
#ifdef NEW_LOGGING
		LDAP_LOG( INDEX, ERR,=20
			"bdb_idl_fetch_key: odd size: expected %ld multiple, got %ld\n",=20
			(long) sizeof( ID ), (long) data.size, 0 );
#else
		Debug( LDAP_DEBUG_ANY, "=3D> bdb_idl_fetch_key: "
			"odd size: expected %ld multiple, got %ld\n",
			(long) sizeof( ID ), (long) data.size, 0 );
#endif
		return -1;

	} else if ( data.size !=3D BDB_IDL_SIZEOF(ids) ) {
		/* size mismatch */
#ifdef NEW_LOGGING
		LDAP_LOG( INDEX, ERR,=20
			"bdb_idl_fetch_key: get size mismatch: expected %ld, got %ld\n",=20
			(long) ((1 + ids[0]) * sizeof( ID )), (long) data.size, 0 );
#else
		Debug( LDAP_DEBUG_ANY, "=3D> bdb_idl_fetch_key: "
			"get size mismatch: expected %ld, got %ld\n",
			(long) ((1 + ids[0]) * sizeof( ID )), (long) data.size, 0 );
#endif
		return -1;
	}

	return rc;
}

int
bdb_idl_insert_key(
	BackendDB	*be,
	DB			*db,
	DB_TXN		*tid,
	DBT			*key,
	ID			id )
{
	struct bdb_info *bdb =3D (struct bdb_info *) be->be_private;
	int	rc;
	DBT data;
#ifndef BDB_IDL_MULTI
	ID ids[BDB_IDL_DB_SIZE];
#endif

#if 0
	/* for printable keys only */
#ifdef NEW_LOGGING
	LDAP_LOG( INDEX, ARGS, "bdb_idl_insert_key: %s %ld\n",=20
		(char *)key->data, (long) id, 0 );
#else
	Debug( LDAP_DEBUG_ARGS,
		"=3D> bdb_idl_insert_key: %s %ld\n",
		(char *)key->data, (long) id, 0 );
#endif
#endif

	assert( id !=3D NOID );

	DBTzero( &data );
#ifdef BDB_IDL_MULTI
	{
		DBC *cursor;
		ID lo, hi, tmp;
		char *err;

		data.size =3D sizeof( ID );
		data.ulen =3D data.size;
		data.flags =3D DB_DBT_USERMEM;

		rc =3D db->cursor( db, tid, &cursor, bdb->bi_db_opflags );
		if ( rc !=3D 0 ) {
#ifdef NEW_LOGGING
			LDAP_LOG( INDEX, ERR,=20
				"bdb_idl_insert_key: cursor failed: %s (%d)\n",=20
				db_strerror(rc), rc, 0 );
#else
			Debug( LDAP_DEBUG_ANY, "=3D> bdb_idl_insert_key: "
				"cursor failed: %s (%d)\n", db_strerror(rc), rc, 0 );
#endif
			return rc;
		}
		data.data =3D &tmp;
		/* Fetch the first data item for this key, to see if it
		 * exists and if it's a range.
		 */
		rc =3D cursor->c_get( cursor, key, &data, DB_SET | DB_RMW );
		err =3D "c_get";
		if ( rc =3D=3D 0 ) {
			if ( tmp !=3D 0 ) {
				/* not a range, count the number of items */
				db_recno_t count;
				rc =3D cursor->c_count( cursor, &count, 0 );
				if ( rc !=3D 0 ) {
					err =3D "c_count";
					goto fail;
				}
				if ( count >=3D BDB_IDL_DB_SIZE ) {
				/* No room, convert to a range */
					DBT key2 =3D *key;

					key2.dlen =3D key2.ulen;
					key2.flags |=3D DB_DBT_PARTIAL;

					lo =3D tmp;
					data.data =3D &hi;
					rc =3D cursor->c_get( cursor, &key2, &data, DB_NEXT_NODUP );
					if ( rc !=3D 0 && rc !=3D DB_NOTFOUND ) {
						err =3D "c_get next_nodup";
						goto fail;
					}
					if ( rc =3D=3D DB_NOTFOUND ) {
						rc =3D cursor->c_get( cursor, key, &data, DB_LAST );
						if ( rc !=3D 0 ) {
							err =3D "c_get last";
							goto fail;
						}
					} else {
						rc =3D cursor->c_get( cursor, key, &data, DB_PREV );
						if ( rc !=3D 0 ) {
							err =3D "c_get prev";
							goto fail;
						}
					}
					if ( id < lo )
						lo =3D id;
					else if ( id > hi )
						hi =3D id;
					rc =3D db->del( db, tid, key, 0 );
					if ( rc !=3D 0 ) {
						err =3D "del";
						goto fail;
					}
					data.data =3D &id;
					id =3D 0;
					rc =3D cursor->c_put( cursor, key, &data, DB_KEYFIRST );
					if ( rc !=3D 0 ) {
						err =3D "c_put 0";
						goto fail;
					}
					id =3D lo;
					rc =3D cursor->c_put( cursor, key, &data, DB_KEYLAST );
					if ( rc !=3D 0 ) {
						err =3D "c_put lo";
						goto fail;
					}
					id =3D hi;
					rc =3D cursor->c_put( cursor, key, &data, DB_KEYLAST );
					if ( rc !=3D 0 ) {
						err =3D "c_put hi";
						goto fail;
					}
				} else {
				/* There's room, just store it */
					goto put1;
				}
			} else {
				/* It's a range, see if we need to rewrite
				 * the boundaries
				 */
				hi =3D id;
				data.data =3D &lo;
				rc =3D cursor->c_get( cursor, key, &data, DB_NEXT_DUP );
				if ( rc !=3D 0 ) {
					err =3D "c_get lo";
					goto fail;
				}
				if ( id > lo ) {
					data.data =3D &hi;
					rc =3D cursor->c_get( cursor, key, &data, DB_NEXT_DUP );
					if ( rc !=3D 0 ) {
						err =3D "c_get hi";
						goto fail;
					}
				}
				if ( id < lo || id > hi ) {
					/* Delete the current lo/hi */
					rc =3D cursor->c_del( cursor, 0 );
					if ( rc !=3D 0 ) {
						err =3D "c_del";
						goto fail;
					}
					data.data =3D &id;
					rc =3D cursor->c_put( cursor, key, &data, DB_KEYFIRST );
					if ( rc !=3D 0 ) {
						err =3D "c_put lo/hi";
						goto fail;
					}
				}
			}
		} else if ( rc =3D=3D DB_NOTFOUND ) {
put1:			data.data =3D &id;
			rc =3D cursor->c_put( cursor, key, &data, DB_KEYFIRST );
			/* Don't worry if it's already there */
			if ( rc !=3D 0 && rc !=3D DB_KEYEXIST ) {
				err =3D "c_put id";
				goto fail;
			}
		} else {
			/* initial c_get failed, nothing was done */
fail:
#ifdef NEW_LOGGING
			LDAP_LOG( INDEX, ERR,=20
				"bdb_idl_insert_key: %s failed: %s (%d)\n",=20
				err, db_strerror(rc), rc );
#else
			Debug( LDAP_DEBUG_ANY, "=3D> bdb_idl_insert_key: "
				"%s failed: %s (%d)\n", err, db_strerror(rc), rc );
#endif
			cursor->c_close( cursor );
			return rc;
		}
		rc =3D cursor->c_close( cursor );
	}
#else	/* !BDB_IDL_MULTI */
	data.data =3D ids;
	data.ulen =3D sizeof ids;
	data.flags =3D DB_DBT_USERMEM;

	/* fetch the key for read/modify/write */
	rc =3D db->get( db, tid, key, &data, DB_RMW | bdb->bi_db_opflags );

	if( rc =3D=3D DB_NOTFOUND ) {
		ids[0] =3D 1;
		ids[1] =3D id;
		data.size =3D 2 * sizeof( ID );

	} else if ( rc !=3D 0 ) {
#ifdef NEW_LOGGING
		LDAP_LOG( INDEX, ERR, "bdb_idl_insert_key: get failed: %s (%d)\n",=20
			db_strerror(rc), rc, 0 );
#else
		Debug( LDAP_DEBUG_ANY, "=3D> bdb_idl_insert_key: "
			"get failed: %s (%d)\n",
			db_strerror(rc), rc, 0 );
#endif
		return rc;

	} else if ( data.size =3D=3D 0 || data.size % sizeof( ID ) ) {
		/* size not multiple of ID size */
#ifdef NEW_LOGGING
		LDAP_LOG( INDEX, ERR,=20
			"bdb_idl_insert_key: odd size: expected %ld multiple, got %ld\n",=20
			(long) sizeof( ID ), (long) data.size, 0 );
#else
		Debug( LDAP_DEBUG_ANY, "=3D> bdb_idl_insert_key: "
			"odd size: expected %ld multiple, got %ld\n",
			(long) sizeof( ID ), (long) data.size, 0 );
#endif
		return -1;
=09
	} else if ( data.size !=3D BDB_IDL_SIZEOF(ids) ) {
		/* size mismatch */
#ifdef NEW_LOGGING
		LDAP_LOG( INDEX, ERR,=20
			"bdb_idl_insert_key: odd size: expected %ld multiple, got %ld\n",=20
			(long) ((1 + ids[0]) * sizeof( ID )), (long) data.size, 0 );
#else
		Debug( LDAP_DEBUG_ANY, "=3D> bdb_idl_insert_key: "
			"get size mismatch: expected %ld, got %ld\n",
			(long) ((1 + ids[0]) * sizeof( ID )), (long) data.size, 0 );
#endif
		return -1;

	} else if ( BDB_IDL_IS_RANGE(ids) ) {
		if( id < ids[1] ) {
			ids[1] =3D id;
		} else if ( ids[2] > id ) {
			ids[2] =3D id;
		} else {
			return 0;
		}

	} else {
		rc =3D bdb_idl_insert( ids, id );

		if( rc =3D=3D -1 ) {
#ifdef NEW_LOGGING
			LDAP_LOG( INDEX, DETAIL1, "bdb_idl_insert_key: dup\n", 0, 0, 0 );
#else
			Debug( LDAP_DEBUG_TRACE, "=3D> bdb_idl_insert_key: dup\n",
				0, 0, 0 );
#endif
			return 0;
		}
		if( rc !=3D 0 ) {
#ifdef NEW_LOGGING
			LDAP_LOG( INDEX, ERR,=20
				"bdb_idl_insert_key: insert failed: (%d)\n", rc, 0, 0 );
#else
			Debug( LDAP_DEBUG_ANY, "=3D> bdb_idl_insert_key: "
				"bdb_idl_insert failed (%d)\n",
				rc, 0, 0 );
#endif
		=09
			return rc;
		}

		data.size =3D BDB_IDL_SIZEOF( ids );
	}

	/* store the key */
	rc =3D db->put( db, tid, key, &data, 0 );
#endif
	if( rc =3D=3D DB_KEYEXIST ) rc =3D 0;

	if( rc !=3D 0 ) {
#ifdef NEW_LOGGING
		LDAP_LOG( INDEX, ERR,=20
			"bdb_idl_insert_key: put failed: %s (%d)\n",=20
			db_strerror(rc), rc, 0 );
#else
		Debug( LDAP_DEBUG_ANY, "=3D> bdb_idl_insert_key: "
			"put failed: %s (%d)\n",
			db_strerror(rc), rc, 0 );
#endif
	}
	return rc;
}

int
bdb_idl_delete_key(
	BackendDB	*be,
	DB			*db,
	DB_TXN		*tid,
	DBT			*key,
	ID			id )
{
	struct bdb_info *bdb =3D (struct bdb_info *) be->be_private;
	int	rc;
	DBT data;
#ifndef BDB_IDL_MULTI
	ID ids[BDB_IDL_DB_SIZE];
#endif

#if 0
	/* for printable keys only */
#ifdef NEW_LOGGING
	LDAP_LOG( INDEX, ARGS, "bdb_idl_delete_key: %s %ld\n",=20
		(char *)key->data, (long) id, 0 );
#else
	Debug( LDAP_DEBUG_ARGS,
		"=3D> bdb_idl_delete_key: %s %ld\n",
		(char *)key->data, (long) id, 0 );
#endif
#endif

	assert( id !=3D NOID );

	DBTzero( &data );
#ifdef BDB_IDL_MULTI
	{
		DBC *cursor;
		ID lo, hi, tmp;
		char *err;

		data.data =3D &tmp;
		data.size =3D sizeof( id );
		data.ulen =3D data.size;
		data.flags =3D DB_DBT_USERMEM;

		rc =3D db->cursor( db, tid, &cursor, bdb->bi_db_opflags );
		if ( rc !=3D 0 ) {
#ifdef NEW_LOGGING
			LDAP_LOG( INDEX, ERR,=20
				"bdb_idl_delete_key: cursor failed: %s (%d)\n",=20
				db_strerror(rc), rc, 0 );
#else
			Debug( LDAP_DEBUG_ANY, "=3D> 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 =3D cursor->c_get( cursor, key, &data, DB_SET | DB_RMW );
		err =3D "c_get";
		if ( rc =3D=3D 0 ) {
			if ( tmp !=3D 0 ) {
				/* Not a range, just delete it */
				if (tmp !=3D id) {
					/* position to correct item */
					tmp =3D id;
					rc =3D cursor->c_get( cursor, key, &data,=20
						DB_GET_BOTH | DB_RMW  );
				}
				if ( rc =3D=3D 0 ) {
					rc =3D cursor->c_del( cursor, 0 );
					if ( rc !=3D 0 ) {
						err =3D "c_del id";
						goto fail;
					}
				}
			} else {
				/* It's a range, see if we need to rewrite
				 * the boundaries
				 */
				hi =3D 0;
				data.data =3D &lo;
				rc =3D cursor->c_get( cursor, key, &data, DB_NEXT_DUP );
				if ( rc !=3D 0 ) {
					err =3D "c_get lo";
					goto fail;
				}
				if ( id > lo ) {
					data.data =3D &hi;
					rc =3D cursor->c_get( cursor, key, &data, DB_NEXT_DUP );
					if ( rc !=3D 0 ) {
						err =3D "c_get hi";
						goto fail;
					}
				}
				if ( id =3D=3D lo || id =3D=3D hi ) {
					if ( id =3D=3D lo ) {
						id++;
						lo =3D id;
					} else if ( id =3D=3D hi ) {
						id--;
						hi =3D id;
					}
					if ( lo >=3D hi ) {
					/* The range has collapsed... */
						rc =3D db->del( db, tid, key, 0 );
						if ( rc !=3D 0 ) {
							err =3D "del";
							goto fail;
						}
					} else {
						rc =3D cursor->c_del( cursor, 0 );
						if ( rc !=3D 0 ) {
							err =3D "c_del";
							goto fail;
						}
					}
					if ( lo <=3D hi ) {
						data.data =3D &id;
						rc =3D cursor->c_put( cursor, key, &data, DB_KEYFIRST );
						if ( rc !=3D 0 ) {
							err =3D "c_put lo/hi";
							goto fail;
						}
					}
				}
			}
		} else {
			/* initial c_get failed, nothing was done */
fail:
#ifdef NEW_LOGGING
			LDAP_LOG( INDEX, ERR,=20
				"bdb_idl_delete_key: %s failed: %s (%d)\n",=20
				err, db_strerror(rc), rc );
#else
			Debug( LDAP_DEBUG_ANY, "=3D> bdb_idl_delete_key: "
				"%s failed: %s (%d)\n", err, db_strerror(rc), rc );
#endif
			cursor->c_close( cursor );
			return rc;
		}
		rc =3D cursor->c_close( cursor );
	}
#else
	data.data =3D ids;
	data.ulen =3D sizeof( ids );
	data.flags =3D DB_DBT_USERMEM;

	/* fetch the key for read/modify/write */
	rc =3D db->get( db, tid, key, &data, DB_RMW | bdb->bi_db_opflags );

	if ( rc !=3D 0 ) {
#ifdef NEW_LOGGING
		LDAP_LOG( INDEX, ERR, "bdb_idl_delete_key: get failed: %s (%d)\n",=20
			db_strerror(rc), rc, 0 );
#else
		Debug( LDAP_DEBUG_ANY, "=3D> bdb_idl_delete_key: "
			"get failed: %s (%d)\n",
			db_strerror(rc), rc, 0 );
#endif
		return rc;

	} else if ( data.size =3D=3D 0 || data.size % sizeof( ID ) ) {
		/* size not multiple of ID size */
#ifdef NEW_LOGGING
		LDAP_LOG( INDEX, ERR,=20
			"bdb_idl_delete_key: odd size: expected: %ld multiple, got %ld\n",=20
			(long) sizeof( ID ), (long) data.size, 0 );
#else
		Debug( LDAP_DEBUG_ANY, "=3D> bdb_idl_delete_key: "
			"odd size: expected %ld multiple, got %ld\n",
			(long) sizeof( ID ), (long) data.size, 0 );
#endif
		return -1;
=09
	} else if ( BDB_IDL_IS_RANGE(ids) ) {
		return 0;

	} else if ( data.size !=3D (1 + ids[0]) * sizeof( ID ) ) {
		/* size mismatch */
#ifdef NEW_LOGGING
		LDAP_LOG( INDEX, ERR,=20
			"bdb_idl_delete_key: get size mismatch: expected: %ld, got %ld\n",=20
			(long) ((1 + ids[0]) * sizeof( ID )), (long) data.size, 0 );
#else
		Debug( LDAP_DEBUG_ANY, "=3D> bdb_idl_delete_key: "
			"get size mismatch: expected %ld, got %ld\n",
			(long) ((1 + ids[0]) * sizeof( ID )), (long) data.size, 0 );
#endif
		return -1;

	} else {
		rc =3D idl_delete( ids, id );

		if( rc !=3D 0 ) {
#ifdef NEW_LOGGING
			LDAP_LOG( INDEX, ERR,=20
				"bdb_idl_delete_key: delete failed: (%d)\n", rc, 0, 0 );
#else
			Debug( LDAP_DEBUG_ANY, "=3D> bdb_idl_delete_key: "
				"idl_delete failed (%d)\n",
				rc, 0, 0 );
#endif
			return rc;
		}

		if( ids[0] =3D=3D 0 ) {
			/* delete the key */
			rc =3D db->del( db, tid, key, 0 );
			if( rc !=3D 0 ) {
#ifdef NEW_LOGGING
				LDAP_LOG( INDEX, ERR,=20
					"bdb_idl_delete_key: delete failed: %s (%d)\n",
					db_strerror(rc), rc, 0 );
#else
				Debug( LDAP_DEBUG_ANY, "=3D> bdb_idl_delete_key: "
					"delete failed: %s (%d)\n",
					db_strerror(rc), rc, 0 );
#endif
			}
			return rc;
		}

		data.size =3D (ids[0]+1) * sizeof( ID );
	}

	/* store the key */
	rc =3D db->put( db, tid, key, &data, 0 );

#endif /* BDB_IDL_MULTI */

	if( rc !=3D 0 ) {
#ifdef NEW_LOGGING
		LDAP_LOG( INDEX, ERR, "bdb_idl_delete_key: put failed: %s (%d)\n",=20
			db_strerror(rc), rc, 0 );
#else
		Debug( LDAP_DEBUG_ANY,
			"=3D> bdb_idl_delete_key: put failed: %s (%d)\n",
			db_strerror(rc), rc, 0 );
#endif
	}

	return rc;
}


/*
 * idl_intersection - return a =3D a intersection b
 */
int
bdb_idl_intersection(
	ID *a,
	ID *b )
{
	ID ida, idb;
	ID idmax, idmin;
	ID cursora =3D 0, cursorb =3D 0, cursorc;
	int swap =3D 0;

	if ( BDB_IDL_IS_ZERO( a ) || BDB_IDL_IS_ZERO( b ) ) {
		a[0] =3D 0;
		return 0;
	}

	idmin =3D IDL_MAX( BDB_IDL_FIRST(a), BDB_IDL_FIRST(b) );
	idmax =3D IDL_MIN( BDB_IDL_LAST(a), BDB_IDL_LAST(b) );
	if ( idmin > idmax ) {
		a[0] =3D 0;
		return 0;
	} else if ( idmin =3D=3D idmax ) {
		a[0] =3D 1;
		a[1] =3D idmin;
		return 0;
	}

	if ( BDB_IDL_IS_RANGE( a ) && BDB_IDL_IS_RANGE(b) ) {
		a[1] =3D idmin;
		a[2] =3D idmax;
		return 0;
	}

	if ( BDB_IDL_IS_RANGE( a ) ) {
		ID *tmp =3D a;
		a =3D b;
		b =3D tmp;
		swap =3D 1;
	}

	if ( BDB_IDL_IS_RANGE( b ) && BDB_IDL_FIRST( b ) <=3D idmin &&
		BDB_IDL_LAST( b ) >=3D idmax) {
		if (idmax - idmin + 1 =3D=3D a[0])
		{
			a[0] =3D NOID;
			a[1] =3D idmin;
			a[2] =3D idmax;
		}
		goto done;
	}

	ida =3D bdb_idl_first( a, &cursora );
	idb =3D bdb_idl_first( b, &cursorb );
	cursorc =3D 0;

	while( ida < idmin )
		ida =3D bdb_idl_next( a, &cursora );
	while( idb < idmin )
		idb =3D bdb_idl_next( b, &cursorb );

	while( ida <=3D idmax || idb <=3D idmax ) {
		if( ida =3D=3D idb ) {
			a[++cursorc] =3D ida;
			ida =3D bdb_idl_next( a, &cursora );
			idb =3D bdb_idl_next( b, &cursorb );
		} else if ( ida < idb ) {
			ida =3D bdb_idl_next( a, &cursora );
		} else {
			idb =3D bdb_idl_next( b, &cursorb );
		}
	}
	a[0] =3D cursorc;
done:
	if (swap)
		BDB_IDL_CPY( b, a );

	return 0;
}


/*
 * idl_union - return a =3D a union b
 */
int
bdb_idl_union(
	ID	*a,
	ID	*b )
{
	ID ida, idb;
	ID cursora =3D 0, cursorb =3D 0, cursorc;

	if ( BDB_IDL_IS_ZERO( b ) ) {
		return 0;
	}

	if ( BDB_IDL_IS_ZERO( a ) ) {
		BDB_IDL_CPY( a, b );
		return 0;
	}

	if ( BDB_IDL_IS_RANGE( a ) || BDB_IDL_IS_RANGE(b) ) {
over:		ida =3D IDL_MIN( BDB_IDL_FIRST(a), BDB_IDL_FIRST(b) );
		idb =3D IDL_MAX( BDB_IDL_LAST(a), BDB_IDL_LAST(b) );
		a[0] =3D NOID;
		a[1] =3D ida;
		a[2] =3D idb;
		return 0;
	}

	ida =3D bdb_idl_first( a, &cursora );
	idb =3D bdb_idl_first( b, &cursorb );

	cursorc =3D b[0];

	/* The distinct elements of a are cat'd to b */
	while( ida !=3D NOID || idb !=3D NOID ) {
		if ( ida < idb ) {
			if( ++cursorc > BDB_IDL_UM_MAX ) {
				goto over;
			}
			b[cursorc] =3D ida;
			ida =3D bdb_idl_next( a, &cursora );

		} else {
			if ( ida =3D=3D idb )
				ida =3D bdb_idl_next( a, &cursora );
			idb =3D bdb_idl_next( b, &cursorb );
		}
	}

	/* b is copied back to a in sorted order */
	a[0] =3D cursorc;
	cursora =3D 1;
	cursorb =3D 1;
	cursorc =3D b[0]+1;
	while (cursorb <=3D b[0] || cursorc <=3D a[0]) {
		if (cursorc > a[0])
			idb =3D NOID;
		else
			idb =3D b[cursorc];
		if (b[cursorb] < idb)
			a[cursora++] =3D b[cursorb++];
		else {
			a[cursora++] =3D idb;
			cursorc++;
		}
	}

	return 0;
}


#if 0
/*
 * bdb_idl_notin - return a intersection ~b (or a minus b)
 */
int
bdb_idl_notin(
	ID	*a,
	ID	*b,
	ID *ids )
{
	ID ida, idb;
	ID cursora =3D 0, cursorb =3D 0;

	if( BDB_IDL_IS_ZERO( a ) ||
		BDB_IDL_IS_ZERO( b ) ||
		BDB_IDL_IS_RANGE( b ) )
	{
		BDB_IDL_CPY( ids, a );
		return 0;
	}

	if( BDB_IDL_IS_RANGE( a ) ) {
		BDB_IDL_CPY( ids, a );
		return 0;
	}

	ida =3D bdb_idl_first( a, &cursora ),
	idb =3D bdb_idl_first( b, &cursorb );

	ids[0] =3D 0;

	while( ida !=3D NOID ) {
		if ( idb =3D=3D NOID ) {
			/* we could shortcut this */
			ids[++ids[0]] =3D ida;
			ida =3D bdb_idl_next( a, &cursora );

		} else if ( ida < idb ) {
			ids[++ids[0]] =3D ida;
			ida =3D bdb_idl_next( a, &cursora );

		} else if ( ida > idb ) {
			idb =3D bdb_idl_next( b, &cursorb );

		} else {
			ida =3D bdb_idl_next( a, &cursora );
			idb =3D bdb_idl_next( b, &cursorb );
		}
	}

	return 0;
}
#endif

ID bdb_idl_first( ID *ids, ID *cursor )
{
	ID pos;

	if ( ids[0] =3D=3D 0 ) {
		*cursor =3D NOID;
		return NOID;
	}

	if ( BDB_IDL_IS_RANGE( ids ) ) {
		if( *cursor < ids[1] ) {
			*cursor =3D ids[1];
		}
		return *cursor;
	}

	if ( *cursor =3D=3D 0 )
		pos =3D 1;
	else
		pos =3D bdb_idl_search( ids, *cursor );

	if( pos > ids[0] ) {
		return NOID;
	}

	*cursor =3D pos;
	return ids[pos];
}

ID bdb_idl_next( ID *ids, ID *cursor )
{
	if ( BDB_IDL_IS_RANGE( ids ) ) {
		if( ids[2] < ++(*cursor) ) {
			return NOID;
		}
		return *cursor;
	}

	if ( ++(*cursor) <=3D ids[0] ) {
		return ids[*cursor];
	}

	return NOID;
}

------=_NextPart_000_01C6_01C24D44.86ABB4F0--