Changeset 24639 for trunk/Nebulous-Server/lib/Nebulous/Server/SQL.pm

Timestamp:

Jul 1, 2009, 6:40:27 PM (17 years ago)

Author:

jhoblitt

Message:

change Nebulous::Server->stat_object() to return both the total number of instance and just those that are available

File:

• trunk/Nebulous-Server/lib/Nebulous/Server/SQL.pm (modified) (1 diff)

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

@@ -83 +83 @@
     stat_object          => qq{
         SELECT
-            storage_object.so_id,
-            storage_object.ext_id,
-            read_lock,
-            write_lock,
-            storage_object_attr.epoch,
-            storage_object_attr.mtime,
-            COUNT(instance.so_id) as instances
-        FROM storage_object
-        JOIN storage_object_attr
+            so.so_id,
+            so.ext_id,
+            attr.read_lock,
+            attr.write_lock,
+            attr.epoch,
+            attr.mtime,
+            COUNT(instance.so_id) as instances,
+            SUM(available) as available
+        FROM storage_object as so
+        JOIN storage_object_attr as attr
             USING (so_id)
         JOIN instance
             USING (so_id)
-        WHERE ext_id = ?
-        GROUP BY storage_object.so_id
+        LEFT JOIN mountedvol
+            USING(vol_id)
+        WHERE ext_id = ?
+        GROUP BY so.so_id
     },
     # Note: this sets an update lock