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

Timestamp:

Jun 24, 2009, 12:50:43 PM (17 years ago)

Author:

jhoblitt

Message:

nebdiskd bug fixes: fix debug mode outpoint going to mail, remove db passwd requirement (not all dbs require a password param)
completely rework how mountedvol is populated, drop mount table

File:

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

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

@@ -396 +396 @@
     },
     get_mounted_volumes => qq{
-        SELECT * FROM mountedvol ORDER BY host, name
+        SELECT mountpoint, total, used, vol_id, name, host, path, allocate, available, xattr FROM mountedvol ORDER BY host, name
     },
 );
@@ -423 +423 @@
 DROP TABLE IF EXISTS lock_record;
 DROP TABLE IF EXISTS volume;
-DROP TABLE IF EXISTS mount;
+DROP TABLE IF EXISTS mountedvol;
 DROP TABLE IF EXISTS log;
-DROP TABLE IF EXISTS mountedvol;
 DROP TABLE IF EXISTS directory;
 DROP PROCEDURE IF EXISTS getmountedvol;
@@ -518 +517 @@
     host VARCHAR(255) NOT NULL,
     path VARCHAR(255) UNIQUE NOT NULL,
-    mountpoint VARCHAR(255) NOT NULL,
     allocate BOOLEAN DEFAULT FALSE,
     available BOOLEAN DEFAULT FALSE,
     xattr BOOLEAN DEFAULT FALSE,
+    mountpoint VARCHAR(255) NOT NULL,
     PRIMARY KEY(vol_id),
     KEY(host(16)),
@@ -527 +526 @@
     KEY(allocate),
     KEY(available)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+###
+
+CREATE TABLE mountedvol(
+    vol_id INT UNIQUE NOT NULL,
+    FOREIGN KEY(vol_id) REFERENCES volume(vol_id) ON DELETE CASCADE,
+    name VARCHAR(255) NOT NULL,
+    host VARCHAR(255) NOT NULL,
+    path VARCHAR(255) NOT NULL,
+    FOREIGN KEY(path) REFERENCES volume(path) ON DELETE CASCADE,
+    allocate BOOLEAN DEFAULT FALSE,
+    available BOOLEAN DEFAULT FALSE,
+    xattr BOOLEAN DEFAULT FALSE,
+    mountpoint VARCHAR(255) NOT NULL,
+    FOREIGN KEY(mountpoint) REFERENCES volume(mountpoint) ON DELETE CASCADE,
+    total BIGINT NOT NULL,
+    used BIGINT NOT NULL,
+    PRIMARY KEY(vol_id),
+    KEY(name),
+    KEY(host),
+    KEY(path),
+    KEY(allocate),
+    KEY(available),
+    KEY(xattr),
+    KEY(mountpoint(255))
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -548 +573 @@
 ###
 
-CREATE TABLE mount (
-    mountpoint VARCHAR(255) NOT NULL,
-    total BIGINT NOT NULL,
-    used BIGINT NOT NULL,
-    PRIMARY KEY(mountpoint)
-) ENGINE=innodb DEFAULT CHARSET=latin1;
-
-###
-
 CREATE TABLE log (
     timestamp TIMESTAMP,
@@ -564 +580 @@
     message VARCHAR(2048) NOT NULL,
     PRIMARY KEY(timestamp)
-) ENGINE=innodb DEFAULT CHARSET=latin1;
-
-###
-
-CREATE TABLE mountedvol(
-    mountpoint VARCHAR(255) NOT NULL,
-    FOREIGN KEY(mountpoint) REFERENCES mount(mountpoint) ON DELETE CASCADE,
-    total BIGINT NOT NULL,
-    used BIGINT NOT NULL,
-    vol_id INT NOT NULL,
-    FOREIGN KEY(vol_id) REFERENCES volume(vol_id) ON DELETE CASCADE,
-    name VARCHAR(255) NOT NULL,
-    host VARCHAR(255) NOT NULL,
-    path VARCHAR(255) NOT NULL,
-    FOREIGN KEY(path) REFERENCES volume(path) ON DELETE CASCADE,
-    allocate BOOLEAN DEFAULT FALSE,
-    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(xattr)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;