Factorize gathering of assigned partitions.

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

neo/pt.py

@@ -99,6 +99,16 @@ class PartitionTable(object):
         self.partition_list = [[] for x in xrange(self.np)]
         self.count_dict.clear()
 
+    def getAssignedPartitionList(self, uuid):
+        """ Return the partition assigned to the specified UUID """
+        assigned_partitions = []
+        for offset in xrange(self.np):
+            for cell in self.getCellList(offset, readable=True):
+                if cell.getUUID() == uuid:
+                    assigned_partitions.add(offset)
+                    break
+        return assigned_partitions
+
     def hasOffset(self, offset):
         try:
             return len(self.partition_list[offset]) > 0

neo/storage/handlers/__init__.py

@@ -71,16 +71,8 @@ class BaseClientAndStorageOperationHandler(BaseStorageHandler):
             raise protocol.ProtocolError('invalid offsets')
 
         app = self.app
-
         if partition == protocol.INVALID_PARTITION:
-            # Collect all usable partitions for me.
-            getCellList = app.pt.getCellList
-            partition_list = []
-            for offset in xrange(app.pt.getPartitions()):
-                for cell in getCellList(offset, readable=True):
-                    if cell.getUUID() == app.uuid:
-                        partition_list.append(offset)
-                        break
+            partition_list = app.pt.getAssignedPartitionList(app.uuid)
         else:
             partition_list = [partition]
 

neo/storage/handlers/storage.py

@@ -37,16 +37,10 @@ class StorageOperationHandler(BaseClientAndStorageOperationHandler):
         app = self.app
 
         if partition == protocol.INVALID_PARTITION:
-            # Collect all usable partitions for me.
-            getCellList = app.pt.getCellList
-            partition_list = []
-            for offset in xrange(app.pt.getPartitions()):
-                for cell in getCellList(offset, readable=True):
-                    if cell.getUUID() == app.uuid:
-                        partition_list.append(offset)
-                        break
+            partition_list = app.pt.getAssignedPartitionList(app.uuid)
         else:
             partition_list = [partition]
+
         oid_list = app.dm.getOIDList(first, last - first,
                                      app.pt.getPartitions(), partition_list)
         conn.answer(Packets.AnswerOIDs(oid_list), packet.getId())