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
Joshua
zodb
Commits
3b23646c
Commit
3b23646c
authored
Jul 12, 2010
by
Jim Fulton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make sure the temporary savepoint storage is closed properly.
parent
470a41f5
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
30 additions
and
27 deletions
+30
-27
src/ZODB/Connection.py
src/ZODB/Connection.py
+30
-27
No files found.
src/ZODB/Connection.py
View file @
3b23646c
...
@@ -1099,7 +1099,7 @@ class Connection(ExportImport, object):
...
@@ -1099,7 +1099,7 @@ class Connection(ExportImport, object):
src
=
self
.
_savepoint_storage
src
=
self
.
_savepoint_storage
self
.
_storage
=
self
.
_normal_storage
self
.
_storage
=
self
.
_normal_storage
self
.
_savepoint_storage
=
None
self
.
_savepoint_storage
=
None
try
:
self
.
_log
.
debug
(
"Committing savepoints of size %s"
,
src
.
getSize
())
self
.
_log
.
debug
(
"Committing savepoints of size %s"
,
src
.
getSize
())
oids
=
src
.
index
.
keys
()
oids
=
src
.
index
.
keys
()
...
@@ -1111,11 +1111,13 @@ class Connection(ExportImport, object):
...
@@ -1111,11 +1111,13 @@ class Connection(ExportImport, object):
data
,
serial
=
src
.
load
(
oid
,
src
)
data
,
serial
=
src
.
load
(
oid
,
src
)
obj
=
self
.
_cache
.
get
(
oid
,
None
)
obj
=
self
.
_cache
.
get
(
oid
,
None
)
if
obj
is
not
None
:
if
obj
is
not
None
:
self
.
_cache
.
update_object_size_estimation
(
obj
.
_p_oid
,
len
(
data
))
self
.
_cache
.
update_object_size_estimation
(
obj
.
_p_oid
,
len
(
data
))
obj
.
_p_estimated_size
=
len
(
data
)
obj
.
_p_estimated_size
=
len
(
data
)
if
isinstance
(
self
.
_reader
.
getGhost
(
data
),
Blob
):
if
isinstance
(
self
.
_reader
.
getGhost
(
data
),
Blob
):
blobfilename
=
src
.
loadBlob
(
oid
,
serial
)
blobfilename
=
src
.
loadBlob
(
oid
,
serial
)
s
=
self
.
_storage
.
storeBlob
(
oid
,
serial
,
data
,
blobfilename
,
s
=
self
.
_storage
.
storeBlob
(
oid
,
serial
,
data
,
blobfilename
,
''
,
transaction
)
''
,
transaction
)
# we invalidate the object here in order to ensure
# we invalidate the object here in order to ensure
# that that the next attribute access of its name
# that that the next attribute access of its name
...
@@ -1127,6 +1129,7 @@ class Connection(ExportImport, object):
...
@@ -1127,6 +1129,7 @@ class Connection(ExportImport, object):
''
,
transaction
)
''
,
transaction
)
self
.
_handle_serial
(
oid
,
s
,
change
=
False
)
self
.
_handle_serial
(
oid
,
s
,
change
=
False
)
finally
:
src
.
close
()
src
.
close
()
def
_abort_savepoint
(
self
):
def
_abort_savepoint
(
self
):
...
...
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