Changeset 25022 for branches/eam_branches/20090715/Nebulous-Server/lib/Nebulous/Server/SQL.pm

Timestamp:

Aug 7, 2009, 12:45:24 PM (17 years ago)

Author:

eugene

Message:

update from mainline

Location:

branches/eam_branches/20090715

Files:

• . (modified) (1 prop)
• Nebulous-Server/lib/Nebulous/Server/SQL.pm (modified) (3 diffs)

branches/eam_branches/20090715/Nebulous-Server/lib/Nebulous/Server/SQL.pm

@@ -183 +183 @@
         WHERE ins_id = ?
     },
-    delete_instance_by_so_id => qq{
-        DELETE FROM instance
-        WHERE so_id = ?
-    },
     get_object_from_uri   => qq{
         SELECT so_id
@@ -218 +214 @@
         GROUP BY so_id
     },
-    copy_instances_to_deleted => qq{
+    copy_dead_instances_to_deleted => qq{
         INSERT INTO deleted 
         SELECT vol_id, uri, NULL
         FROM instance
+        LEFT JOIN mountedvol
+            USING(vol_id)
         WHERE
             so_id = ?
+            AND (mountedvol.available IS NULL || mountedvol.available = 0)
+    },
+    find_dead_instances_by_so_id => qq{
+        SELECT so_id, ins_id, vol_id, uri
+        FROM instance
+        LEFT JOIN mountedvol
+            USING(vol_id)
+        WHERE
+            so_id = ?
+            AND (mountedvol.available IS NULL || mountedvol.available = 0)
     },
     get_object_instances    => qq{
@@ -329 +337 @@
     },
     find_object_by_ext_id => qq{
-        SELECT ext_id, ext_id_basename
+        SELECT so_id, ext_id, ext_id_basename
         FROM storage_object
         WHERE ext_id = ?