Changeset 13092 for trunk/Nebulous/lib

Timestamp:

Apr 30, 2007, 4:52:04 PM (19 years ago)

Author:

jhoblitt

Message:

remove $class_id & $comment params from Nebulous::Server->create() and Nebulous::Client->create*() and all supporting functions and tests

Location:

trunk/Nebulous/lib/Nebulous

Files:

• Client.pm (modified) (4 diffs)
• Server.pm (modified) (5 diffs)
• Server/SQL.pm (modified) (6 diffs)

trunk/Nebulous/lib/Nebulous/Client.pm

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Client.pm,v 1.28 2007-04-28 01:15:38 jhoblitt Exp $
+# $Id: Client.pm,v 1.29 2007-05-01 02:52:04 jhoblitt Exp $
 
 package Nebulous::Client;
@@ -96 +96 @@
         {
             type        => SCALAR,
-            callbacks   => {
-                'is + integer' => sub { $_[0] =~ /^\d+$/ },
-            },
-            default     => 0,
-        },
-        {
-            type        => SCALAR,
-            optional    => 1,
-        },
-        {
-            type        => SCALAR,
             optional    => 1,
         },
@@ -141 +130 @@
         {
             type        => SCALAR,
-        },
-        {
-            type        => SCALAR,
-            callbacks   => {
-                'is + integer' => sub { $_[0] =~ /^\d+$/ },
-            },
-            default     => 0,
-        },
-        {
-            type        => SCALAR,
-            optional    => 1,
         },
         {
@@ -609 +587 @@
     my $new_fh;
     if (defined $volume) {
-        $new_fh  = $self->open_create( $new_key, 0, $volume );
+        $new_fh  = $self->open_create( $new_key, $volume );
     } else {
         $new_fh  = $self->open_create( $new_key );

trunk/Nebulous/lib/Nebulous/Server.pm

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Server.pm,v 1.27 2007-05-01 02:00:07 jhoblitt Exp $
+# $Id: Server.pm,v 1.28 2007-05-01 02:52:04 jhoblitt Exp $
 
 package Nebulous::Server;
@@ -123 +123 @@
     my $self = shift;
 
-    my ( $key, $class, $volume, $comment ) = validate_pos( @_,
-        {
-            type        => SCALAR,
-        },
-        {
-            type        => SCALAR,
-            callbacks   => {
-                'is + integer' => sub { $_[0] =~ /^\d+$/ },
-                # check that the class requested is valid
-                'is valid class id' => sub { $self->_is_valid_class_id( $_[0] ) },
-            },
-            default     => 0,
+    my ($key, $volume) = validate_pos(@_,
+        {
+            type        => SCALAR,
         },
         {
@@ -144 +135 @@
             optional    => 1,
         },
-        {
-            type        => SCALAR,
-            callbacks   => {
-                # check that the comment isn't too long
-                'comment length' => sub { length $_[0] < 256 },
-            },
-            optional    => 1,
-        },
     );
 
@@ -185 +168 @@
             # create storage_object_attr
             my $query = $db->prepare_cached( $sql->new_object_attr ); 
-            $query->execute( $object_id, $class, $comment );
+            $query->execute( $object_id );
         }
 
@@ -1070 +1053 @@
 }
 
-sub _is_valid_class_id {
-    my ($self, $class_id) = @_;
-
-    my $log = $self->log;
-    my $sql = $self->sql;
-    my $db  = $self->db;
-
-    my $class;
-    eval {
-        my $query = $db->prepare_cached( $sql->get_class_by_id ); 
-        $query->execute( $class_id );
-        ( $class ) = $query->fetchrow_array;
-
-        $query->finish;
-    };
-    if ( $@ ) {
-        $db->rollback;
-        $log->logdie( "database error: $@" );
-    }
-
-    return ( defined $class ) ? 1 : undef;
-}
-
 sub _is_valid_volume_name  {
     my ($self, $vol_name) = @_;

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

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: SQL.pm,v 1.29 2007-05-01 02:00:07 jhoblitt Exp $
+# $Id: SQL.pm,v 1.30 2007-05-01 02:52:04 jhoblitt Exp $
 
 package Nebulous::Server::SQL;
@@ -29 +29 @@
     new_object_attr  => qq{
         INSERT INTO storage_object_attr
-        (so_id, class_id, comment, read_lock, write_lock)
-        VALUES (?, ?, ?, 0, NULL)
+        (so_id, read_lock, write_lock)
+        VALUES (?, 0, NULL)
     },
     delete_object       => qq{
@@ -48 +48 @@
     get_object          => qq{
         SELECT storage_object.so_id,
-            ext_id, class_id, comment, read_lock, write_lock, epoch, mtime
+            ext_id, read_lock, write_lock, epoch, mtime
         FROM storage_object
         LEFT JOIN storage_object_attr
@@ -176 +176 @@
         INSERT INTO volume (name, path)
         VALUES (?, ?)
-    },
-    get_class_by_id => qq{
-        SELECT class_id, priority, comment
-        FROM class
-        WHERE class_id = ?
     },
     get_volume_by_name => qq{
@@ -257 +252 @@
 CREATE TABLE storage_object_attr (
     so_id BIGINT NOT NULL AUTO_INCREMENT,
-    class_id TINYINT NOT NULL,
-    comment VARCHAR(255),
     read_lock TINYINT DEFAULT 0 NOT NULL,
     write_lock ENUM( 'write' ),
     epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     mtime TIMESTAMP,
-    PRIMARY KEY(so_id),
-    KEY(class_id)
+    PRIMARY KEY(so_id)
 ) ENGINE=innodb;
 
@@ -318 +310 @@
     PRIMARY KEY(mountpoint)
 ) ENGINE=innodb;
-
-###
-
-CREATE TABLE class (
-    class_id TINYINT NOT NULL,
-    priority TINYINT,
-    comment VARCHAR(255),
-    PRIMARY KEY(class_id)
-) ENGINE=innodb;
-
-###
-
-INSERT INTO class VALUES(0,0, 'default class ID');
 
 ###