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

Timestamp:

Nov 4, 2005, 4:35:45 PM (21 years ago)

Author:

jhoblitt

Message:

split storage_object table into storage_object & storage_object_attr

File:

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

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

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: SQL.pm,v 1.9 2005-08-31 21:00:12 jhoblitt Exp $
+# $Id: SQL.pm,v 1.10 2005-11-05 02:35:45 jhoblitt Exp $
 
 package Nebulous::Server::SQL;
@@ -24 +24 @@
     new_object          => qq{
         INSERT INTO storage_object
-        (so_id, ext_id, class_id, comment, read_lock, write_lock)
-        VALUES (NULL, ?, ?, ?, 0, NULL)
+        (so_id, ext_id)
+        VALUES (?, ?)
+    },
+    new_object_attr  => qq{
+        INSERT INTO storage_object_attr
+        (so_id, class_id, comment, read_lock, write_lock)
+        VALUES (?, ?, ?, 0, NULL)
     },
     delete_object       => qq{
@@ -40 +45 @@
     },
     get_object          => qq{
-        SELECT so_id, ext_id, class_id, comment, read_lock, write_lock, epoch, mtime
+        SELECT storage_object.so_id,
+            ext_id, class_id, comment, read_lock, write_lock, epoch, mtime
         FROM storage_object
+        LEFT JOIN storage_object_attr
+        USING (so_id)
         WHERE ext_id = ?
     },
     get_object_locks    => qq{
-        SELECT so_id, read_lock, write_lock 
+        SELECT storage_object.so_id,
+            read_lock, write_lock 
         FROM storage_object
+        LEFT JOIN storage_object_attr
+        USING (so_id)
         WHERE ext_id = ?
         FOR UPDATE
     },
     set_write_lock      => qq{
-        UPDATE storage_object
+        UPDATE storage_object_attr
+        LEFT JOIN storage_object
+        USING(so_id)
         SET write_lock = 'write'
-        WHERE ext_id = ?
+        WHERE storage_object.ext_id = ?
     },
     delete_write_lock   => qq{
-        UPDATE storage_object
+        UPDATE storage_object_attr
+        LEFT JOIN storage_object
+        USING(so_id)
         SET write_lock = NULL
         WHERE ext_id = ?
     },
     increment_read_lock => qq{
-        UPDATE storage_object
-        SET read_lock = read_lock+1
+        UPDATE storage_object_attr
+        LEFT JOIN storage_object
+        USING(so_id)
+        SET read_lock = read_lock + 1
         WHERE ext_id = ?
     },
     decrement_read_lock => qq{
-        UPDATE storage_object
-        SET read_lock = read_lock-1
+        UPDATE storage_object_attr
+        LEFT JOIN storage_object
+        USING(so_id)
+        SET read_lock = read_lock - 1
         WHERE ext_id = ?
     },
@@ -85 +104 @@
     },
     get_object_instances        => qq{
-        SELECT storage_object.so_id, uri, assigned_location
+        SELECT storage_object.so_id,
+            uri, assigned_location
         FROM storage_object
         LEFT JOIN instance
         USING (so_id)
-        WHERE storage_object.ext_id = ?
+        WHERE ext_id = ?
     },
     get_storage_volume_byname   => qq{
@@ -143 +163 @@
 
 __DATA__
+DROP TABLE IF EXISTS storage_object;
 CREATE TABLE storage_object (
     so_id BIGINT NOT NULL AUTO_INCREMENT,
     ext_id VARCHAR(255) BINARY NOT NULL UNIQUE,
+    PRIMARY KEY(so_id),
+    KEY(ext_id(64))
+) ENGINE=innodb;
+
+DROP TABLE IF EXISTS storage_object_attr ;
+CREATE TABLE storage_object_attr (
+    so_id BIGINT NOT NULL AUTO_INCREMENT,
     class_id TINYINT NOT NULL,
     comment VARCHAR(255),
@@ -153 +181 @@
     mtime TIMESTAMP,
     PRIMARY KEY(so_id),
-    KEY(ext_id(64)),
     KEY(class_id)
 ) ENGINE=innodb;