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

Timestamp:

Jun 24, 2009, 11:20:15 AM (17 years ago)

Author:

jhoblitt

Message:

start volume handling refactoring

File:

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

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

@@ -517 +517 @@
     name VARCHAR(255) UNIQUE NOT NULL,
     host VARCHAR(255) NOT NULL,
-    path VARCHAR(255) NOT NULL,
+    path VARCHAR(255) UNIQUE NOT NULL,
+    mountpoint VARCHAR(255) NOT NULL,
     allocate BOOLEAN DEFAULT FALSE,
     available BOOLEAN DEFAULT FALSE,
@@ -523 +524 @@
     PRIMARY KEY(vol_id),
     KEY(host(16)),
-    KEY(path(255)),
+    KEY(mountpoint(255)),
     KEY(allocate),
     KEY(available)
@@ -609 +610 @@
 
     -- store the okey checking state
-    SELECT @@FOREIGN_KEY_CHECKS INTO key_checks; 
+--    SELECT @@FOREIGN_KEY_CHECKS INTO key_checks; 
     -- disable foregin check checks to prevent deadlocks on the mountedvol table
-    SET FOREIGN_KEY_CHECKS=0;
+--    SET FOREIGN_KEY_CHECKS=0;
 
     -- make sure the temp table does not already exist... this can happy if the
@@ -630 +631 @@
     OPEN cur1;
 
-    DELETE FROM mountedvol;
-
     myloop: LOOP
         FETCH cur1 INTO vol_idvar, namevar, hostvar, pathvar, allocatevar, availablevar, xattrvar;
         IF `done` THEN LEAVE myloop; END IF;
-        INSERT INTO mountedvol
+        REPLACE INTO mountedvol
             SELECT mountpoint, total, used, vol_idvar, namevar, hostvar, pathvar, allocatevar, availablevar, xattrvar
             FROM
@@ -651 +650 @@
 
     -- restore the original key checking state
-    SET @@FOREIGN_KEY_CHECKS = key_checks; 
+--    SET @@FOREIGN_KEY_CHECKS = key_checks; 
 
     DROP TABLE IF EXISTS myvolume;
 
-    SET FOREIGN_KEY_CHECKS=1;
+--    SET FOREIGN_KEY_CHECKS=1;
 
     COMMIT;