[Checkins] SVN: relstorage/branches/1.1/ Normalized
poll-invalidation patches as Solaris' patch command would not
Stefan H. Holek
stefan at epy.co.at
Thu Jul 24 09:50:16 EDT 2008
Log message for revision 88790:
Normalized poll-invalidation patches as Solaris' patch command would not
accept the current format. The patches now apply with:
patch -d lib/python/ZODB -p0 < poll-invalidation-1-zodb-3-X-X.patch
Changed:
U relstorage/branches/1.1/CHANGES.txt
U relstorage/branches/1.1/poll-invalidation-1-zodb-3-7-1.patch
U relstorage/branches/1.1/poll-invalidation-1-zodb-3-8-0.patch
-=-
Modified: relstorage/branches/1.1/CHANGES.txt
===================================================================
--- relstorage/branches/1.1/CHANGES.txt 2008-07-24 13:29:44 UTC (rev 88789)
+++ relstorage/branches/1.1/CHANGES.txt 2008-07-24 13:50:14 UTC (rev 88790)
@@ -1,8 +1,11 @@
RelStorage 1.1c1
+- Normalized poll-invalidation patches as Solaris' patch command would not
+ accept the current format. The patches now apply with:
+ patch -d lib/python/ZODB -p0 < poll-invalidation-1-zodb-3-X-X.patch
+
- Use DROP TABLE IF EXISTS instead of TRUNCATE to clear 'temp_store' because:
-
- TRUNCATE has one page of caveats in the MySQL documentation.
- TEMPORARY TABLEs have half a page of caveats when it comes to
replication.
Modified: relstorage/branches/1.1/poll-invalidation-1-zodb-3-7-1.patch
===================================================================
--- relstorage/branches/1.1/poll-invalidation-1-zodb-3-7-1.patch 2008-07-24 13:29:44 UTC (rev 88789)
+++ relstorage/branches/1.1/poll-invalidation-1-zodb-3-7-1.patch 2008-07-24 13:50:14 UTC (rev 88790)
@@ -1,7 +1,8 @@
-diff -r 34747fbd09ec Connection.py
---- a/Connection.py Tue Nov 20 21:57:31 2007 -0700
-+++ b/Connection.py Fri Jan 11 21:19:00 2008 -0700
-@@ -75,8 +75,14 @@ class Connection(ExportImport, object):
+Index: Connection.py
+===================================================================
+--- Connection.py (revision 87280)
++++ Connection.py (working copy)
+@@ -75,8 +75,14 @@
"""Create a new Connection."""
self._db = db
@@ -18,7 +19,7 @@
self._savepoint_storage = None
self.transaction_manager = self._synch = self._mvcc = None
-@@ -170,6 +176,12 @@ class Connection(ExportImport, object):
+@@ -170,6 +176,12 @@
# Multi-database support
self.connections = {self._db.database_name: self}
@@ -31,7 +32,7 @@
def add(self, obj):
"""Add a new object 'obj' to the database and assign it an oid."""
-@@ -267,6 +279,11 @@ class Connection(ExportImport, object):
+@@ -267,6 +279,11 @@
self.transaction_manager.unregisterSynch(self)
self._synch = None
@@ -43,7 +44,7 @@
if primary:
for connection in self.connections.values():
if connection is not self:
-@@ -295,6 +312,10 @@ class Connection(ExportImport, object):
+@@ -295,6 +312,10 @@
def invalidate(self, tid, oids):
"""Notify the Connection that transaction 'tid' invalidated oids."""
@@ -54,7 +55,7 @@
self._inv_lock.acquire()
try:
if self._txn_time is None:
-@@ -438,8 +459,23 @@ class Connection(ExportImport, object):
+@@ -438,8 +459,23 @@
self._registered_objects = []
self._creating.clear()
@@ -78,10 +79,11 @@
self._inv_lock.acquire()
try:
# Non-ghostifiable objects may need to read when they are
-diff -r 34747fbd09ec DB.py
---- a/DB.py Tue Nov 20 21:57:31 2007 -0700
-+++ b/DB.py Wed Nov 28 18:33:12 2007 -0700
-@@ -260,6 +260,10 @@ class DB(object):
+Index: DB.py
+===================================================================
+--- DB.py (revision 87280)
++++ DB.py (working copy)
+@@ -260,6 +260,10 @@
storage.store(z64, None, file.getvalue(), '', t)
storage.tpc_vote(t)
storage.tpc_finish(t)
Modified: relstorage/branches/1.1/poll-invalidation-1-zodb-3-8-0.patch
===================================================================
--- relstorage/branches/1.1/poll-invalidation-1-zodb-3-8-0.patch 2008-07-24 13:29:44 UTC (rev 88789)
+++ relstorage/branches/1.1/poll-invalidation-1-zodb-3-8-0.patch 2008-07-24 13:50:14 UTC (rev 88790)
@@ -1,7 +1,8 @@
-diff -r 72bf2fd94b66 src/ZODB/Connection.py
---- a/src/ZODB/Connection.py Wed Jan 30 23:23:05 2008 -0700
-+++ b/src/ZODB/Connection.py Wed Jan 30 23:38:51 2008 -0700
-@@ -90,8 +90,15 @@ class Connection(ExportImport, object):
+Index: Connection.py
+===================================================================
+--- Connection.py (revision 87666)
++++ Connection.py (working copy)
+@@ -90,8 +90,15 @@
self.connections = {self._db.database_name: self}
self._version = version
@@ -19,7 +20,7 @@
self._savepoint_storage = None
# Do we need to join a txn manager?
-@@ -151,6 +158,12 @@ class Connection(ExportImport, object):
+@@ -151,6 +158,12 @@
# in the cache on abort and in other connections on finish.
self._modified = []
@@ -32,7 +33,7 @@
# _invalidated queues invalidate messages delivered from the DB
# _inv_lock prevents one thread from modifying the set while
-@@ -297,6 +310,11 @@ class Connection(ExportImport, object):
+@@ -297,6 +310,11 @@
if self._opened:
self.transaction_manager.unregisterSynch(self)
@@ -44,7 +45,7 @@
if primary:
for connection in self.connections.values():
if connection is not self:
-@@ -328,6 +346,10 @@ class Connection(ExportImport, object):
+@@ -328,6 +346,10 @@
def invalidate(self, tid, oids):
"""Notify the Connection that transaction 'tid' invalidated oids."""
@@ -55,7 +56,7 @@
self._inv_lock.acquire()
try:
if self._txn_time is None:
-@@ -469,8 +491,23 @@ class Connection(ExportImport, object):
+@@ -469,8 +491,23 @@
self._registered_objects = []
self._creating.clear()
@@ -79,10 +80,11 @@
self._inv_lock.acquire()
try:
# Non-ghostifiable objects may need to read when they are
-diff -r 72bf2fd94b66 src/ZODB/DB.py
---- a/src/ZODB/DB.py Wed Jan 30 23:23:05 2008 -0700
-+++ b/src/ZODB/DB.py Wed Jan 30 23:38:51 2008 -0700
-@@ -284,6 +284,10 @@ class DB(object):
+Index: DB.py
+===================================================================
+--- DB.py (revision 87666)
++++ DB.py (working copy)
+@@ -284,6 +284,10 @@
storage.store(z64, None, file.getvalue(), '', t)
storage.tpc_vote(t)
storage.tpc_finish(t)
More information about the Checkins
mailing list