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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Nicolas Wavrant
ZODB
Commits
e9e6f3dc
Commit
e9e6f3dc
authored
Aug 29, 2008
by
Jim Fulton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug Fixed: Packing failed for databases containing cross-database references.
parent
96933dd7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
23 deletions
+29
-23
src/ZODB/serialize.py
src/ZODB/serialize.py
+8
-23
src/ZODB/tests/PackableStorage.py
src/ZODB/tests/PackableStorage.py
+21
-0
No files found.
src/ZODB/serialize.py
View file @
e9e6f3dc
...
@@ -605,17 +605,14 @@ class ObjectReader:
...
@@ -605,17 +605,14 @@ class ObjectReader:
obj
.
__setstate__
(
state
)
obj
.
__setstate__
(
state
)
oid_loaders
=
{
'w'
:
lambda
oid
:
None
,
}
def
referencesf
(
p
,
oids
=
None
):
def
referencesf
(
p
,
oids
=
None
):
"""Return a list of object ids found in a pickle
"""Return a list of object ids found in a pickle
A list may be passed in, in which case, information is
A list may be passed in, in which case, information is
appended to it.
appended to it.
Weak references are not included.
Only ordinary internal references are included.
Weak and multi-database references are not included.
"""
"""
refs
=
[]
refs
=
[]
...
@@ -636,15 +633,9 @@ def referencesf(p, oids=None):
...
@@ -636,15 +633,9 @@ def referencesf(p, oids=None):
elif
isinstance
(
reference
,
str
):
elif
isinstance
(
reference
,
str
):
oid
=
reference
oid
=
reference
else
:
else
:
try
:
assert
isinstance
(
reference
,
list
)
reference_type
,
args
=
reference
except
ValueError
:
# weakref
continue
continue
else
:
oid
=
oid_loaders
[
reference_type
](
*
args
)
if
oid
:
oids
.
append
(
oid
)
oids
.
append
(
oid
)
return
oids
return
oids
...
@@ -678,15 +669,9 @@ def get_refs(a_pickle):
...
@@ -678,15 +669,9 @@ def get_refs(a_pickle):
elif
isinstance
(
reference
,
str
):
elif
isinstance
(
reference
,
str
):
data
=
reference
,
None
data
=
reference
,
None
else
:
else
:
try
:
assert
isinstance
(
reference
,
list
)
reference_type
,
args
=
reference
except
ValueError
:
# weakref
continue
continue
else
:
data
=
oid_klass_loaders
[
reference_type
](
*
args
)
if
data
:
result
.
append
(
data
)
result
.
append
(
data
)
return
result
return
result
src/ZODB/tests/PackableStorage.py
View file @
e9e6f3dc
...
@@ -38,6 +38,8 @@ from ZODB.POSException import ConflictError, StorageError
...
@@ -38,6 +38,8 @@ from ZODB.POSException import ConflictError, StorageError
from
ZODB.tests.MTStorage
import
TestThread
from
ZODB.tests.MTStorage
import
TestThread
import
ZODB.tests.util
ZERO
=
'
\
0
'
*
8
ZERO
=
'
\
0
'
*
8
...
@@ -311,6 +313,24 @@ class PackableStorage(PackableStorageBase):
...
@@ -311,6 +313,24 @@ class PackableStorage(PackableStorageBase):
pass
pass
it
.
close
()
it
.
close
()
def
checkPackWithMultiDatabaseReferences
(
self
):
databases
=
{}
db
=
DB
(
self
.
_storage
,
databases
=
databases
,
database_name
=
''
)
otherdb
=
ZODB
.
tests
.
util
.
DB
(
databases
=
databases
,
database_name
=
'o'
)
conn
=
db
.
open
()
root
=
conn
.
root
()
root
[
1
]
=
C
()
transaction
.
commit
()
del
root
[
1
]
transaction
.
commit
()
root
[
2
]
=
conn
.
get_connection
(
'o'
).
root
()
transaction
.
commit
()
db
.
pack
(
time
.
time
()
+
1
)
assert
(
len
(
self
.
_storage
)
==
1
)
class
PackableUndoStorage
(
PackableStorageBase
):
class
PackableUndoStorage
(
PackableStorageBase
):
def
checkPackAllRevisions
(
self
):
def
checkPackAllRevisions
(
self
):
...
@@ -705,3 +725,4 @@ class ElapsedTimer:
...
@@ -705,3 +725,4 @@ class ElapsedTimer:
def
elapsed_millis
(
self
):
def
elapsed_millis
(
self
):
return
int
((
time
.
time
()
-
self
.
start_time
)
*
1000
)
return
int
((
time
.
time
()
-
self
.
start_time
)
*
1000
)
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