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
ec370c85
Commit
ec370c85
authored
Jun 06, 2016
by
Jim Fulton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed: the ZEO cache loadBefore method failed to utilize current data.
parent
50692664
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
41 additions
and
8 deletions
+41
-8
src/ZEO/cache.py
src/ZEO/cache.py
+23
-7
src/ZEO/tests/test_cache.py
src/ZEO/tests/test_cache.py
+18
-1
No files found.
src/ZEO/cache.py
View file @
ec370c85
...
...
@@ -494,7 +494,7 @@ class ClientCache(object):
# @defreturn 3-tuple: (string, string, string)
@
locked
def
load
(
self
,
oid
):
def
load
(
self
,
oid
,
before_tid
=
None
):
ofs
=
self
.
current
.
get
(
oid
)
if
ofs
is
None
:
self
.
_trace
(
0x20
,
oid
)
...
...
@@ -509,6 +509,9 @@ class ClientCache(object):
assert
end_tid
==
z64
,
(
ofs
,
self
.
f
.
tell
(),
oid
,
tid
,
end_tid
)
assert
lver
==
0
,
"Versions aren't supported"
if
before_tid
and
tid
>=
before_tid
:
return
None
data
=
read
(
ldata
)
assert
len
(
data
)
==
ldata
,
(
ofs
,
self
.
f
.
tell
(),
oid
,
len
(
data
),
ldata
)
...
...
@@ -550,13 +553,22 @@ class ClientCache(object):
def
loadBefore
(
self
,
oid
,
before_tid
):
noncurrent_for_oid
=
self
.
noncurrent
.
get
(
u64
(
oid
))
if
noncurrent_for_oid
is
None
:
self
.
_trace
(
0x24
,
oid
,
""
,
before_tid
)
return
None
result
=
self
.
load
(
oid
,
before_tid
)
if
result
:
return
result
[
0
],
result
[
1
],
None
else
:
self
.
_trace
(
0x24
,
oid
,
""
,
before_tid
)
return
result
items
=
noncurrent_for_oid
.
items
(
None
,
u64
(
before_tid
)
-
1
)
if
not
items
:
self
.
_trace
(
0x24
,
oid
,
""
,
before_tid
)
return
None
result
=
self
.
load
(
oid
,
before_tid
)
if
result
:
return
result
[
0
],
result
[
1
],
None
else
:
self
.
_trace
(
0x24
,
oid
,
""
,
before_tid
)
return
result
tid
,
ofs
=
items
[
-
1
]
self
.
f
.
seek
(
ofs
)
...
...
@@ -577,8 +589,12 @@ class ClientCache(object):
assert
read
(
8
)
==
oid
,
(
ofs
,
self
.
f
.
tell
(),
oid
)
if
end_tid
<
before_tid
:
self
.
_trace
(
0x24
,
oid
,
""
,
before_tid
)
return
None
result
=
self
.
load
(
oid
,
before_tid
)
if
result
:
return
result
[
0
],
result
[
1
],
None
else
:
self
.
_trace
(
0x24
,
oid
,
""
,
before_tid
)
return
result
self
.
_n_accesses
+=
1
self
.
_trace
(
0x26
,
oid
,
""
,
saved_tid
)
...
...
src/ZEO/tests/test_cache.py
View file @
ec370c85
...
...
@@ -314,7 +314,9 @@ class CacheTests(ZODB.tests.util.TestCase):
# We use large-2 for the same reason we used small-1 above.
expected_len
=
large
-
2
self
.
assertEquals
(
len
(
cache
),
expected_len
)
expected_oids
=
set
(
list
(
range
(
11
,
50
))
+
list
(
range
(
106
,
110
))
+
list
(
range
(
200
,
305
)))
expected_oids
=
set
(
list
(
range
(
11
,
50
))
+
list
(
range
(
106
,
110
))
+
list
(
range
(
200
,
305
)))
self
.
assertEquals
(
set
(
u64
(
oid
)
for
(
oid
,
tid
)
in
cache
.
contents
()),
expected_oids
)
...
...
@@ -336,6 +338,21 @@ class CacheTests(ZODB.tests.util.TestCase):
self
.
cache
.
setLastTid
(
p64
(
3
))
self
.
cache
.
setLastTid
(
p64
(
4
))
def
test_loadBefore_doesnt_miss_current
(
self
):
# Make sure that loadBefore get's current data if there
# isn't non-current data
cache
=
self
.
cache
oid
=
n1
cache
.
store
(
oid
,
n1
,
None
,
b'first'
)
self
.
assertEqual
(
cache
.
loadBefore
(
oid
,
n1
),
None
)
self
.
assertEqual
(
cache
.
loadBefore
(
oid
,
n2
),
(
b'first'
,
n1
,
None
))
self
.
cache
.
invalidate
(
oid
,
n2
)
cache
.
store
(
oid
,
n2
,
None
,
b'second'
)
self
.
assertEqual
(
cache
.
loadBefore
(
oid
,
n1
),
None
)
self
.
assertEqual
(
cache
.
loadBefore
(
oid
,
n2
),
(
b'first'
,
n1
,
n2
))
self
.
assertEqual
(
cache
.
loadBefore
(
oid
,
n3
),
(
b'second'
,
n2
,
None
))
def
kill_does_not_cause_cache_corruption
():
r"""
...
...
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