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
3d523683
Commit
3d523683
authored
Jul 21, 2007
by
Jim Fulton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
merged spelling fixes from trunk r76952
parent
303cf766
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
13 additions
and
12 deletions
+13
-12
src/BTrees/SetOpTemplate.c
src/BTrees/SetOpTemplate.c
+1
-1
src/ZODB/Connection.py
src/ZODB/Connection.py
+4
-3
src/ZODB/FileStorage/FileStorage.py
src/ZODB/FileStorage/FileStorage.py
+1
-1
src/ZODB/cross-database-references.txt
src/ZODB/cross-database-references.txt
+2
-2
src/ZODB/serialize.py
src/ZODB/serialize.py
+2
-2
src/ZODB/tests/testcrossdatabasereferences.py
src/ZODB/tests/testcrossdatabasereferences.py
+2
-2
src/persistent/cPersistence.c
src/persistent/cPersistence.c
+1
-1
No files found.
src/BTrees/SetOpTemplate.c
View file @
3d523683
...
...
@@ -206,7 +206,7 @@ set_operation(PyObject *s1, PyObject *s2,
The following ifdef works around a template/type problem
Weights are passed as integers. In particular, the weight passed by
difference is one. This works fin
d
in the int value and float value
difference is one. This works fin
e
in the int value and float value
cases but makes no sense in the object value case. In the object
value case, we don't do merging, so we don't use the weights, so it
doesn't matter what they are.
...
...
src/ZODB/Connection.py
View file @
3d523683
...
...
@@ -787,8 +787,8 @@ class Connection(ExportImport, object):
return
self
.
_reader
.
getState
(
p
)
def
setstate
(
self
,
obj
):
"""Turns the ghost 'obj' into a real object by loading it
's from the
database."""
"""Turns the ghost 'obj' into a real object by loading it
s state from
the
database."""
oid
=
obj
.
_p_oid
if
self
.
_opened
is
None
:
...
...
@@ -822,7 +822,8 @@ class Connection(ExportImport, object):
# 3. Raise ConflictError.
# Does anything actually use _p_independent()? It would simplify
# the code if we could drop support for it.
# the code if we could drop support for it.
# (BTrees.Length does.)
# There is a harmless data race with self._invalidated. A
# dict update could go on in another thread, but we don't care
...
...
src/ZODB/FileStorage/FileStorage.py
View file @
3d523683
...
...
@@ -530,7 +530,7 @@ class FileStorage(BaseStorage.BaseStorage,
return
data
,
h
.
tid
else
:
# Get the data from the backpointer, but tid from
# currnt txn.
# curr
e
nt txn.
data
=
self
.
_loadBack_impl
(
oid
,
h
.
back
)[
0
]
return
data
,
h
.
tid
finally
:
...
...
src/ZODB/cross-database-references.txt
View file @
3d523683
...
...
@@ -21,7 +21,7 @@ And create a persistent object in the first database:
>>> tm.commit()
First, we get a connection to the second database. We get the second
connection using the first connection's `get_conne
x
tion` method. This
connection using the first connection's `get_conne
c
tion` method. This
is important. When using multiple databases, we need to make sure we
use a consistent set of connections so that the objects in the
connection caches are connected in a consistent manner.
...
...
@@ -71,7 +71,7 @@ Databases for new objects
Objects are normally added to a database by making them reachable from
an object already in the database. This is unambiguous when there is
only one database. With m
od
ultiple databases, it is not so clear what
only one database. With multiple databases, it is not so clear what
happens. Consider:
>>> p4 = MyClass()
...
...
src/ZODB/serialize.py
View file @
3d523683
...
...
@@ -106,11 +106,11 @@ oid
'n'
Multi-database simple object reference. The arguments consist
of a databa
a
se name, and an object id.
of a database name, and an object id.
'm'
Multi-database persistent object reference. The arguments consist
of a databa
a
se name, an object id, and class meta data.
of a database name, an object id, and class meta data.
The following legacy format is also supported.
...
...
src/ZODB/tests/testcrossdatabasereferences.py
View file @
3d523683
...
...
@@ -29,8 +29,8 @@ class MyClass_w_getnewargs(persistent.Persistent):
def
test_must_use_consistent_connections
():
"""
It's important to use consistent connections. References to
to
separate connections to the s
s
me database or multi-database won't
It's important to use consistent connections. References to
separate connections to the s
a
me database or multi-database won't
work.
For example, it's tempting to open a second database using the
...
...
src/persistent/cPersistence.c
View file @
3d523683
...
...
@@ -85,7 +85,7 @@ unghostify(cPersistentObject *self)
if
(
self
->
state
<
0
&&
self
->
jar
)
{
PyObject
*
r
;
/* Is it ever possibl
y
to not have a cache? */
/* Is it ever possibl
e
to not have a cache? */
if
(
self
->
cache
)
{
/* Create a node in the ring for this unghostified object. */
self
->
cache
->
non_ghost_count
++
;
...
...
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