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
d06e32a8
Commit
d06e32a8
authored
Jul 14, 2016
by
Jim Fulton
Committed by
GitHub
Jul 14, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #47 from NextThought/trace-before
Fix tracing of loadBefore with empty tids on Py3.
parents
edf0bf07
121a551e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
CHANGES.rst
CHANGES.rst
+5
-0
src/ZEO/cache.py
src/ZEO/cache.py
+4
-4
No files found.
CHANGES.rst
View file @
d06e32a8
Changelog
Changelog
=========
=========
4.2.2 (unreleased)
------------------
- Fix ZEO cache tracing on Python 3.
4.2.1 (2016-06-30)
4.2.1 (2016-06-30)
------------------
------------------
...
...
src/ZEO/cache.py
View file @
d06e32a8
...
@@ -557,7 +557,7 @@ class ClientCache(object):
...
@@ -557,7 +557,7 @@ class ClientCache(object):
if
result
:
if
result
:
return
result
[
0
],
result
[
1
],
None
return
result
[
0
],
result
[
1
],
None
else
:
else
:
self
.
_trace
(
0x24
,
oid
,
""
,
before_tid
)
self
.
_trace
(
0x24
,
oid
,
b
""
,
before_tid
)
return
result
return
result
items
=
noncurrent_for_oid
.
items
(
None
,
u64
(
before_tid
)
-
1
)
items
=
noncurrent_for_oid
.
items
(
None
,
u64
(
before_tid
)
-
1
)
...
@@ -566,7 +566,7 @@ class ClientCache(object):
...
@@ -566,7 +566,7 @@ class ClientCache(object):
if
result
:
if
result
:
return
result
[
0
],
result
[
1
],
None
return
result
[
0
],
result
[
1
],
None
else
:
else
:
self
.
_trace
(
0x24
,
oid
,
""
,
before_tid
)
self
.
_trace
(
0x24
,
oid
,
b
""
,
before_tid
)
return
result
return
result
tid
,
ofs
=
items
[
-
1
]
tid
,
ofs
=
items
[
-
1
]
...
@@ -593,11 +593,11 @@ class ClientCache(object):
...
@@ -593,11 +593,11 @@ class ClientCache(object):
if
result
:
if
result
:
return
result
[
0
],
result
[
1
],
None
return
result
[
0
],
result
[
1
],
None
else
:
else
:
self
.
_trace
(
0x24
,
oid
,
""
,
before_tid
)
self
.
_trace
(
0x24
,
oid
,
b
""
,
before_tid
)
return
result
return
result
self
.
_n_accesses
+=
1
self
.
_n_accesses
+=
1
self
.
_trace
(
0x26
,
oid
,
""
,
saved_tid
)
self
.
_trace
(
0x26
,
oid
,
b
""
,
saved_tid
)
return
data
,
saved_tid
,
end_tid
return
data
,
saved_tid
,
end_tid
##
##
...
...
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