IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
May 1, 2007, 3:00:10 PM (19 years ago)
Author:
jhoblitt
Message:

add instance.vol_id field
misc code cleanups

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r13092 r13115  
    11# Copyright (c) 2004  Joshua Hoblitt
    22#
    3 # $Id: SQL.pm,v 1.30 2007-05-01 02:52:04 jhoblitt Exp $
     3# $Id: SQL.pm,v 1.31 2007-05-02 01:00:10 jhoblitt Exp $
    44
    55package Nebulous::Server::SQL;
    … …  
    1717    },
    1818    update_instance_uri => qq{
    19         UPDATE instance SET uri = ? WHERE ins_id = ?
     19        UPDATE instance SET vol_id = ?, uri = ? WHERE ins_id = ?
    2020    },
    2121    last_insert_id      => qq{
    … …  
    3838        WHERE storage_object.so_id = ?
    3939    },
    40     new_object_instance  => qq{
     40    new_object_instance => qq{
    4141        INSERT INTO instance
    42         VALUES (NULL, LAST_INSERT_ID(), 'error', NULL, NULL, NULL, NULL)
     42        VALUES (NULL, LAST_INSERT_ID(), 0, 'error', NULL, NULL, NULL, NULL)
    4343    },
    4444    new_instance        => qq{
    4545        INSERT INTO instance
    46         VALUES (NULL, ?, 'error', NULL,NULL, NULL, NULL)
     46        VALUES (NULL, ?, 0, 'error', NULL,NULL, NULL, NULL)
    4747    },
    4848    get_object          => qq{
    … …  
    154154    get_storage_volume_byname   => qq{
    155155        SELECT
    156             path as volume,
     156            vol_id,
     157            path,
    157158            total - used as free
    158159        FROM mountedvol
    … …  
    165166    get_storage_volume          => qq{
    166167        SELECT
    167             path as volume,
     168            vol_id,
     169            path,
    168170            total - used as free
    169171        FROM mountedvol
    … …  
    210212{
    211213    my @clear = split /;/, <<END;
     214SET FOREIGN_KEY_CHECKS=0;
    212215DROP TABLE IF EXISTS storage_object;
    213216DROP TABLE IF EXISTS storage_object_attr;
    … …  
    219222DROP TABLE IF EXISTS class;
    220223DROP TABLE IF EXISTS log;
    221 DROP PROCEDURE IF EXISTS getmountedvol
     224DROP PROCEDURE IF EXISTS getmountedvol;
     225SET FOREIGN_KEY_CHECKS=1
    222226END
    223227    $sql{get_db_clear} = \@clear;
    … …  
    273277    ins_id BIGINT NOT NULL AUTO_INCREMENT,
    274278    so_id BIGINT NOT NULL,
     279    vol_id INT NOT NULL,
    275280    uri VARCHAR(255) NOT NULL,
    276281    sha1sum CHAR(40) ASCII,
Note: See TracChangeset for help on using the changeset viewer.