فهرست منبع

removed function that I just added

Dave Schuyler 20 سال پیش
والد
کامیت
84a5f4a344
1فایلهای تغییر یافته به همراه3 افزوده شده و 7 حذف شده
  1. 3 7
      direct/src/distributed/DoCollectionManager.py

+ 3 - 7
direct/src/distributed/DoCollectionManager.py

@@ -191,7 +191,7 @@ class DoCollectionManager:
             oldZoneId = obj.zoneId
             oldZoneId = obj.zoneId
             if oldParentId != parentId:
             if oldParentId != parentId:
                 # Remove old location
                 # Remove old location
-                self.deleteDoIdFromLocation(doId, oldParentId, oldZoneId)
+                self.deleteObjectLocation(doId, oldParentId, oldZoneId)
             if oldParentId == parentId and oldZoneId == zoneId:
             if oldParentId == parentId and oldZoneId == zoneId:
                 # object is already at that parent and zone
                 # object is already at that parent and zone
                 return
                 return
@@ -203,11 +203,7 @@ class DoCollectionManager:
             zoneDoSet = parentZoneDict.setdefault(zoneId, set())
             zoneDoSet = parentZoneDict.setdefault(zoneId, set())
             zoneDoSet.add(doId)
             zoneDoSet.add(doId)
 
 
-    def deleteObjectLocation(self, distObj):
-        self.deleteDoIdFromLocation(
-            distObj.doId, distObj.parentId, distObj.zoneId)
-
-    def deleteDoIdFromLocation(self, doId, parentId, zoneId):
+    def deleteObjectLocation(self, doId, parentId, zoneId):
         # Do not worry about null values
         # Do not worry about null values
         if (parentId is None) or (zoneId is None):
         if (parentId is None) or (zoneId is None):
             return
             return
@@ -266,7 +262,7 @@ class DoCollectionManager:
         assert self.notify.debugStateCall(self)
         assert self.notify.debugStateCall(self)
         #assert not hasattr(do, "isQueryAllResponse") or not do.isQueryAllResponse
         #assert not hasattr(do, "isQueryAllResponse") or not do.isQueryAllResponse
         #assert do.doId in self.doId2do
         #assert do.doId in self.doId2do
-        self.deleteObjectLocation(do)
+        self.deleteObjectLocation(do.doId, do.parentId, do.zoneId)
         ## location = do.getLocation()
         ## location = do.getLocation()
         ## if location is not None:
         ## if location is not None:
         ##     if location not in self.zoneId2doIds:
         ##     if location not in self.zoneId2doIds: