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

Timestamp:

Nov 8, 2005, 2:48:24 PM (21 years ago)

Author:

jhoblitt

Message:

add type to storage_object
fix delete_object sql

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.11 2005-11-05 03:26:07 jhoblitt Exp $
+# $Id: SQL.pm,v 1.12 2005-11-09 00:48:24 jhoblitt Exp $
 
 package Nebulous::Server::SQL;
@@ -24 +24 @@
     new_object          => qq{
         INSERT INTO storage_object
-        (so_id, ext_id)
-        VALUES (?, ?)
+        (so_id, ext_id, type)
+        VALUES (?, ?, 'REG_FILE')
     },
     new_object_attr  => qq{
@@ -33 +33 @@
     },
     delete_object       => qq{
-        DELETE FROM storage_object, storage_object_attr
-        WHERE so_id = ?
+        DELETE storage_object, storage_object_attr 
+        FROM storage_object LEFT JOIN storage_object_attr
+        USING (so_id)
+        WHERE storage_object.so_id = ?
     },
     new_object_instance  => qq{
@@ -52 +54 @@
         WHERE ext_id = ?
     },
+    # Note: this sets an update lock
     get_object_locks    => qq{
         SELECT storage_object.so_id,
@@ -139 +142 @@
     my @clear = split /;/, <<END;
 DROP TABLE IF EXISTS storage_object;
+DROP TABLE IF EXISTS storage_object_attr;
 DROP TABLE IF EXISTS instance;
 DROP TABLE IF EXISTS lock_record;
@@ -163 +167 @@
 
 __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,
+    type enum('REG_FILE'),
     PRIMARY KEY(so_id),
-    KEY(ext_id(64))
-) ENGINE=innodb;
-
-DROP TABLE IF EXISTS storage_object_attr ;
+    KEY(ext_id(64)),
+    KEY(type)
+) ENGINE=innodb;
+
 CREATE TABLE storage_object_attr (
     so_id BIGINT NOT NULL AUTO_INCREMENT,