Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
ZODB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
ZODB
Commits
02e79f40
Commit
02e79f40
authored
Jun 19, 2002
by
Jeremy Hylton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify _BTree_setstate() based on changes in Zope3.
parent
8cd1aea1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
75 additions
and
78 deletions
+75
-78
src/BTrees/BTreeTemplate.c
src/BTrees/BTreeTemplate.c
+75
-78
No files found.
src/BTrees/BTreeTemplate.c
View file @
02e79f40
...
...
@@ -12,7 +12,7 @@
****************************************************************************/
#define BTREETEMPLATE_C "$Id: BTreeTemplate.c,v 1.6
2 2002/06/18 22:56:01 tim_one
Exp $\n"
#define BTREETEMPLATE_C "$Id: BTreeTemplate.c,v 1.6
3 2002/06/19 20:20:07 jeremy
Exp $\n"
/*
** _BTree_get
...
...
@@ -763,93 +763,90 @@ err:
static
int
_BTree_setstate
(
BTree
*
self
,
PyObject
*
state
,
int
noval
)
{
PyObject
*
items
,
*
firstbucket
=
0
;
BTreeItem
*
d
;
int
len
,
l
,
i
,
copied
=
1
;
PyObject
*
items
,
*
firstbucket
=
0
;
BTreeItem
*
d
;
int
len
,
l
,
i
,
copied
=
1
;
if
(
_BTree_clear
(
self
)
<
0
)
return
-
1
;
if
(
_BTree_clear
(
self
)
<
0
)
return
-
1
;
if
(
state
!=
Py_None
)
{
/* The state of a BTree can be one of the following:
None -- an empty BTree
A one-tuple -- a single bucket btree
A two-tuple -- a BTree with more than one bucket
See comments for BTree_getstate() for the details.
*/
if
(
!
PyArg_ParseTuple
(
state
,
"O|O"
,
&
items
,
&
firstbucket
)
)
return
-
1
;
if
(
state
==
Py_None
)
return
0
;
if
((
len
=
PyTuple_Size
(
items
))
<
0
)
return
-
1
;
len
=
(
len
+
1
)
/
2
;
assert
(
len
>
0
);
assert
(
self
->
size
==
0
);
/* XXX we called _BTree_clear() above! */
assert
(
self
->
data
==
NULL
);
/* ditto */
if
(
len
>
self
->
size
)
{
UNLESS
(
d
=
PyRealloc
(
self
->
data
,
sizeof
(
BTreeItem
)
*
len
))
return
-
1
;
self
->
data
=
d
;
self
->
size
=
len
;
}
if
(
!
PyArg_ParseTuple
(
state
,
"O|O:__setstate__"
,
&
items
,
&
firstbucket
))
return
-
1
;
for
(
i
=
0
,
d
=
self
->
data
,
l
=
0
;
i
<
len
;
i
++
,
d
++
)
{
if
(
i
)
{
COPY_KEY_FROM_ARG
(
d
->
key
,
PyTuple_GET_ITEM
(
items
,
l
),
copied
);
l
++
;
UNLESS
(
copied
)
return
-
1
;
INCREF_KEY
(
d
->
key
);
}
d
->
child
=
SIZED
(
PyTuple_GET_ITEM
(
items
,
l
));
if
(
PyTuple_Check
(
d
->
child
))
{
if
(
noval
)
{
d
->
child
=
SIZED
(
PyObject_CallObject
(
OBJECT
(
&
SetType
),
NULL
));
UNLESS
(
d
->
child
)
return
-
1
;
if
(
_set_setstate
(
BUCKET
(
d
->
child
),
PyTuple_GET_ITEM
(
items
,
l
))
<
0
)
return
-
1
;
}
else
{
d
->
child
=
SIZED
(
PyObject_CallObject
(
OBJECT
(
&
BucketType
),
NULL
));
UNLESS
(
d
->
child
)
return
-
1
;
if
(
_bucket_setstate
(
BUCKET
(
d
->
child
),
PyTuple_GET_ITEM
(
items
,
l
))
<
0
)
return
-
1
;
}
}
else
{
Py_INCREF
(
d
->
child
);
}
l
++
;
}
len
=
PyTuple_Size
(
items
);
if
(
len
<
0
)
return
-
1
;
len
=
(
len
+
1
)
/
2
;
assert
(
len
>
0
);
assert
(
self
->
size
==
0
);
/* XXX we called _BTree_clear() above! */
assert
(
self
->
data
==
NULL
);
/* ditto */
self
->
data
=
PyMalloc
(
sizeof
(
BTreeItem
)
*
len
);
if
(
self
->
data
==
NULL
)
return
-
1
;
self
->
size
=
len
;
for
(
i
=
0
,
d
=
self
->
data
,
l
=
0
;
i
<
len
;
i
++
,
d
++
)
{
PyObject
*
v
;
if
(
i
)
{
/* skip the first key slot */
COPY_KEY_FROM_ARG
(
d
->
key
,
PyTuple_GET_ITEM
(
items
,
l
),
copied
);
l
++
;
if
(
!
copied
)
return
-
1
;
INCREF_KEY
(
d
->
key
);
}
v
=
PyTuple_GET_ITEM
(
items
,
l
);
if
(
PyTuple_Check
(
v
))
{
/* Handle the special case in __getstate__() for a BTree
with a single bucket. */
if
(
noval
)
{
d
->
child
=
SIZED
(
PyObject_CallObject
(
OBJECT
(
&
SetType
),
NULL
));
UNLESS
(
d
->
child
)
return
-
1
;
if
(
_set_setstate
(
BUCKET
(
d
->
child
),
v
)
<
0
)
return
-
1
;
}
else
{
d
->
child
=
SIZED
(
PyObject_CallObject
(
OBJECT
(
&
BucketType
),
NULL
));
UNLESS
(
d
->
child
)
return
-
1
;
if
(
_bucket_setstate
(
BUCKET
(
d
->
child
),
v
)
<
0
)
return
-
1
;
}
}
else
{
d
->
child
=
(
Sized
*
)
v
;
Py_INCREF
(
v
);
}
l
++
;
}
assert
(
len
>
0
);
if
(
len
)
{
if
(
!
firstbucket
)
firstbucket
=
OBJECT
(
self
->
data
->
child
);
if
(
!
firstbucket
)
firstbucket
=
OBJECT
(
self
->
data
->
child
);
UNLESS
(
ExtensionClassSubclassInstance_Check
(
firstbucket
,
noval
?
&
SetType
:
&
BucketType
))
{
PyErr_SetString
(
PyExc_TypeError
,
"No firstbucket in non-empty BTree"
);
return
-
1
;
}
if
(
!
ExtensionClassSubclassInstance_Check
(
firstbucket
,
noval
?
&
SetType
:
&
BucketType
))
{
PyErr_SetString
(
PyExc_TypeError
,
"No firstbucket in non-empty BTree"
);
return
-
1
;
}
self
->
firstbucket
=
BUCKET
(
firstbucket
);
Py_INCREF
(
firstbucket
);
assert
(
firstbucket
->
ob_refcnt
>
1
);
}
self
->
firstbucket
=
BUCKET
(
firstbucket
);
Py_INCREF
(
firstbucket
);
assert
(
firstbucket
->
ob_refcnt
>
1
);
self
->
len
=
len
;
}
self
->
len
=
len
;
return
0
;
return
0
;
}
static
PyObject
*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment