IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
May 2, 2007, 3:49:55 PM (19 years ago)
Author:
jhoblitt
Message:

SQL cleanup

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r13173 r13177  
    11# Copyright (c) 2004  Joshua Hoblitt
    22#
    3 # $Id: SQL.pm,v 1.34 2007-05-03 01:44:24 jhoblitt Exp $
     3# $Id: SQL.pm,v 1.35 2007-05-03 01:49:55 jhoblitt Exp $
    44
    55package Nebulous::Server::SQL;
    … …  
    1717    },
    1818    update_instance_uri => qq{
    19         UPDATE instance SET vol_id = ?, uri = ? WHERE ins_id = ?
     19        UPDATE instance
     20        SET vol_id = ?, uri = ?
     21        WHERE ins_id = ?
    2022    },
    2123    last_insert_id      => qq{
    … …  
    3335    },
    3436    delete_object       => qq{
    35         DELETE storage_object, storage_object_attr
    36         FROM storage_object LEFT JOIN storage_object_attr
    37         USING (so_id)
     37        DELETE
     38            storage_object,
     39            storage_object_attr
     40        FROM storage_object
     41        JOIN storage_object_attr
     42            USING (so_id)
    3843        WHERE storage_object.so_id = ?
    3944    },
    … …  
    4752    },
    4853    get_object          => qq{
    49         SELECT storage_object.so_id,
    50             ext_id, read_lock, write_lock, epoch, mtime
    51         FROM storage_object
    52         LEFT JOIN storage_object_attr
     54        SELECT
     55            storage_object.so_id,
     56            ext_id,
     57            read_lock,
     58            write_lock,
     59            epoch,
     60            mtime
     61        FROM storage_object
     62        JOIN storage_object_attr
    5363        USING (so_id)
    5464        WHERE ext_id = ?
    … …  
    5666    # Note: this sets an update lock
    5767    get_object_locks    => qq{
    58         SELECT storage_object.so_id,
    59             read_lock, write_lock
    60         FROM storage_object
    61         LEFT JOIN storage_object_attr
     68        SELECT
     69            storage_object.so_id,
     70            read_lock,
     71            write_lock
     72        FROM storage_object
     73        JOIN storage_object_attr
    6274        USING (so_id)
    6375        WHERE ext_id = ?
    … …  
    104116    set_write_lock      => qq{
    105117        UPDATE storage_object_attr
    106         LEFT JOIN storage_object
     118        JOIN storage_object
    107119        USING(so_id)
    108120        SET write_lock = 'write'
    … …  
    111123    delete_write_lock   => qq{
    112124        UPDATE storage_object_attr
    113         LEFT JOIN storage_object
     125        JOIN storage_object
    114126        USING(so_id)
    115127        SET write_lock = NULL
    … …  
    118130    increment_read_lock => qq{
    119131        UPDATE storage_object_attr
    120         LEFT JOIN storage_object
     132        JOIN storage_object
    121133        USING(so_id)
    122134        SET read_lock = read_lock + 1
    … …  
    125137    decrement_read_lock => qq{
    126138        UPDATE storage_object_attr
    127         LEFT JOIN storage_object
     139        JOIN storage_object
    128140        USING(so_id)
    129141        SET read_lock = read_lock - 1
Note: See TracChangeset for help on using the changeset viewer.