[Zodb-checkins] CVS: Packages/ZEO - ClientStorage.py:1.26.4.13 ServerStub.py:1.1.2.5 StorageServer.py:1.21.4.9

[jeremy@digicool.com]

Update of /cvs-repository/Packages/ZEO
In directory korak:/tmp/cvs-serv5894

Modified Files:
      Tag: ZEO-ZRPC-Dev
	ClientStorage.py ServerStub.py StorageServer.py 
Log Message:
Change tpc_finish() to take just the transaction id.
Remove tpc_begin_sync() from the ServerStub.



--- Updated File ClientStorage.py in package Packages/ZEO --
--- ClientStorage.py	2001/04/25 21:02:58	1.26.4.12
+++ ClientStorage.py	2001/04/25 22:51:32	1.26.4.13
@@ -458,21 +458,20 @@
     def tpc_finish(self, transaction, f=None):
         self._lock_acquire()
         try:
-            if transaction is not self._transaction: return
-            if f is not None: f()
+            if transaction is not self._transaction:
+                return
+            if f is not None: # XXX what is f()?
+                f()
 
-            # XXX what happens if the network dies RIGHT NOW?
+            self._server.tpc_finish(self._serial)
 
-            self._server.tpc_finish(self._serial,
-                                    transaction.user,
-                                    transaction.description,
-                                    transaction._extension)
-
             r = self._check_serials()
             assert r is None or len(r) == 0, "unhandled serialnos: %s" % r
 
             self._cache.checkSize(self._tbuf.get_size())
 
+            # Iterate over the objects in the transaction buffer and
+            # update or invalidate the cache. 
             self._tbuf.begin_iterate()
             while 1:
                 try:

--- Updated File ServerStub.py in package Packages/ZEO --
--- ServerStub.py	2001/04/25 20:38:38	1.1.2.4
+++ ServerStub.py	2001/04/25 22:51:32	1.1.2.5
@@ -44,16 +44,11 @@
     def tpc_begin(self, id, user, descr, ext):
         return self.rpc.call('tpc_begin', id, user, descr, ext)
 
-    def tpc_begin_sync(self, id, user, descr, ext):
-        # XXX nuked
-        return self.rpc.call('tpc_begin_sync', id, user, descr, ext)
-
     def vote(self, trans_id):
         return self.rpc.call('vote', trans_id)
 
-    def tpc_finish(self, id, user, descr, ext):
-##        self.rpc.callAsync('tpc_finish', id, user, descr, ext)
-        return self.rpc.call('tpc_finish', id, user, descr, ext)
+    def tpc_finish(self, id):
+        return self.rpc.call('tpc_finish', id)
 
     def tpc_abort(self, id):
         self.rpc.callAsync('tpc_abort', id)

--- Updated File StorageServer.py in package Packages/ZEO --
--- StorageServer.py	2001/04/25 22:33:50	1.21.4.8
+++ StorageServer.py	2001/04/25 22:51:32	1.21.4.9
@@ -402,7 +402,7 @@
         self.__storage.tpc_begin(t)
         self.__invalidated = []
 
-    def tpc_finish(self, id, user, description, ext):
+    def tpc_finish(self, id):
         if not self._check_tid(id):
             return