[Zope-Checkins] CVS: Packages/ZODB - config.py:1.13.4.1.38.2

2006-01-20 Thread Jim Fulton 
Update of /cvs-repository/Packages/ZODB
In directory cvs.zope.org:/tmp/cvs-serv6069

Modified Files:
  Tag: jim-test-storage
config.py 
Log Message:
Make sure providing as-of implies read-only.


=== Packages/ZODB/config.py 1.13.4.1.38.1 = 1.13.4.1.38.2 ===
--- Packages/ZODB/config.py:1.13.4.1.38.1   Thu Jan 19 20:15:09 2006
+++ Packages/ZODB/config.py Fri Jan 20 13:29:27 2006
@@ -133,12 +133,14 @@
 
 y, m, d = map(int, d.split('-'))
 as_of = ZODB.TimeStamp.TimeStamp(y, m, d, *t.split(':'))
+read_only = True
 else:
 as_of = None
+read_only = self.config.read_only
 
 return FileStorage(self.config.path,
create=self.config.create,
-   read_only=self.config.read_only,
+   read_only=read_only,
quota=self.config.quota,
stop=as_of,
)

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] CVS: Packages/ZODB - DemoStorage.py:1.18.10.2.4.1

2006-01-20 Thread Jim Fulton 
Update of /cvs-repository/Packages/ZODB
In directory cvs.zope.org:/tmp/cvs-serv15107/ZODB

Modified Files:
  Tag: jim-test-storage
DemoStorage.py 
Log Message:
Added lastTransaction, which ZEO wants


=== Packages/ZODB/DemoStorage.py 1.18.10.2 = 1.18.10.2.4.1 ===
--- Packages/ZODB/DemoStorage.py:1.18.10.2  Fri Apr 22 15:36:07 2005
+++ Packages/ZODB/DemoStorage.pyFri Jan 20 17:15:19 2006
@@ -87,6 +87,7 @@
 from TimeStamp import TimeStamp
 from cPickle import loads
 from BTrees import OOBTree
+from ZODB.utils import z64
 
 class DemoStorage(BaseStorage):
 
@@ -105,6 +106,8 @@
 raise POSException.StorageError, (
 Demo base storage has version data)
 
+self._ltid = z64
+
 # While we officially don't support wrapping a non-read-only base
 # storage, it has proved useful for test suites to wrap a ClientStorage
 # in DemoStorage.  The least we can do to help support that case is
@@ -322,6 +325,12 @@
 if v is None:
 v = self._vindex[version] = {}
 v[oid] = r
+
+self._ltid = tid
+
+def lastTransaction(self):
+Return transaction id for last committed transaction
+return self._ltid
 
 def undo(self, transaction_id):
 self._lock_acquire()

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] CVS: Packages/ZODB - BaseStorage.py:1.34.4.6.2.1

2006-01-20 Thread Jim Fulton 
Update of /cvs-repository/Packages/ZODB
In directory cvs.zope.org:/tmp/cvs-serv15074/ZODB

Modified Files:
  Tag: jim-test-storage
BaseStorage.py 
Log Message:
Should be OK to ask for new_oid in read-only mode.  Demo storage wants
it.  Maybe need a max_oid.


=== Packages/ZODB/BaseStorage.py 1.34.4.6 = 1.34.4.6.2.1 ===
--- Packages/ZODB/BaseStorage.py:1.34.4.6   Wed Oct  5 15:31:01 2005
+++ Packages/ZODB/BaseStorage.pyFri Jan 20 17:15:18 2006
@@ -94,8 +94,6 @@
 return ''
 
 def new_oid(self):
-if self._is_read_only:
-raise POSException.ReadOnlyError()
 self._lock_acquire()
 try:
 last = self._oid

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] CVS: Packages/ZODB - config.py:1.13.4.1.38.3

2006-01-20 Thread Jim Fulton 
Update of /cvs-repository/Packages/ZODB
In directory cvs.zope.org:/tmp/cvs-serv15174/ZODB

Modified Files:
  Tag: jim-test-storage
config.py 
Log Message:
Args to TimeStamp must be ints.


=== Packages/ZODB/config.py 1.13.4.1.38.2 = 1.13.4.1.38.3 ===
--- Packages/ZODB/config.py:1.13.4.1.38.2   Fri Jan 20 13:29:27 2006
+++ Packages/ZODB/config.py Fri Jan 20 17:15:22 2006
@@ -17,11 +17,11 @@
 
 import os
 from cStringIO import StringIO
-import ZODB.Timestamp
 
 import ZConfig
 
 import ZODB
+import ZODB.TimeStamp
 
 db_schema_path = os.path.join(ZODB.__path__[0], config.xml)
 _db_schema = None
@@ -132,7 +132,7 @@
 d, t = as_of, '0'
 
 y, m, d = map(int, d.split('-'))
-as_of = ZODB.TimeStamp.TimeStamp(y, m, d, *t.split(':'))
+as_of = ZODB.TimeStamp.TimeStamp(y, m, d, *map(int, t.split(':')))
 read_only = True
 else:
 as_of = None

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins