Skip to content

C
cpython
Commit eae0cb41 authored by Gregory P. Smith's avatar Gregory P. Smith
Browse files
Options

* add support for DBSequence objects [patch #1466734]

parent eae034bf
Hide whitespace changes
Inline Side-by-side
Showing with 501 additions and 12 deletions
Lib/bsddb/dbobj.py
View file @ eae0cb41
......@@ -217,3 +217,38 @@ class DB(DictMixin):
if db.version() >= (4,1):
def set_encrypt(self, *args, **kwargs):
return apply(self._cobj.set_encrypt, args, kwargs)
class DBSequence:
def __init__(self, *args, **kwargs):
self._cobj = apply(db.DBSequence, args, kwargs)
def close(self, *args, **kwargs):
return apply(self._cobj.close, args, kwargs)
def get(self, *args, **kwargs):
return apply(self._cobj.get, args, kwargs)
def get_dbp(self, *args, **kwargs):
return apply(self._cobj.get_dbp, args, kwargs)
def get_key(self, *args, **kwargs):
return apply(self._cobj.get_key, args, kwargs)
def init_value(self, *args, **kwargs):
return apply(self._cobj.init_value, args, kwargs)
def open(self, *args, **kwargs):
return apply(self._cobj.open, args, kwargs)
def remove(self, *args, **kwargs):
return apply(self._cobj.remove, args, kwargs)
def stat(self, *args, **kwargs):
return apply(self._cobj.stat, args, kwargs)
def set_cachesize(self, *args, **kwargs):
return apply(self._cobj.set_cachesize, args, kwargs)
def set_flags(self, *args, **kwargs):
return apply(self._cobj.set_flags, args, kwargs)
def set_range(self, *args, **kwargs):
return apply(self._cobj.set_range, args, kwargs)
def get_cachesize(self, *args, **kwargs):
return apply(self._cobj.get_cachesize, args, kwargs)
def get_flags(self, *args, **kwargs):
return apply(self._cobj.get_flags, args, kwargs)
def get_range(self, *args, **kwargs):
return apply(self._cobj.get_range, args, kwargs)
Lib/bsddb/test/test_all.py
View file @ eae0cb41
......@@ -4,6 +4,12 @@
import sys
import os
import unittest
try:
# For Pythons w/distutils pybsddb
from bsddb3 import db
except ImportError:
# For Python 2.3
from bsddb import db
verbose = 0
if 'verbose' in sys.argv:
......@@ -16,12 +22,6 @@ if 'silent' in sys.argv: # take care of old flag, just in case
def print_versions():
try:
# For Pythons w/distutils pybsddb
from bsddb3 import db
except ImportError:
# For Python 2.3
from bsddb import db
print
print '-=' * 38
print db.DB_VERSION_STRING
......@@ -69,6 +69,7 @@ def suite():
'test_queue',
'test_recno',
'test_thread',
'test_sequence',
]
alltests = unittest.TestSuite()
......
Lib/test/test_bsddb3.py
View file @ eae0cb41
......@@ -44,6 +44,7 @@ def suite():
'test_queue',
'test_recno',
'test_thread',
'test_sequence',
]
alltests = unittest.TestSuite()
......
Misc/NEWS
View file @ eae0cb41
......@@ -109,6 +109,9 @@ Extension Modules
assuming BerkeleyDB >= 4.0 and 4.4 respectively. [pybsddb project SF
patch numbers 1494885 and 1494902]
- bsddb: added an interface for the BerkeleyDB >= 4.3 DBSequence class
[pybsddb project SF patch number 1466734]
Library
-------
......
Modules/_bsddb.c
View file @ eae0cb41
......@@ -61,13 +61,14 @@
*
* http://www.python.org/peps/pep-0291.html
*
* This module contains 5 types:
* This module contains 6 types:
*
* DB (Database)
* DBCursor (Database Cursor)
* DBEnv (database environment)
* DBTxn (An explicit database transaction)
* DBLock (A lock handle)
* DBSequence (Sequence)
*
*/
......@@ -285,7 +286,17 @@ typedef struct {
#endif
} DBLockObject;
#if (DBVER >= 43)
typedef struct {
PyObject_HEAD
DB_SEQUENCE* sequence;
DBObject* mydb;
#ifdef HAVE_WEAKREF
PyObject *in_weakreflist; /* List of weak references */
#endif
} DBSequenceObject;
staticforward PyTypeObject DBSequence_Type;
#endif
staticforward PyTypeObject DB_Type, DBCursor_Type, DBEnv_Type, DBTxn_Type, DBLock_Type;
......@@ -294,6 +305,9 @@ staticforward PyTypeObject DB_Type, DBCursor_Type, DBEnv_Type, DBTxn_Type, DBLoc
#define DBEnvObject_Check(v) ((v)->ob_type == &DBEnv_Type)
#define DBTxnObject_Check(v) ((v)->ob_type == &DBTxn_Type)
#define DBLockObject_Check(v) ((v)->ob_type == &DBLock_Type)
#if (DBVER >= 43)
#define DBSequenceObject_Check(v) ((v)->ob_type == &DBSequence_Type)
#endif
/* --------------------------------------------------------------------- */
......@@ -324,6 +338,10 @@ staticforward PyTypeObject DB_Type, DBCursor_Type, DBEnv_Type, DBTxn_Type, DBLoc
#define CHECK_CURSOR_NOT_CLOSED(curs) \
_CHECK_OBJECT_NOT_CLOSED(curs->dbc, DBCursorClosedError, DBCursor)
#if (DBVER >= 43)
#define CHECK_SEQUENCE_NOT_CLOSED(curs) \
_CHECK_OBJECT_NOT_CLOSED(curs->sequence, DBError, DBSequence)
#endif
#define CHECK_DBFLAG(mydb, flag) (((mydb)->flags & (flag)) || \
(((mydb)->myenvobj != NULL) && ((mydb)->myenvobj->flags & (flag))))
......@@ -724,7 +742,17 @@ static void _addIntToDict(PyObject* dict, char *name, int value)
Py_XDECREF(v);
}
#if (DBVER >= 43)
/* add an db_seq_t to a dictionary using the given name as a key */
static void _addDb_seq_tToDict(PyObject* dict, char *name, db_seq_t value)
{
PyObject* v = PyLong_FromLongLong(value);
if (!v || PyDict_SetItemString(dict, name, v))
PyErr_Clear();
Py_XDECREF(v);
}
#endif
......@@ -777,7 +805,7 @@ newDBObject(DBEnvObject* arg, int flags)
MYDB_END_ALLOW_THREADS;
/* TODO add a weakref(self) to the self->myenvobj->open_child_weakrefs
* list so that a DBEnv can refuse to close without aborting any open
* open DBTxns and closing any open DBs first. */
* DBTxns and closing any open DBs first. */
if (makeDBError(err)) {
if (self->myenvobj) {
Py_DECREF(self->myenvobj);
......@@ -1029,6 +1057,48 @@ DBLock_dealloc(DBLockObject* self)
}
#if (DBVER >= 43)
static DBSequenceObject*
newDBSequenceObject(DBObject* mydb, int flags)
{
int err;
DBSequenceObject* self = PyObject_New(DBSequenceObject, &DBSequence_Type);
if (self == NULL)
return NULL;
Py_INCREF(mydb);
self->mydb = mydb;
#ifdef HAVE_WEAKREF
self->in_weakreflist = NULL;
#endif
MYDB_BEGIN_ALLOW_THREADS;
err = db_sequence_create(&self->sequence, self->mydb->db, flags);
MYDB_END_ALLOW_THREADS;
if (makeDBError(err)) {
Py_DECREF(self->mydb);
PyObject_Del(self);
self = NULL;
}
return self;
}
static void
DBSequence_dealloc(DBSequenceObject* self)
{
#ifdef HAVE_WEAKREF
if (self->in_weakreflist != NULL) {
PyObject_ClearWeakRefs((PyObject *) self);
}
#endif
Py_DECREF(self->mydb);
PyObject_Del(self);
}
#endif
/* --------------------------------------------------------------------- */
/* DB methods */
......@@ -4715,6 +4785,294 @@ DBTxn_id(DBTxnObject* self, PyObject* args)
return PyInt_FromLong(id);
}
#if (DBVER >= 43)
/* --------------------------------------------------------------------- */
/* DBSequence methods */
static PyObject*
DBSequence_close(DBSequenceObject* self, PyObject* args)
{
int err, flags=0;
if (!PyArg_ParseTuple(args,"|i:close", &flags))
return NULL;
CHECK_SEQUENCE_NOT_CLOSED(self)
MYDB_BEGIN_ALLOW_THREADS
err = self->sequence->close(self->sequence, flags);
self->sequence = NULL;
MYDB_END_ALLOW_THREADS
RETURN_IF_ERR();
RETURN_NONE();
}
static PyObject*
DBSequence_get(DBSequenceObject* self, PyObject* args, PyObject* kwargs)
{
int err, flags = 0;
int delta = 1;
db_seq_t value;
PyObject *txnobj = NULL;
DB_TXN *txn = NULL;
static char* kwnames[] = {"delta", "txn", "flags", NULL };
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|iOi:get", kwnames, &delta, &txnobj, &flags))
return NULL;
CHECK_SEQUENCE_NOT_CLOSED(self)
if (!checkTxnObj(txnobj, &txn))
return NULL;
MYDB_BEGIN_ALLOW_THREADS
err = self->sequence->get(self->sequence, txn, delta, &value, flags);
MYDB_END_ALLOW_THREADS
RETURN_IF_ERR();
return PyLong_FromLongLong(value);
}
static PyObject*
DBSequence_get_dbp(DBSequenceObject* self, PyObject* args)
{
if (!PyArg_ParseTuple(args,":get_dbp"))
return NULL;
CHECK_SEQUENCE_NOT_CLOSED(self)
Py_INCREF(self->mydb);
return (PyObject* )self->mydb;
}
static PyObject*
DBSequence_get_key(DBSequenceObject* self, PyObject* args)
{
int err;
DBT key;
CHECK_SEQUENCE_NOT_CLOSED(self)
MYDB_BEGIN_ALLOW_THREADS
err = self->sequence->get_key(self->sequence, &key);
MYDB_END_ALLOW_THREADS
RETURN_IF_ERR();
return PyString_FromStringAndSize(key.data, key.size);
}
static PyObject*
DBSequence_init_value(DBSequenceObject* self, PyObject* args)
{
int err;
db_seq_t value;
if (!PyArg_ParseTuple(args,"L|:init_value", &value))
return NULL;
CHECK_SEQUENCE_NOT_CLOSED(self)
MYDB_BEGIN_ALLOW_THREADS
err = self->sequence->initial_value(self->sequence, value);
MYDB_END_ALLOW_THREADS
RETURN_IF_ERR();
RETURN_NONE();
}
static PyObject*
DBSequence_open(DBSequenceObject* self, PyObject* args, PyObject* kwargs)
{
int err, flags = 0;
PyObject* keyobj;
PyObject *txnobj = NULL;
DB_TXN *txn = NULL;
DBT key;
static char* kwnames[] = {"key", "txn", "flags", NULL };
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|Oi:set", kwnames, &keyobj, &txnobj, &flags))
return NULL;
if (!checkTxnObj(txnobj, &txn))
return NULL;
if (!make_key_dbt(self->mydb, keyobj, &key, NULL))
return NULL;
MYDB_BEGIN_ALLOW_THREADS
err = self->sequence->open(self->sequence, txn, &key, flags);
MYDB_END_ALLOW_THREADS
CLEAR_DBT(key);
RETURN_IF_ERR();
RETURN_NONE();
}
static PyObject*
DBSequence_remove(DBSequenceObject* self, PyObject* args, PyObject* kwargs)
{
int err, flags = 0;
PyObject *txnobj = NULL;
DB_TXN *txn = NULL;
static char* kwnames[] = {"txn", "flags", NULL };
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Oi:set", kwnames, &txnobj, &flags))
return NULL;
if (!checkTxnObj(txnobj, &txn))
return NULL;
CHECK_SEQUENCE_NOT_CLOSED(self)
MYDB_BEGIN_ALLOW_THREADS
err = self->sequence->remove(self->sequence, txn, flags);
MYDB_END_ALLOW_THREADS
RETURN_IF_ERR();
RETURN_NONE();
}
static PyObject*
DBSequence_set_cachesize(DBSequenceObject* self, PyObject* args)
{
int err, size;
if (!PyArg_ParseTuple(args,"i|:set_cachesize", &size))
return NULL;
CHECK_SEQUENCE_NOT_CLOSED(self)
MYDB_BEGIN_ALLOW_THREADS
err = self->sequence->set_cachesize(self->sequence, size);
MYDB_END_ALLOW_THREADS
RETURN_IF_ERR();
RETURN_NONE();
}
static PyObject*
DBSequence_get_cachesize(DBSequenceObject* self, PyObject* args)
{
int err, size;
if (!PyArg_ParseTuple(args,":get_cachesize"))
return NULL;
CHECK_SEQUENCE_NOT_CLOSED(self)
MYDB_BEGIN_ALLOW_THREADS
err = self->sequence->get_cachesize(self->sequence, &size);
MYDB_END_ALLOW_THREADS
RETURN_IF_ERR();
return PyInt_FromLong(size);
}
static PyObject*
DBSequence_set_flags(DBSequenceObject* self, PyObject* args)
{
int err, flags = 0;
if (!PyArg_ParseTuple(args,"i|:set_flags", &flags))
return NULL;
CHECK_SEQUENCE_NOT_CLOSED(self)
MYDB_BEGIN_ALLOW_THREADS
err = self->sequence->set_flags(self->sequence, flags);
MYDB_END_ALLOW_THREADS
RETURN_IF_ERR();
RETURN_NONE();
}
static PyObject*
DBSequence_get_flags(DBSequenceObject* self, PyObject* args)
{
unsigned int flags;
int err;
if (!PyArg_ParseTuple(args,":get_cachesize"))
return NULL;
CHECK_SEQUENCE_NOT_CLOSED(self)
MYDB_BEGIN_ALLOW_THREADS
err = self->sequence->get_flags(self->sequence, &flags);
MYDB_END_ALLOW_THREADS
RETURN_IF_ERR();
return PyInt_FromLong((int)flags);
}
static PyObject*
DBSequence_set_range(DBSequenceObject* self, PyObject* args)
{
int err;
db_seq_t min, max;
if (!PyArg_ParseTuple(args,"(LL):set_range", &min, &max))
return NULL;
CHECK_SEQUENCE_NOT_CLOSED(self)
MYDB_BEGIN_ALLOW_THREADS
err = self->sequence->set_range(self->sequence, min, max);
MYDB_END_ALLOW_THREADS
RETURN_IF_ERR();
RETURN_NONE();
}
static PyObject*
DBSequence_get_range(DBSequenceObject* self, PyObject* args)
{
int err;
db_seq_t min, max;
if (!PyArg_ParseTuple(args,":get_range"))
return NULL;
CHECK_SEQUENCE_NOT_CLOSED(self)
MYDB_BEGIN_ALLOW_THREADS
err = self->sequence->get_range(self->sequence, &min, &max);
MYDB_END_ALLOW_THREADS
RETURN_IF_ERR();
return Py_BuildValue("(LL)", min, max);
}
static PyObject*
DBSequence_stat(DBSequenceObject* self, PyObject* args, PyObject* kwargs)
{
int err, flags = 0;
DB_SEQUENCE_STAT* sp = NULL;
PyObject* dict_stat;
static char* kwnames[] = {"flags", NULL };
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|i:stat", kwnames, &flags))
return NULL;
CHECK_SEQUENCE_NOT_CLOSED(self);
MYDB_BEGIN_ALLOW_THREADS;
err = self->sequence->stat(self->sequence, &sp, flags);
MYDB_END_ALLOW_THREADS;
RETURN_IF_ERR();
if ((dict_stat = PyDict_New()) == NULL) {
free(sp);
return NULL;
}
#define MAKE_INT_ENTRY(name) _addIntToDict(dict_stat, #name, sp->st_##name)
#define MAKE_LONG_LONG_ENTRY(name) _addDb_seq_tToDict(dict_stat, #name, sp->st_##name)
MAKE_INT_ENTRY(wait);
MAKE_INT_ENTRY(nowait);
MAKE_LONG_LONG_ENTRY(current);
MAKE_LONG_LONG_ENTRY(value);
MAKE_LONG_LONG_ENTRY(last_value);
MAKE_LONG_LONG_ENTRY(min);
MAKE_LONG_LONG_ENTRY(max);
MAKE_INT_ENTRY(cache_size);
MAKE_INT_ENTRY(flags);
#undef MAKE_INT_ENTRY
#undef MAKE_LONG_LONG_ENTRY
free(sp);
return dict_stat;
}
#endif
/* --------------------------------------------------------------------- */
/* Method definition tables and type objects */
......@@ -4888,6 +5246,28 @@ static PyMethodDef DBTxn_methods[] = {
};
#if (DBVER >= 43)
static PyMethodDef DBSequence_methods[] = {
{"close", (PyCFunction)DBSequence_close, METH_VARARGS},
{"get", (PyCFunction)DBSequence_get, METH_VARARGS|METH_KEYWORDS},
{"get_dbp", (PyCFunction)DBSequence_get_dbp, METH_VARARGS},
{"get_key", (PyCFunction)DBSequence_get_key, METH_VARARGS},
//should it be called "initial_value" as in c code?
{"init_value", (PyCFunction)DBSequence_init_value, METH_VARARGS},
{"open", (PyCFunction)DBSequence_open, METH_VARARGS|METH_KEYWORDS},
{"remove", (PyCFunction)DBSequence_remove, METH_VARARGS|METH_KEYWORDS},
{"set_cachesize", (PyCFunction)DBSequence_set_cachesize, METH_VARARGS},
{"get_cachesize", (PyCFunction)DBSequence_get_cachesize, METH_VARARGS},
{"set_flags", (PyCFunction)DBSequence_set_flags, METH_VARARGS},
{"get_flags", (PyCFunction)DBSequence_get_flags, METH_VARARGS},
{"set_range", (PyCFunction)DBSequence_set_range, METH_VARARGS},
{"get_range", (PyCFunction)DBSequence_get_range, METH_VARARGS},
{"stat", (PyCFunction)DBSequence_stat, METH_VARARGS|METH_KEYWORDS},
{NULL, NULL} /* sentinel */
};
#endif
static PyObject*
DB_getattr(DBObject* self, char *name)
{
......@@ -4928,6 +5308,14 @@ DBLock_getattr(DBLockObject* self, char *name)
return NULL;
}
#if (DBVER >= 43)
static PyObject*
DBSequence_getattr(DBSequenceObject* self, char *name)
{
return Py_FindMethod(DBSequence_methods, (PyObject* )self, name);
}
#endif
statichere PyTypeObject DB_Type = {
PyObject_HEAD_INIT(NULL)
0, /*ob_size*/
......@@ -5091,6 +5479,39 @@ statichere PyTypeObject DBLock_Type = {
#endif
};
#if (DBVER >= 43)
statichere PyTypeObject DBSequence_Type = {
PyObject_HEAD_INIT(NULL)
0, /*ob_size*/
"DBSequence", /*tp_name*/
sizeof(DBSequenceObject), /*tp_basicsize*/
0, /*tp_itemsize*/
/* methods */
(destructor)DBSequence_dealloc, /*tp_dealloc*/
0, /*tp_print*/
(getattrfunc)DBSequence_getattr,/*tp_getattr*/
0, /*tp_setattr*/
0, /*tp_compare*/
0, /*tp_repr*/
0, /*tp_as_number*/
0, /*tp_as_sequence*/
0, /*tp_as_mapping*/
0, /*tp_hash*/
#ifdef HAVE_WEAKREF
0, /* tp_call */
0, /* tp_str */
0, /* tp_getattro */
0, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_WEAKREFS, /* tp_flags */
0, /* tp_doc */
0, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
offsetof(DBSequenceObject, in_weakreflist), /* tp_weaklistoffset */
#endif
};
#endif
/* --------------------------------------------------------------------- */
/* Module-level functions */
......@@ -5124,6 +5545,25 @@ DBEnv_construct(PyObject* self, PyObject* args)
return (PyObject* )newDBEnvObject(flags);
}
#if (DBVER >= 43)
static PyObject*
DBSequence_construct(PyObject* self, PyObject* args, PyObject* kwargs)
{
PyObject* dbobj = NULL;
int flags = 0;
static char* kwnames[] = { "db", "flags", NULL};
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|i:DBSequence", kwnames, &dbobj, &flags))
return NULL;
if (dbobj == Py_None)
dbobj = NULL;
else if (dbobj && !DBObject_Check(dbobj)) {
makeTypeError("DB", dbobj);
return NULL;
}
return (PyObject* )newDBSequenceObject((DBObject*)dbobj, flags);
}
#endif
static char bsddb_version_doc[] =
"Returns a tuple of major, minor, and patch release numbers of the\n\
......@@ -5144,9 +5584,12 @@ bsddb_version(PyObject* self, PyObject* args)
/* List of functions defined in the module */
static PyMethodDef bsddb_methods[] = {
{"DB", (PyCFunction)DB_construct, METH_VARARGS | METH_KEYWORDS },
{"DBEnv", (PyCFunction)DBEnv_construct, METH_VARARGS},
{"version", (PyCFunction)bsddb_version, METH_VARARGS, bsddb_version_doc},
{"DB", (PyCFunction)DB_construct, METH_VARARGS | METH_KEYWORDS },
{"DBEnv", (PyCFunction)DBEnv_construct, METH_VARARGS},
#if (DBVER >= 43)
{"DBSequence", (PyCFunction)DBSequence_construct, METH_VARARGS | METH_KEYWORDS },
#endif
{"version", (PyCFunction)bsddb_version, METH_VARARGS, bsddb_version_doc},
{NULL, NULL} /* sentinel */
};
......@@ -5178,6 +5621,9 @@ DL_EXPORT(void) init_bsddb(void)
DBEnv_Type.ob_type = &PyType_Type;
DBTxn_Type.ob_type = &PyType_Type;
DBLock_Type.ob_type = &PyType_Type;
#if (DBVER >= 43)
DBSequence_Type.ob_type = &PyType_Type;
#endif
#if defined(WITH_THREAD) && !defined(MYDB_USE_GILSTATE)
......@@ -5468,6 +5914,9 @@ DL_EXPORT(void) init_bsddb(void)
#if (DBVER >= 43)
ADD_INT(d, DB_LOG_INMEMORY);
ADD_INT(d, DB_BUFFER_SMALL);
ADD_INT(d, DB_SEQ_DEC);
ADD_INT(d, DB_SEQ_INC);
ADD_INT(d, DB_SEQ_WRAP);
#endif
#if (DBVER >= 41)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7