-/*
+/*
Unix SMB/CIFS implementation.
Python interface to tdb.
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <Python.h>
+#include "lib/replace/system/python.h"
#include "replace.h"
#include "system/filesys.h"
/* Include tdb headers */
#include <tdb.h>
-#if PY_MAJOR_VERSION >= 3
-#define PyStr_FromString PyUnicode_FromString
-#define PyStr_FromFormat PyUnicode_FromFormat
-#define PyInt_FromLong PyLong_FromLong
-#define PyInt_Check PyLong_Check
-#define PyInt_AsLong PyLong_AsLong
-#define Py_TPFLAGS_HAVE_ITER 0
-#else
-#define PyStr_FromString PyString_FromString
-#define PyStr_FromFormat PyString_FromFormat
-#endif
+/* discard signature of 'func' in favour of 'target_sig' */
+#define PY_DISCARD_FUNC_SIG(target_sig, func) (target_sig)(void(*)(void))func
typedef struct {
PyObject_HEAD
static void PyErr_SetTDBError(TDB_CONTEXT *tdb)
{
- PyErr_SetObject(PyExc_RuntimeError,
+ PyErr_SetObject(PyExc_RuntimeError,
Py_BuildValue("(i,s)", tdb_error(tdb), tdb_errorstr(tdb)));
}
return (PyObject *)ret;
}
-static PyObject *obj_transaction_cancel(PyTdbObject *self)
+static PyObject *obj_transaction_cancel(PyTdbObject *self,
+ PyObject *Py_UNUSED(ignored))
{
int ret;
Py_RETURN_NONE;
}
-static PyObject *obj_transaction_commit(PyTdbObject *self)
+static PyObject *obj_transaction_commit(PyTdbObject *self,
+ PyObject *Py_UNUSED(ignored))
{
int ret;
PyErr_TDB_RAISE_IF_CLOSED(self);
Py_RETURN_NONE;
}
-static PyObject *obj_transaction_prepare_commit(PyTdbObject *self)
+static PyObject *obj_transaction_prepare_commit(PyTdbObject *self,
+ PyObject *Py_UNUSED(ignored))
{
int ret;
PyErr_TDB_RAISE_IF_CLOSED(self);
Py_RETURN_NONE;
}
-static PyObject *obj_transaction_start(PyTdbObject *self)
+static PyObject *obj_transaction_start(PyTdbObject *self,
+ PyObject *Py_UNUSED(ignored))
{
int ret;
PyErr_TDB_RAISE_IF_CLOSED(self);
Py_RETURN_NONE;
}
-static PyObject *obj_reopen(PyTdbObject *self)
+static PyObject *obj_reopen(PyTdbObject *self,
+ PyObject *Py_UNUSED(ignored))
{
int ret;
PyErr_TDB_RAISE_IF_CLOSED(self);
Py_RETURN_NONE;
}
-static PyObject *obj_lockall(PyTdbObject *self)
+static PyObject *obj_lockall(PyTdbObject *self,
+ PyObject *Py_UNUSED(ignored))
{
int ret;
PyErr_TDB_RAISE_IF_CLOSED(self);
Py_RETURN_NONE;
}
-static PyObject *obj_unlockall(PyTdbObject *self)
+static PyObject *obj_unlockall(PyTdbObject *self,
+ PyObject *Py_UNUSED(ignored))
{
int ret;
PyErr_TDB_RAISE_IF_CLOSED(self);
Py_RETURN_NONE;
}
-static PyObject *obj_lockall_read(PyTdbObject *self)
+static PyObject *obj_lockall_read(PyTdbObject *self,
+ PyObject *Py_UNUSED(ignored))
{
int ret;
PyErr_TDB_RAISE_IF_CLOSED(self);
Py_RETURN_NONE;
}
-static PyObject *obj_unlockall_read(PyTdbObject *self)
+static PyObject *obj_unlockall_read(PyTdbObject *self,
+ PyObject *Py_UNUSED(ignored))
{
int ret = tdb_unlockall_read(self->ctx);
PyErr_TDB_ERROR_IS_ERR_RAISE(ret, self->ctx);
Py_RETURN_NONE;
}
-static PyObject *obj_close(PyTdbObject *self)
+static PyObject *obj_close(PyTdbObject *self, PyObject *Py_UNUSED(ignored))
{
int ret;
if (self->closed)
Py_RETURN_NONE;
}
-static PyObject *obj_firstkey(PyTdbObject *self)
+static PyObject *obj_firstkey(PyTdbObject *self, PyObject *Py_UNUSED(ignored))
{
PyErr_TDB_RAISE_IF_CLOSED(self);
key = PyBytes_AsTDB_DATA(py_key);
if (!key.dptr)
return NULL;
-
+
return PyBytes_FromTDB_DATA(tdb_nextkey(self->ctx, key));
}
Py_RETURN_NONE;
}
-static PyObject *obj_has_key(PyTdbObject *self, PyObject *args)
+static int obj_contains(PyTdbObject *self, PyObject *py_key)
{
TDB_DATA key;
int ret;
- PyObject *py_key;
- PyErr_TDB_RAISE_IF_CLOSED(self);
-
- if (!PyArg_ParseTuple(args, "O", &py_key))
- return NULL;
+ PyErr_TDB_RAISE_RETURN_MINUS_1_IF_CLOSED(self);
key = PyBytes_AsTDB_DATA(py_key);
- if (!key.dptr)
- return NULL;
- ret = tdb_exists(self->ctx, key);
- if (ret != TDB_ERR_NOEXIST) {
- PyErr_TDB_ERROR_IS_ERR_RAISE(ret, self->ctx);
+ if (!key.dptr) {
+ PyErr_BadArgument();
+ return -1;
}
-
- return (ret == TDB_ERR_NOEXIST)?Py_False:Py_True;
+ ret = tdb_exists(self->ctx, key);
+ if (ret)
+ return 1;
+ return 0;
}
static PyObject *obj_store(PyTdbObject *self, PyObject *args)
Py_RETURN_NONE;
}
+static PyObject *obj_storev(PyTdbObject *self, PyObject *args)
+{
+ TDB_DATA key, *values, value;
+ int ret;
+ int flag = TDB_REPLACE;
+ Py_ssize_t num_values, i;
+ PyObject *py_key, *py_values, *py_value;
+
+ PyErr_TDB_RAISE_IF_CLOSED(self);
+
+ if (!PyArg_ParseTuple(
+ args, "OO!|i", &py_key, &PyList_Type, &py_values, &flag)) {
+ return NULL;
+ }
+
+ num_values = PyList_Size(py_values);
+
+ key = PyBytes_AsTDB_DATA(py_key);
+ if (key.dptr == NULL) {
+ return NULL;
+ }
+
+ if (SSIZE_MAX/sizeof(TDB_DATA) < num_values) {
+ PyErr_SetFromErrno(PyExc_OverflowError);
+ return NULL;
+ }
+ if (num_values > INT_MAX) {
+ PyErr_SetFromErrno(PyExc_OverflowError);
+ return NULL;
+ }
+ values = malloc(sizeof(TDB_DATA) * num_values);
+ if (values == NULL) {
+ PyErr_NoMemory();
+ return NULL;
+ }
+ for (i=0; i<num_values; i++) {
+ py_value = PyList_GetItem(py_values, i);
+ value = PyBytes_AsTDB_DATA(py_value);
+ if (!value.dptr) {
+ free(values);
+ return NULL;
+ }
+ values[i] = value;
+ }
+
+ ret = tdb_storev(self->ctx, key, values, (int)num_values, flag);
+ free(values);
+ PyErr_TDB_ERROR_IS_ERR_RAISE(ret, self->ctx);
+ Py_RETURN_NONE;
+}
+
static PyObject *obj_add_flags(PyTdbObject *self, PyObject *args)
{
unsigned flags;
static void tdb_iter_dealloc(PyTdbIteratorObject *self)
{
- Py_DECREF(self->iteratee);
+ Py_CLEAR(self->iteratee);
PyObject_Del(self);
}
.tp_iter = PyObject_SelfIter,
};
-static PyObject *tdb_object_iter(PyTdbObject *self)
+static PyObject *tdb_object_iter(PyTdbObject *self,
+ PyObject *Py_UNUSED(ignored))
{
- PyTdbIteratorObject *ret;
+ PyTdbIteratorObject *ret;
PyErr_TDB_RAISE_IF_CLOSED(self);
return (PyObject *)ret;
}
-static PyObject *obj_clear(PyTdbObject *self)
+static PyObject *obj_clear(PyTdbObject *self, PyObject *Py_UNUSED(ignored))
{
int ret;
PyErr_TDB_RAISE_IF_CLOSED(self);
Py_RETURN_NONE;
}
-static PyObject *obj_repack(PyTdbObject *self)
+static PyObject *obj_repack(PyTdbObject *self, PyObject *Py_UNUSED(ignored))
{
int ret;
PyErr_TDB_RAISE_IF_CLOSED(self);
Py_RETURN_NONE;
}
-static PyObject *obj_enable_seqnum(PyTdbObject *self)
+static PyObject *obj_enable_seqnum(PyTdbObject *self,
+ PyObject *Py_UNUSED(ignored))
{
PyErr_TDB_RAISE_IF_CLOSED(self);
tdb_enable_seqnum(self->ctx);
Py_RETURN_NONE;
}
-static PyObject *obj_increment_seqnum_nonblock(PyTdbObject *self)
+static PyObject *obj_increment_seqnum_nonblock(PyTdbObject *self,
+ PyObject *Py_UNUSED(ignored))
{
PyErr_TDB_RAISE_IF_CLOSED(self);
tdb_increment_seqnum_nonblock(self->ctx);
}
static PyMethodDef tdb_object_methods[] = {
- { "transaction_cancel", (PyCFunction)obj_transaction_cancel, METH_NOARGS,
+ { "transaction_cancel", (PyCFunction)obj_transaction_cancel, METH_NOARGS,
"S.transaction_cancel() -> None\n"
"Cancel the currently active transaction." },
{ "transaction_commit", (PyCFunction)obj_transaction_commit, METH_NOARGS,
"Return the next key in this database." },
{ "delete", (PyCFunction)obj_delete, METH_VARARGS, "S.delete(key) -> None\n"
"Delete an entry." },
- { "has_key", (PyCFunction)obj_has_key, METH_VARARGS, "S.has_key(key) -> None\n"
- "Check whether key exists in this database." },
{ "store", (PyCFunction)obj_store, METH_VARARGS, "S.store(key, data, flag=REPLACE) -> None"
"Store data." },
+ { "storev", (PyCFunction)obj_storev, METH_VARARGS, "S.storev(key, data, flag=REPLACE) -> None"
+ "Store several data." },
{ "add_flags", (PyCFunction)obj_add_flags, METH_VARARGS, "S.add_flags(flags) -> None" },
{ "remove_flags", (PyCFunction)obj_remove_flags, METH_VARARGS, "S.remove_flags(flags) -> None" },
- { "iterkeys", (PyCFunction)tdb_object_iter, METH_NOARGS, "S.iterkeys() -> iterator" },
+ { "keys", (PyCFunction)tdb_object_iter, METH_NOARGS, "S.keys() -> iterator" },
{ "clear", (PyCFunction)obj_clear, METH_NOARGS, "S.clear() -> None\n"
"Wipe the entire database." },
{ "repack", (PyCFunction)obj_repack, METH_NOARGS, "S.repack() -> None\n"
"S.enable_seqnum() -> None" },
{ "increment_seqnum_nonblock", (PyCFunction)obj_increment_seqnum_nonblock, METH_NOARGS,
"S.increment_seqnum_nonblock() -> None" },
- { NULL }
+ {0}
};
static PyObject *obj_get_hash_size(PyTdbObject *self, void *closure)
{
PyErr_TDB_RAISE_IF_CLOSED(self);
- return PyInt_FromLong(tdb_hash_size(self->ctx));
+ return PyLong_FromLong(tdb_hash_size(self->ctx));
}
static int obj_set_max_dead(PyTdbObject *self, PyObject *max_dead, void *closure)
{
PyErr_TDB_RAISE_RETURN_MINUS_1_IF_CLOSED(self);
- if (!PyInt_Check(max_dead))
+ if (!PyLong_Check(max_dead))
return -1;
- tdb_set_max_dead(self->ctx, PyInt_AsLong(max_dead));
+ tdb_set_max_dead(self->ctx, PyLong_AsLong(max_dead));
return 0;
}
static PyObject *obj_get_map_size(PyTdbObject *self, void *closure)
{
PyErr_TDB_RAISE_IF_CLOSED(self);
- return PyInt_FromLong(tdb_map_size(self->ctx));
+ return PyLong_FromLong(tdb_map_size(self->ctx));
}
static PyObject *obj_get_freelist_size(PyTdbObject *self, void *closure)
{
PyErr_TDB_RAISE_IF_CLOSED(self);
- return PyInt_FromLong(tdb_freelist_size(self->ctx));
+ return PyLong_FromLong(tdb_freelist_size(self->ctx));
}
static PyObject *obj_get_flags(PyTdbObject *self, void *closure)
{
PyErr_TDB_RAISE_IF_CLOSED(self);
- return PyInt_FromLong(tdb_get_flags(self->ctx));
+ return PyLong_FromLong(tdb_get_flags(self->ctx));
}
static PyObject *obj_get_filename(PyTdbObject *self, void *closure)
static PyObject *obj_get_seqnum(PyTdbObject *self, void *closure)
{
PyErr_TDB_RAISE_IF_CLOSED(self);
- return PyInt_FromLong(tdb_get_seqnum(self->ctx));
+ return PyLong_FromLong(tdb_get_seqnum(self->ctx));
}
+static PyObject *obj_get_text(PyTdbObject *self, void *closure)
+{
+ PyObject *mod, *cls, *inst;
+ mod = PyImport_ImportModule("_tdb_text");
+ if (mod == NULL)
+ return NULL;
+ cls = PyObject_GetAttrString(mod, "TdbTextWrapper");
+ if (cls == NULL) {
+ Py_DECREF(mod);
+ return NULL;
+ }
+ inst = PyObject_CallFunction(cls, discard_const_p(char, "O"), self);
+ Py_DECREF(mod);
+ Py_DECREF(cls);
+ return inst;
+}
static PyGetSetDef tdb_object_getsetters[] = {
- { discard_const_p(char, "hash_size"),
- (getter)obj_get_hash_size, NULL, NULL },
- { discard_const_p(char, "map_size"),
- (getter)obj_get_map_size, NULL, NULL },
- { discard_const_p(char, "freelist_size"),
- (getter)obj_get_freelist_size, NULL, NULL },
- { discard_const_p(char, "flags"),
- (getter)obj_get_flags, NULL, NULL },
- { discard_const_p(char, "max_dead"),
- NULL, (setter)obj_set_max_dead, NULL },
- { discard_const_p(char, "filename"),
- (getter)obj_get_filename, NULL,
- discard_const_p(char, "The filename of this TDB file.") },
- { discard_const_p(char, "seqnum"),
- (getter)obj_get_seqnum, NULL, NULL },
- { NULL }
+ {
+ .name = discard_const_p(char, "hash_size"),
+ .get = (getter)obj_get_hash_size,
+ },
+ {
+ .name = discard_const_p(char, "map_size"),
+ .get = (getter)obj_get_map_size,
+ },
+ {
+ .name = discard_const_p(char, "freelist_size"),
+ .get = (getter)obj_get_freelist_size,
+ },
+ {
+ .name = discard_const_p(char, "flags"),
+ .get = (getter)obj_get_flags,
+ },
+ {
+ .name = discard_const_p(char, "max_dead"),
+ .set = (setter)obj_set_max_dead,
+ },
+ {
+ .name = discard_const_p(char, "filename"),
+ .get = (getter)obj_get_filename,
+ .doc = discard_const_p(char, "The filename of this TDB file."),
+ },
+ {
+ .name = discard_const_p(char, "seqnum"),
+ .get = (getter)obj_get_seqnum,
+ },
+ {
+ .name = discard_const_p(char, "text"),
+ .get = (getter)obj_get_text,
+ },
+ { .name = NULL }
};
static PyObject *tdb_object_repr(PyTdbObject *self)
{
PyErr_TDB_RAISE_IF_CLOSED(self);
if (tdb_get_flags(self->ctx) & TDB_INTERNAL) {
- return PyStr_FromString("Tdb(<internal>)");
+ return PyUnicode_FromString("Tdb(<internal>)");
} else {
- return PyStr_FromFormat("Tdb('%s')", tdb_name(self->ctx));
+ return PyUnicode_FromFormat("Tdb('%s')", tdb_name(self->ctx));
}
}
val = tdb_fetch(self->ctx, tkey);
if (val.dptr == NULL) {
- PyErr_SetString(PyExc_KeyError, "No such TDB entry");
+ /*
+ * if the key doesn't exist raise KeyError(key) to be
+ * consistent with python dict
+ */
+ PyErr_SetObject(PyExc_KeyError, key);
return NULL;
} else {
return PyBytes_FromTDB_DATA(val);
tkey = PyBytes_AsTDB_DATA(key);
- if (value == NULL) {
+ if (value == NULL) {
ret = tdb_delete(self->ctx, tkey);
- } else {
+ } else {
if (!PyBytes_Check(value)) {
PyErr_SetString(PyExc_TypeError, "Expected string as value");
return -1;
if (ret != 0) {
PyErr_SetTDBError(self->ctx);
return -1;
- }
+ }
return ret;
}
.mp_subscript = (binaryfunc)obj_getitem,
.mp_ass_subscript = (objobjargproc)obj_setitem,
};
+static PySequenceMethods tdb_object_seq = {
+ .sq_contains = (objobjproc)obj_contains,
+};
static PyTypeObject PyTdb = {
.tp_name = "tdb.Tdb",
.tp_basicsize = sizeof(PyTdbObject),
.tp_repr = (reprfunc)tdb_object_repr,
.tp_dealloc = (destructor)tdb_object_dealloc,
.tp_as_mapping = &tdb_object_mapping,
- .tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_ITER,
- .tp_iter = (getiterfunc)tdb_object_iter,
+ .tp_as_sequence = &tdb_object_seq,
+ .tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE,
+ .tp_iter = PY_DISCARD_FUNC_SIG(getiterfunc,tdb_object_iter),
};
static PyMethodDef tdb_methods[] = {
- { "open", (PyCFunction)py_tdb_open, METH_VARARGS|METH_KEYWORDS, "open(name, hash_size=0, tdb_flags=TDB_DEFAULT, flags=O_RDWR, mode=0600)\n"
- "Open a TDB file." },
- { NULL }
+ {
+ .ml_name = "open",
+ .ml_meth = PY_DISCARD_FUNC_SIG(PyCFunction, py_tdb_open),
+ .ml_flags = METH_VARARGS|METH_KEYWORDS,
+ .ml_doc = "open(name, hash_size=0, tdb_flags=TDB_DEFAULT, "
+ "flags=O_RDWR, mode=0600)\nOpen a TDB file."
+ },
+ { .ml_name = NULL }
};
#define MODULE_DOC "simple key-value database that supports multiple writers."
-#if PY_MAJOR_VERSION >= 3
static struct PyModuleDef moduledef = {
PyModuleDef_HEAD_INIT,
.m_name = "tdb",
.m_size = -1,
.m_methods = tdb_methods,
};
-#endif
PyObject* module_init(void);
PyObject* module_init(void)
if (PyType_Ready(&PyTdbIterator) < 0)
return NULL;
-#if PY_MAJOR_VERSION >= 3
m = PyModule_Create(&moduledef);
-#else
- m = Py_InitModule3("tdb", tdb_methods, MODULE_DOC);
-#endif
if (m == NULL)
return NULL;
}
-#if PY_MAJOR_VERSION >= 3
PyMODINIT_FUNC PyInit_tdb(void);
PyMODINIT_FUNC PyInit_tdb(void)
{
return module_init();
}
-#else
-void inittdb(void);
-void inittdb(void)
-{
- module_init();
-}
-#endif
git.samba.org / samba.git / blobdiff