bdb 0.2.2 → 0.2.5

data/AUTHORS

@@ -0,0 +1,2 @@
+Justin Balthrop code.at.justinbalthrop.dot.com
+Denis Knauf denis.dot.knauf.at.gmail.dot.com

data/README.md

@@ -0,0 +1,92 @@
+Description
+===
+
+Ruby bindings for Berkeley DB versions 4.2-4.8.
+
+Installation
+============
+
+From Git
+--------
+
+You can check out the latest source from git:
+
+	git clone git://github.com/DenisKnauf/bdb.git
+
+As a Gem
+========
+
+At the moment this library is not available on Rubyforge.  To install it as a
+gem, do the following:
+
+	sudo gem install dk-bdb
+
+For Berkeley DB v4.7 installed from MacPorts do the following:
+
+	sudo env ARCHFLAGS="-arch i386" gem install dk-bdb
+
+This assumes you're on OS X and BerkeleyDB wasn't compiled as a universal binary.
+
+Sample Usage
+============
+
+	env = Bdb::Env.new(0)
+	env_flags =  Bdb::DB_CREATE |    # Create the environment if it does not already exist.
+	             Bdb::DB_INIT_TXN  | # Initialize transactions
+	             Bdb::DB_INIT_LOCK | # Initialize locking.
+	             Bdb::DB_INIT_LOG  | # Initialize logging
+	             Bdb::DB_INIT_MPOOL  # Initialize the in-memory cache.
+	env.open(File.join(File.dirname(__FILE__), 'tmp'), env_flags, 0);
+	
+	db = env.db
+	db.open(nil, 'db1.db', nil, Bdb::Db::BTREE, Bdb::DB_CREATE | Bdb::DB_AUTO_COMMIT, 0)    
+
+	txn = env.txn_begin(nil, 0)
+	db.put(txn, 'key', 'value', 0)
+	txn.commit(0)
+
+	value = db.get(nil, 'key', nil, 0)
+
+	db.close(0)
+	env.close
+
+API
+===
+
+This interface is most closely based on the DB4 C api and tries to maintain close 
+interface proximity.
+[That API is published by Oracle](http://www.oracle.com/technology/documentation/berkeley-db/db/api_reference/C/frame_main.html).
+
+All function arguments systematically omit the leading DB handles and TXN handles.
+A few calls omit the flags parameter when the documentation indicates that no
+flag values are used - cursor.close is one.
+
+Alternative API
+---------------
+
+You can use [SBDB](http://github.com/DenisKnauf/sbdb), too.  It is easier to use, but base on this library.
+
+Notes
+=====
+
+The defines generator is imperfect and includes some defines that are not
+flags. While it could be improved, it is easier to delete the incorrect ones.
+Thus, if you decide to rebuild the defines, you will need to edit the resulting
+file. This may be necessary if using a different release of DB4 than the ones
+the authors developed against.  In nearly every case the defines generator works
+flawlessly.
+
+The authors have put all possible caution into ensuring that DB and Ruby cooperate.
+The memory access was one aspect carefully considered. Since Ruby copies
+when doing String#new, all key/data retrieval from DB is done with a 0 flag,
+meaning that DB will be responsible. See [*this* news group posting](http://groups.google.com/group/comp.databases.berkeley-db/browse_frm/thread/4f70a9999b64ce6a/c06b94692e3cbc41?tvc=1&q=dbt+malloc#c06b94692e3cbc41)
+about the effect of that.
+
+The only other design consideration of consequence was associate. The prior
+version used a Ruby thread local variable and kept track of the current
+database in use. The authors decided to take a simpler approach since Ruby is green
+threads. A global array stores the VALUE of the Proc for a given association
+by the file descriptor number of the underlying database. This is looked
+up when the first layer callback is made. It would have been better considered
+if DB allowed the passing of a (void *) user data into the alloc that would
+be supplied during callback. So far this design has not produced any problems.

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.5

data/ext/bdb.c

@@ -32,6 +32,24 @@ VALUE eDbError;
 
 static ID fv_call,fv_uniq,fv_err_new,fv_err_code,fv_err_msg;
 
+#define EXCEPTIONS_CREATE \
+	eDbE_create(BUFFER_SMALL, BufferSmall)\
+	eDbE_create(LOCK_DEADLOCK, LockDeadlock)\
+	eDbE_create(LOCK_NOTGRANTED, LockNotgranted)\
+	eDbE_create(REP_HANDLE_DEAD, RepHandleDead)\
+	eDbE_create(REP_LEASE_EXPIRED, RepLeaseExpired)\
+	eDbE_create(REP_LOCKOUT, RepLockout)\
+	eDbE_create(SECONDARY_BAD, SecondaryBad) \
+	eDbE_create(FOREIGN_CONFLICT, ForeignConflict) \
+	eDbE_create(OLD_VERSION, OldVersion) \
+	eDbE_create(KEYEXIST, KeyExist) \
+	eDbE_create(KEYEMPTY, KeyEmpty) \
+	eDbE_create(RUNRECOVERY, RunRecovery) \
+	eDbE_create(VERSION_MISMATCH, VersionMismatch)
+
+#define eDbE_create(n,c) VALUE eDbE_##c;
+EXCEPTIONS_CREATE
+
 /*
  * Document-class: Bdb::DbError
  *
@@ -61,8 +79,14 @@ raise_error(int code, const char *fmt, ...)
 
   argv[0]=rb_str_new2(buf);
   argv[1]=INT2NUM(code);
+	VALUE cl;
+	switch( code) {
+#define eDbE_create(n,c) case DB_##n: cl = eDbE_##c; break;
+	EXCEPTIONS_CREATE
+	default: cl = eDbError; break;
+	}
 
-  exc=rb_class_new_instance(2,argv,eDbError);
+  exc=rb_class_new_instance(2,argv,cl);
   rb_exc_raise(exc);
 }
 
@@ -100,7 +124,7 @@ static void db_free(t_dbh *dbh)
       	dbh->db->close(dbh->db,NOFLAGS);
       if ( RTEST(ruby_debug) && dbh->filename[0] != '\0')
     fprintf(stderr,"%s/%d %s %p %s\n",__FILE__,__LINE__,
-        "db_free database was still open!",dbh->db,dbh->filename);
+        "db_free database was still open!",(void*)dbh->db,dbh->filename);
       dbh->db=NULL;
     }
     free(dbh);
@@ -230,7 +254,7 @@ VALUE db_open(VALUE obj, VALUE vtxn, VALUE vdisk_file,
   u_int32_t flags=0;
   DBTYPE dbtype=DB_UNKNOWN;
   char *logical_db=NULL;
-  long len;
+  //long len;
   int mode=0;
 
   if ( ! NIL_P(vflags) )
@@ -279,6 +303,36 @@ VALUE db_open(VALUE obj, VALUE vtxn, VALUE vdisk_file,
   return obj;
 }
 
+/**
+ * call-seq:
+ *  db.set_re_len( db, re_len)
+ *
+ * Set record-length
+ */
+VALUE db_set_re_len(VALUE obj, VALUE re_len) {
+	int rv;
+	t_dbh *dbh;
+	Data_Get_Struct(obj,t_dbh,dbh);
+  if (!dbh->db)
+    raise_error(0,"db isn't created");
+	rv = dbh->db->set_re_len(dbh->db,NUM2UINT(re_len));
+  if ( rv != 0 )
+    raise_error(rv, "set_re_len failure: %s",db_strerror(rv));
+	return re_len;
+}
+
+VALUE db_get_re_len( VALUE obj) {
+	u_int32_t re_len;
+	t_dbh *dbh;
+	Data_Get_Struct(obj,t_dbh,dbh);
+  if (!dbh->db)
+    raise_error(0,"db isn't created");
+	int rv = dbh->db->get_re_len(dbh->db,&re_len);
+  if ( rv != 0 )
+    raise_error(rv, "db_get_re_len failure: %s",db_strerror(rv));
+	return UINT2NUM(re_len);
+}
+
 /*
  * call-seq:
  *	db.flags=value
@@ -498,7 +552,7 @@ VALUE db_close(VALUE obj, VALUE vflags)
   if ( dbh->db==NULL )
     return Qnil;
 
-  if (! NIL_P(dbh->adbc) && RARRAY(dbh->adbc)->len > 0 ) {
+  if (! NIL_P(dbh->adbc) && RARRAY_LEN(dbh->adbc) > 0 ) {
     rb_warning("%s/%d %s",__FILE__,__LINE__,
 	       "cursor handles still open");
     while ( (cur=rb_ary_pop(dbh->adbc)) != Qnil ) {
@@ -507,8 +561,8 @@ VALUE db_close(VALUE obj, VALUE vflags)
   }
 
   if ( RTEST(ruby_debug) )
-    rb_warning("%s/%d %s 0x%x %s",__FILE__,__LINE__,"db_close!",dbh,
-	       (dbh->filename==NULL||*(dbh->filename)=='0') ? "unknown" : dbh->filename);
+    rb_warning("%s/%d %s 0x%p %s",__FILE__,__LINE__,"db_close!", (void*)dbh,
+	       (dbh->filename==NULL||*(dbh->filename)=='0') ? (char*)"unknown" : dbh->filename);
 
   rv = dbh->db->close(dbh->db,flags);
   dbh->db=NULL;
@@ -516,7 +570,7 @@ VALUE db_close(VALUE obj, VALUE vflags)
   dbh->sproc=Qnil;
   if ( dbh->env ) {
   	if ( RTEST(ruby_debug) )
-    	rb_warning("%s/%d %s 0x%x",__FILE__,__LINE__,"db_close! removing",obj);
+    	rb_warning("%s/%d %s 0x%p",__FILE__,__LINE__,"db_close! removing",(void*)obj);
     rb_ary_delete(dbh->env->adb,obj);
     dbh->env = NULL;
   }
@@ -559,10 +613,9 @@ VALUE db_put(VALUE obj, VALUE vtxn, VALUE vkey, VALUE vdata, VALUE vflags)
   if (!dbh->db)
     raise_error(0,"db is closed");
 
-  StringValue(vkey);
-  key.data = RSTRING_PTR(vkey);
-  key.size = RSTRING_LEN(vkey);
-  key.flags = LMEMFLAG;
+	key.data = RSTRING_PTR(vkey);
+	key.size = RSTRING_LEN(vkey);
+	key.flags = LMEMFLAG;
 
   StringValue(vdata);
   data.data = RSTRING_PTR(vdata);
@@ -577,6 +630,13 @@ VALUE db_put(VALUE obj, VALUE vtxn, VALUE vkey, VALUE vdata, VALUE vflags)
   if (rv != 0) {
     raise_error(rv, "db_put fails: %s",db_strerror(rv));
   }
+
+	if ( flags & DB_APPEND == DB_APPEND ) {
+    VALUE str = rb_str_new(key.data,key.size);
+    if (key.data) free(key.data);
+    return str;
+	}
+
   return obj;
 }
 
@@ -654,7 +714,7 @@ VALUE db_pget(VALUE obj, VALUE vtxn, VALUE vkey, VALUE vdata, VALUE vflags)
   int rv;
   u_int32_t flags=0;
   DBT key,data,pkey;
-  VALUE str;
+  //VALUE str;
   t_txnh *txn=NULL;
 
   memset(&key,0,sizeof(DBT));
@@ -749,9 +809,9 @@ VALUE db_join(VALUE obj, VALUE vacurs, VALUE vflags)
   if (!dbh->db)
     raise(0, "db is closed");
 
-  curs = ALLOCA_N(DBC *,RARRAY(vacurs)->len);
-  for (i=0; i<RARRAY(vacurs)->len; i++) {
-    Data_Get_Struct(RARRAY(vacurs)->ptr[i],t_dbch,dbch);
+  curs = ALLOCA_N(DBC *,RARRAY_LEN(vacurs));
+  for (i=0; i<RARRAY_LEN(vacurs); i++) {
+    Data_Get_Struct(RARRAY_PTR(vacurs)[i],t_dbch,dbch);
     /* cursor is closed? */
     curs[i]=dbch->dbc;
   }
@@ -767,7 +827,7 @@ VALUE db_join(VALUE obj, VALUE vacurs, VALUE vflags)
   return jcurs;
 }
 
-#if DB_VERSION_MINOR > 3
+#if DB_VERSION_MAJOR == 5 || DB_VERSION_MINOR > 3
 /*
  * call-seq:
  *	db.compact(txn,start_key,stop_key,compact_opts,flags) -> end_key
@@ -890,7 +950,7 @@ VALUE db_remove(VALUE obj, VALUE vdisk_file,
   t_dbh *dbh;
   int rv;
   u_int32_t flags=0;
-  char *logical_db=NULL;
+  //char *logical_db=NULL;
 
   if ( ! NIL_P(vflags) )
     flags=NUM2UINT(vflags);
@@ -921,8 +981,8 @@ VALUE db_rename(VALUE obj, VALUE vdisk_file,
   t_dbh *dbh;
   int rv;
   u_int32_t flags=0;
-  char *disk_file=NULL;
-  char *logical_db=NULL;
+  //char *disk_file=NULL;
+  //char *logical_db=NULL;
 
   if ( ! NIL_P(vflags) )
     flags=NUM2UINT(vflags);
@@ -978,7 +1038,7 @@ VALUE db_truncate(VALUE obj, VALUE vtxn)
   t_dbh *dbh;
   t_txnh *txn=NULL;
   int rv;
-  VALUE result;
+  //VALUE result;
   u_int32_t count;
 
   if ( ! NIL_P(vtxn) ) {
@@ -1011,7 +1071,7 @@ VALUE db_key_range(VALUE obj, VALUE vtxn, VALUE vkey, VALUE vflags)
   t_dbh *dbh;
   t_txnh *txn=NULL;
   DBT key;
-  u_int32_t flags;
+  u_int32_t flags = 0;
   int rv;
   DB_KEY_RANGE key_range;
   VALUE result;
@@ -1062,7 +1122,7 @@ VALUE db_del(VALUE obj, VALUE vtxn, VALUE vkey, VALUE vflags)
   int rv;
   u_int32_t flags;
   DBT key;
-  VALUE str;
+  //VALUE str;
   t_txnh *txn=NULL;
 
   memset(&key,0,sizeof(DBT));
@@ -1117,12 +1177,13 @@ VALUE assoc_rescue(VALUE *error, VALUE e)
   VALUE message = StringValue(e);
   rb_warn(RSTRING_PTR(message));
   *error = e;
+	return Qnil;
 }
 
 int assoc_callback(DB *secdb, const DBT* pkey, const DBT* data, DBT* skey)
 {
   t_dbh *dbh;
-  VALUE proc;
+  //VALUE proc;
   VALUE error = Qnil;
   VALUE retv;
   VALUE args[4];
@@ -1150,20 +1211,20 @@ int assoc_callback(DB *secdb, const DBT* pkey, const DBT* data, DBT* skey)
   keys = rb_check_array_type(retv);
   if (!NIL_P(keys)) {
     keys = rb_funcall(keys,fv_uniq,0); /* secondary keys must be uniq */
-    switch(RARRAY(keys)->len) {
+    switch(RARRAY_LEN(keys)) {
     case 0:
       return DB_DONOTINDEX;
     case 1:
-      retv=RARRAY(keys)->ptr[0];
+      retv=RARRAY_PTR(keys)[0];
       break;
     default:
-      skey->size  = RARRAY(keys)->len;
+      skey->size  = RARRAY_LEN(keys);
       skey->flags = LMEMFLAG | DB_DBT_MULTIPLE | DB_DBT_APPMALLOC;
       skey->data  = malloc(skey->size * sizeof(DBT));
       memset(skey->data, 0, skey->size * sizeof(DBT));
     
       for (i=0; i<skey->size; i++) {
-        assoc_key(skey->data + i * sizeof(DBT), (VALUE)RARRAY(keys)->ptr[i]);
+        assoc_key(skey->data + i * sizeof(DBT), (VALUE)RARRAY_PTR(keys)[i]);
       }
       return 0;
     }
@@ -1190,7 +1251,7 @@ VALUE db_associate(VALUE obj, VALUE vtxn, VALUE osecdb,
   t_dbh *sdbh,*pdbh;
   int rv;
   u_int32_t flags,flagsp,flagss;
-  int fdp;
+  //int fdp;
   t_txnh *txn=NOTXN;
 
   flags=NUM2UINT(vflags);
@@ -1246,7 +1307,7 @@ bt_compare_callback2(VALUE *args)
 int bt_compare_callback(DB *db, const DBT* key1, const DBT* key2)
 {
   t_dbh *dbh;
-  VALUE proc;
+  //VALUE proc;
   int cmp;
   VALUE retv;
 
@@ -1313,7 +1374,7 @@ VALUE db_cursor(VALUE obj, VALUE vtxn, VALUE vflags)
   t_dbh *dbh;
   int rv;
   u_int32_t flags;
-  DBC *dbc;
+  //DBC *dbc;
   t_txnh *txn=NOTXN;
   VALUE c_obj;
   t_dbch *dbch;
@@ -1671,18 +1732,18 @@ VALUE env_close(VALUE obj)
   if ( eh->env==NULL )
     return Qnil;
 
-  if (RARRAY(eh->adb)->len > 0) {
-    rb_warning("%s/%d %s %d",__FILE__,__LINE__,
-	       "database handles still open",RARRAY(eh->adb)->len);
-    while (RARRAY(eh->adb)->len > 0)
+  if (RARRAY_LEN(eh->adb) > 0) {
+    rb_warning("%s/%d %s %li",__FILE__,__LINE__,
+	       "database handles still open",RARRAY_LEN(eh->adb));
+    while (RARRAY_LEN(eh->adb) > 0)
       if ((db=rb_ary_pop(eh->adb)) != Qnil ) {
-    rb_warning("%s/%d %s 0x%x",__FILE__,__LINE__,
-           "closing",db);
+    rb_warning("%s/%d %s 0x%p",__FILE__,__LINE__,
+           "closing",(void*)db);
       /* this could raise! needs rb_protect */
     db_close(db,INT2FIX(0));
       }
   }
-  if (RARRAY(eh->atxn)->len > 0) {
+  if (RARRAY_LEN(eh->atxn) > 0) {
     rb_warning("%s/%d %s",__FILE__,__LINE__,
 	       "database transactions still open");
     while ( (db=rb_ary_pop(eh->atxn)) != Qnil ) {
@@ -1692,7 +1753,7 @@ VALUE env_close(VALUE obj)
   }
 
   if ( RTEST(ruby_debug) )
-    rb_warning("%s/%d %s 0x%x",__FILE__,__LINE__,"env_close!",eh);
+    rb_warning("%s/%d %s 0x%p",__FILE__,__LINE__,"env_close!",(void*)eh);
 
   rv = eh->env->close(eh->env,NOFLAGS);
   eh->env=NULL;
@@ -1773,7 +1834,7 @@ VALUE env_set_cachesize(VALUE obj, VALUE size)
 VALUE env_get_cachesize(VALUE obj)
 {
   t_envh *eh;
-  unsigned long long ln;
+  //unsigned long long ln;
   u_int32_t bytes=0,gbytes=0;
 	int ncache;
   int rv;
@@ -2044,7 +2105,7 @@ VALUE db_stat(VALUE obj, VALUE vtxn, VALUE vflags)
   rv=dbh->db->get_type(dbh->db,&dbtype);
   if (rv)
     raise_error(rv,"db_stat %s",db_strerror(rv));
-#if DB_VERSION_MINOR > 2
+#if DB_VERSION_MAJOR == 5 || DB_VERSION_MINOR > 2
   rv=dbh->db->stat(dbh->db,txn?txn->txn:NULL,&(su.stat),flags);
 #else
   rv=dbh->db->stat(dbh->db,&(su.stat),flags);
@@ -2090,7 +2151,7 @@ VALUE db_stat(VALUE obj, VALUE vtxn, VALUE vflags)
     bs_int(bt_nkeys);		/* Number of unique keys. */
     bs_int(bt_ndata);		/* Number of data items. */
     bs_int(bt_pagesize);		/* Page size. */
-#if DB_VERSION_MINOR < 4
+#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 4
     bs_int(bt_maxkey);		/* Maxkey value. */
 #endif
     bs_int(bt_minkey);		/* Minkey value. */
@@ -2101,7 +2162,7 @@ VALUE db_stat(VALUE obj, VALUE vtxn, VALUE vflags)
     bs_int(bt_leaf_pg);		/* Leaf pages. */
     bs_int(bt_dup_pg);		/* Duplicate pages. */
     bs_int(bt_over_pg);		/* Overflow pages. */
-#if DB_VERSION_MINOR > 2
+#if DB_VERSION_MAJOR == 5 || DB_VERSION_MINOR > 2
     bs_int(bt_empty_pg);		/* Empty pages. */
 #endif
     bs_int(bt_free);		/* Pages on the free list. */
@@ -2131,6 +2192,8 @@ VALUE db_stat(VALUE obj, VALUE vtxn, VALUE vflags)
     qs_int(qs_cur_recno);		/* Next available record number. */
     
     break;
+	case DB_UNKNOWN:
+		break;
   }
 
   free(su.stat);
@@ -2145,7 +2208,7 @@ VALUE db_stat(VALUE obj, VALUE vtxn, VALUE vflags)
  */
 VALUE stat_aref(VALUE obj, VALUE vname)
 {
-  rb_iv_get(obj,RSTRING_PTR(rb_str_concat(rb_str_new2("@"),vname)));
+  return rb_iv_get(obj,RSTRING_PTR(rb_str_concat(rb_str_new2("@"),vname)));
 }
 
 /*
@@ -2418,6 +2481,46 @@ VALUE env_get_shm_key(VALUE obj)
   return INT2FIX(key);
 }
 
+VALUE env_log_set_config_h(VALUE obj, u_int32_t flags, VALUE onoff) {
+	t_envh *eh;
+	int rv;
+	Data_Get_Struct(obj,t_envh, eh);
+	rv=eh->env->log_set_config(eh->env, flags, Qnil != flags && Qfalse != onoff);
+	if(rv != 0)
+		raise_error(rv, "log_set_config: %s", db_strerror(rv));
+	return flags;
+}
+
+VALUE env_log_get_config_h( VALUE obj, u_int32_t flags) {
+	t_envh *eh;
+	int rv, onoff;
+	Data_Get_Struct(obj,t_envh, eh);
+	rv=eh->env->log_get_config(eh->env, flags, &onoff);
+	if(rv != 0)
+		raise_error(rv, "log_set_config: %s", db_strerror(rv));
+	return onoff ? Qtrue : Qfalse;
+}
+
+#define ENV_LOG_CONFIG_FUNCS \
+	ENV_LOG_CONFIG_FUNC(direct,DIRECT) \
+	ENV_LOG_CONFIG_FUNC(dsync,DSYNC) \
+	ENV_LOG_CONFIG_FUNC(auto_remove,AUTO_REMOVE) \
+	ENV_LOG_CONFIG_FUNC(in_memory,IN_MEMORY) \
+	ENV_LOG_CONFIG_FUNC(zero,ZERO)
+
+#define ENV_LOG_CONFIG_FUNC( name, cnst) \
+	VALUE env_log_set_##cnst( VALUE obj, VALUE flags) { \
+		return env_log_set_config_h( obj, DB_LOG_##cnst, flags); \
+	} \
+	VALUE env_log_get_##cnst( VALUE obj, VALUE flags) { \
+		return env_log_get_config_h( obj, DB_LOG_##cnst); \
+	}
+ENV_LOG_CONFIG_FUNCS
+
+VALUE env_log_set_config( VALUE obj, VALUE flags, VALUE onoff) {
+	return env_log_set_config_h( obj, NUM2UINT(flags), onoff);
+}
+
 /*
  * call-seq:
  * env.set_lk_detect(detect) -> detect
@@ -2565,8 +2668,8 @@ VALUE env_get_lk_max_objects(VALUE obj)
 VALUE env_report_stderr(VALUE obj)
 {
   t_envh *eh;
-  u_int32_t max;
-  int rv;
+  //u_int32_t max;
+  //int rv;
 
   Data_Get_Struct(obj,t_envh,eh);
   if (!eh->env)
@@ -2949,11 +3052,74 @@ VALUE env_repmgr_stat_print(VALUE obj, VALUE flags)
   return Qtrue;
 }
 
+VALUE env_set_lg_bsize( VALUE obj, VALUE size) {
+	t_envh *eh;
+	int rv;
+	Data_Get_Struct(obj, t_envh, eh);
+	rv = eh->env->set_lg_bsize( eh->env, NUM2UINT( size));
+  if ( rv != 0 )
+		raise_error(rv, "env_set_lg_bsize: %s", db_strerror(rv));
+  return size;
+}
+
+VALUE env_get_lg_bsize( VALUE obj) {
+	t_envh *eh;
+	int rv;
+	u_int32_t size;
+	Data_Get_Struct( obj, t_envh, eh);
+	rv = eh->env->get_lg_bsize( eh->env, &size);
+  if ( rv != 0 )
+		raise_error(rv, "env_get_lg_bsize: %s", db_strerror(rv));
+  return UINT2FIX(size);
+}
+
+VALUE env_set_lg_max( VALUE obj, VALUE size) {
+	t_envh *eh;
+	int rv;
+	Data_Get_Struct(obj, t_envh, eh);
+	rv = eh->env->set_lg_max( eh->env, NUM2UINT( size));
+  if ( rv != 0 )
+		raise_error(rv, "env_set_lg_max: %s", db_strerror(rv));
+  return size;
+}
+
+VALUE env_get_lg_max( VALUE obj) {
+	t_envh *eh;
+	int rv;
+	u_int32_t size;
+	Data_Get_Struct( obj, t_envh, eh);
+	rv = eh->env->get_lg_max( eh->env, &size);
+  if ( rv != 0 )
+		raise_error(rv, "env_get_lg_max: %s", db_strerror(rv));
+  return UINT2FIX(size);
+}
+
+VALUE env_set_lg_regionmax( VALUE obj, VALUE size) {
+	t_envh *eh;
+	int rv;
+	Data_Get_Struct(obj, t_envh, eh);
+	rv = eh->env->set_lg_regionmax( eh->env, NUM2UINT( size));
+  if ( rv != 0 )
+		raise_error(rv, "env_set_lg_regionmax: %s", db_strerror(rv));
+  return size;
+}
+
+VALUE env_get_lg_regionmax( VALUE obj) {
+	t_envh *eh;
+	int rv;
+	u_int32_t size;
+	Data_Get_Struct( obj, t_envh, eh);
+	rv = eh->env->get_lg_regionmax( eh->env, &size);
+  if ( rv != 0 )
+		raise_error(rv, "env_get_lg_regionmax: %s", db_strerror(rv));
+  return UINT2FIX(size);
+}
+
 
 static void txn_finish(t_txnh *txn)
 {
   if ( RTEST(ruby_debug) )
-    rb_warning("%s/%d %s 0x%x",__FILE__,__LINE__,"txn_finish",txn);
+    rb_warning("%s/%d %s 0x%p",__FILE__,__LINE__,"txn_finish",(void*)txn);
 
   txn->txn=NULL;
   if (txn->env) {
@@ -3116,6 +3282,9 @@ void Init_bdb() {
 
   cDb = rb_define_class_under(mBdb,"Db", rb_cObject);
   eDbError = rb_define_class_under(mBdb,"DbError",rb_eStandardError);
+#define eDbE_create(n,c) eDbE_##c = rb_define_class_under(mBdb, #c, eDbError);
+EXCEPTIONS_CREATE
+
   rb_define_method(eDbError,"initialize",err_initialize,2);
   rb_define_method(eDbError,"code",err_code,0);
 
@@ -3135,6 +3304,8 @@ void Init_bdb() {
   rb_define_method(cDb,"cursor",db_cursor,2);
   rb_define_method(cDb,"associate",db_associate,4);
   rb_define_method(cDb,"btree_compare=",db_btree_compare_set,1);
+  rb_define_method(cDb,"re_len=",db_set_re_len,1);
+  rb_define_method(cDb,"re_len",db_get_re_len,0);
   rb_define_method(cDb,"flags=",db_flags_set,1);
   rb_define_method(cDb,"flags",db_flags_get,0);
   rb_define_method(cDb,"open",db_open,6);
@@ -3160,7 +3331,7 @@ void Init_bdb() {
   rb_define_method(cDb,"sync",db_sync,0);
   rb_define_method(cDb,"truncate",db_truncate,1);
 
-#if DB_VERSION_MINOR > 3
+#if DB_VERSION_MAJOR == 5 || DB_VERSION_MINOR > 3
   rb_define_method(cDb,"compact",db_compact,5);
 #endif
 
@@ -3186,29 +3357,34 @@ void Init_bdb() {
   rb_define_method(cEnv,"txn_begin",env_txn_begin,2);
   rb_define_method(cEnv,"txn_checkpoint",env_txn_checkpoint,3);
   rb_define_method(cEnv,"txn_stat",env_txn_stat,1);
-  rb_define_method(cEnv,"set_timeout",env_set_timeout,2);
-  rb_define_method(cEnv,"get_timeout",env_get_timeout,1);
-  rb_define_method(cEnv,"set_tx_max",env_set_tx_max,1);
+	rb_define_method(cEnv,"timeout",env_set_timeout,2);
+	rb_define_method(cEnv,"timeout",env_get_timeout,1);
   rb_define_method(cEnv,"mutex_get_max",env_mutex_get_max,0);
   rb_define_method(cEnv,"mutex_set_max",env_mutex_set_max,1);
-  rb_define_method(cEnv,"get_tx_max",env_get_tx_max,0);
+  rb_define_method(cEnv,"tx_max=",env_set_tx_max,1);
+  rb_define_method(cEnv,"tx_max",env_get_tx_max,0);
   rb_define_method(cEnv,"report_stderr",env_report_stderr,0);
-  rb_define_method(cEnv,"set_lk_detect",env_set_lk_detect,1);
-  rb_define_method(cEnv,"get_lk_detect",env_get_lk_detect,0);
-  rb_define_method(cEnv,"set_lk_max_locks",env_set_lk_max_locks,1);
-  rb_define_method(cEnv,"get_lk_max_locks",env_get_lk_max_locks,0);
-  rb_define_method(cEnv,"set_lk_max_objects",env_set_lk_max_objects,1);
-  rb_define_method(cEnv,"get_lk_max_objects",env_get_lk_max_objects,0);
-  rb_define_method(cEnv,"set_shm_key",env_set_shm_key,1);
-  rb_define_method(cEnv,"get_shm_key",env_get_shm_key,0);
-
-  rb_define_method(cEnv,"set_data_dir",env_set_data_dir,1);
-  rb_define_method(cEnv,"get_data_dirs",env_get_data_dirs,0);
-  rb_define_method(cEnv,"set_lg_dir",env_set_lg_dir,1);
-  rb_define_method(cEnv,"get_lg_dir",env_get_lg_dir,0);
-  rb_define_method(cEnv,"set_tmp_dir",env_set_tmp_dir,1);
-  rb_define_method(cEnv,"get_tmp_dir",env_get_tmp_dir,0);
-  rb_define_method(cEnv,"get_home",env_get_home,0);
+  rb_define_method(cEnv,"lk_detect=",env_set_lk_detect,1);
+  rb_define_method(cEnv,"lk_detect",env_get_lk_detect,0);
+  rb_define_method(cEnv,"lk_max_locks=",env_set_lk_max_locks,1);
+  rb_define_method(cEnv,"lk_max_locks",env_get_lk_max_locks,0);
+  rb_define_method(cEnv,"lk_max_objects=",env_set_lk_max_objects,1);
+  rb_define_method(cEnv,"lk_max_objects",env_get_lk_max_objects,0);
+  rb_define_method(cEnv,"shm_key=",env_set_shm_key,1);
+  rb_define_method(cEnv,"shm_key",env_get_shm_key,0);
+	rb_define_method(cEnv,"log_config",env_log_set_config,2);
+#define ENV_LOG_CONFIG_FUNC(name,cnst) \
+	rb_define_method(cEnv,"log_"#name "=",env_log_set_##cnst,1); \
+	rb_define_method(cEnv,"log_"#name,env_log_get_##cnst,0);
+	ENV_LOG_CONFIG_FUNCS
+
+  rb_define_method(cEnv,"data_dir=",env_set_data_dir,1);
+  rb_define_method(cEnv,"data_dirs",env_get_data_dirs,0);
+	rb_define_method(cEnv,"lg_dir=",env_set_lg_dir,1);
+  rb_define_method(cEnv,"lg_dir",env_get_lg_dir,0);
+  rb_define_method(cEnv,"tmp_dir=",env_set_tmp_dir,1);
+  rb_define_method(cEnv,"tmp_dir",env_get_tmp_dir,0);
+  rb_define_method(cEnv,"home",env_get_home,0);
   rb_define_method(cEnv,"set_verbose",env_set_verbose,2);
 
   rb_define_method(cEnv,"rep_priority=", env_rep_set_priority, 1);
@@ -3222,6 +3398,13 @@ void Init_bdb() {
   rb_define_method(cEnv,"repmgr_start", env_repmgr_start, 2);
   rb_define_method(cEnv,"repmgr_stat_print", env_repmgr_stat_print, 1);
 
+	rb_define_method(cEnv,"lg_bsize=", env_set_lg_bsize, 1);
+	rb_define_method(cEnv,"lg_bsize", env_get_lg_bsize, 0);
+	rb_define_method(cEnv,"lg_max=", env_set_lg_max, 1);
+	rb_define_method(cEnv,"lg_max", env_get_lg_max, 0);
+	rb_define_method(cEnv,"lg_regionmax=", env_set_lg_regionmax, 1);
+	rb_define_method(cEnv,"lg_regionmax", env_get_lg_regionmax, 0);
+
   cTxnStat = rb_define_class_under(mBdb,"TxnStat",rb_cObject);
   rb_define_method(cTxnStat,"[]",stat_aref,1);
 

data/ext/bdb.h

@@ -16,7 +16,7 @@
   #undef rename
 #endif
 
-#include <version.h>
+//#include <version.h>
 #include <db.h>
 
 #define NOTXN NULL

data/ext/extconf.rb

@@ -1,11 +1,16 @@
 #!/usr/bin/env ruby
 require 'mkmf'
-default_dir = '/usr/local/BerkeleyDB.4.8'
-inc, lib = dir_config('db', "#{default_dir}/include", "#{default_dir}/lib")
 
-versions=%w(db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2)
-until versions.empty?
-  (lib_ok = have_library(versions.shift, 'db_version', 'db.h')) && break
+# This list is checked in reverse order, so this order allows mkmf on my Mac
+# to find BDB installed via Homebrew (/usr/local) before system installs
+%w[/usr / /usr/local /usr/local/db* /usr/local/BerkeleyDB*].each do |pdir|
+	Dir[pdir].each do |dir|
+		dir_config('db', "#{dir}/include", "#{dir}/lib")
+	end
+end
+
+%w(db-5.1 db-5.0 db-4.9 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2).each do |ver|
+	have_library ver, 'db_version', 'db.h'
 end
 
 def create_header
@@ -15,11 +20,12 @@ def create_header
   end
   
   message("Writing bdb_aux._c (defines), this takes a while\n")
+
   db_header = $CPPFLAGS.split.select { |f| f =~ /^-I/ }.map { |e| 
     f = File.join(e[2..-1], 'db.h')
     File.exists?(f) ? f : nil
   }.select { |e| e }.first
-  
+
   n=0
   defines=[]
   File.open(db_header) {|fd|
@@ -50,10 +56,10 @@ def create_header
   }
 end
 
-if lib_ok
+#if lib_ok
   create_header
   create_makefile('bdb')
-else
-  $stderr.puts("cannot create Makefile")
-  exit 1
-end
+#else
+#  $stderr.puts("cannot create Makefile")
+#  exit 1
+#end

metadata

@@ -1,32 +1,33 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bdb
-version: !ruby/object:Gem::Version 
-  version: 0.2.2
+version: !ruby/object:Gem::Version
+  version: 0.2.5
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Justin Balthrop
+- Denis Knauf
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-12-17 00:00:00 -08:00
-default_executable: 
+date: 2011-08-24 00:00:00.000000000Z
 dependencies: []
-
 description: Advanced Ruby Berkeley DB library.
-email: code@justinbalthrop.com
+email:
+- code@justinbalthrop.com
+- Denis.Knauf@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
-- README.textile
-files: 
+- README.md
+files:
+- AUTHORS
+- README.md
 - VERSION
 - ext/bdb.c
 - ext/bdb.h
-- ext/extconf.rb
 - lib/bdb/base.rb
 - lib/bdb/database.rb
 - lib/bdb/environment.rb
@@ -45,46 +46,30 @@ files:
 - test/test_helper.rb
 - test/txn_test.rb
 - LICENSE
-- README.textile
-has_rdoc: true
+- ext/extconf.rb
 homepage: http://github.com/ninjudd/bdb
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - ext
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: Ruby Berkeley DB
-test_files: 
-- test/benchmark.rb
-- test/cursor_test.rb
-- test/database_test.rb
-- test/database_test_helper.rb
-- test/db_test.rb
-- test/deadlock_test.rb
-- test/env_test.rb
-- test/replication_test.rb
-- test/stat_test.rb
-- test/test_helper.rb
-- test/txn_test.rb
-- examples/replication.rb
+test_files: []

data/README.textile

@@ -1,95 +0,0 @@
-h1. Bdb
-
-Ruby bindings for Berkeley DB versions 4.2-4.7.
-
-h2. Download
-
-Currently this library is available via git at:
-
-<pre>
-   git://github.com/ninjudd/bdb.git
-</pre>
-
-h2. Installation
-
-h3. From Git
-
-You can check out the latest source from git:
-
-<pre>
-   git clone git://github.com/ninjudd/bdb.git
-</pre>
-
-h3. As a Gem
-
-At the moment this library is not available on Rubyforge.  To install it as a
-gem, do the following (for custom compiled version 4.8):
-
-<pre>
-   sudo env ARCHFLAGS="-arch i386" gem install bdb --source http://gemcutter.org -- --with-db-dir=/usr/local/BerkeleyDB.4.8
-</pre>
-
-For Berkeley DB v4.7 installed from MacPorts do the following:
-
-<pre>
-   sudo env ARCHFLAGS="-arch i386" gem install bdb --source http://gemcutter.org -- --with-db-include=/opt/local/include/db47 --with-db-lib=/opt/local/lib/db47
-</pre>
-
-This assumes you're on OS X and BerkeleyDB wasn't compiled as a universal binary.
-
-h2. Sample Usage
-
-<pre>
-  env = Bdb::Env.new(0)
-  env_flags =  Bdb::DB_CREATE |    # Create the environment if it does not already exist.
-               Bdb::DB_INIT_TXN  | # Initialize transactions
-               Bdb::DB_INIT_LOCK | # Initialize locking.
-               Bdb::DB_INIT_LOG  | # Initialize logging
-               Bdb::DB_INIT_MPOOL  # Initialize the in-memory cache.
-  env.open(File.join(File.dirname(__FILE__), 'tmp'), env_flags, 0);
-  
-  db = env.db
-  db.open(nil, 'db1.db', nil, Bdb::Db::BTREE, Bdb::DB_CREATE | Bdb::DB_AUTO_COMMIT, 0)    
-
-  txn = env.txn_begin(nil, 0)
-  db.put(txn, 'key', 'value', 0)
-  txn.commit(0)
-
-  value = db.get(nil, 'key', nil, 0)
-
-  db.close(0)
-  env.close
-</pre>
-
-h2. API
-
-This interface is most closely based on the DB4 C api and tries to maintain close 
-interface proximity. That API is published by Oracle at "http://www.oracle.com/technology/documentation/berkeley-db/db/api_reference/C/frame_main.html":http://www.oracle.com/technology/documentation/berkeley-db/db/api_reference/C/frame_main.html.
-
-All function arguments systematically omit the leading DB handles and TXN handles.
- A few calls omit the flags parameter when the documentation indicates that no 
- flag values are used - cursor.close is one.
-
-h2. Notes
-
-The defines generator is imperfect and includes some defines that are not
-flags. While it could be improved, it is easier to delete the incorrect ones.
-Thus, if you decide to rebuild the defines, you will need to edit the resulting
-file. This may be necessary if using a different release of DB4 than the ones
-the authors developed against.  In nearly every case the defines generator works
-flawlessly.
-
-The authors have put all possible caution into ensuring that DB and Ruby cooperate.
-The memory access was one aspect carefully considered. Since Ruby copies
-when doing String#new, all key/data retrieval from DB is done with a 0 flag,
-meaning that DB will be responsible. See "this":http://groups.google.com/group/comp.databases.berkeley-db/browse_frm/thread/4f70a9999b64ce6a/c06b94692e3cbc41?tvc=1&q=dbt+malloc#c06b94692e3cbc41
- news group posting about the effect of that.
-
-The only other design consideration of consequence was associate. The prior
-version used a Ruby thread local variable and kept track of the current
-database in use. The authors decided to take a simpler approach since Ruby is green
-threads. A global array stores the VALUE of the Proc for a given association
-by the file descriptor number of the underlying database. This is looked
-up when the first layer callback is made. It would have been better considered
-if DB allowed the passing of a (void *) user data into the alloc that would
-be supplied during callback. So far this design has not produced any problems.

data/examples/replication.rb

@@ -1,29 +0,0 @@
-require 'rubygems'
-require 'bdb/database'
-require 'fileutils'
-
-role = ARGV.shift || 'client'
-
-MASTER = 'localhost:8888'
-CLIENT = 'localhost:9999'
-
-DIR = "/tmp/#{role}"
-FileUtils.rmtree DIR
-FileUtils.mkdir  DIR
-
-puts "Starting #{role}..."
-
-Bdb::Environment.replicate DIR, :from => MASTER, :to => CLIENT, :host => role == 'master' ? MASTER : CLIENT
-db = Bdb::Database.new('foo', :path => DIR)
-
-loop do
-  100.times do |i|
-    if role == 'master'
-      db.set(i, db[i].to_i + 1)
-      puts "#{i}: #{db[i]}"
-    else
-      puts "#{i}: #{db[i]}"
-    end
-    sleep 0.1
-  end
-end