Changeset 13177
- Timestamp:
- May 2, 2007, 3:49:55 PM (19 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
-
Nebulous-Server/Changes (modified) (1 diff)
-
Nebulous-Server/lib/Nebulous/Server/SQL.pm (modified) (9 diffs)
-
Nebulous/Changes (modified) (1 diff)
-
Nebulous/lib/Nebulous/Server/SQL.pm (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Nebulous-Server/Changes
r13173 r13177 2 2 3 3 0.05 4 - SQL cleanup 4 5 - better paramter checking 5 6 - overhaul instance table -
trunk/Nebulous-Server/lib/Nebulous/Server/SQL.pm
r13173 r13177 1 1 # Copyright (c) 2004 Joshua Hoblitt 2 2 # 3 # $Id: SQL.pm,v 1.3 4 2007-05-03 01:44:24jhoblitt Exp $3 # $Id: SQL.pm,v 1.35 2007-05-03 01:49:55 jhoblitt Exp $ 4 4 5 5 package Nebulous::Server::SQL; … … 17 17 }, 18 18 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 = ? 20 22 }, 21 23 last_insert_id => qq{ … … 33 35 }, 34 36 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) 38 43 WHERE storage_object.so_id = ? 39 44 }, … … 47 52 }, 48 53 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 53 63 USING (so_id) 54 64 WHERE ext_id = ? … … 56 66 # Note: this sets an update lock 57 67 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 62 74 USING (so_id) 63 75 WHERE ext_id = ? … … 104 116 set_write_lock => qq{ 105 117 UPDATE storage_object_attr 106 LEFTJOIN storage_object118 JOIN storage_object 107 119 USING(so_id) 108 120 SET write_lock = 'write' … … 111 123 delete_write_lock => qq{ 112 124 UPDATE storage_object_attr 113 LEFTJOIN storage_object125 JOIN storage_object 114 126 USING(so_id) 115 127 SET write_lock = NULL … … 118 130 increment_read_lock => qq{ 119 131 UPDATE storage_object_attr 120 LEFTJOIN storage_object132 JOIN storage_object 121 133 USING(so_id) 122 134 SET read_lock = read_lock + 1 … … 125 137 decrement_read_lock => qq{ 126 138 UPDATE storage_object_attr 127 LEFTJOIN storage_object139 JOIN storage_object 128 140 USING(so_id) 129 141 SET read_lock = read_lock - 1 -
trunk/Nebulous/Changes
r13173 r13177 2 2 3 3 0.05 4 - SQL cleanup 4 5 - better paramter checking 5 6 - overhaul instance table -
trunk/Nebulous/lib/Nebulous/Server/SQL.pm
r13173 r13177 1 1 # Copyright (c) 2004 Joshua Hoblitt 2 2 # 3 # $Id: SQL.pm,v 1.3 4 2007-05-03 01:44:24jhoblitt Exp $3 # $Id: SQL.pm,v 1.35 2007-05-03 01:49:55 jhoblitt Exp $ 4 4 5 5 package Nebulous::Server::SQL; … … 17 17 }, 18 18 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 = ? 20 22 }, 21 23 last_insert_id => qq{ … … 33 35 }, 34 36 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) 38 43 WHERE storage_object.so_id = ? 39 44 }, … … 47 52 }, 48 53 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 53 63 USING (so_id) 54 64 WHERE ext_id = ? … … 56 66 # Note: this sets an update lock 57 67 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 62 74 USING (so_id) 63 75 WHERE ext_id = ? … … 104 116 set_write_lock => qq{ 105 117 UPDATE storage_object_attr 106 LEFTJOIN storage_object118 JOIN storage_object 107 119 USING(so_id) 108 120 SET write_lock = 'write' … … 111 123 delete_write_lock => qq{ 112 124 UPDATE storage_object_attr 113 LEFTJOIN storage_object125 JOIN storage_object 114 126 USING(so_id) 115 127 SET write_lock = NULL … … 118 130 increment_read_lock => qq{ 119 131 UPDATE storage_object_attr 120 LEFTJOIN storage_object132 JOIN storage_object 121 133 USING(so_id) 122 134 SET read_lock = read_lock + 1 … … 125 137 decrement_read_lock => qq{ 126 138 UPDATE storage_object_attr 127 LEFTJOIN storage_object139 JOIN storage_object 128 140 USING(so_id) 129 141 SET read_lock = read_lock - 1
Note:
See TracChangeset
for help on using the changeset viewer.
