Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
ZEO
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
ZEO
Commits
2fe24944
Commit
2fe24944
authored
Jun 24, 2003
by
Jim Fulton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added a database removeVersionPool method to remove a version pool.
parent
b301836e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
109 additions
and
8 deletions
+109
-8
src/ZODB/DB.py
src/ZODB/DB.py
+29
-5
src/ZODB/tests/testDB.py
src/ZODB/tests/testDB.py
+80
-3
No files found.
src/ZODB/DB.py
View file @
2fe24944
...
@@ -13,8 +13,8 @@
...
@@ -13,8 +13,8 @@
##############################################################################
##############################################################################
"""Database objects
"""Database objects
$Id: DB.py,v 1.5
0 2003/04/23 20:05:51 jeremy
Exp $"""
$Id: DB.py,v 1.5
1 2003/06/24 21:29:54 jim
Exp $"""
__version__
=
'$Revision: 1.5
0
$'
[
11
:
-
2
]
__version__
=
'$Revision: 1.5
1
$'
[
11
:
-
2
]
import
cPickle
,
cStringIO
,
sys
,
POSException
,
UndoLogCompatible
import
cPickle
,
cStringIO
,
sys
,
POSException
,
UndoLogCompatible
from
Connection
import
Connection
from
Connection
import
Connection
...
@@ -136,12 +136,23 @@ class DB(UndoLogCompatible.UndoLogCompatible):
...
@@ -136,12 +136,23 @@ class DB(UndoLogCompatible.UndoLogCompatible):
am
.
closedConnection
(
connection
)
am
.
closedConnection
(
connection
)
version
=
connection
.
_version
version
=
connection
.
_version
pools
,
pooll
=
self
.
_pools
pools
,
pooll
=
self
.
_pools
pool
,
allocated
,
pool_lock
=
pools
[
version
]
try
:
pool
,
allocated
,
pool_lock
=
pools
[
version
]
except
KeyError
:
# No such version. We must have deleted the pool.
# Just let the connection go.
# We need to break circular refs to make it really go:
connection
.
__dict__
.
clear
()
return
pool
.
append
(
connection
)
pool
.
append
(
connection
)
if
len
(
pool
)
==
1
:
if
len
(
pool
)
==
1
:
# Pool now usable again, unlock it.
# Pool now usable again, unlock it.
pool_lock
.
release
()
pool_lock
.
release
()
finally
:
self
.
_r
()
finally
:
self
.
_r
()
def
_connectionMap
(
self
,
f
):
def
_connectionMap
(
self
,
f
):
self
.
_a
()
self
.
_a
()
...
@@ -384,7 +395,7 @@ class DB(UndoLogCompatible.UndoLogCompatible):
...
@@ -384,7 +395,7 @@ class DB(UndoLogCompatible.UndoLogCompatible):
return
c
return
c
pools
,
pooll
=
self
.
_pools
pools
,
pooll
=
self
.
_pools
# pools is a mapping object:
# pools is a mapping object:
#
#
...
@@ -473,6 +484,19 @@ class DB(UndoLogCompatible.UndoLogCompatible):
...
@@ -473,6 +484,19 @@ class DB(UndoLogCompatible.UndoLogCompatible):
finally
:
self
.
_r
()
finally
:
self
.
_r
()
def
removeVersionPool
(
self
,
version
):
pools
,
pooll
=
self
.
_pools
info
=
pools
.
get
(
version
)
if
info
:
del
pools
[
version
]
pool
,
allocated
,
pool_lock
=
info
pooll
.
remove
((
pool
,
allocated
))
try
:
pool_lock
.
release
()
except
:
pass
del
pool
[:]
del
allocated
[:]
6
def
connectionDebugInfo
(
self
):
def
connectionDebugInfo
(
self
):
r
=
[]
r
=
[]
pools
,
pooll
=
self
.
_pools
pools
,
pooll
=
self
.
_pools
...
...
src/ZODB/tests/testDB.py
View file @
2fe24944
...
@@ -11,22 +11,27 @@
...
@@ -11,22 +11,27 @@
# FOR A PARTICULAR PURPOSE.
# FOR A PARTICULAR PURPOSE.
#
#
##############################################################################
##############################################################################
import
os
import
time
import
time
import
unittest
import
unittest
import
ZODB
import
ZODB
import
ZODB.
Mapping
Storage
import
ZODB.
File
Storage
from
ZODB.tests.MinPO
import
MinPO
from
ZODB.tests.MinPO
import
MinPO
class
DBTests
(
unittest
.
TestCase
):
class
DBTests
(
unittest
.
TestCase
):
def
setUp
(
self
):
def
setUp
(
self
):
store
=
ZODB
.
MappingStorage
.
MappingStorage
()
self
.
__path
=
os
.
path
.
abspath
(
'test.fs'
)
store
=
ZODB
.
FileStorage
.
FileStorage
(
self
.
__path
)
self
.
db
=
ZODB
.
DB
(
store
)
self
.
db
=
ZODB
.
DB
(
store
)
def
tearDown
(
self
):
def
tearDown
(
self
):
self
.
db
.
close
()
self
.
db
.
close
()
for
s
in
(
''
,
'.index'
,
'.lock'
,
'.tmp'
):
if
os
.
path
.
exists
(
self
.
__path
+
s
):
os
.
remove
(
self
.
__path
+
s
)
def
dowork
(
self
,
version
=
''
):
def
dowork
(
self
,
version
=
''
):
c
=
self
.
db
.
open
(
version
)
c
=
self
.
db
.
open
(
version
)
...
@@ -37,7 +42,6 @@ class DBTests(unittest.TestCase):
...
@@ -37,7 +42,6 @@ class DBTests(unittest.TestCase):
o
.
value
=
MinPO
(
i
)
o
.
value
=
MinPO
(
i
)
get_transaction
().
commit
()
get_transaction
().
commit
()
o
=
o
.
value
o
=
o
.
value
print
r
.
items
()
c
.
close
()
c
.
close
()
# make sure the basic methods are callable
# make sure the basic methods are callable
...
@@ -49,5 +53,78 @@ class DBTests(unittest.TestCase):
...
@@ -49,5 +53,78 @@ class DBTests(unittest.TestCase):
self
.
db
.
setVersionCacheDeactivateAfter
(
12
)
# deprecated
self
.
db
.
setVersionCacheDeactivateAfter
(
12
)
# deprecated
self
.
db
.
setVersionCacheSize
(
15
)
self
.
db
.
setVersionCacheSize
(
15
)
def
test_removeVersionPool
(
self
):
# Test that we can remove a version pool
# This is white box because we check some internal data structures
self
.
dowork
()
self
.
dowork
(
'v2'
)
c1
=
self
.
db
.
open
(
'v1'
)
c1
.
close
()
# return to pool
c12
=
self
.
db
.
open
(
'v1'
)
c12
.
close
()
# return to pool
self
.
assert_
(
c1
is
c12
)
# should be same
pools
,
pooll
=
self
.
db
.
_pools
self
.
assertEqual
(
len
(
pools
),
3
)
self
.
assertEqual
(
len
(
pooll
),
3
)
self
.
db
.
removeVersionPool
(
'v1'
)
self
.
assertEqual
(
len
(
pools
),
2
)
self
.
assertEqual
(
len
(
pooll
),
2
)
c12
=
self
.
db
.
open
(
'v1'
)
c12
.
close
()
# return to pool
self
.
assert_
(
c1
is
not
c12
)
# should be different
self
.
assertEqual
(
len
(
pools
),
3
)
self
.
assertEqual
(
len
(
pooll
),
3
)
def
_test_for_leak
(
self
):
self
.
dowork
()
self
.
dowork
(
'v2'
)
while
1
:
c1
=
self
.
db
.
open
(
'v1'
)
self
.
db
.
removeVersionPool
(
'v1'
)
c1
.
close
()
# return to pool
def
test_removeVersionPool_while_connection_open
(
self
):
# Test that we can remove a version pool
# This is white box because we check some internal data structures
self
.
dowork
()
self
.
dowork
(
'v2'
)
c1
=
self
.
db
.
open
(
'v1'
)
c1
.
close
()
# return to pool
c12
=
self
.
db
.
open
(
'v1'
)
self
.
assert_
(
c1
is
c12
)
# should be same
pools
,
pooll
=
self
.
db
.
_pools
self
.
assertEqual
(
len
(
pools
),
3
)
self
.
assertEqual
(
len
(
pooll
),
3
)
self
.
db
.
removeVersionPool
(
'v1'
)
self
.
assertEqual
(
len
(
pools
),
2
)
self
.
assertEqual
(
len
(
pooll
),
2
)
c12
.
close
()
# should leave pools alone
self
.
assertEqual
(
len
(
pools
),
2
)
self
.
assertEqual
(
len
(
pooll
),
2
)
c12
=
self
.
db
.
open
(
'v1'
)
c12
.
close
()
# return to pool
self
.
assert_
(
c1
is
not
c12
)
# should be different
self
.
assertEqual
(
len
(
pools
),
3
)
self
.
assertEqual
(
len
(
pooll
),
3
)
def
test_suite
():
def
test_suite
():
return
unittest
.
makeSuite
(
DBTests
)
return
unittest
.
makeSuite
(
DBTests
)
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