Changeset 20966

Timestamp:

Dec 12, 2008, 11:41:07 AM (17 years ago)

Author:

jhoblitt

Message:

update

File:

• trunk/Nebulous-Server/lib/Nebulous/Server/SQL.pm (modified) (2 diffs)

trunk/Nebulous-Server/lib/Nebulous/Server/SQL.pm

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: SQL.pm,v 1.76 2008-12-12 21:13:41 jhoblitt Exp $
+# $Id: SQL.pm,v 1.77 2008-12-12 21:41:07 jhoblitt Exp $
 
 package Nebulous::Server::SQL;
@@ -328 +328 @@
         HAVING available_instances < instances OR instances < copies
     },
-    find_objects_with_extra_instances => qq{
-        SELECT
-            storage_object.so_id,
-            ext_id,
+    find_objects_with_extra_instances_by_xattr => qq{
+        SELECT
+            so.so_id,
+            so.ext_id,
             count(ins_id) as instances,
-            volume.name as volume_name,
-            volume.host as volume_host,
-            count(mymountedvol.vol_id) as available_instances,
-            count(mymountedvol.vol_id) > 0 as recoverable,
-            storage_object_xattr.value as copies
-        FROM storage_object
-        JOIN instance
-            USING(so_id)
-        JOIN volume
-            USING(vol_id)
-        LEFT JOIN storage_object_xattr
-            ON storage_object.so_id = storage_object_xattr.so_id
-        JOIN mymountedvol
+            mv.name as volume_name,
+            mv.host as volume_host,
+            count(mv.vol_id) as available_instances,
+            xattr.value as copies
+        FROM storage_object AS so
+        JOIN storage_object_xattr as xattr
+            ON so.so_id = xattr.so_id
+            AND xattr.name = 'user.copies'
+        JOIN instance AS i
+            ON so.so_id = i.so_id
+        JOIN mountedvol AS mv
             USING(vol_id)
         WHERE
-            mymountedvol.available = 1
-            AND storage_object_xattr.name = 'user.copies'
+            mv.available = 1
         GROUP BY so_id
         HAVING available_instances > copies
+        limit 5;
     },
     get_mounted_volumes => qq{