Changeset 23708 for branches/neb_distrib_20081210/Nebulous-Server/lib/Nebulous/Server/SQL.pm

Timestamp:

Apr 3, 2009, 3:14:24 PM (17 years ago)

Author:

jhoblitt

Message:

merge everything from head except Server.pm

File:

• branches/neb_distrib_20081210/Nebulous-Server/lib/Nebulous/Server/SQL.pm (modified) (9 diffs)

branches/neb_distrib_20081210/Nebulous-Server/lib/Nebulous/Server/SQL.pm

@@ -47 +47 @@
         (so_id, vol_id, uri)
         VALUES (?, ?, 'error')
-    },
-    get_all_instances   => qq{
-        SELECT * FROM INSTANCE
-        WHERE so_id = ?
     },
     get_object          => qq{
@@ -63 +59 @@
         JOIN storage_object_attr
         USING (so_id)
+        WHERE ext_id = ?
+    },
+    check_object_name => qq{
+        SELECT
+            so_id,
+            ext_id
+        FROM storage_object
         WHERE ext_id = ?
     },
@@ -351 +354 @@
         limit 5;
     },
+    find_objects_with_extra_instances => qq{
+        SELECT
+            storage_object.so_id,
+            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
+            USING(vol_id)
+        WHERE
+            mymountedvol.available = 1
+            AND storage_object_xattr.name = 'user.copies'
+        GROUP BY so_id
+        HAVING available_instances > copies
+    },
     get_mounted_volumes => qq{
         SELECT * FROM mountedvol ORDER BY host, name
@@ -408 +436 @@
     type enum('REG_FILE'),
     PRIMARY KEY(so_id),
-    KEY(ext_id(64)),
     KEY(type)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
@@ -443 +470 @@
     type ENUM( 'read', 'write' ) NOT NULL,
     epoch TIMESTAMP,
-    KEY(so_ID)
+    KEY(so_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -457 +484 @@
     xattr BOOLEAN DEFAULT FALSE,
     PRIMARY KEY(vol_id),
-    KEY(name(16)),
     KEY(host(16)),
     KEY(path(255)),
@@ -472 +498 @@
     vol_id INT NOT NULL,
     FOREIGN KEY(vol_id) REFERENCES volume(vol_id),
-    uri VARCHAR(255) NOT NULL UNIQUE,
+    uri VARCHAR(255) NOT NULL,
     epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     mtime TIMESTAMP,
@@ -478 +504 @@
     KEY(so_id),
     KEY(vol_id),
-    KEY(uri(64))
+    KEY(uri(40))
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -517 +543 @@
     available BOOLEAN DEFAULT FALSE,
     xattr BOOLEAN DEFAULT FALSE,
+    PRIMARY KEY(mountpoint),
     KEY(vol_id),
+    KEY(name),
+    KEY(host),
+    KEY(path),
     KEY(allocate),
-    KEY(available)
+    KEY(available),
+    KEY(xattr)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;