Changeset 28794 for branches/eam_branches/ipp-20100621/Nebulous-Server/lib/Nebulous/Server.pm

Timestamp:

Jul 30, 2010, 9:31:50 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

File:

• branches/eam_branches/ipp-20100621/Nebulous-Server/lib/Nebulous/Server.pm (modified) (3 diffs)

branches/eam_branches/ipp-20100621/Nebulous-Server/lib/Nebulous/Server.pm

@@ -9 +9 @@
 no warnings qw( uninitialized );
 
-our $VERSION = '0.17';
+our $VERSION = '0.18';
 
 use base qw( Class::Accessor::Fast );
@@ -1510 +1510 @@
 }
 
+sub find_objects_wildcard
+{
+    my $self = shift;
+
+    my $log = $self->log;
+    $log->debug( "entered - @_" );
+
+    my ($pattern) = validate_pos( @_,
+        {
+            type        => SCALAR,
+            optional    => 1,
+        },
+    );
+
+    my $sql = $self->sql;
+    my $db  = $self->_db_for_index(0);
+    
+    # validate that we have a key to deal with
+    eval {
+        $pattern = parse_neb_key($pattern) if defined $pattern;
+    };
+    $log->logdie("$@") if $@;
+
+    unless (defined $pattern) {
+        $log->debug( "leaving" );
+        $log->logdie("no keys found");
+    }
+
+    # parse out the directory we're working in, and decide if we are a directory
+    my $dir_id = $self->_resolve_dir_parent_id(key => $pattern, dir_id => 1);
+    my $work_dir;
+    my $file_pattern;
+    if (defined $dir_id) {
+        $work_dir = $pattern;
+        $file_pattern = '%';
+    }
+    else {
+        my $dir_plain = dirname($pattern);
+        if ($dir_plain eq 'neb:') {
+            $dir_plain = 'neb:///';
+        }
+        if ($dir_plain) {
+            $work_dir = parse_neb_key($dir_plain);
+        }
+        else {
+            $work_dir = parse_neb_key('/');
+        }
+        $file_pattern = basename $pattern;
+        unless ($file_pattern) {
+            $file_pattern = '%';
+        }
+        
+        $dir_id = $self->_resolve_dir_parent_id(key => $work_dir, dir_id => 1);
+        unless (defined $dir_id) {
+            $log->logdie("pattern $work_dir does not match any key or directory");
+        }
+    }
+    
+    # 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 . " AND dirname LIKE ? ");
+        $query->execute( $dir_id, $file_pattern );
+
+        while ( my $row = $query->fetchrow_hashref ) {
+            next if $row->{'dir_id'} == 1;
+            my $dir = $row->{'dirname'};
+            if ($dir_id == 1) {
+                push @dir_keys, $dir . '/' if $dir;
+            } else {
+                push @dir_keys, $work_dir->path . '/' . $dir . '/' if $dir;
+            }
+            $log->debug( "matched $dir" ) if $dir;
+        }
+    };
+    $log->logdie("database error: $@") if $@;
+
+    # find files under dir
+    my @keys;
+    eval {
+        $log->debug("looking for objects under dir: $dir_id");
+        my $query = $db->prepare_cached( $sql->find_object_by_dir_id . " AND ext_id_basename LIKE ? ");
+        $query->execute( $dir_id , $file_pattern);
+
+        while ( my $row = $query->fetchrow_hashref ) {
+            my $key = $row->{ 'ext_id' };
+            push @keys, $key if $key;
+            $log->debug( "matched $key" ) if $key;
+        }
+    };
+    $log->logdie("database error: $@") if $@;
+
+    $log->debug( "leaving" );
+    
+    return [sort(@dir_keys), sort(@keys)];
+
+}
+
 # find matching objects from the given server
 sub _find_objects_for_index
@@ -1598 +1698 @@
 }
 
+sub find_ext_id_by_volume
+{
+    my $self = shift;
+    my $log = $self->log;
+    $log->debug("entered - @_");
+    my ($vol_name,$limit) = validate_pos(@_,
+                                        {
+                                            type      => SCALAR,
+# #                                         callbacks => {
+# #                                             'is valid volume name' => sub {
+# #                                                 return 1 if not defined $_[0];
+# #                                                 $self->_is_valid_volume_name($_[0])
+# #                                             },
+#                                           },
+                                        },
+                                        {
+                                            type      => SCALAR|UNDEF,
+                                            optional => 1,
+                                        },
+        );
+    unless (defined($limit)) {
+        $limit = 50000;
+    }
+
+    my $sql = $self->sql;
+    my @ext_ids;
+    my $db = $self->_db_for_index(0);
+    eval {
+        my $query;
+        $query = $db->prepare_cached( $sql->get_ext_id_by_vol_name );
+        my $rows = $query->execute($vol_name, 1,$limit);
+        unless ($rows > 0) {
+            $query->finish;
+            $log->logdie("no instances on storage volume or volume is not avaiable for volume: $vol_name");
+        }
+        while (my $row = $query->fetchrow_hashref) {
+            my $ext_id = $row->{ 'ext_id' };
+            push @ext_ids, $ext_id if $ext_id;
+        }
+    };
+    if ($@) {
+        $db->rollback;
+        $log->logdie("database error: $@");
+    }
+
+    # XXX remove this?
+    $log->logdie("no ext_ids found") unless (scalar @ext_ids);
+
+    $log->debug("found: \@ext_ids");
+
+    $log->debug("leaving");
+
+    return \@ext_ids;
+}
 
 sub find_instances