Changeset 24558

Timestamp:

Jun 25, 2009, 2:29:18 PM (17 years ago)

Author:

jhoblitt

Message:

change Nebulous::Server->find_objects() to return dirs and to sort it's output

Location:

trunk/Nebulous-Server

Files:

• Changes (modified) (1 diff)
• lib/Nebulous/Server.pm (modified) (2 diffs)
• lib/Nebulous/Server/SQL.pm (modified) (1 diff)
• t/13_server_find_objects.t (modified) (6 diffs)

trunk/Nebulous-Server/Changes

@@ -29 +29 @@
     - infinitely try to get a db handle if the connection fails
     - add --mountpoint param to neb-voladd
+    - change Nebulous::Server->find_objects() to return dirs and to sort it's
+      output 
       
 0.16

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

@@ -1449 +1449 @@
     }
 
-    eval {
-        $log->debug("trying for a directory match under dir: $dir_id");
+    # find dirs under dir
+    my @dir_keys;
+    eval {
+        $log->debug("looking for directories under dir: $dir_id");
+        my $query = $db->prepare_cached( $sql->find_dir_by_parent_id);
+        $query->execute( $dir_id );
+
+        while ( my $row = $query->fetchrow_hashref ) {
+            next if $row->{'dir_id'} == 1;
+            my $dir = $row->{'dirname'};
+            if ($dir_id == 1) {
+                push @keys, $dir . '/' if $dir;
+            } else {
+                push @keys, $key->path . '/' . $dir . '/' if $dir;
+            }
+            $log->debug( "matched $dir" ) if $dir;
+        }
+    };
+    $log->logdie("database error: $@") if $@;
+
+    # find files under dir
+    eval {
+        $log->debug("looking for objects under dir: $dir_id");
         my $query = $db->prepare_cached( $sql->find_object_by_dir_id );
         $query->execute( $dir_id );
@@ -1463 +1484 @@
 
     $log->debug( "leaving" );
-
-    return \@keys;
+    
+    return [sort(@dir_keys), sort(@keys)];
 }
 

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

@@ -317 +317 @@
         FROM storage_object
         WHERE dir_id = ?
+    },
+    find_dir_by_parent_id => qq{
+        SELECT dir_id, dirname
+        FROM directory
+        WHERE parent_id = ?
     },
     rename_object => qq{

trunk/Nebulous-Server/t/13_server_find_objects.t

@@ -8 +8 @@
 use warnings FATAL => qw( all );
 
-use Test::More tests => 28;
+use Test::More tests => 36;
 
 use lib qw( ./t ./lib );
@@ -100 +100 @@
     my $keys = $neb->find_objects("a");
 
-    is(scalar @$keys, 1, 'number of keys found');
-    is($keys->[0], "a/foo", "key name");
+    is(scalar @$keys, 2, 'number of keys found');
+    is($keys->[0], "a/b/", "key name");
+    is($keys->[1], "a/foo", "key name");
 }
 
@@ -113 +114 @@
 
     is(scalar @$keys, 2, 'number of keys found');
-    is($keys->[0], "a/foo", "key name");
-    is($keys->[1], "a/bar", "key name");
+    is($keys->[0], "a/bar", "key name");
+    is($keys->[1], "a/foo", "key name");
 }
 
@@ -138 +139 @@
     my $keys = $neb->find_objects("/");
 
-    is(scalar @$keys, 2, 'number of keys found');
-    is($keys->[0], "foo", "key name");
+    is(scalar @$keys, 3, 'number of keys found');
+    is($keys->[0], "a/", "key name");
     is($keys->[1], "bar", "key name");
+    is($keys->[2], "foo", "key name");
 }
 
@@ -152 +154 @@
     my $keys = $neb->find_objects(".");
 
-    is(scalar @$keys, 2, 'number of keys found');
-    is($keys->[0], "foo", "key name");
+    is(scalar @$keys, 3, 'number of keys found');
+    is($keys->[0], "a/", "key name");
     is($keys->[1], "bar", "key name");
+    is($keys->[2], "foo", "key name");
 }
 
@@ -166 +169 @@
     my $keys = $neb->find_objects("..");
 
-    is(scalar @$keys, 2, 'number of keys found');
-    is($keys->[0], "foo", "key name");
+    is(scalar @$keys, 3, 'number of keys found');
+    is($keys->[0], "a/", "key name");
     is($keys->[1], "bar", "key name");
+    is($keys->[2], "foo", "key name");
+}
+
+Test::Nebulous->setup;
+
+{
+    $neb->create_object("a/bar");
+    $neb->create_object("b/foo");
+    $neb->create_object("foo");
+
+    my $keys = $neb->find_objects("/");
+
+    is(scalar @$keys, 3, 'number of keys found');
+    is($keys->[0], "a/", "key name");
+    is($keys->[1], "b/", "key name");
+    is($keys->[2], "foo", "key name");
 }