[Zodb-checkins] CVS: StandaloneZODB/ZEO - ClientStorage.py:1.35.6.4.2.3 ClientStub.py:1.3.2.2.2.2

[Jeremy Hylton]

Update of /cvs-repository/StandaloneZODB/ZEO
In directory cvs.zope.org:/tmp/cvs-serv27490

Modified Files:
      Tag: ZEO2-branch
	ClientStorage.py ClientStub.py 
Log Message:
Replace serialno() metho with serialnos().

The storage server sent the client new serialnos for updated objects
with the serialno() method.  Change the interface to take a list of
oid, serialno pairs instead of a single pair.  This reduces the number
of messages sent for multi-object commits, but has only a small effect
on msg size for a single-object commit.

Bug fixed: If tpc_begin() is called with a tid, honor it.



=== StandaloneZODB/ZEO/ClientStorage.py 1.35.6.4.2.2 => 1.35.6.4.2.3 ===
             raise ClientDisconnected()
 
-        self._ts = get_timestamp(self._ts)
-        id = `self._ts`
+        if tid is None:
+            self._ts = get_timestamp(self._ts)
+            id = `self._ts`
+        else:
+            self._ts = TimeStamp(tid)
+            id = tid
         self._transaction = transaction
 
         try:
@@ -452,8 +456,8 @@
 
     # below are methods invoked by the StorageServer
 
-    def serialno(self, arg):
-        self._serials.append(arg)
+    def serialnos(self, args):
+        self._serials.extend(args)
 
     def info(self, dict):
         self._info.update(dict)


=== StandaloneZODB/ZEO/ClientStub.py 1.3.2.2.2.1 => 1.3.2.2.2.2 ===
         self.rpc.callAsync('end')
 
-    def serialno(self, arg):
-        self.rpc.callAsync('serialno', arg)
+    def serialnos(self, arg):
+        self.rpc.callAsync('serialnos', arg)
 
     def info(self, arg):
         self.rpc.callAsync('info', arg)