Skip to content

Z
ZEO
Commit a850f002 authored by Jeremy Hylton's avatar Jeremy Hylton
Browse files
Options

Fix a small bug -- PyDict_SetItem() returns -1 on error, not 0. 

Add check that argument to cc_ass_sub() is a string.  The cache maps
oids to objects, and oids must be strings for now.

Re-indent a bunch of code.

Replace an XXX comment about v->oid with a comment explaining why
getattr is necessary.
parent 96e76111
Show whitespace changes
Inline Side-by-side
Showing with 120 additions and 87 deletions
src/Persistence/cPickleCache.c
View file @ a850f002
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
static char cPickleCache_doc_string[] = static char cPickleCache_doc_string[] =
"Defines the PickleCache used by ZODB Connection objects.\n" "Defines the PickleCache used by ZODB Connection objects.\n"
"\n" "\n"
"$Id: cPickleCache.c,v 1.49 2002/04/02 22:22:03 bwarsaw Exp $\n"; "$Id: cPickleCache.c,v 1.50 2002/04/03 00:03:32 jeremy Exp $\n";
#define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;} #define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;}
#define UNLESS(E) if(!(E)) #define UNLESS(E) if(!(E))
...@@ -691,13 +691,15 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v) ...@@ -691,13 +691,15 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v)
return -1; return -1;
} }
/* XXX Why not self->oid? */ /* Can't access v->oid directly because the object might be a
* persistent class.
*/
oid = PyObject_GetAttr(v, py__p_oid); oid = PyObject_GetAttr(v, py__p_oid);
if (oid == NULL) if (oid == NULL)
return -1; return -1;
/* XXX key and oid should both be PyString objects */ /* XXX key and oid should both be PyString objects */
if (PyObject_Cmp(key, oid, &result)) { if (PyObject_Cmp(key, oid, &result) < 0) {
Py_DECREF(oid); Py_DECREF(oid);
return -1; return -1;
} }
...@@ -709,7 +711,6 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v) ...@@ -709,7 +711,6 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v)
} }
object_again = object_from_oid(self, key); object_again = object_from_oid(self, key);
if (object_again) { if (object_again) {
/* XXX Do we need to check for this? */
if (object_again != v) { if (object_again != v) {
Py_DECREF(object_again); Py_DECREF(object_again);
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
...@@ -748,8 +749,8 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v) ...@@ -748,8 +749,8 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v)
if (PyDict_SetItem(self->data, key, v)) if (PyDict_SetItem(self->data, key, v))
return -1; return -1;
Py_INCREF(self);
p = (cPersistentObject *)v; p = (cPersistentObject *)v;
Py_INCREF(self);
p->cache = (PerCache *)self; p->cache = (PerCache *)self;
if (p->state >= 0) { if (p->state >= 0) {
/* insert this non-ghost object into the ring just /* insert this non-ghost object into the ring just
...@@ -825,6 +826,11 @@ cc_del_item(ccobject *self, PyObject *key) ...@@ -825,6 +826,11 @@ cc_del_item(ccobject *self, PyObject *key)
static int static int
cc_ass_sub(ccobject *self, PyObject *key, PyObject *v) cc_ass_sub(ccobject *self, PyObject *key, PyObject *v)
{ {
if (!PyString_Check(key)) {
PyErr_Format("cPickleCache key must be a string, not a %s",
key->ob_type->tp_name);
return NULL;
}
if (v) if (v)
return cc_add_item(self, key, v); return cc_add_item(self, key, v);
else else
...@@ -941,25 +947,30 @@ newccobject(PyObject *jar, int cache_size, int cache_age) ...@@ -941,25 +947,30 @@ newccobject(PyObject *jar, int cache_size, int cache_age)
{ {
ccobject *self; ccobject *self;
UNLESS(self = PyObject_NEW(ccobject, &Cctype)) return NULL; self = PyObject_NEW(ccobject, &Cctype);
self->setklassstate=self->jar=NULL; if (self == NULL)
if ((self->data=PyDict_New())) return NULL;
{ self->setklassstate = self->jar = NULL;
self->jar=jar; self->data = PyDict_New();
Py_INCREF(jar); if (self->data == NULL) {
UNLESS (self->setklassstate=PyObject_GetAttrString(jar, "setklassstate")) Py_DECREF(self);
return NULL; return NULL;
self->cache_size=cache_size;
self->non_ghost_count=0;
self->klass_count=0;
self->cache_drain_resistance=0;
self->ring_lock=0;
self->ring_home.next = &self->ring_home;
self->ring_home.prev = &self->ring_home;
return self;
} }
self->setklassstate = PyObject_GetAttrString(jar, "setklassstate");
if (self->setklassstate == NULL) {
Py_DECREF(self); Py_DECREF(self);
return NULL; return NULL;
}
self->jar = jar;
Py_INCREF(jar);
self->cache_size = cache_size;
self->non_ghost_count = 0;
self->klass_count = 0;
self->cache_drain_resistance = 0;
self->ring_lock = 0;
self->ring_home.next = &self->ring_home;
self->ring_home.prev = &self->ring_home;
return self;
} }
static PyObject * static PyObject *
...@@ -968,9 +979,9 @@ cCM_new(PyObject *self, PyObject *args) ...@@ -968,9 +979,9 @@ cCM_new(PyObject *self, PyObject *args)
int cache_size=100, cache_age=1000; int cache_size=100, cache_age=1000;
PyObject *jar; PyObject *jar;
UNLESS(PyArg_ParseTuple(args, "O|ii", &jar, &cache_size, &cache_age)) if (!PyArg_ParseTuple(args, "O|ii", &jar, &cache_size, &cache_age))
return NULL; return NULL;
return (PyObject*)newccobject(jar, cache_size,cache_age); return (PyObject*)newccobject(jar, cache_size, cache_age);
} }
static struct PyMethodDef cCM_methods[] = { static struct PyMethodDef cCM_methods[] = {
......
src/ZODB/cPickleCache.c
View file @ a850f002
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
static char cPickleCache_doc_string[] = static char cPickleCache_doc_string[] =
"Defines the PickleCache used by ZODB Connection objects.\n" "Defines the PickleCache used by ZODB Connection objects.\n"
"\n" "\n"
"$Id: cPickleCache.c,v 1.49 2002/04/02 22:22:03 bwarsaw Exp $\n"; "$Id: cPickleCache.c,v 1.50 2002/04/03 00:03:32 jeremy Exp $\n";
#define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;} #define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;}
#define UNLESS(E) if(!(E)) #define UNLESS(E) if(!(E))
...@@ -691,13 +691,15 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v) ...@@ -691,13 +691,15 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v)
return -1; return -1;
} }
/* XXX Why not self->oid? */ /* Can't access v->oid directly because the object might be a
* persistent class.
*/
oid = PyObject_GetAttr(v, py__p_oid); oid = PyObject_GetAttr(v, py__p_oid);
if (oid == NULL) if (oid == NULL)
return -1; return -1;
/* XXX key and oid should both be PyString objects */ /* XXX key and oid should both be PyString objects */
if (PyObject_Cmp(key, oid, &result)) { if (PyObject_Cmp(key, oid, &result) < 0) {
Py_DECREF(oid); Py_DECREF(oid);
return -1; return -1;
} }
...@@ -709,7 +711,6 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v) ...@@ -709,7 +711,6 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v)
} }
object_again = object_from_oid(self, key); object_again = object_from_oid(self, key);
if (object_again) { if (object_again) {
/* XXX Do we need to check for this? */
if (object_again != v) { if (object_again != v) {
Py_DECREF(object_again); Py_DECREF(object_again);
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
...@@ -748,8 +749,8 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v) ...@@ -748,8 +749,8 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v)
if (PyDict_SetItem(self->data, key, v)) if (PyDict_SetItem(self->data, key, v))
return -1; return -1;
Py_INCREF(self);
p = (cPersistentObject *)v; p = (cPersistentObject *)v;
Py_INCREF(self);
p->cache = (PerCache *)self; p->cache = (PerCache *)self;
if (p->state >= 0) { if (p->state >= 0) {
/* insert this non-ghost object into the ring just /* insert this non-ghost object into the ring just
...@@ -825,6 +826,11 @@ cc_del_item(ccobject *self, PyObject *key) ...@@ -825,6 +826,11 @@ cc_del_item(ccobject *self, PyObject *key)
static int static int
cc_ass_sub(ccobject *self, PyObject *key, PyObject *v) cc_ass_sub(ccobject *self, PyObject *key, PyObject *v)
{ {
if (!PyString_Check(key)) {
PyErr_Format("cPickleCache key must be a string, not a %s",
key->ob_type->tp_name);
return NULL;
}
if (v) if (v)
return cc_add_item(self, key, v); return cc_add_item(self, key, v);
else else
...@@ -941,25 +947,30 @@ newccobject(PyObject *jar, int cache_size, int cache_age) ...@@ -941,25 +947,30 @@ newccobject(PyObject *jar, int cache_size, int cache_age)
{ {
ccobject *self; ccobject *self;
UNLESS(self = PyObject_NEW(ccobject, &Cctype)) return NULL; self = PyObject_NEW(ccobject, &Cctype);
self->setklassstate=self->jar=NULL; if (self == NULL)
if ((self->data=PyDict_New())) return NULL;
{ self->setklassstate = self->jar = NULL;
self->jar=jar; self->data = PyDict_New();
Py_INCREF(jar); if (self->data == NULL) {
UNLESS (self->setklassstate=PyObject_GetAttrString(jar, "setklassstate")) Py_DECREF(self);
return NULL; return NULL;
self->cache_size=cache_size;
self->non_ghost_count=0;
self->klass_count=0;
self->cache_drain_resistance=0;
self->ring_lock=0;
self->ring_home.next = &self->ring_home;
self->ring_home.prev = &self->ring_home;
return self;
} }
self->setklassstate = PyObject_GetAttrString(jar, "setklassstate");
if (self->setklassstate == NULL) {
Py_DECREF(self); Py_DECREF(self);
return NULL; return NULL;
}
self->jar = jar;
Py_INCREF(jar);
self->cache_size = cache_size;
self->non_ghost_count = 0;
self->klass_count = 0;
self->cache_drain_resistance = 0;
self->ring_lock = 0;
self->ring_home.next = &self->ring_home;
self->ring_home.prev = &self->ring_home;
return self;
} }
static PyObject * static PyObject *
...@@ -968,9 +979,9 @@ cCM_new(PyObject *self, PyObject *args) ...@@ -968,9 +979,9 @@ cCM_new(PyObject *self, PyObject *args)
int cache_size=100, cache_age=1000; int cache_size=100, cache_age=1000;
PyObject *jar; PyObject *jar;
UNLESS(PyArg_ParseTuple(args, "O|ii", &jar, &cache_size, &cache_age)) if (!PyArg_ParseTuple(args, "O|ii", &jar, &cache_size, &cache_age))
return NULL; return NULL;
return (PyObject*)newccobject(jar, cache_size,cache_age); return (PyObject*)newccobject(jar, cache_size, cache_age);
} }
static struct PyMethodDef cCM_methods[] = { static struct PyMethodDef cCM_methods[] = {
......
src/persistent/cPickleCache.c
View file @ a850f002
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
static char cPickleCache_doc_string[] = static char cPickleCache_doc_string[] =
"Defines the PickleCache used by ZODB Connection objects.\n" "Defines the PickleCache used by ZODB Connection objects.\n"
"\n" "\n"
"$Id: cPickleCache.c,v 1.49 2002/04/02 22:22:03 bwarsaw Exp $\n"; "$Id: cPickleCache.c,v 1.50 2002/04/03 00:03:32 jeremy Exp $\n";
#define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;} #define ASSIGN(V,E) {PyObject *__e; __e=(E); Py_XDECREF(V); (V)=__e;}
#define UNLESS(E) if(!(E)) #define UNLESS(E) if(!(E))
...@@ -691,13 +691,15 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v) ...@@ -691,13 +691,15 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v)
return -1; return -1;
} }
/* XXX Why not self->oid? */ /* Can't access v->oid directly because the object might be a
* persistent class.
*/
oid = PyObject_GetAttr(v, py__p_oid); oid = PyObject_GetAttr(v, py__p_oid);
if (oid == NULL) if (oid == NULL)
return -1; return -1;
/* XXX key and oid should both be PyString objects */ /* XXX key and oid should both be PyString objects */
if (PyObject_Cmp(key, oid, &result)) { if (PyObject_Cmp(key, oid, &result) < 0) {
Py_DECREF(oid); Py_DECREF(oid);
return -1; return -1;
} }
...@@ -709,7 +711,6 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v) ...@@ -709,7 +711,6 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v)
} }
object_again = object_from_oid(self, key); object_again = object_from_oid(self, key);
if (object_again) { if (object_again) {
/* XXX Do we need to check for this? */
if (object_again != v) { if (object_again != v) {
Py_DECREF(object_again); Py_DECREF(object_again);
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
...@@ -748,8 +749,8 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v) ...@@ -748,8 +749,8 @@ cc_add_item(ccobject *self, PyObject *key, PyObject *v)
if (PyDict_SetItem(self->data, key, v)) if (PyDict_SetItem(self->data, key, v))
return -1; return -1;
Py_INCREF(self);
p = (cPersistentObject *)v; p = (cPersistentObject *)v;
Py_INCREF(self);
p->cache = (PerCache *)self; p->cache = (PerCache *)self;
if (p->state >= 0) { if (p->state >= 0) {
/* insert this non-ghost object into the ring just /* insert this non-ghost object into the ring just
...@@ -825,6 +826,11 @@ cc_del_item(ccobject *self, PyObject *key) ...@@ -825,6 +826,11 @@ cc_del_item(ccobject *self, PyObject *key)
static int static int
cc_ass_sub(ccobject *self, PyObject *key, PyObject *v) cc_ass_sub(ccobject *self, PyObject *key, PyObject *v)
{ {
if (!PyString_Check(key)) {
PyErr_Format("cPickleCache key must be a string, not a %s",
key->ob_type->tp_name);
return NULL;
}
if (v) if (v)
return cc_add_item(self, key, v); return cc_add_item(self, key, v);
else else
...@@ -941,25 +947,30 @@ newccobject(PyObject *jar, int cache_size, int cache_age) ...@@ -941,25 +947,30 @@ newccobject(PyObject *jar, int cache_size, int cache_age)
{ {
ccobject *self; ccobject *self;
UNLESS(self = PyObject_NEW(ccobject, &Cctype)) return NULL; self = PyObject_NEW(ccobject, &Cctype);
self->setklassstate=self->jar=NULL; if (self == NULL)
if ((self->data=PyDict_New())) return NULL;
{ self->setklassstate = self->jar = NULL;
self->jar=jar; self->data = PyDict_New();
Py_INCREF(jar); if (self->data == NULL) {
UNLESS (self->setklassstate=PyObject_GetAttrString(jar, "setklassstate")) Py_DECREF(self);
return NULL; return NULL;
self->cache_size=cache_size;
self->non_ghost_count=0;
self->klass_count=0;
self->cache_drain_resistance=0;
self->ring_lock=0;
self->ring_home.next = &self->ring_home;
self->ring_home.prev = &self->ring_home;
return self;
} }
self->setklassstate = PyObject_GetAttrString(jar, "setklassstate");
if (self->setklassstate == NULL) {
Py_DECREF(self); Py_DECREF(self);
return NULL; return NULL;
}
self->jar = jar;
Py_INCREF(jar);
self->cache_size = cache_size;
self->non_ghost_count = 0;
self->klass_count = 0;
self->cache_drain_resistance = 0;
self->ring_lock = 0;
self->ring_home.next = &self->ring_home;
self->ring_home.prev = &self->ring_home;
return self;
} }
static PyObject * static PyObject *
...@@ -968,9 +979,9 @@ cCM_new(PyObject *self, PyObject *args) ...@@ -968,9 +979,9 @@ cCM_new(PyObject *self, PyObject *args)
int cache_size=100, cache_age=1000; int cache_size=100, cache_age=1000;
PyObject *jar; PyObject *jar;
UNLESS(PyArg_ParseTuple(args, "O|ii", &jar, &cache_size, &cache_age)) if (!PyArg_ParseTuple(args, "O|ii", &jar, &cache_size, &cache_age))
return NULL; return NULL;
return (PyObject*)newccobject(jar, cache_size,cache_age); return (PyObject*)newccobject(jar, cache_size, cache_age);
} }
static struct PyMethodDef cCM_methods[] = { static struct PyMethodDef cCM_methods[] = {
......
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