Changeset 640

Timestamp:

01/05/07 05:46:11 (3 years ago)

Author:

bradfitz

Message:

remove last dbh from Domain

Location:

trunk/server/lib/MogileFS

Files:

• Domain.pm (modified) (1 diff)
• Store.pm (modified) (1 diff)
• Store/MySQL.pm (modified) (1 diff)

trunk/server/lib/MogileFS/Domain.pm

@@ -104 +104 @@
     my ($pkg, $name) = @_;
 
-    my $dbh = Mgd::get_dbh();
-
-    if (my $dmid = MogileFS::Domain->id_of_name($name)) {
-        throw("dup");
-    }
-
-    # get the max domain id
-    my $maxid = $dbh->selectrow_array('SELECT MAX(dmid) FROM domain') || 0;
-    $dbh->do('INSERT INTO domain (dmid, namespace) VALUES (?, ?)',
-             undef, $maxid + 1, $name);
-    throw("db") if $dbh->err;
+    # throws 'dup':
+    my $dmid = Mgd::get_store()->create_domain($name)
+        or die "create domain didn't return a dmid";
 
     # return the domain id we created
     MogileFS::Domain->invalidate_cache;
-    return MogileFS::Domain->of_dmid($maxid+1);
+    return MogileFS::Domain->of_dmid($dmid);
 }
 

trunk/server/lib/MogileFS/Store.pm

@@ -389 +389 @@
 }
 
+# creates a new domain, given a domain namespace string.  return the dmid on success,
+# throw 'dup' on duplicate name.
+sub create_domain {
+    my ($self, $name) = @_;
+    die "UNIMPLEMENTED";
+}
+
 1;
 

trunk/server/lib/MogileFS/Store/MySQL.pm

@@ -216 +216 @@
 }
 
+# creates a new domain, given a domain namespace string.  return the dmid on success,
+# throw 'dup' on duplicate name.
+sub create_domain {
+    my ($self, $name) = @_;
+    my $dbh = $self->dbh;
+
+    # get the max domain id
+    my $maxid = $dbh->selectrow_array('SELECT MAX(dmid) FROM domain') || 0;
+    my $rv = eval {
+        $dbh->do('INSERT INTO domain (dmid, namespace) VALUES (?, ?)',
+                 undef, $maxid + 1, $name);
+    };
+    if ($self->was_duplicate_error) {
+        throw("dup");
+    }
+    return $maxid+1 if $rv;
+    die "failed to make domain";  # FIXME: the above is racy.
+}
 
 1;