Changeset 17753

Timestamp:

May 19, 2008, 3:47:08 PM (18 years ago)

Author:

jhoblitt

Message:

add support for the magical ':any' volume to Nebulous::Server:find_instances()

Location:

trunk/Nebulous-Server

Files:

• Changes (modified) (1 diff)
• lib/Nebulous/Server.pm (modified) (3 diffs)
• t/07_server_find_instances.t (modified) (2 diffs)

trunk/Nebulous-Server/Changes

@@ -2 +2 @@
 
 0.11
+    - add support for the magical ':any' volume to
+      Nebulous::Server:find_instances()
     - call sync on newly created files from
       Nebulous::Server::_create_empty_file()

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

@@ -1 +1 @@
 # Copyright (c) 2004-2008  Joshua Hoblitt
 #
-# $Id: Server.pm,v 1.72 2008-05-16 20:22:29 jhoblitt Exp $
+# $Id: Server.pm,v 1.73 2008-05-20 01:47:08 jhoblitt Exp $
 
 package Nebulous::Server;
@@ -928 +928 @@
     }
 
+    # handle :any volume
+    if ($vol_name eq ':any') {
+        $vol_name = undef;
+    }
+
     my @locations;
     eval {
@@ -1228 +1233 @@
     my $db  =$self->db;
 
+    # handle ":any" volume
+    if ($vol_name eq ':any') {
+        return 1;
+    }
+
     my ($vol_id, $vol_path);
     eval {

trunk/Nebulous-Server/t/07_server_find_instances.t

@@ -3 +3 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 07_server_find_instances.t,v 1.11 2008-05-06 22:10:58 jhoblitt Exp $
+# $Id: 07_server_find_instances.t,v 1.12 2008-05-20 01:47:08 jhoblitt Exp $
 
 use strict;
 use warnings FATAL => qw( all );
 
-use Test::More tests => 17;
+use Test::More tests => 19;
 
 use lib qw( ./t ./lib );
@@ -75 +75 @@
 
 {
+    # key, volume
+    my $uri = $neb->create_object('foo', 'node01');
+
+    my $locations = $neb->find_instances('neb://node02/foo', ":any");
+
+    uri_scheme_ok($locations->[0], 'file');
+    is($uri, $locations->[0], "URIs match");
+}
+
+Test::Nebulous->setup;
+
+{
     # key
     my $uri1 = $neb->create_object("foo");