Changeset 24643

Timestamp:

Jul 2, 2009, 2:14:41 PM (17 years ago)

Author:

jhoblitt

Message:

maintain backwards stat() compat

Location:

trunk/Nebulous-Server

Files:

• lib/Nebulous/Server.pod (modified) (1 diff)
• lib/Nebulous/Server/SQL.pm (modified) (1 diff)
• t/10_server_stat_object.t (modified) (1 diff)

trunk/Nebulous-Server/lib/Nebulous/Server.pod

@@ -182 +182 @@
     epoch
     mtime
-    number of instances
     number of available instances
+    total number of instances
 
 =item * mounts( $key );

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

@@ -89 +89 @@
             attr.epoch,
             attr.mtime,
-            COUNT(instance.so_id) as instances,
-            SUM(available) as available
+            SUM(available) as available,
+            COUNT(instance.so_id) as instances
         FROM storage_object as so
         JOIN storage_object_attr as attr

trunk/Nebulous-Server/t/10_server_stat_object.t

@@ -44 +44 @@
     like(@$info[4], qr/....-..-.. ..:..:../,   "epoch");
     like(@$info[5], qr/....-..-.. ..:..:../,   "mtime");
-    is(@$info[6], 1,                           "instances");
-    is(@$info[7], 1,                           "available instances");
+    is(@$info[6], 1,                           "available instances");
+    is(@$info[7], 1,                           "total instances");
 }