Changeset 13180 for trunk/Nebulous-Server

Timestamp:

May 2, 2007, 5:21:28 PM (19 years ago)

Author:

jhoblitt

Message:

overhaul Nebulous::Client->cull()
add the number of instances to ->stat_object()

Location:

trunk/Nebulous-Server

Files:

• lib/Nebulous/Server.pm (modified) (2 diffs)
• lib/Nebulous/Server/SQL.pm (modified) (3 diffs)
• t/09_server_stat_object.t (modified) (6 diffs)

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

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Server.pm,v 1.32 2007-05-03 01:44:23 jhoblitt Exp $
+# $Id: Server.pm,v 1.33 2007-05-03 03:21:28 jhoblitt Exp $
 
 package Nebulous::Server;
@@ -1021 +1021 @@
     my ( $key ) = validate_pos( @_,
         {
-            type => SCALAR,
-        },
-    );
-
-    my $log = $self->log;
-    my $sql = $self->sql;
-    my $db  =$self->db;
-
-    $log->debug( "entered - @_" );
+            type        => SCALAR,
+            callbacks   => {
+                'is valid object key' => sub { $self->_is_valid_object_key($_[0]) },
+            },
+        },
+    );
+
+    my $log = $self->log;
+    my $sql = $self->sql;
+    my $db  =$self->db;
+
+    $log->debug("entered - @_");
 
     my $stat;
     eval {
-        my $query = $db->prepare_cached( $sql->get_object );
-        my $rows = $query->execute( $key );
-
-        unless ( $rows == 1 ) {
-            $log->logdie( "no storage object found" );
+        my $query = $db->prepare_cached( $sql->stat_object );
+        my $rows = $query->execute($key);
+
+        unless ($rows == 1) {
+            $log->logdie("no storage object found");
         }
 
         $stat = $query->fetchrow_arrayref;
         $query->finish;
-
-        $db->commit;
     };
     if ( $@ ) {
         $db->rollback;
-        $log->logdie( "database error: $@" );
-    }
-
-    $log->debug( "leaving" );
+        $log->logdie("database error: $@");
+    }
+
+    $log->debug("leaving");
 
     return $stat;

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

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: SQL.pm,v 1.35 2007-05-03 01:49:55 jhoblitt Exp $
+# $Id: SQL.pm,v 1.36 2007-05-03 03:21:28 jhoblitt Exp $
 
 package Nebulous::Server::SQL;
@@ -53 +53 @@
     get_object          => qq{
         SELECT
-            storage_object.so_id,
+            so_id,
             ext_id,
             read_lock,
@@ -63 +63 @@
         USING (so_id)
         WHERE ext_id = ?
+    },
+    stat_object          => qq{
+        SELECT
+            storage_object.so_id,
+            storage_object.ext_id,
+            read_lock,
+            write_lock,
+            storage_object_attr.epoch,
+            storage_object_attr.mtime,
+            COUNT(instance.so_id) as instances
+        FROM storage_object
+        JOIN storage_object_attr
+            USING (so_id)
+        JOIN instance
+            USING (so_id)
+        WHERE ext_id = ?
+        GROUP BY storage_object.so_id
     },
     # Note: this sets an update lock

trunk/Nebulous-Server/t/09_server_stat_object.t

@@ -3 +3 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 09_server_stat_object.t,v 1.10 2007-05-01 02:52:04 jhoblitt Exp $
+# $Id: 09_server_stat_object.t,v 1.11 2007-05-03 03:21:28 jhoblitt Exp $
 
 use strict;
 use warnings FATAL => qw( all );
 
-use Test::More tests => 11;
+use Test::More tests => 12;
 
 use lib qw( ./t ./lib );
@@ -23 +23 @@
 
 Test::Nebulous->setup;
-
 {
-    my $uri = $neb->create_object("foo");
+    $neb->create_object("foo");
 
     my $info = $neb->stat_object("foo");
 
-    is(scalar @$info, 6, "number of columns");
+    is(scalar @$info, 7, "number of columns");
 }
 
@@ -35 +34 @@
 
 {
-    my $uri = $neb->create_object("foo", "node01");
+    $neb->create_object("foo", "node01");
 
     my $info = $neb->stat_object("foo");
 
-    is(scalar @$info, 6,                       "number of columns");
+    is(scalar @$info, 7,                       "number of columns");
     is(@$info[0], 1,                           "so_id");
     is(@$info[1], "foo",                       "ext_id");
@@ -46 +45 @@
     like(@$info[4], qr/....-..-.. ..:..:../,   "epoch");
     like(@$info[5], qr/....-..-.. ..:..:../,   "mtime");
+    is(@$info[6], 1,                           "instances");
 }
 
@@ -53 +53 @@
     $neb->stat_object("foo");
 };
-like($@, qr/no storage object found/, "object does not exist");
+like($@, qr/is valid object key/, "object does not exist");
 
 Test::Nebulous->setup;
@@ -65 +65 @@
 
 eval {
+    $neb->create_object("foo");
     $neb->stat_object("foo", 2);
 };