Index: trunk/Nebulous-Server/lib/Nebulous/Server.pm
===================================================================
--- trunk/Nebulous-Server/lib/Nebulous/Server.pm	(revision 20972)
+++ trunk/Nebulous-Server/lib/Nebulous/Server.pm	(revision 20990)
@@ -1,5 +1,5 @@
 # Copyright (c) 2004-2008  Joshua Hoblitt
 #
-# $Id: Server.pm,v 1.95 2008-12-13 00:41:15 jhoblitt Exp $
+# $Id: Server.pm,v 1.96 2008-12-14 22:54:25 eugene Exp $
 
 package Nebulous::Server;
@@ -9,5 +9,5 @@
 no warnings qw( uninitialized );
 
-our $VERSION = '0.16';
+our $VERSION = '0.15';
 
 use base qw( Class::Accessor::Fast );
@@ -19,8 +19,8 @@
 use File::Spec;
 use Log::Log4perl;
-use Nebulous::Keys qw( parse_neb_key parse_neb_volume );
 use Nebulous::Server::Config;
 use Nebulous::Server::Log;
 use Nebulous::Server::SQL;
+use Nebulous::Keys qw( parse_neb_key parse_neb_volume );
 use Params::Validate qw( validate_pos SCALAR SCALARREF UNDEF );
 use URI::file;
@@ -36,13 +36,5 @@
 
     # let Nebulous::Server::Config validate our params
-    my $config = Nebulous::Server::Config->new( @_ );
-
-    return $class->new_from_config($config);
-}
-
-
-sub new_from_config
-{
-    my ($class, $config) = @_;
+    my $config = Nebulous::Server::Config->init( @_ );
 
     # log4perl is not avaliable until we call init()
@@ -59,12 +51,21 @@
     $self->config($config);
 
+    # ask for the db handle as a means of validating the database parameters
+    $self->db;
+
     $log->debug( "leaving" );
-
+    
     return $self;
 }
 
+
 sub db
 {
-    my ($self, $key) = @_;
+    my $self = shift;
+
+    if (@_) {
+        $self->{db} = $_[0];
+        return $self;
+    }
 
     my $log     = $self->log;
@@ -72,26 +73,11 @@
     my $config  = $self->config;
 
-    my $db_index = 0;
-    if (defined $key) {
-        # hash the key to select the correct database instance
-        # only use the first 8 hex chars... have to be careful to avoid an int
-        # overflow here
-        $db_index = unpack("h8", sha1_hex("$key")) % $config->n_db;
-    }
-
-    # lookup to see if we have a stored dbh for this database
-    my $dbh = $self->{dbs}[$db_index];
     # if the dbh is still alive, return it
-    if (defined $dbh and $dbh->ping) {
+    if (defined $self->{db} and $self->{db}->ping) {
         $log->debug("db handle is still alive");
-        return $dbh;
+        return $self->{db};
     }
     # otherwise create a new connection
     $log->debug("db handle is dead/unopened");
-
-    # lookup database info
-    my $db_config = $config->db($db_index);
-    die "can't find database configuration info for database # $db_index"
-        unless $db_config;
 
     # if we're running under mod_perl & Apache::DBI is loaded we want to
@@ -100,9 +86,10 @@
     # processes and the database might have gone away on us.  Apache::DBI will
     # take care of getting a valid dbh back.
-    eval {
-        $dbh = DBI->connect_cached(
-            $db_config->dsn,
-            $db_config->dbuser,
-            $db_config->dbpasswd,
+    my $db;
+    eval {
+        $db = DBI->connect_cached(
+            $config->dsn,
+            $config->dbuser,
+            $config->dbpasswd,
             {
                 RaiseError => 1,
@@ -112,18 +99,18 @@
         );
 
-        $dbh->do( $sql->set_transaction_model );
-        $log->debug( "connected to database: ", sub { $dbh->data_sources; } );
-        $dbh->commit;
+        $db->do( $sql->set_transaction_model );
+        $log->debug( "connected to database: ", sub { $db->data_sources; } );
+        $db->commit;
         $log->debug("commit");
     };
     if ( $@ ) {
-        $dbh->rollback if $dbh;
+        $db->rollback if $db;
         $log->debug("rollback");
         $log->logdie( "database error: $@" );
     }
 
-    $self->{dbs}[$db_index] = $dbh;
-
-    return $dbh;
+    $self->{db} = $db;
+
+    return $db;
 }
 
@@ -152,5 +139,5 @@
     my $log = $self->log;
     my $sql = $self->sql;
-    my $db  = $self->db($key);
+    my $db  =$self->db;
 
     $log->debug( "entered - @_" );
@@ -163,5 +150,5 @@
     # to check it after parsing the key
     if (defined $vol_name
-        and not $self->_is_valid_volume_name($key, $key->volume)) {
+        and not $self->_is_valid_volume_name($key->volume)) {
         if ($key->soft_volume) {
             $log->warn( "$vol_name is not a known volume name" );
@@ -173,5 +160,5 @@
         
     my ($vol_id, $vol_host, $vol_path, $vol_xattr)
-        = $self->_get_storage_volume($key, $vol_name, $key->soft_volume);
+        = $self->_get_storage_volume($vol_name, $key->soft_volume);
 
     my $uri;
@@ -274,5 +261,5 @@
     my $log = $self->log;
     my $sql = $self->sql;
-    my $db  = $self->db($key);
+    my $db  =$self->db;
 
     $log->debug("entered - @_");
@@ -309,157 +296,91 @@
 
 
-# sub swap_objects
-# {
-#     my $self = shift;
-# 
-#     my ($key1, $key2) = validate_pos(@_,
-#         {
-#             type        => SCALAR,
-#             callbacks   => {
-#                 'is valid object key' => sub { $self->_is_valid_object_key($_[0]) },
-#             },
-#         },
-#         {
-#             type        => SCALAR,
-#             callbacks   => {
-#                 'is valid object key' => sub { $self->_is_valid_object_key($_[0]) },
-#             },
-#         },
-#     );
-# 
-#     my $log  = $self->log;
-#     my $sql  = $self->sql;
-#     my $dbh1 = $self->db($key1);
-#     my $dbh2 = $self->db($key2);
-# 
-#     $log->debug("entered - @_");
-# 
-#     # ignore volumes
-#     $key1 = parse_neb_key($key1);
-#     $key2 = parse_neb_key($key2);
-# 
-#     # order of operations for the swap with a single db is:
-#     # key1 -> key1.swap
-#     # key2 -> key1
-#     # key1.swap -> key2
-# 
-#     # XXX this cmp will only work if ->db() returns the same exact (cached) dbh
-#     if ($dbh1 == $dbh2) {
-#         my $dbh = $dbh1;
-#         eval {
-#             {
-#                 # key1 -> key1.swap
-#                 my $query = $dbh->prepare_cached($sql->rename_object); 
-#                 # this SQL statment takes the new key name as the first param
-#                 my $rows = $query->execute($key1->path . ".swap", $key1->path);
-# 
-#                 # if we affected more then one row something very bad has happened.
-#                 unless ($rows == 1) {
-#                     $query->finish;
-#                     $log->logdie("affected row count is $rows instead of 1");
-#                 }
-#             }
-# 
-#             {
-#                 # key2 -> key1
-#                 my $query = $dbh->prepare_cached($sql->rename_object); 
-#                 # this SQL statment takes the new key name as the first param
-#                 my $rows = $query->execute($key1->path, $key2->path);
-# 
-#                 # if we affected more then one row something very bad has happened.
-#                 unless ($rows == 1) {
-#                     $query->finish;
-#                     $log->logdie("affected row count is $rows instead of 1");
-#                 }
-#             }
-# 
-#             {
-#                 # key1.swap -> key2
-#                 my $query = $dbh->prepare_cached($sql->rename_object); 
-#                 # this SQL statment takes the new key name as the first param
-#                 my $rows = $query->execute($key2->path, $key1->path . ".swap");
-# 
-#                 # if we affected more then one row something very bad has happened.
-#                 unless ($rows == 1) {
-#                     $query->finish;
-#                     $log->logdie("affected row count is $rows instead of 1");
-#                 }
-#             }
-# 
-#             $dbn->commit;
-#             $log->debug("commit");
-#         };
-#         if ($@) {
-#             $dbh->rollback;
-#             $log->debug("rollback");
-#             $log->logdie("database error: $@");
-#         }
-#     }
-# 
-#     # order of operations for the swap between two dbs is:
-#     # key1 start transaction
-#     # key1 -> read all instances
-#     # key1 -> remove all instances
-#     # key2 start transaction
-#     # key2 -> read all instances
-#     # key2 -> remove all instances
-#     # key1 -> insert key 2 instances
-#     # key2 -> insert key 1 instances
-#     # key1,2 commit
-# 
-#     eval {
-#         {
-#             # key1 -> read all instances
-#             my $query = $dbh->prepare_cached($sql->rename_object); 
-#             # this SQL statment takes the new key name as the first param
-#             my $rows = $query->execute($key1->path . ".swap", $key1->path);
-# 
-#             # if we affected more then one row something very bad has happened.
-#             unless ($rows == 1) {
-#                 $query->finish;
-#                 $log->logdie("affected row count is $rows instead of 1");
-#             }
-#         }
-# 
-#         {
-#             # key2 -> key1
-#             my $query = $db->prepare_cached($sql->rename_object); 
-#             # this SQL statment takes the new key name as the first param
-#             my $rows = $query->execute($key1->path, $key2->path);
-# 
-#             # if we affected more then one row something very bad has happened.
-#             unless ($rows == 1) {
-#                 $query->finish;
-#                 $log->logdie("affected row count is $rows instead of 1");
-#             }
-#         }
-# 
-#         {
-#             # key1.swap -> key2
-#             my $query = $db->prepare_cached($sql->rename_object); 
-#             # this SQL statment takes the new key name as the first param
-#             my $rows = $query->execute($key2->path, $key1->path . ".swap");
-# 
-#             # if we affected more then one row something very bad has happened.
-#             unless ($rows == 1) {
-#                 $query->finish;
-#                 $log->logdie("affected row count is $rows instead of 1");
-#             }
-#         }
-# 
-#         $db->commit;
-#         $log->debug("commit");
-#     };
-#         if ($@) {
-#             $db->rollback;
-#             $log->debug("rollback");
-#             $log->logdie("database error: $@");
-#         }
-# 
-# 
-#     $log->debug("leaving");
-# 
-#     return 1;
-# }
+sub swap_objects
+{
+    my $self = shift;
+
+    my ($key1, $key2) = validate_pos(@_,
+        {
+            type        => SCALAR,
+            callbacks   => {
+                'is valid object key' => sub { $self->_is_valid_object_key($_[0]) },
+            },
+        },
+        {
+            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 - @_");
+
+    # ignore volumes
+    $key1 = parse_neb_key($key1);
+    $key2 = parse_neb_key($key2);
+
+    # order of operations for the swap:
+    # key1 -> key1.swap
+    # key2 -> key1
+    # key1.swap -> key2
+
+    eval {
+        {
+            # key1 -> key1.swap
+            my $query = $db->prepare_cached($sql->rename_object); 
+            # this SQL statment takes the new key name as the first param
+            my $rows = $query->execute($key1->path . ".swap", $key1->path);
+
+            # if we affected more then one row something very bad has happened.
+            unless ($rows == 1) {
+                $query->finish;
+                $log->logdie("affected row count is $rows instead of 1");
+            }
+        }
+
+        {
+            # key2 -> key1
+            my $query = $db->prepare_cached($sql->rename_object); 
+            # this SQL statment takes the new key name as the first param
+            my $rows = $query->execute($key1->path, $key2->path);
+
+            # if we affected more then one row something very bad has happened.
+            unless ($rows == 1) {
+                $query->finish;
+                $log->logdie("affected row count is $rows instead of 1");
+            }
+        }
+
+        {
+            # key1.swap -> key2
+            my $query = $db->prepare_cached($sql->rename_object); 
+            # this SQL statment takes the new key name as the first param
+            my $rows = $query->execute($key2->path, $key1->path . ".swap");
+
+            # if we affected more then one row something very bad has happened.
+            unless ($rows == 1) {
+                $query->finish;
+                $log->logdie("affected row count is $rows instead of 1");
+            }
+        }
+
+        $db->commit;
+        $log->debug("commit");
+    };
+    if ($@) {
+        $db->rollback;
+        $log->debug("rollback");
+        $log->logdie("database error: $@");
+    }
+
+    $log->debug("leaving");
+
+    return 1;
+}
 
 
@@ -499,5 +420,5 @@
     my $log = $self->log;
     my $sql = $self->sql;
-    my $db  = $self->db($key);
+    my $db  =$self->db;
 
     $log->debug("entered - @_");
@@ -508,5 +429,5 @@
 
     if (defined $vol_name
-        and not $self->_is_valid_volume_name($key, $key->volume)) {
+        and not $self->_is_valid_volume_name($key->volume)) {
         if ($key->soft_volume) {
             $log->warn( "$vol_name is not a known volume name" );
@@ -520,5 +441,5 @@
     if (defined $vol_name) {
         ($vol_id, $vol_host, $vol_path, $vol_xattr)
-            = $self->_get_storage_volume($key, $vol_name);
+            = $self->_get_storage_volume($vol_name);
     } else {
         ($vol_id, $vol_host, $vol_path, $vol_xattr)
@@ -613,5 +534,5 @@
     my $log = $self->log;
     my $sql = $self->sql;
-    my $db  = $self->db($key);
+    my $db  =$self->db;
 
     $log->debug( "entered - @_" );
@@ -716,5 +637,5 @@
     my $log = $self->log;
     my $sql = $self->sql;
-    my $db  = $self->db($key);
+    my $db  =$self->db;
 
     $log->debug( "entered - @_" );
@@ -828,5 +749,5 @@
     my $log = $self->log;
     my $sql = $self->sql;
-    my $db  = $self->db($key);
+    my $db  =$self->db;
 
     $log->debug("entered - @_");
@@ -895,5 +816,5 @@
     my $log = $self->log;
     my $sql = $self->sql;
-    my $db  = $self->db($key);
+    my $db  =$self->db;
 
     $log->debug("entered - @_");
@@ -948,5 +869,5 @@
     my $log = $self->log;
     my $sql = $self->sql;
-    my $db  = $self->db($key);
+    my $db  =$self->db;
 
     $log->debug("entered - @_");
@@ -991,5 +912,5 @@
     my $log = $self->log;
     my $sql = $self->sql;
-    my $db  = $self->db($key);
+    my $db  =$self->db;
 
     $log->debug("entered - @_");
@@ -1026,9 +947,7 @@
 sub find_objects
 {
-    # XXX: this will only search one db
-
-    my $self = shift;
-
-    my ($pattern) = validate_pos( @_,
+    my $self = shift;
+
+    my ( $pattern ) = validate_pos( @_,
         {
             type        => SCALAR,
@@ -1039,5 +958,5 @@
     my $log = $self->log;
     my $sql = $self->sql;
-    my $db  = $self->db;
+    my $db  =$self->db;
 
     $log->debug( "entered - @_" );
@@ -1097,5 +1016,5 @@
     my $log = $self->log;
     my $sql = $self->sql;
-    my $db  = $self->db($key);
+    my $db  =$self->db;
 
     $log->debug("entered - @_");
@@ -1108,5 +1027,5 @@
     # to check it after parsing the key
     if (defined $vol_name
-        and not $self->_is_valid_volume_name($key, $key->volume)) {
+        and not $self->_is_valid_volume_name($key->volume)) {
         if ($key->soft_volume) {
             $log->warn( "$vol_name is not a known volume name" );
@@ -1168,11 +1087,5 @@
     my $self = shift;
 
-    my ($key, $uri) = validate_pos( @_,
-        {
-            type        => SCALAR,
-            callbacks   => {
-                'is valid object key' => sub { $self->_is_valid_object_key($_[0]) },
-            },
-        },
+    my ( $uri ) = validate_pos( @_,
         {
             type => SCALAR|SCALARREF,
@@ -1182,5 +1095,5 @@
     my $log = $self->log;
     my $sql = $self->sql;
-    my $db  = $self->db($key);
+    my $db  =$self->db;
 
     $log->debug( "entered - @_" );
@@ -1269,5 +1182,5 @@
     my $log = $self->log;
     my $sql = $self->sql;
-    my $db  = $self->db($key);
+    my $db  =$self->db;
 
     $log->debug("entered - @_");
@@ -1298,5 +1211,4 @@
 sub mounts
 {
-    # XXX: this will only pull the mounts from one db
     my $self = shift;
 
@@ -1305,5 +1217,5 @@
     my $log = $self->log;
     my $sql = $self->sql;
-    my $db  = $self->db;
+    my $db  =$self->db;
 
     $log->debug("entered - @_");
@@ -1334,13 +1246,13 @@
     my $self = shift;
 
-    my ($key, $name, $soft_volume) = @_;
-
-    my $log = $self->log;
-    my $sql = $self->sql;
-    my $db  = $self->db($key);
+    my $log = $self->log;
+    my $sql = $self->sql;
+    my $db  = $self->db;
 
     no warnings qw( uninitialized );
     $log->debug( "entered - @_" );
     use warnings;
+
+    my ($name, $soft_volume) = @_;
 
     my ($vol_id, $vol_host, $vol_path, $xattr);
@@ -1359,5 +1271,5 @@
                 # find it, fall back to any volume
                 if ($soft_volume) {
-                    ($vol_id, $vol_host, $vol_path, $xattr) = $self->_get_storage_volume($key);
+                    ($vol_id, $vol_host, $vol_path, $xattr) = $self->_get_storage_volume;
                     return; # this just returns out of the eval not from the subroutine
                 }
@@ -1399,9 +1311,7 @@
     my $self = shift;
 
-    my $key = shift;
-
-    my $log = $self->log;
-    my $sql = $self->sql;
-    my $db  = $self->db($key);
+    my $log = $self->log;
+    my $sql = $self->sql;
+    my $db  =$self->db;
 
     no warnings qw( uninitialized );
@@ -1409,4 +1319,5 @@
     use warnings;
 
+    my $key = shift;
 
     $key = parse_neb_key($key);
@@ -1450,5 +1361,5 @@
     my $log = $self->log;
     my $sql = $self->sql;
-    my $db  = $self->db($key);
+    my $db  =$self->db;
 
     $key = parse_neb_key($key);
@@ -1477,9 +1388,9 @@
 sub _is_valid_volume_name
 {
-    my ($self, $key, $vol_name) = @_;
-
-    my $log = $self->log;
-    my $sql = $self->sql;
-    my $db  = $self->db($key);
+    my ($self, $vol_name) = @_;
+
+    my $log = $self->log;
+    my $sql = $self->sql;
+    my $db  =$self->db;
 
     my $volume_info = parse_neb_volume($vol_name);
@@ -1518,5 +1429,5 @@
     my $log = $self->log;
     my $sql = $self->sql;
-    my $db  = $self->db($key);
+    my $db  = $self->db;
 
     my $uri;
@@ -1647,11 +1558,11 @@
     my $log = $self->log;
     my $sql = $self->sql;
-#    my $db  = $self->db;
+    my $db  =$self->db;
 
     $log->debug( "entered" );
 
-#    $self->db->disconnect;        
-
-#    $log->debug( "disconnected from database: ", sub { $db->data_sources; } );
+    $self->db->disconnect;        
+
+    $log->debug( "disconnected from database: ", sub { $db->data_sources; } );
 
     $log->debug( "leaving" );