Add support for "packed" transaction property.

This does not add pack support, but merely prepares a place on transaction
description to tell whether it has been packed, along with corresponding
transport (packed definition, handlers, etc).

git-svn-id: https://svn.erp5.org/repos/neo/trunk@1833 71dcc9de-d417-0410-9af5-da40c76e7ee4

neo/client/handlers/storage.py

@@ -82,7 +82,7 @@ class StorageAnswersHandler(AnswerBaseHandler):
         self.app.setTransactionVoted()
 
     def answerTransactionInformation(self, conn, tid,
-                                           user, desc, ext, oid_list):
+                                           user, desc, ext, packed, oid_list):
         # transaction information are returned as a dict
         info = {}
         info['time'] = TimeStamp(tid).timeTime()
@@ -90,6 +90,7 @@ class StorageAnswersHandler(AnswerBaseHandler):
         info['description'] = desc
         info['id'] = tid
         info['oids'] = oid_list
+        info['packed'] = packed
         self.app.local_var.txn_info = info
 
     def answerObjectHistory(self, conn, oid, history_list):

neo/handler.py

@@ -262,7 +262,7 @@ class EventHandler(object):
         raise UnexpectedPacketError
 
     def answerTransactionInformation(self, conn, tid,
-                                           user, desc, ext, oid_list):
+                                           user, desc, ext, packed, oid_list):
         raise UnexpectedPacketError
 
     def askObjectHistory(self, conn, oid, first, last):

neo/logger.py

@@ -191,7 +191,7 @@ class PacketLogger(EventHandler):
         pass
 
     def answerTransactionInformation(self, conn, tid,
-                                           user, desc, ext, oid_list):
+                                           user, desc, ext, packed, oid_list):
         pass
 
     def askObjectHistory(self, conn, oid, first, last):

neo/master/verification.py

@@ -201,7 +201,7 @@ class VerificationManager(BaseServiceHandler):
         self._uuid_dict[uuid] = True
 
     def answerTransactionInformation(self, conn, tid,
-                                           user, desc, ext, oid_list):
+                                           user, desc, ext, packed, oid_list):
         uuid = conn.getUUID()
         app = self.app
         if self._uuid_dict.get(uuid, True):

neo/protocol.py

@@ -21,7 +21,7 @@ from socket import inet_ntoa, inet_aton
 from neo.util import Enum
 
 # The protocol version (major, minor).
-PROTOCOL_VERSION = (4, 0)
+PROTOCOL_VERSION = (4, 1)
 
 # Size restrictions.
 MIN_PACKET_SIZE = 10
@@ -905,9 +905,10 @@ class AnswerTransactionInformation(Packet):
     """
     Answer information (user, description) about a transaction. S -> Any.
     """
-    def _encode(self, tid, user, desc, ext, oid_list):
-        body = [pack('!8sHHHL', tid, len(user), len(desc), len(ext),
-            len(oid_list))]
+    def _encode(self, tid, user, desc, ext, packed, oid_list):
+        packed = packed and 1 or 0
+        body = [pack('!8sHHHBL', tid, len(user), len(desc), len(ext),
+            packed, len(oid_list))]
         body.append(user)
         body.append(desc)
         body.append(ext)
@@ -915,8 +916,9 @@ class AnswerTransactionInformation(Packet):
         return ''.join(body)
 
     def _decode(self, body):
-        r = unpack('!8sHHHL', body[:18])
-        tid, user_len, desc_len, ext_len, oid_len = r
+        r = unpack('!8sHHHBL', body[:18])
+        tid, user_len, desc_len, ext_len, packed, oid_len = r
+        packed = bool(packed)
         body = body[18:]
         user = body[:user_len]
         body = body[user_len:]
@@ -929,7 +931,7 @@ class AnswerTransactionInformation(Packet):
             (oid, ) = unpack('8s', body[:8])
             body = body[8:]
             oid_list.append(oid)
-        return (tid, user, desc, ext, oid_list)
+        return (tid, user, desc, ext, packed, oid_list)
 
 class AskObjectHistory(Packet):
     """

neo/storage/database/manager.py

@@ -232,7 +232,8 @@ class DatabaseManager(object):
         contains tuples, each of which consists of an object ID,
         a compression specification, a checksum and object data.
         The transaction is either None or a tuple of the list of OIDs,
-        user information, a description and extension information."""
+        user information, a description, extension information and transaction
+        pack state (True for packed)."""
         raise NotImplementedError
 
     def finishTransaction(self, tid):

neo/storage/database/mysqldb.py

@@ -132,6 +132,7 @@ class MySQLDatabaseManager(DatabaseManager):
         # The table "trans" stores information on committed transactions.
         q("""CREATE TABLE IF NOT EXISTS trans (
                  tid BIGINT UNSIGNED NOT NULL PRIMARY KEY,
+                 packed BOOLEAN NOT NULL,
                  oids MEDIUMBLOB NOT NULL,
                  user BLOB NOT NULL,
                  description BLOB NOT NULL,
@@ -151,6 +152,7 @@ class MySQLDatabaseManager(DatabaseManager):
         # The table "ttrans" stores information on uncommitted transactions.
         q("""CREATE TABLE IF NOT EXISTS ttrans (
                  tid BIGINT UNSIGNED NOT NULL,
+                 packed BOOLEAN NOT NULL,
                  oids MEDIUMBLOB NOT NULL,
                  user BLOB NOT NULL,
                  description BLOB NOT NULL,
@@ -364,13 +366,14 @@ class MySQLDatabaseManager(DatabaseManager):
                 q("""REPLACE INTO %s VALUES (%d, %d, %d, %d, '%s')""" \
                         % (obj_table, oid, tid, compression, checksum, data))
             if transaction is not None:
-                oid_list, user, desc, ext = transaction
+                oid_list, user, desc, ext, packed = transaction
+                packed = packed and 1 or 0
                 oids = e(''.join(oid_list))
                 user = e(user)
                 desc = e(desc)
                 ext = e(ext)
-                q("""REPLACE INTO %s VALUES (%d, '%s', '%s', '%s', '%s')""" \
-                        % (trans_table, tid, oids, user, desc, ext))
+                q("""REPLACE INTO %s VALUES (%d, %i, '%s', '%s', '%s', '%s')""" \
+                        % (trans_table, tid, packed, oids, user, desc, ext))
         except:
             self.rollback()
             raise
@@ -412,22 +415,22 @@ class MySQLDatabaseManager(DatabaseManager):
         q = self.query
         tid = util.u64(tid)
         self.begin()
-        r = q("""SELECT oids, user, description, ext FROM trans
+        r = q("""SELECT oids, user, description, ext, packed FROM trans
                     WHERE tid = %d""" \
                 % tid)
         if not r and all:
-            r = q("""SELECT oids, user, description, ext FROM ttrans
+            r = q("""SELECT oids, user, description, ext, packed FROM ttrans
                         WHERE tid = %d""" \
                     % tid)
         self.commit()
         if r:
-            oids, user, desc, ext = r[0]
+            oids, user, desc, exti, packed = r[0]
             if (len(oids) % 8) != 0 or len(oids) == 0:
                 raise DatabaseFailure('invalid oids for tid %x' % tid)
             oid_list = []
             for i in xrange(0, len(oids), 8):
                 oid_list.append(oids[i:i+8])
-            return oid_list, user, desc, ext
+            return oid_list, user, desc, ext, bool(packed)
         return None
 
     def getOIDList(self, offset, length, num_partitions, partition_list):

neo/storage/handlers/__init__.py

@@ -95,7 +95,7 @@ class BaseClientAndStorageOperationHandler(EventHandler):
             p = Errors.TidNotFound('%s does not exist' % dump(tid))
         else:
             p = Packets.AnswerTransactionInformation(tid, t[1], t[2], t[3],
-                    t[0])
+                    t[4], t[0])
         conn.answer(p)
 
     def askObject(self, conn, oid, serial, tid):

neo/storage/handlers/client.py

@@ -39,7 +39,8 @@ class ClientOperationHandler(BaseClientAndStorageOperationHandler):
     def askStoreTransaction(self, conn, tid, user, desc,
                                   ext, oid_list):
         uuid = conn.getUUID()
-        self.app.tm.storeTransaction(uuid, tid, oid_list, user, desc, ext)
+        self.app.tm.storeTransaction(uuid, tid, oid_list, user, desc, ext,
+            False)
         conn.answer(Packets.AnswerStoreTransaction(tid))
 
     def askStoreObject(self, conn, oid, serial,

neo/storage/handlers/replication.py

@@ -69,13 +69,14 @@ class ReplicationHandler(EventHandler):
             app.replicator.oid_offset = 0
 
     def answerTransactionInformation(self, conn, tid,
-                                           user, desc, ext, oid_list):
+                                           user, desc, ext, packed, oid_list):
         app = self.app
         if app.replicator.current_connection is not conn:
             return
 
         # Directly store the transaction.
-        app.dm.storeTransaction(tid, (), (oid_list, user, desc, ext), False)
+        app.dm.storeTransaction(tid, (), (oid_list, user, desc, ext, packed),
+            False)
 
     def answerOIDs(self, conn, oid_list):
         app = self.app

neo/storage/handlers/verification.py

@@ -75,7 +75,7 @@ class VerificationHandler(BaseMasterHandler):
             p = Errors.TidNotFound('%s does not exist' % dump(tid))
         else:
             p = Packets.AnswerTransactionInformation(tid, t[1], t[2], t[3],
-                    t[0])
+                    t[4], t[0])
         conn.answer(p)
 
     def askObjectPresent(self, conn, oid, tid):

neo/storage/transactions.py

@@ -63,12 +63,12 @@ class Transaction(object):
     def isLocked(self):
         return self._locked
 
-    def prepare(self, oid_list, user, desc, ext):
+    def prepare(self, oid_list, user, desc, ext, packed):
         """
             Set the transaction informations
         """
         # assert self._transaction is not None
-        self._transaction = (oid_list, user, desc, ext)
+        self._transaction = (oid_list, user, desc, ext, packed)
 
     def addObject(self, oid, compression, checksum, data):
         """
@@ -160,12 +160,12 @@ class TransactionManager(object):
             self._loid = self._loid_seen
             self._app.dm.setLastOID(self._loid)
 
-    def storeTransaction(self, uuid, tid, oid_list, user, desc, ext):
+    def storeTransaction(self, uuid, tid, oid_list, user, desc, ext, packed):
         """
             Store transaction information received from client node
         """
         transaction = self._getTransaction(tid, uuid)
-        transaction.prepare(oid_list, user, desc, ext)
+        transaction.prepare(oid_list, user, desc, ext, packed)
 
     def storeObject(self, uuid, tid, serial, oid, compression, checksum, data):
         """