1
diff --git a/setup.py b/setup.py
2
index 6c512a5..e6850ff 100644
5
@@ -776,7 +776,7 @@ class PyBuildExt(build_ext):
6
# a release. Most open source OSes come with one or more
7
# versions of BerkeleyDB already installed.
12
db_setup_debug = False # verbose debug prints from this script?
14
@@ -798,7 +798,11 @@ class PyBuildExt(build_ext):
17
def gen_db_minor_ver_nums(major):
20
+ for x in range(max_db_ver[1]+1):
21
+ if allow_db_ver((5, x)):
24
for x in range(max_db_ver[1]+1):
25
if allow_db_ver((4, x)):
27
diff --git a/Lib/bsddb/__init__.py b/Lib/bsddb/__init__.py
28
index ed4deea..eec3412 100644
29
--- a/Lib/bsddb/__init__.py
30
+++ b/Lib/bsddb/__init__.py
32
#----------------------------------------------------------------------
35
-"""Support for Berkeley DB 4.1 through 4.8 with a simple interface.
36
+"""Support for Berkeley DB 4.2 through 5.1 with a simple interface.
38
For the full featured object oriented interface use the bsddb.db module
39
instead. It mirrors the Oracle Berkeley DB C API.
40
diff --git a/Lib/bsddb/test/test_all.py b/Lib/bsddb/test/test_all.py
41
index e9fe618..6a25f4a 100644
42
--- a/Lib/bsddb/test/test_all.py
43
+++ b/Lib/bsddb/test/test_all.py
44
@@ -484,6 +484,8 @@ def print_versions():
46
print db.DB_VERSION_STRING
47
print 'bsddb.db.version(): %s' % (db.version(), )
48
+ if db.version() >= (5, 0) :
49
+ print 'bsddb.db.full_version(): %s' %repr(db.full_version())
50
print 'bsddb.db.__version__: %s' % db.__version__
51
print 'bsddb.db.cvsid: %s' % db.cvsid
53
@@ -528,7 +530,8 @@ def get_new_database_path() :
55
# This path can be overriden via "set_test_path_prefix()".
57
-get_new_path.prefix=os.path.join(os.sep,"tmp","z-Berkeley_DB")
58
+get_new_path.prefix=os.path.join(os.environ.get("TMPDIR",
59
+ os.path.join(os.sep,"tmp")), "z-Berkeley_DB")
62
def get_test_path_prefix() :
63
diff --git a/Lib/bsddb/test/test_associate.py b/Lib/bsddb/test/test_associate.py
64
index 7a49e11..9df4fb3 100644
65
--- a/Lib/bsddb/test/test_associate.py
66
+++ b/Lib/bsddb/test/test_associate.py
67
@@ -76,6 +76,11 @@ musicdata = {
68
#----------------------------------------------------------------------
70
class AssociateErrorTestCase(unittest.TestCase):
72
+ if sys.version_info < (2, 4) :
73
+ def assertTrue(self, expr, msg=None):
74
+ self.failUnless(expr,msg=msg)
77
self.filename = self.__class__.__name__ + '.db'
78
self.homeDir = get_new_environment_path()
79
@@ -120,6 +125,11 @@ class AssociateErrorTestCase(unittest.TestCase):
82
class AssociateTestCase(unittest.TestCase):
84
+ if sys.version_info < (2, 4) :
85
+ def assertTrue(self, expr, msg=None):
86
+ self.failUnless(expr,msg=msg)
91
diff --git a/Lib/bsddb/test/test_basics.py b/Lib/bsddb/test/test_basics.py
92
index 4d43390..4096e00 100644
93
--- a/Lib/bsddb/test/test_basics.py
94
+++ b/Lib/bsddb/test/test_basics.py
95
@@ -74,7 +74,6 @@ class BasicTestCase(unittest.TestCase):
96
# create and open the DB
97
self.d = db.DB(self.env)
99
- if db.version() >= (4, 2) :
100
self.d.set_cachesize(*self.cachesize)
101
cachesize = self.d.get_cachesize()
102
self.assertEqual(cachesize[0], self.cachesize[0])
103
@@ -792,7 +791,6 @@ class BasicTransactionTestCase(BasicTestCase):
106
print 'log file: ' + log
107
- if db.version() >= (4,2):
108
logs = self.env.log_archive(db.DB_ARCH_REMOVE)
109
self.assertTrue(not logs)
111
@@ -875,7 +873,6 @@ class BasicTransactionTestCase(BasicTestCase):
113
#----------------------------------------
115
- if db.version() >= (4, 2) :
116
def test_get_tx_max(self) :
117
self.assertEqual(self.env.get_tx_max(), 30)
119
diff --git a/Lib/bsddb/test/test_compat.py b/Lib/bsddb/test/test_compat.py
120
index 7679f19..03c8d58 100644
121
--- a/Lib/bsddb/test/test_compat.py
122
+++ b/Lib/bsddb/test/test_compat.py
123
@@ -11,6 +11,11 @@ from test_all import db, hashopen, btopen, rnopen, verbose, \
126
class CompatibilityTestCase(unittest.TestCase):
128
+ if sys.version_info < (2, 4) :
129
+ def assertTrue(self, expr, msg=None):
130
+ self.failUnless(expr,msg=msg)
133
self.filename = get_new_database_path()
135
diff --git a/Lib/bsddb/test/test_db.py b/Lib/bsddb/test/test_db.py
136
index 8d3a32b..9448271 100644
137
--- a/Lib/bsddb/test/test_db.py
138
+++ b/Lib/bsddb/test/test_db.py
139
@@ -11,6 +11,8 @@ class DB(unittest.TestCase):
140
if sys.version_info < (2, 4) :
141
def assertTrue(self, expr, msg=None):
142
self.failUnless(expr,msg=msg)
143
+ def assertFalse(self, expr, msg=None):
144
+ self.failIf(expr,msg=msg)
147
self.path = get_new_database_path()
148
@@ -19,10 +21,28 @@ class DB(unittest.TestCase):
152
- test_support.rmtree(self.path)
153
+ test_support.unlink(self.path)
155
class DB_general(DB) :
156
- if db.version() >= (4, 2) :
157
+ def test_get_open_flags(self) :
158
+ self.db.open(self.path, dbtype=db.DB_HASH, flags = db.DB_CREATE)
159
+ self.assertEqual(db.DB_CREATE, self.db.get_open_flags())
161
+ def test_get_open_flags2(self) :
162
+ self.db.open(self.path, dbtype=db.DB_HASH, flags = db.DB_CREATE |
164
+ self.assertEqual(db.DB_CREATE | db.DB_THREAD, self.db.get_open_flags())
166
+ def test_get_dbname_filename(self) :
167
+ self.db.open(self.path, dbtype=db.DB_HASH, flags = db.DB_CREATE)
168
+ self.assertEqual((self.path, None), self.db.get_dbname())
170
+ def test_get_dbname_filename_database(self) :
171
+ name = "jcea-random-name"
172
+ self.db.open(self.path, dbname=name, dbtype=db.DB_HASH,
173
+ flags = db.DB_CREATE)
174
+ self.assertEqual((self.path, name), self.db.get_dbname())
176
def test_bt_minkey(self) :
177
for i in [17, 108, 1030] :
178
self.db.set_bt_minkey(i)
179
@@ -44,8 +64,13 @@ class DB_general(DB) :
180
self.db.set_priority(flag)
181
self.assertEqual(flag, self.db.get_priority())
183
+ if db.version() >= (4, 3) :
184
+ def test_get_transactional(self) :
185
+ self.assertFalse(self.db.get_transactional())
186
+ self.db.open(self.path, dbtype=db.DB_HASH, flags = db.DB_CREATE)
187
+ self.assertFalse(self.db.get_transactional())
190
- if db.version() >= (4, 2) :
191
def test_h_ffactor(self) :
192
for ffactor in [4, 16, 256] :
193
self.db.set_h_ffactor(ffactor)
194
@@ -84,7 +109,6 @@ class DB_txn(DB) :
196
test_support.rmtree(self.homeDir)
198
- if db.version() >= (4, 2) :
199
def test_flags(self) :
200
self.db.set_flags(db.DB_CHKSUM)
201
self.assertEqual(db.DB_CHKSUM, self.db.get_flags())
202
@@ -92,8 +116,15 @@ class DB_txn(DB) :
203
self.assertEqual(db.DB_TXN_NOT_DURABLE | db.DB_CHKSUM,
206
+ if db.version() >= (4, 3) :
207
+ def test_get_transactional(self) :
208
+ self.assertFalse(self.db.get_transactional())
209
+ # DB_AUTO_COMMIT = Implicit transaction
210
+ self.db.open("XXX", dbtype=db.DB_HASH,
211
+ flags = db.DB_CREATE | db.DB_AUTO_COMMIT)
212
+ self.assertTrue(self.db.get_transactional())
215
- if db.version() >= (4, 2) :
216
def test_re_pad(self) :
217
for i in [' ', '*'] : # Check chars
218
self.db.set_re_pad(i)
219
@@ -116,7 +147,6 @@ class DB_recno(DB) :
220
self.assertEqual(i, self.db.get_re_source())
223
- if db.version() >= (4, 2) :
224
def test_re_len(self) :
225
for i in [33, 65, 300, 2000] :
226
self.db.set_re_len(i)
227
diff --git a/Lib/bsddb/test/test_dbenv.py b/Lib/bsddb/test/test_dbenv.py
228
index 37281df..1d90633 100644
229
--- a/Lib/bsddb/test/test_dbenv.py
230
+++ b/Lib/bsddb/test/test_dbenv.py
231
@@ -25,12 +25,31 @@ class DBEnv(unittest.TestCase):
232
test_support.rmtree(self.homeDir)
234
class DBEnv_general(DBEnv) :
235
+ def test_get_open_flags(self) :
236
+ flags = db.DB_CREATE | db.DB_INIT_MPOOL
237
+ self.env.open(self.homeDir, flags)
238
+ self.assertEqual(flags, self.env.get_open_flags())
240
+ def test_get_open_flags2(self) :
241
+ flags = db.DB_CREATE | db.DB_INIT_MPOOL | \
242
+ db.DB_INIT_LOCK | db.DB_THREAD
243
+ self.env.open(self.homeDir, flags)
244
+ self.assertEqual(flags, self.env.get_open_flags())
246
if db.version() >= (4, 7) :
247
def test_lk_partitions(self) :
248
for i in [10, 20, 40] :
249
self.env.set_lk_partitions(i)
250
self.assertEqual(i, self.env.get_lk_partitions())
252
+ def test_getset_intermediate_dir_mode(self) :
253
+ self.assertEqual(None, self.env.get_intermediate_dir_mode())
254
+ for mode in ["rwx------", "rw-rw-rw-", "rw-r--r--"] :
255
+ self.env.set_intermediate_dir_mode(mode)
256
+ self.assertEqual(mode, self.env.get_intermediate_dir_mode())
257
+ self.assertRaises(db.DBInvalidArgError,
258
+ self.env.set_intermediate_dir_mode, "abcde")
260
if db.version() >= (4, 6) :
261
def test_thread(self) :
262
for i in [16, 100, 1000] :
263
@@ -72,7 +91,6 @@ class DBEnv_general(DBEnv) :
264
v=self.env.get_mp_max_write()
265
self.assertEqual((i, j), v)
267
- if db.version() >= (4, 2) :
268
def test_invalid_txn(self) :
269
# This environment doesn't support transactions
270
self.assertRaises(db.DBInvalidArgError, self.env.txn_begin)
271
@@ -115,7 +133,7 @@ class DBEnv_general(DBEnv) :
272
self.assertEqual(i, self.env.get_lk_max_lockers())
274
def test_lg_regionmax(self) :
275
- for i in [128, 256, 1024] :
276
+ for i in [128, 256, 1000] :
278
self.env.set_lg_regionmax(i)
279
j = self.env.get_lg_regionmax()
280
@@ -173,7 +191,11 @@ class DBEnv_general(DBEnv) :
281
cachesize = (0, 2*1024*1024, 1)
282
self.assertRaises(db.DBInvalidArgError,
283
self.env.set_cachesize, *cachesize)
284
- self.assertEqual(cachesize2, self.env.get_cachesize())
285
+ cachesize3 = self.env.get_cachesize()
286
+ self.assertEqual(cachesize2[0], cachesize3[0])
287
+ self.assertEqual(cachesize2[2], cachesize3[2])
288
+ # In Berkeley DB 5.1, the cachesize can change when opening the Env
289
+ self.assertTrue(cachesize2[1] <= cachesize3[1])
291
def test_set_cachesize_dbenv_db(self) :
292
# You can not configure the cachesize using
293
diff --git a/Lib/bsddb/test/test_dbtables.py b/Lib/bsddb/test/test_dbtables.py
294
index 3ef517c..904a4de 100644
295
--- a/Lib/bsddb/test/test_dbtables.py
296
+++ b/Lib/bsddb/test/test_dbtables.py
297
@@ -38,6 +38,11 @@ from test_all import db, dbtables, test_support, verbose, \
298
#----------------------------------------------------------------------
300
class TableDBTestCase(unittest.TestCase):
302
+ if sys.version_info < (2, 4) :
303
+ def assertTrue(self, expr, msg=None):
304
+ self.failUnless(expr,msg=msg)
306
db_name = 'test-table.db'
309
diff --git a/Lib/bsddb/test/test_distributed_transactions.py b/Lib/bsddb/test/test_distributed_transactions.py
310
index 1711fc5..0051f20 100644
311
--- a/Lib/bsddb/test/test_distributed_transactions.py
312
+++ b/Lib/bsddb/test/test_distributed_transactions.py
313
@@ -19,6 +19,11 @@ from test_all import verbose
314
#----------------------------------------------------------------------
316
class DBTxn_distributed(unittest.TestCase):
318
+ if sys.version_info < (2, 4) :
319
+ def assertTrue(self, expr, msg=None):
320
+ self.failUnless(expr,msg=msg)
325
@@ -37,15 +42,11 @@ class DBTxn_distributed(unittest.TestCase):
326
self.db = db.DB(self.dbenv)
327
self.db.set_re_len(db.DB_GID_SIZE)
329
- if db.version() >= (4,2) :
330
txn=self.dbenv.txn_begin()
331
self.db.open(self.filename,
332
db.DB_QUEUE, db.DB_CREATE | db.DB_THREAD, 0666,
336
- self.db.open(self.filename,
337
- db.DB_QUEUE, db.DB_CREATE | db.DB_THREAD, 0666)
340
self.homeDir = get_new_environment_path()
341
diff --git a/Lib/bsddb/test/test_get_none.py b/Lib/bsddb/test/test_get_none.py
342
index 8763b54..ee9e1a7 100644
343
--- a/Lib/bsddb/test/test_get_none.py
344
+++ b/Lib/bsddb/test/test_get_none.py
345
@@ -11,6 +11,11 @@ from test_all import db, verbose, get_new_database_path
346
#----------------------------------------------------------------------
348
class GetReturnsNoneTestCase(unittest.TestCase):
350
+ if sys.version_info < (2, 4) :
351
+ def assertTrue(self, expr, msg=None):
352
+ self.failUnless(expr,msg=msg)
355
self.filename = get_new_database_path()
357
diff --git a/Lib/bsddb/test/test_join.py b/Lib/bsddb/test/test_join.py
358
index 1f0dfff..c9f6400 100644
359
--- a/Lib/bsddb/test/test_join.py
360
+++ b/Lib/bsddb/test/test_join.py
361
@@ -30,6 +30,11 @@ ColorIndex = [
364
class JoinTestCase(unittest.TestCase):
366
+ if sys.version_info < (2, 4) :
367
+ def assertTrue(self, expr, msg=None):
368
+ self.failUnless(expr,msg=msg)
373
diff --git a/Lib/bsddb/test/test_lock.py b/Lib/bsddb/test/test_lock.py
374
index 25260fc..d37f2b5 100644
375
--- a/Lib/bsddb/test/test_lock.py
376
+++ b/Lib/bsddb/test/test_lock.py
377
@@ -89,7 +89,6 @@ class LockingTestCase(unittest.TestCase):
381
- if db.version() >= (4, 2) :
382
def test03_lock_timeout(self):
383
self.env.set_timeout(0, db.DB_SET_LOCK_TIMEOUT)
384
self.assertEqual(self.env.get_timeout(db.DB_SET_LOCK_TIMEOUT), 0)
385
diff --git a/Lib/bsddb/test/test_misc.py b/Lib/bsddb/test/test_misc.py
386
index 8dda296..7e06b34 100644
387
--- a/Lib/bsddb/test/test_misc.py
388
+++ b/Lib/bsddb/test/test_misc.py
389
@@ -97,10 +97,6 @@ class MiscTestCase(unittest.TestCase):
390
test_support.unlink(self.filename)
392
def test07_DB_set_flags_persists(self):
393
- if db.version() < (4,2):
394
- # The get_flags API required for this to work is only available
395
- # in Berkeley DB >= 4.2
399
db1.set_flags(db.DB_DUPSORT)
400
diff --git a/Lib/bsddb/test/test_queue.py b/Lib/bsddb/test/test_queue.py
401
index 251a8cf..c213ff4 100644
402
--- a/Lib/bsddb/test/test_queue.py
403
+++ b/Lib/bsddb/test/test_queue.py
404
@@ -99,11 +99,6 @@ class SimpleQueueTestCase(unittest.TestCase):
405
print '\n', '-=' * 30
406
print "Running %s.test02_basicPost32..." % self.__class__.__name__
408
- if db.version() < (3, 2, 0):
410
- print "Test not run, DB not new enough..."
414
d.set_re_len(40) # Queues must be fixed length
415
d.open(self.filename, db.DB_QUEUE, db.DB_CREATE)
416
diff --git a/Lib/bsddb/test/test_recno.py b/Lib/bsddb/test/test_recno.py
417
index 3191fdc..d3cd216 100644
418
--- a/Lib/bsddb/test/test_recno.py
419
+++ b/Lib/bsddb/test/test_recno.py
420
@@ -236,7 +236,9 @@ class SimpleRecnoTestCase(unittest.TestCase):
423
# get the text from the backing source
424
- text = open(source, 'r').read()
425
+ f = open(source, 'r')
431
@@ -256,7 +258,9 @@ class SimpleRecnoTestCase(unittest.TestCase):
435
- text = open(source, 'r').read()
436
+ f = open(source, 'r')
442
@@ -298,6 +302,18 @@ class SimpleRecnoTestCase(unittest.TestCase):
446
+ def test04_get_size_empty(self) :
448
+ d.open(self.filename, dbtype=db.DB_RECNO, flags=db.DB_CREATE)
450
+ row_id = d.append(' ')
451
+ self.assertEqual(1, d.get_size(key=row_id))
452
+ row_id = d.append('')
453
+ self.assertEqual(0, d.get_size(key=row_id))
459
#----------------------------------------------------------------------
461
diff --git a/Modules/_bsddb.c b/Modules/_bsddb.c
462
index 6ce86b0..ecf73ec 100644
463
--- a/Modules/_bsddb.c
464
+++ b/Modules/_bsddb.c
465
@@ -202,9 +202,7 @@ static PyObject* DBFileExistsError; /* EEXIST */
466
static PyObject* DBNoSuchFileError; /* ENOENT */
467
static PyObject* DBPermissionsError; /* EPERM */
470
static PyObject* DBRepHandleDeadError; /* DB_REP_HANDLE_DEAD */
473
static PyObject* DBRepLockoutError; /* DB_REP_LOCKOUT */
475
@@ -715,9 +713,7 @@ static int makeDBError(int err)
476
case ENOENT: errObj = DBNoSuchFileError; break;
477
case EPERM : errObj = DBPermissionsError; break;
480
case DB_REP_HANDLE_DEAD : errObj = DBRepHandleDeadError; break;
483
case DB_REP_LOCKOUT : errObj = DBRepLockoutError; break;
485
@@ -2132,7 +2128,7 @@ DB_get_size(DBObject* self, PyObject* args, PyObject* kwargs)
486
MYDB_BEGIN_ALLOW_THREADS;
487
err = self->db->get(self->db, txn, &key, &data, flags);
488
MYDB_END_ALLOW_THREADS;
489
- if (err == DB_BUFFER_SMALL) {
490
+ if ((err == DB_BUFFER_SMALL) || (err == 0)) {
491
retval = NUMBER_FromLong((long)data.size);
494
@@ -2385,9 +2381,7 @@ DB_open(DBObject* self, PyObject* args, PyObject* kwargs)
499
self->db->get_flags(self->db, &self->setflags);
504
@@ -2539,6 +2533,37 @@ DB_get_priority(DBObject* self)
508
+DB_get_dbname(DBObject* self)
511
+ const char *filename, *dbname;
513
+ CHECK_DB_NOT_CLOSED(self);
515
+ MYDB_BEGIN_ALLOW_THREADS;
516
+ err = self->db->get_dbname(self->db, &filename, &dbname);
517
+ MYDB_END_ALLOW_THREADS;
519
+ /* If "dbname==NULL", it is correctly converted to "None" */
520
+ return Py_BuildValue("(ss)", filename, dbname);
524
+DB_get_open_flags(DBObject* self)
527
+ unsigned int flags;
529
+ CHECK_DB_NOT_CLOSED(self);
531
+ MYDB_BEGIN_ALLOW_THREADS;
532
+ err = self->db->get_open_flags(self->db, &flags);
533
+ MYDB_END_ALLOW_THREADS;
535
+ return NUMBER_FromLong(flags);
539
DB_set_q_extentsize(DBObject* self, PyObject* args)
542
@@ -2555,7 +2580,6 @@ DB_set_q_extentsize(DBObject* self, PyObject* args)
548
DB_get_q_extentsize(DBObject* self)
550
@@ -2570,7 +2594,6 @@ DB_get_q_extentsize(DBObject* self)
552
return NUMBER_FromLong(extentsize);
557
DB_set_bt_minkey(DBObject* self, PyObject* args)
558
@@ -2588,7 +2611,6 @@ DB_set_bt_minkey(DBObject* self, PyObject* args)
564
DB_get_bt_minkey(DBObject* self)
566
@@ -2603,7 +2625,6 @@ DB_get_bt_minkey(DBObject* self)
568
return NUMBER_FromLong(bt_minkey);
573
_default_cmp(const DBT *leftKey,
574
@@ -2759,7 +2780,6 @@ DB_set_cachesize(DBObject* self, PyObject* args)
580
DB_get_cachesize(DBObject* self)
582
@@ -2777,7 +2797,6 @@ DB_get_cachesize(DBObject* self)
584
return Py_BuildValue("(iii)", gbytes, bytes, ncache);
589
DB_set_flags(DBObject* self, PyObject* args)
590
@@ -2797,7 +2816,6 @@ DB_set_flags(DBObject* self, PyObject* args)
596
DB_get_flags(DBObject* self)
598
@@ -2812,6 +2830,35 @@ DB_get_flags(DBObject* self)
600
return NUMBER_FromLong(flags);
605
+DB_get_transactional(DBObject* self)
609
+ CHECK_DB_NOT_CLOSED(self);
611
+ MYDB_BEGIN_ALLOW_THREADS;
612
+ err = self->db->get_transactional(self->db);
613
+ MYDB_END_ALLOW_THREADS;
616
+ Py_INCREF(Py_False);
618
+ } else if(err == 1) {
619
+ Py_INCREF(Py_True);
624
+ ** If we reach there, there was an error. The
625
+ ** "return" should be unreachable.
628
+ assert(0); /* This coude SHOULD be unreachable */
634
@@ -2830,7 +2877,6 @@ DB_set_h_ffactor(DBObject* self, PyObject* args)
640
DB_get_h_ffactor(DBObject* self)
642
@@ -2845,7 +2891,6 @@ DB_get_h_ffactor(DBObject* self)
644
return NUMBER_FromLong(ffactor);
649
DB_set_h_nelem(DBObject* self, PyObject* args)
650
@@ -2863,7 +2908,6 @@ DB_set_h_nelem(DBObject* self, PyObject* args)
656
DB_get_h_nelem(DBObject* self)
658
@@ -2878,7 +2922,6 @@ DB_get_h_nelem(DBObject* self)
660
return NUMBER_FromLong(nelem);
665
DB_set_lorder(DBObject* self, PyObject* args)
666
@@ -2896,7 +2939,6 @@ DB_set_lorder(DBObject* self, PyObject* args)
672
DB_get_lorder(DBObject* self)
674
@@ -2911,7 +2953,6 @@ DB_get_lorder(DBObject* self)
676
return NUMBER_FromLong(lorder);
681
DB_set_pagesize(DBObject* self, PyObject* args)
682
@@ -2929,7 +2970,6 @@ DB_set_pagesize(DBObject* self, PyObject* args)
688
DB_get_pagesize(DBObject* self)
690
@@ -2944,7 +2984,6 @@ DB_get_pagesize(DBObject* self)
692
return NUMBER_FromLong(pagesize);
697
DB_set_re_delim(DBObject* self, PyObject* args)
698
@@ -2967,7 +3006,6 @@ DB_set_re_delim(DBObject* self, PyObject* args)
704
DB_get_re_delim(DBObject* self)
706
@@ -2981,7 +3019,6 @@ DB_get_re_delim(DBObject* self)
708
return NUMBER_FromLong(re_delim);
713
DB_set_re_len(DBObject* self, PyObject* args)
714
@@ -2999,7 +3036,6 @@ DB_set_re_len(DBObject* self, PyObject* args)
720
DB_get_re_len(DBObject* self)
722
@@ -3014,7 +3050,6 @@ DB_get_re_len(DBObject* self)
724
return NUMBER_FromLong(re_len);
729
DB_set_re_pad(DBObject* self, PyObject* args)
730
@@ -3036,7 +3071,6 @@ DB_set_re_pad(DBObject* self, PyObject* args)
736
DB_get_re_pad(DBObject* self)
738
@@ -3050,7 +3084,6 @@ DB_get_re_pad(DBObject* self)
740
return NUMBER_FromLong(re_pad);
745
DB_set_re_source(DBObject* self, PyObject* args)
746
@@ -3069,7 +3102,6 @@ DB_set_re_source(DBObject* self, PyObject* args)
752
DB_get_re_source(DBObject* self)
754
@@ -3084,7 +3116,6 @@ DB_get_re_source(DBObject* self)
756
return PyBytes_FromString(source);
761
DB_stat(DBObject* self, PyObject* args, PyObject* kwargs)
762
@@ -3381,7 +3412,6 @@ DB_set_encrypt(DBObject* self, PyObject* args, PyObject* kwargs)
768
DB_get_encrypt_flags(DBObject* self)
770
@@ -3396,7 +3426,6 @@ DB_get_encrypt_flags(DBObject* self)
772
return NUMBER_FromLong(flags);
778
@@ -4987,7 +5016,6 @@ DBEnv_set_encrypt(DBEnvObject* self, PyObject* args, PyObject* kwargs)
784
DBEnv_get_encrypt_flags(DBEnvObject* self)
786
@@ -5025,7 +5053,6 @@ DBEnv_get_timeout(DBEnvObject* self, PyObject* args, PyObject* kwargs)
788
return NUMBER_FromLong(timeout);
794
@@ -5064,7 +5091,6 @@ DBEnv_set_shm_key(DBEnvObject* self, PyObject* args)
800
DBEnv_get_shm_key(DBEnvObject* self)
802
@@ -5081,7 +5107,6 @@ DBEnv_get_shm_key(DBEnvObject* self)
804
return NUMBER_FromLong(shm_key);
810
@@ -5170,7 +5195,6 @@ DBEnv_set_cachesize(DBEnvObject* self, PyObject* args)
816
DBEnv_get_cachesize(DBEnvObject* self)
818
@@ -5188,7 +5212,6 @@ DBEnv_get_cachesize(DBEnvObject* self)
820
return Py_BuildValue("(iii)", gbytes, bytes, ncache);
826
@@ -5208,7 +5231,6 @@ DBEnv_set_flags(DBEnvObject* self, PyObject* args)
832
DBEnv_get_flags(DBEnvObject* self)
834
@@ -5223,7 +5245,6 @@ DBEnv_get_flags(DBEnvObject* self)
836
return NUMBER_FromLong(flags);
842
@@ -5423,7 +5444,6 @@ DBEnv_set_data_dir(DBEnvObject* self, PyObject* args)
848
DBEnv_get_data_dirs(DBEnvObject* self)
850
@@ -5463,7 +5483,6 @@ DBEnv_get_data_dirs(DBEnvObject* self)
858
@@ -5513,7 +5532,6 @@ DBEnv_set_lg_bsize(DBEnvObject* self, PyObject* args)
864
DBEnv_get_lg_bsize(DBEnvObject* self)
866
@@ -5528,7 +5546,6 @@ DBEnv_get_lg_bsize(DBEnvObject* self)
868
return NUMBER_FromLong(lg_bsize);
873
DBEnv_set_lg_dir(DBEnvObject* self, PyObject* args)
874
@@ -5547,7 +5564,6 @@ DBEnv_set_lg_dir(DBEnvObject* self, PyObject* args)
880
DBEnv_get_lg_dir(DBEnvObject* self)
882
@@ -5562,7 +5578,6 @@ DBEnv_get_lg_dir(DBEnvObject* self)
884
return PyBytes_FromString(dirp);
889
DBEnv_set_lg_max(DBEnvObject* self, PyObject* args)
890
@@ -5580,7 +5595,6 @@ DBEnv_set_lg_max(DBEnvObject* self, PyObject* args)
896
DBEnv_get_lg_max(DBEnvObject* self)
898
@@ -5595,8 +5609,6 @@ DBEnv_get_lg_max(DBEnvObject* self)
900
return NUMBER_FromLong(lg_max);
906
DBEnv_set_lg_regionmax(DBEnvObject* self, PyObject* args)
907
@@ -5614,7 +5626,6 @@ DBEnv_set_lg_regionmax(DBEnvObject* self, PyObject* args)
913
DBEnv_get_lg_regionmax(DBEnvObject* self)
915
@@ -5629,7 +5640,6 @@ DBEnv_get_lg_regionmax(DBEnvObject* self)
917
return NUMBER_FromLong(lg_regionmax);
923
@@ -5680,7 +5690,6 @@ DBEnv_set_lk_detect(DBEnvObject* self, PyObject* args)
929
DBEnv_get_lk_detect(DBEnvObject* self)
931
@@ -5695,8 +5704,6 @@ DBEnv_get_lk_detect(DBEnvObject* self)
933
return NUMBER_FromLong(lk_detect);
940
@@ -5734,7 +5741,6 @@ DBEnv_set_lk_max_locks(DBEnvObject* self, PyObject* args)
946
DBEnv_get_lk_max_locks(DBEnvObject* self)
948
@@ -5749,7 +5755,6 @@ DBEnv_get_lk_max_locks(DBEnvObject* self)
950
return NUMBER_FromLong(lk_max);
955
DBEnv_set_lk_max_lockers(DBEnvObject* self, PyObject* args)
956
@@ -5767,7 +5772,6 @@ DBEnv_set_lk_max_lockers(DBEnvObject* self, PyObject* args)
962
DBEnv_get_lk_max_lockers(DBEnvObject* self)
964
@@ -5782,7 +5786,6 @@ DBEnv_get_lk_max_lockers(DBEnvObject* self)
966
return NUMBER_FromLong(lk_max);
971
DBEnv_set_lk_max_objects(DBEnvObject* self, PyObject* args)
972
@@ -5800,7 +5803,6 @@ DBEnv_set_lk_max_objects(DBEnvObject* self, PyObject* args)
978
DBEnv_get_lk_max_objects(DBEnvObject* self)
980
@@ -5815,9 +5817,7 @@ DBEnv_get_lk_max_objects(DBEnvObject* self)
982
return NUMBER_FromLong(lk_max);
988
DBEnv_get_mp_mmapsize(DBEnvObject* self)
990
@@ -5832,8 +5832,6 @@ DBEnv_get_mp_mmapsize(DBEnvObject* self)
992
return NUMBER_FromLong(mmapsize);
998
DBEnv_set_mp_mmapsize(DBEnvObject* self, PyObject* args)
999
@@ -5869,8 +5867,6 @@ DBEnv_set_tmp_dir(DBEnvObject* self, PyObject* args)
1006
DBEnv_get_tmp_dir(DBEnvObject* self)
1008
@@ -5887,8 +5883,6 @@ DBEnv_get_tmp_dir(DBEnvObject* self)
1010
return PyBytes_FromString(dirpp);
1016
DBEnv_txn_recover(DBEnvObject* self)
1017
@@ -6003,8 +5997,6 @@ DBEnv_txn_checkpoint(DBEnvObject* self, PyObject* args)
1024
DBEnv_get_tx_max(DBEnvObject* self)
1026
@@ -6019,8 +6011,6 @@ DBEnv_get_tx_max(DBEnvObject* self)
1028
return PyLong_FromUnsignedLong(max);
1034
DBEnv_set_tx_max(DBEnvObject* self, PyObject* args)
1035
@@ -6038,8 +6028,6 @@ DBEnv_set_tx_max(DBEnvObject* self, PyObject* args)
1042
DBEnv_get_tx_timestamp(DBEnvObject* self)
1044
@@ -6054,7 +6042,6 @@ DBEnv_get_tx_timestamp(DBEnvObject* self)
1046
return NUMBER_FromLong(timestamp);
1051
DBEnv_set_tx_timestamp(DBEnvObject* self, PyObject* args)
1052
@@ -6756,6 +6743,55 @@ DBEnv_set_private(DBEnvObject* self, PyObject* private_obj)
1058
+DBEnv_set_intermediate_dir_mode(DBEnvObject* self, PyObject* args)
1063
+ if (!PyArg_ParseTuple(args,"s:set_intermediate_dir_mode", &mode))
1066
+ CHECK_ENV_NOT_CLOSED(self);
1068
+ MYDB_BEGIN_ALLOW_THREADS;
1069
+ err = self->db_env->set_intermediate_dir_mode(self->db_env, mode);
1070
+ MYDB_END_ALLOW_THREADS;
1076
+DBEnv_get_intermediate_dir_mode(DBEnvObject* self)
1081
+ CHECK_ENV_NOT_CLOSED(self);
1083
+ MYDB_BEGIN_ALLOW_THREADS;
1084
+ err = self->db_env->get_intermediate_dir_mode(self->db_env, &mode);
1085
+ MYDB_END_ALLOW_THREADS;
1087
+ return Py_BuildValue("s", mode);
1092
+DBEnv_get_open_flags(DBEnvObject* self)
1095
+ unsigned int flags;
1097
+ CHECK_ENV_NOT_CLOSED(self);
1099
+ MYDB_BEGIN_ALLOW_THREADS;
1100
+ err = self->db_env->get_open_flags(self->db_env, &flags);
1101
+ MYDB_END_ALLOW_THREADS;
1103
+ return NUMBER_FromLong(flags);
1108
@@ -6875,7 +6911,6 @@ DBEnv_set_verbose(DBEnvObject* self, PyObject* args)
1114
DBEnv_get_verbose(DBEnvObject* self, PyObject* args)
1116
@@ -6893,7 +6928,6 @@ DBEnv_get_verbose(DBEnvObject* self, PyObject* args)
1118
return PyBool_FromLong(verbose);
1124
@@ -6975,9 +7009,7 @@ DBEnv_rep_process_message(DBEnvObject* self, PyObject* args)
1125
PyObject *control_py, *rec_py;
1132
if (!PyArg_ParseTuple(args, "OOi:rep_process_message", &control_py,
1134
@@ -6994,13 +7026,8 @@ DBEnv_rep_process_message(DBEnvObject* self, PyObject* args)
1135
err = self->db_env->rep_process_message(self->db_env, &control, &rec,
1139
err = self->db_env->rep_process_message(self->db_env, &control, &rec,
1142
- err = self->db_env->rep_process_message(self->db_env, &control, &rec,
1146
MYDB_END_ALLOW_THREADS;
1148
@@ -7029,12 +7056,10 @@ DBEnv_rep_process_message(DBEnvObject* self, PyObject* args)
1153
case DB_REP_NOTPERM :
1154
case DB_REP_ISPERM :
1155
return Py_BuildValue("(i(ll))", err, lsn.file, lsn.offset);
1160
return Py_BuildValue("(OO)", Py_None, Py_None);
1161
@@ -7086,20 +7111,6 @@ _DBEnv_rep_transportCallback(DB_ENV* db_env, const DBT* control, const DBT* rec,
1167
-_DBEnv_rep_transportCallbackOLD(DB_ENV* db_env, const DBT* control, const DBT* rec,
1168
- int envid, u_int32_t flags)
1172
- lsn.file = -1; /* Dummy values */
1174
- return _DBEnv_rep_transportCallback(db_env, control, rec, &lsn, envid,
1180
DBEnv_rep_set_transport(DBEnvObject* self, PyObject* args)
1182
@@ -7120,13 +7131,8 @@ DBEnv_rep_set_transport(DBEnvObject* self, PyObject* args)
1183
err = self->db_env->rep_set_transport(self->db_env, envid,
1184
&_DBEnv_rep_transportCallback);
1187
err = self->db_env->set_rep_transport(self->db_env, envid,
1188
&_DBEnv_rep_transportCallback);
1190
- err = self->db_env->set_rep_transport(self->db_env, envid,
1191
- &_DBEnv_rep_transportCallbackOLD);
1194
MYDB_END_ALLOW_THREADS;
1196
@@ -8482,65 +8488,43 @@ static PyMethodDef DB_methods[] = {
1197
{"remove", (PyCFunction)DB_remove, METH_VARARGS|METH_KEYWORDS},
1198
{"rename", (PyCFunction)DB_rename, METH_VARARGS},
1199
{"set_bt_minkey", (PyCFunction)DB_set_bt_minkey, METH_VARARGS},
1201
{"get_bt_minkey", (PyCFunction)DB_get_bt_minkey, METH_NOARGS},
1203
{"set_bt_compare", (PyCFunction)DB_set_bt_compare, METH_O},
1204
{"set_cachesize", (PyCFunction)DB_set_cachesize, METH_VARARGS},
1206
{"get_cachesize", (PyCFunction)DB_get_cachesize, METH_NOARGS},
1208
{"set_encrypt", (PyCFunction)DB_set_encrypt, METH_VARARGS|METH_KEYWORDS},
1210
{"get_encrypt_flags", (PyCFunction)DB_get_encrypt_flags, METH_NOARGS},
1213
{"set_flags", (PyCFunction)DB_set_flags, METH_VARARGS},
1215
{"get_flags", (PyCFunction)DB_get_flags, METH_NOARGS},
1217
+ {"get_transactional", (PyCFunction)DB_get_transactional, METH_NOARGS},
1219
{"set_h_ffactor", (PyCFunction)DB_set_h_ffactor, METH_VARARGS},
1221
{"get_h_ffactor", (PyCFunction)DB_get_h_ffactor, METH_NOARGS},
1223
{"set_h_nelem", (PyCFunction)DB_set_h_nelem, METH_VARARGS},
1225
{"get_h_nelem", (PyCFunction)DB_get_h_nelem, METH_NOARGS},
1227
{"set_lorder", (PyCFunction)DB_set_lorder, METH_VARARGS},
1229
{"get_lorder", (PyCFunction)DB_get_lorder, METH_NOARGS},
1231
{"set_pagesize", (PyCFunction)DB_set_pagesize, METH_VARARGS},
1233
{"get_pagesize", (PyCFunction)DB_get_pagesize, METH_NOARGS},
1235
{"set_re_delim", (PyCFunction)DB_set_re_delim, METH_VARARGS},
1237
{"get_re_delim", (PyCFunction)DB_get_re_delim, METH_NOARGS},
1239
{"set_re_len", (PyCFunction)DB_set_re_len, METH_VARARGS},
1241
{"get_re_len", (PyCFunction)DB_get_re_len, METH_NOARGS},
1243
{"set_re_pad", (PyCFunction)DB_set_re_pad, METH_VARARGS},
1245
{"get_re_pad", (PyCFunction)DB_get_re_pad, METH_NOARGS},
1247
{"set_re_source", (PyCFunction)DB_set_re_source, METH_VARARGS},
1249
{"get_re_source", (PyCFunction)DB_get_re_source, METH_NOARGS},
1251
{"set_q_extentsize",(PyCFunction)DB_set_q_extentsize, METH_VARARGS},
1253
{"get_q_extentsize",(PyCFunction)DB_get_q_extentsize, METH_NOARGS},
1255
{"set_private", (PyCFunction)DB_set_private, METH_O},
1256
{"get_private", (PyCFunction)DB_get_private, METH_NOARGS},
1258
{"set_priority", (PyCFunction)DB_set_priority, METH_VARARGS},
1259
{"get_priority", (PyCFunction)DB_get_priority, METH_NOARGS},
1261
+ {"get_dbname", (PyCFunction)DB_get_dbname, METH_NOARGS},
1262
+ {"get_open_flags", (PyCFunction)DB_get_open_flags, METH_NOARGS},
1263
{"stat", (PyCFunction)DB_stat, METH_VARARGS|METH_KEYWORDS},
1265
{"stat_print", (PyCFunction)DB_stat_print,
1266
@@ -8639,24 +8623,18 @@ static PyMethodDef DBEnv_methods[] = {
1267
{"get_thread_count", (PyCFunction)DBEnv_get_thread_count, METH_NOARGS},
1269
{"set_encrypt", (PyCFunction)DBEnv_set_encrypt, METH_VARARGS|METH_KEYWORDS},
1271
{"get_encrypt_flags", (PyCFunction)DBEnv_get_encrypt_flags, METH_NOARGS},
1272
{"get_timeout", (PyCFunction)DBEnv_get_timeout,
1273
METH_VARARGS|METH_KEYWORDS},
1275
{"set_timeout", (PyCFunction)DBEnv_set_timeout, METH_VARARGS|METH_KEYWORDS},
1276
{"set_shm_key", (PyCFunction)DBEnv_set_shm_key, METH_VARARGS},
1278
{"get_shm_key", (PyCFunction)DBEnv_get_shm_key, METH_NOARGS},
1281
{"set_cache_max", (PyCFunction)DBEnv_set_cache_max, METH_VARARGS},
1282
{"get_cache_max", (PyCFunction)DBEnv_get_cache_max, METH_NOARGS},
1284
{"set_cachesize", (PyCFunction)DBEnv_set_cachesize, METH_VARARGS},
1286
{"get_cachesize", (PyCFunction)DBEnv_get_cachesize, METH_NOARGS},
1288
{"memp_trickle", (PyCFunction)DBEnv_memp_trickle, METH_VARARGS},
1289
{"memp_sync", (PyCFunction)DBEnv_memp_sync, METH_VARARGS},
1290
{"memp_stat", (PyCFunction)DBEnv_memp_stat,
1291
@@ -8685,33 +8663,21 @@ static PyMethodDef DBEnv_methods[] = {
1294
{"set_data_dir", (PyCFunction)DBEnv_set_data_dir, METH_VARARGS},
1296
{"get_data_dirs", (PyCFunction)DBEnv_get_data_dirs, METH_NOARGS},
1299
{"get_flags", (PyCFunction)DBEnv_get_flags, METH_NOARGS},
1301
{"set_flags", (PyCFunction)DBEnv_set_flags, METH_VARARGS},
1303
{"log_set_config", (PyCFunction)DBEnv_log_set_config, METH_VARARGS},
1304
{"log_get_config", (PyCFunction)DBEnv_log_get_config, METH_VARARGS},
1306
{"set_lg_bsize", (PyCFunction)DBEnv_set_lg_bsize, METH_VARARGS},
1308
{"get_lg_bsize", (PyCFunction)DBEnv_get_lg_bsize, METH_NOARGS},
1310
{"set_lg_dir", (PyCFunction)DBEnv_set_lg_dir, METH_VARARGS},
1312
{"get_lg_dir", (PyCFunction)DBEnv_get_lg_dir, METH_NOARGS},
1314
{"set_lg_max", (PyCFunction)DBEnv_set_lg_max, METH_VARARGS},
1316
{"get_lg_max", (PyCFunction)DBEnv_get_lg_max, METH_NOARGS},
1318
{"set_lg_regionmax",(PyCFunction)DBEnv_set_lg_regionmax, METH_VARARGS},
1320
{"get_lg_regionmax",(PyCFunction)DBEnv_get_lg_regionmax, METH_NOARGS},
1323
{"set_lg_filemode", (PyCFunction)DBEnv_set_lg_filemode, METH_VARARGS},
1324
{"get_lg_filemode", (PyCFunction)DBEnv_get_lg_filemode, METH_NOARGS},
1325
@@ -8721,36 +8687,24 @@ static PyMethodDef DBEnv_methods[] = {
1326
{"get_lk_partitions", (PyCFunction)DBEnv_get_lk_partitions, METH_NOARGS},
1328
{"set_lk_detect", (PyCFunction)DBEnv_set_lk_detect, METH_VARARGS},
1330
{"get_lk_detect", (PyCFunction)DBEnv_get_lk_detect, METH_NOARGS},
1333
{"set_lk_max", (PyCFunction)DBEnv_set_lk_max, METH_VARARGS},
1335
{"set_lk_max_locks", (PyCFunction)DBEnv_set_lk_max_locks, METH_VARARGS},
1337
{"get_lk_max_locks", (PyCFunction)DBEnv_get_lk_max_locks, METH_NOARGS},
1339
{"set_lk_max_lockers", (PyCFunction)DBEnv_set_lk_max_lockers, METH_VARARGS},
1341
{"get_lk_max_lockers", (PyCFunction)DBEnv_get_lk_max_lockers, METH_NOARGS},
1343
{"set_lk_max_objects", (PyCFunction)DBEnv_set_lk_max_objects, METH_VARARGS},
1345
{"get_lk_max_objects", (PyCFunction)DBEnv_get_lk_max_objects, METH_NOARGS},
1348
{"stat_print", (PyCFunction)DBEnv_stat_print,
1349
METH_VARARGS|METH_KEYWORDS},
1351
{"set_mp_mmapsize", (PyCFunction)DBEnv_set_mp_mmapsize, METH_VARARGS},
1353
{"get_mp_mmapsize", (PyCFunction)DBEnv_get_mp_mmapsize, METH_NOARGS},
1355
{"set_tmp_dir", (PyCFunction)DBEnv_set_tmp_dir, METH_VARARGS},
1357
{"get_tmp_dir", (PyCFunction)DBEnv_get_tmp_dir, METH_NOARGS},
1359
{"txn_begin", (PyCFunction)DBEnv_txn_begin, METH_VARARGS|METH_KEYWORDS},
1360
{"txn_checkpoint", (PyCFunction)DBEnv_txn_checkpoint, METH_VARARGS},
1361
{"txn_stat", (PyCFunction)DBEnv_txn_stat, METH_VARARGS},
1362
@@ -8758,10 +8712,8 @@ static PyMethodDef DBEnv_methods[] = {
1363
{"txn_stat_print", (PyCFunction)DBEnv_txn_stat_print,
1364
METH_VARARGS|METH_KEYWORDS},
1367
{"get_tx_max", (PyCFunction)DBEnv_get_tx_max, METH_NOARGS},
1368
{"get_tx_timestamp", (PyCFunction)DBEnv_get_tx_timestamp, METH_NOARGS},
1370
{"set_tx_max", (PyCFunction)DBEnv_set_tx_max, METH_VARARGS},
1371
{"set_tx_timestamp", (PyCFunction)DBEnv_set_tx_timestamp, METH_VARARGS},
1372
{"lock_detect", (PyCFunction)DBEnv_lock_detect, METH_VARARGS},
1373
@@ -8804,11 +8756,16 @@ static PyMethodDef DBEnv_methods[] = {
1374
{"get_mp_max_write", (PyCFunction)DBEnv_get_mp_max_write, METH_NOARGS},
1376
{"set_verbose", (PyCFunction)DBEnv_set_verbose, METH_VARARGS},
1378
- {"get_verbose", (PyCFunction)DBEnv_get_verbose, METH_VARARGS},
1379
+ {"get_verbose", (PyCFunction)DBEnv_get_verbose, METH_VARARGS},
1380
+ {"set_private", (PyCFunction)DBEnv_set_private, METH_O},
1381
+ {"get_private", (PyCFunction)DBEnv_get_private, METH_NOARGS},
1382
+ {"get_open_flags", (PyCFunction)DBEnv_get_open_flags, METH_NOARGS},
1384
+ {"set_intermediate_dir_mode", (PyCFunction)DBEnv_set_intermediate_dir_mode,
1386
+ {"get_intermediate_dir_mode", (PyCFunction)DBEnv_get_intermediate_dir_mode,
1389
- {"set_private", (PyCFunction)DBEnv_set_private, METH_O},
1390
- {"get_private", (PyCFunction)DBEnv_get_private, METH_NOARGS},
1391
{"rep_start", (PyCFunction)DBEnv_rep_start,
1392
METH_VARARGS|METH_KEYWORDS},
1393
{"rep_set_transport", (PyCFunction)DBEnv_rep_set_transport, METH_VARARGS},
1394
@@ -8922,13 +8879,9 @@ DBEnv_db_home_get(DBEnvObject* self)
1396
CHECK_ENV_NOT_CLOSED(self);
1399
MYDB_BEGIN_ALLOW_THREADS;
1400
self->db_env->get_home(self->db_env, &home);
1401
MYDB_END_ALLOW_THREADS;
1403
- home=self->db_env->db_home;
1408
@@ -9298,10 +9251,25 @@ bsddb_version(PyObject* self)
1410
int major, minor, patch;
1412
+ /* This should be instantaneous, no need to release the GIL */
1413
db_version(&major, &minor, &patch);
1414
return Py_BuildValue("(iii)", major, minor, patch);
1419
+bsddb_version_full(PyObject* self)
1421
+ char *version_string;
1422
+ int family, release, major, minor, patch;
1424
+ /* This should be instantaneous, no need to release the GIL */
1425
+ version_string = db_full_version(&family, &release, &major, &minor, &patch);
1426
+ return Py_BuildValue("(siiiii)",
1427
+ version_string, family, release, major, minor, patch);
1432
/* List of functions defined in the module */
1433
static PyMethodDef bsddb_methods[] = {
1434
@@ -9311,6 +9279,9 @@ static PyMethodDef bsddb_methods[] = {
1435
{"DBSequence", (PyCFunction)DBSequence_construct, METH_VARARGS | METH_KEYWORDS },
1437
{"version", (PyCFunction)bsddb_version, METH_NOARGS, bsddb_version_doc},
1439
+ {"full_version", (PyCFunction)bsddb_version_full, METH_NOARGS},
1441
{NULL, NULL} /* sentinel */
1444
@@ -9328,6 +9299,11 @@ static BSDDB_api bsddb_api;
1446
#define ADD_INT(dict, NAME) _addIntToDict(dict, #NAME, NAME)
1449
+** We can rename the module at import time, so the string allocated
1450
+** must be big enough, and any use of the name must use this particular
1453
#define MODULE_NAME_MAX_LEN 11
1454
static char _bsddbModuleName[MODULE_NAME_MAX_LEN+1] = "_bsddb";
1456
@@ -9428,13 +9404,7 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */
1457
ADD_INT(d, DB_MAX_RECORDS);
1461
ADD_INT(d, DB_RPCCLIENT);
1463
- ADD_INT(d, DB_CLIENT);
1464
- /* allow apps to be written using DB_RPCCLIENT on older Berkeley DB */
1465
- _addIntToDict(d, "DB_RPCCLIENT", DB_CLIENT);
1470
@@ -9477,6 +9447,14 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */
1471
ADD_INT(d, DB_TXN_SYNC);
1472
ADD_INT(d, DB_TXN_NOWAIT);
1475
+ ADD_INT(d, DB_TXN_BULK);
1479
+ ADD_INT(d, DB_CURSOR_BULK);
1483
ADD_INT(d, DB_TXN_WAIT);
1485
@@ -9561,9 +9539,7 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */
1486
ADD_INT(d, DB_ARCH_ABS);
1487
ADD_INT(d, DB_ARCH_DATA);
1488
ADD_INT(d, DB_ARCH_LOG);
1490
ADD_INT(d, DB_ARCH_REMOVE);
1493
ADD_INT(d, DB_BTREE);
1494
ADD_INT(d, DB_HASH);
1495
@@ -9591,9 +9567,6 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */
1496
ADD_INT(d, DB_CACHED_COUNTS);
1500
- ADD_INT(d, DB_COMMIT);
1502
ADD_INT(d, DB_CONSUME);
1503
ADD_INT(d, DB_CONSUME_WAIT);
1504
ADD_INT(d, DB_CURRENT);
1505
@@ -9671,6 +9644,10 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */
1507
ADD_INT(d, DB_STAT_SUBSYSTEM);
1508
ADD_INT(d, DB_STAT_MEMP_HASH);
1509
+ ADD_INT(d, DB_STAT_LOCK_CONF);
1510
+ ADD_INT(d, DB_STAT_LOCK_LOCKERS);
1511
+ ADD_INT(d, DB_STAT_LOCK_OBJECTS);
1512
+ ADD_INT(d, DB_STAT_LOCK_PARAMS);
1516
@@ -9690,7 +9667,6 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */
1517
ADD_INT(d, DB_EID_INVALID);
1518
ADD_INT(d, DB_EID_BROADCAST);
1521
ADD_INT(d, DB_TIME_NOTGRANTED);
1522
ADD_INT(d, DB_TXN_NOT_DURABLE);
1523
ADD_INT(d, DB_TXN_WRITE_NOSYNC);
1524
@@ -9698,9 +9674,8 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */
1525
ADD_INT(d, DB_INIT_REP);
1526
ADD_INT(d, DB_ENCRYPT);
1527
ADD_INT(d, DB_CHKSUM);
1530
-#if (DBVER >= 42) && (DBVER < 47)
1532
ADD_INT(d, DB_LOG_AUTOREMOVE);
1533
ADD_INT(d, DB_DIRECT_LOG);
1535
@@ -9733,6 +9708,20 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */
1536
ADD_INT(d, DB_VERB_REPLICATION);
1537
ADD_INT(d, DB_VERB_WAITSFOR);
1540
+ ADD_INT(d, DB_VERB_REP_SYSTEM);
1544
+ ADD_INT(d, DB_VERB_REP_ELECT);
1545
+ ADD_INT(d, DB_VERB_REP_LEASE);
1546
+ ADD_INT(d, DB_VERB_REP_MISC);
1547
+ ADD_INT(d, DB_VERB_REP_MSGS);
1548
+ ADD_INT(d, DB_VERB_REP_SYNC);
1549
+ ADD_INT(d, DB_VERB_REPMGR_CONNFAIL);
1550
+ ADD_INT(d, DB_VERB_REPMGR_MISC);
1554
ADD_INT(d, DB_EVENT_PANIC);
1555
ADD_INT(d, DB_EVENT_REP_CLIENT);
1556
@@ -9748,16 +9737,25 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */
1557
ADD_INT(d, DB_EVENT_WRITE_FAILED);
1561
+ ADD_INT(d, DB_REPMGR_CONF_ELECTIONS);
1562
+ ADD_INT(d, DB_EVENT_REP_MASTER_FAILURE);
1563
+ ADD_INT(d, DB_EVENT_REP_DUPMASTER);
1564
+ ADD_INT(d, DB_EVENT_REP_ELECTION_FAILED);
1567
+ ADD_INT(d, DB_EVENT_REG_ALIVE);
1568
+ ADD_INT(d, DB_EVENT_REG_PANIC);
1571
ADD_INT(d, DB_REP_DUPMASTER);
1572
ADD_INT(d, DB_REP_HOLDELECTION);
1574
ADD_INT(d, DB_REP_IGNORE);
1575
ADD_INT(d, DB_REP_JOIN_FAILURE);
1578
ADD_INT(d, DB_REP_ISPERM);
1579
ADD_INT(d, DB_REP_NOTPERM);
1581
ADD_INT(d, DB_REP_NEWSITE);
1583
ADD_INT(d, DB_REP_MASTER);
1584
@@ -9766,7 +9764,13 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */
1585
ADD_INT(d, DB_REP_PERMANENT);
1589
+ ADD_INT(d, DB_REP_CONF_AUTOINIT);
1591
ADD_INT(d, DB_REP_CONF_NOAUTOINIT);
1595
ADD_INT(d, DB_REP_CONF_DELAYCLIENT);
1596
ADD_INT(d, DB_REP_CONF_BULK);
1597
ADD_INT(d, DB_REP_CONF_NOWAIT);
1598
@@ -9774,9 +9778,7 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */
1599
ADD_INT(d, DB_REP_REREQUEST);
1603
ADD_INT(d, DB_REP_NOBUFFER);
1607
ADD_INT(d, DB_REP_LEASE_EXPIRED);
1608
@@ -9819,6 +9821,28 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */
1609
ADD_INT(d, DB_STAT_ALL);
1613
+ ADD_INT(d, DB_REPMGR_ACKS_ALL_AVAILABLE);
1617
+ ADD_INT(d, DB_REP_CONF_INMEM);
1620
+ ADD_INT(d, DB_TIMEOUT);
1623
+ ADD_INT(d, DB_FORCESYNC);
1627
+ ADD_INT(d, DB_FAILCHK);
1631
+ ADD_INT(d, DB_HOTBACKUP_IN_PROGRESS);
1635
ADD_INT(d, DB_BUFFER_SMALL);
1636
ADD_INT(d, DB_SEQ_DEC);
1637
@@ -9856,6 +9880,10 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */
1638
ADD_INT(d, DB_SET_LOCK_TIMEOUT);
1639
ADD_INT(d, DB_SET_TXN_TIMEOUT);
1642
+ ADD_INT(d, DB_SET_REG_TIMEOUT);
1645
/* The exception name must be correct for pickled exception *
1646
* objects to unpickle properly. */
1647
#ifdef PYBSDDB_STANDALONE /* different value needed for standalone pybsddb */
1648
@@ -9927,9 +9955,7 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */
1649
MAKE_EX(DBNoSuchFileError);
1650
MAKE_EX(DBPermissionsError);
1653
MAKE_EX(DBRepHandleDeadError);
1656
MAKE_EX(DBRepLockoutError);
1658
@@ -9947,6 +9973,7 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */
1661
/* Initialise the C API structure and add it to the module */
1662
+ bsddb_api.api_version = PYBSDDB_API_VERSION;
1663
bsddb_api.db_type = &DB_Type;
1664
bsddb_api.dbcursor_type = &DBCursor_Type;
1665
bsddb_api.dblogcursor_type = &DBLogCursor_Type;
1666
@@ -9955,19 +9982,25 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */
1667
bsddb_api.dblock_type = &DBLock_Type;
1669
bsddb_api.dbsequence_type = &DBSequence_Type;
1671
+ bsddb_api.dbsequence_type = NULL;
1673
bsddb_api.makeDBError = makeDBError;
1676
- ** Capsules exist from Python 3.1, but I
1677
- ** don't want to break the API compatibility
1678
- ** for already published Python versions.
1679
+ ** Capsules exist from Python 2.7 and 3.1.
1680
+ ** We don't support Python 3.0 anymore, so...
1681
+ ** #if (PY_VERSION_HEX < ((PY_MAJOR_VERSION < 3) ? 0x02070000 : 0x03020000))
1683
-#if (PY_VERSION_HEX < 0x03020000)
1684
+#if (PY_VERSION_HEX < 0x02070000)
1685
py_api = PyCObject_FromVoidPtr((void*)&bsddb_api, NULL);
1688
- char py_api_name[250];
1690
+ ** The data must outlive the call!!. So, the static definition.
1691
+ ** The buffer must be big enough...
1693
+ static char py_api_name[MODULE_NAME_MAX_LEN+10];
1695
strcpy(py_api_name, _bsddbModuleName);
1696
strcat(py_api_name, ".api");
1697
diff --git a/Modules/bsddb.h b/Modules/bsddb.h
1698
index a3a687b..af438bd 100644
1699
--- a/Modules/bsddb.h
1700
+++ b/Modules/bsddb.h
1702
#error "eek! DBVER can't handle minor versions > 9"
1705
-#define PY_BSDDB_VERSION "4.8.4.1"
1706
+#define PY_BSDDB_VERSION "5.1.2"
1708
/* Python object definitions */
1710
@@ -236,7 +236,7 @@ typedef struct DBSequenceObject {
1711
/* To access the structure from an external module, use code like the
1712
following (error checking missed out for clarity):
1714
- // If you are using Python before 3.2:
1715
+ // If you are using Python before 2.7:
1716
BSDDB_api* bsddb_api;
1719
@@ -249,7 +249,7 @@ typedef struct DBSequenceObject {
1723
- // If you are using Python 3.2 or up:
1724
+ // If you are using Python 2.7 or up: (except Python 3.0, unsupported)
1725
BSDDB_api* bsddb_api;
1727
// Use "bsddb3._pybsddb.api" if you're using
1728
@@ -257,10 +257,14 @@ typedef struct DBSequenceObject {
1729
bsddb_api = (void **)PyCapsule_Import("bsddb._bsddb.api", 1);
1732
+ Check "api_version" number before trying to use the API.
1734
The structure's members must not be changed.
1737
+#define PYBSDDB_API_VERSION 1
1739
+ unsigned int api_version;
1741
PyTypeObject* db_type;
1742
PyTypeObject* dbcursor_type;
1743
@@ -268,9 +272,7 @@ typedef struct {
1744
PyTypeObject* dbenv_type;
1745
PyTypeObject* dbtxn_type;
1746
PyTypeObject* dblock_type;
1748
- PyTypeObject* dbsequence_type;
1750
+ PyTypeObject* dbsequence_type; /* If DBVER < 43 -> NULL */
1753
int (*makeDBError)(int err);
1754
@@ -289,9 +291,9 @@ typedef struct {
1755
#define DBEnvObject_Check(v) ((v)->ob_type == bsddb_api->dbenv_type)
1756
#define DBTxnObject_Check(v) ((v)->ob_type == bsddb_api->dbtxn_type)
1757
#define DBLockObject_Check(v) ((v)->ob_type == bsddb_api->dblock_type)
1759
-#define DBSequenceObject_Check(v) ((v)->ob_type == bsddb_api->dbsequence_type)
1761
+#define DBSequenceObject_Check(v) \
1762
+ ((bsddb_api->dbsequence_type) && \
1763
+ ((v)->ob_type == bsddb_api->dbsequence_type))
1765
#endif /* COMPILING_BSDDB_C */