Commit f7700783 authored by Tim Peters's avatar Tim Peters

_BTree_set(): Still on the trail of a bug here. Simplified some of the

code and slashed nesting depth, but no semantic changes yet.
parent 8fd36a69
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
****************************************************************************/ ****************************************************************************/
#define BTREETEMPLATE_C "$Id: BTreeTemplate.c,v 1.39 2002/06/10 20:38:06 tim_one Exp $\n" #define BTREETEMPLATE_C "$Id: BTreeTemplate.c,v 1.40 2002/06/11 00:19:19 tim_one Exp $\n"
/* /*
** _BTree_get ** _BTree_get
...@@ -367,93 +367,93 @@ _BTree_set(BTree *self, PyObject *keyarg, PyObject *value, ...@@ -367,93 +367,93 @@ _BTree_set(BTree *self, PyObject *keyarg, PyObject *value,
&bchanged); &bchanged);
if (grew < 0) if (grew < 0)
goto err; goto err;
if (grew == 0)
goto Done;
/* A bucket changed size. */
bchanged = 1;
if (value) {
/* A bucket got bigger. */
int toobig;
if (SameType_Check(self, d->child))
toobig = BTREE(d->child)->len > MAX_BTREE_SIZE(d->child);
else
toobig = BUCKET(d->child)->len > MAX_BUCKET_SIZE(d->child);
if (toobig) {
if (BTree_grow(self, min, noval) < 0)
goto err;
changed = 1;
}
goto Done;
}
if (grew) { /* A bucket got smaller. */
bchanged = 1; /* A bucket changed size */ if (min && grew > 1) {
if (value) { /* got bigger */ /* Somebody below us deleted their first bucket and */
if (SameType_Check(self, d->child)) { /* an intermediate tree couldn't handle it. */
if (BTREE(d->child)->len > MAX_BTREE_SIZE(d->child)) { if (BTree_deleteNextBucket(BTREE(d[-1].child)) < 0)
if (BTree_grow(self, min, noval) < 0) goto err;
goto err; grew = 1; /* Reset flag, since we handled it */
changed = 1; }
} if (d->child->len > 0)
goto Done;
/* The child became empty. */
if (!SameType_Check(self, d->child)) {
/* We are about to delete a bucket. */
if (min) {
/* If it's not our first bucket, we can tell the
previous bucket to adjust it's reference to it. */
if (Bucket_deleteNextBucket(BUCKET(d[-1].child)) < 0)
goto err;
}
else {
/* If it's the first bucket, we can't adjust the
reference to it ourselves, so we'll just
increment the grew flag to indicate to a
parent node that it's last bucket should
adjust its reference. If there is no parent,
then there's nothing to do. */
grew++;
}
}
self->len--;
Py_DECREF(d->child);
if (min) {
DECREF_KEY(d->key);
}
if (min < self->len)
memmove(d, d+1, (self->len-min)*sizeof(BTreeItem));
if (!min) {
if (self->len) {
/* We just deleted our first child, so we need to
adjust our first bucket. */
if (SameType_Check(self, self->data->child)) {
UNLESS (PER_USE(BTREE(self->data->child)))
goto err;
ASSIGNB(self->firstbucket,
BTREE(self->data->child)->firstbucket);
Py_XINCREF(self->firstbucket);
PER_ALLOW_DEACTIVATION(BTREE(self->data->child));
PER_ACCESSED(BTREE(self->data->child));
} }
else { else {
if (BUCKET(d->child)->len > MAX_BUCKET_SIZE(d->child)) { ASSIGNB(self->firstbucket, BUCKET(self->data->child));
if (BTree_grow(self, min, noval) < 0) Py_INCREF(self->firstbucket);
goto err;
changed = 1;
}
}
}
else { /* got smaller */
if (min && grew > 1) {
/* Somebody below us deleted their first bucket and */
/* and an intermediate tree couldn't handle it. */
if (BTree_deleteNextBucket(BTREE(d[-1].child)) < 0)
goto err;
grew = 1; /* Reset flag, since we handled it */
}
if (BUCKET(d->child)->len == 0) { /* Got empty */
if (!SameType_Check(self, d->child)) {
/* We are about to delete a bucket. */
if (min) {
/* If it's not our first bucket, we can tell the
previous bucket to adjust it's reference to
it. */
if (Bucket_deleteNextBucket(BUCKET(d[-1].child)) < 0)
goto err;
}
else {
/* If it's the first bucket, we can't adjust the
reference to it ourselves, so we'll just
increment the grew flag to indicate to a
parent node that it's last bucket should
adjust its reference. If there is no parent,
then there's nothing to do. */
grew++;
}
}
self->len--;
Py_DECREF(d->child);
if (min) {
DECREF_KEY(d->key);
}
if (min < self->len)
memmove(d, d+1, (self->len-min)*sizeof(BTreeItem));
if (!min) {
if (self->len) {
/* We just deleted our first child, so we need to
adjust our first bucket. */
if (SameType_Check(self, self->data->child)) {
UNLESS (PER_USE(BTREE(self->data->child)))
goto err;
ASSIGNB(self->firstbucket,
BTREE(self->data->child)->firstbucket);
Py_XINCREF(self->firstbucket);
PER_ALLOW_DEACTIVATION(BTREE(self->data->child));
PER_ACCESSED(BTREE(self->data->child));
}
else {
ASSIGNB(self->firstbucket,
BUCKET(self->data->child));
Py_INCREF(self->firstbucket);
}
/* We can toss our first key now */
DECREF_KEY(self->data->key);
}
else {
Py_XDECREF(self->firstbucket);
self->firstbucket = 0;
}
}
changed=1;
} }
/* We can toss our first key now */
DECREF_KEY(self->data->key);
}
else {
Py_XDECREF(self->firstbucket);
self->firstbucket = 0;
} }
} }
changed = 1;
Done:
#ifdef PERSISTENT #ifdef PERSISTENT
if (changed if (changed
|| (bchanged /* The bucket changed */ || (bchanged /* The bucket changed */
...@@ -470,7 +470,7 @@ _BTree_set(BTree *self, PyObject *keyarg, PyObject *value, ...@@ -470,7 +470,7 @@ _BTree_set(BTree *self, PyObject *keyarg, PyObject *value,
PER_ACCESSED(self); PER_ACCESSED(self);
return grew; return grew;
err: err:
PER_ALLOW_DEACTIVATION(self); PER_ALLOW_DEACTIVATION(self);
PER_ACCESSED(self); PER_ACCESSED(self);
return -1; return -1;
......
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