Changeset 752 for trunk

Timestamp:

06/29/15 18:24:51 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Fine-tune original allocation UPDATE; make it into a prepared statement
and call that in locations downstream instead of copy-pasting calls.
Also add missing call in targettype==leaf branch. See #8.

File:

• trunk/cgi-bin/IPDB.pm (modified) (5 diffs)

trunk/cgi-bin/IPDB.pm

@@ -2216 +2216 @@
 
     # We always update the "prime" block passed in...
-    $dbh->do("UPDATE allocations SET cidr = ?, type = ? WHERE id = ?", undef,
-        ($newblock, $args{newtype}, $prime) )
-        # ... but only on existing container or pool types.  Leaf -> container conversions
-        # may need a new parent inserted instead.
-        if $basetype =~ /[cm]/;
+    my $updsth = $dbh->prepare("UPDATE allocations SET cidr = ?, type = ? WHERE id = ?");
+
+##fixme:  There's still an edge case in the return list where some branches accidentally include
+# the original block as "additional".  Probably due to the ordering of when the prepared update
+# above gets executed.
 
     # For leaf blocks, we may need to create a new parent as the "primary" instead
@@ -2280 +2280 @@
         push @retlist, { block => "$newblock", type => $disp_alloctypes{$args{newtype}}, id => $prime };
         # update the primary allocation info
-        $dbh->do("UPDATE allocations SET cidr = ?, type = ? WHERE id = ?", undef, ($newblock, $args{newtype}, $prime) );
+        $updsth->execute($newblock, $args{newtype}, $prime);
         # Reparent the free blocks in the new block
         $fbreparentsth->execute($prime, $binfo->{master_id}, $binfo->{city}, $newcontainerclass, $binfo->{vrf},
@@ -2349 +2349 @@
         } # merge peers
         # update the primary allocation info.  Do this last so we don't stomp extra data-retrieval in the loop above
-        $dbh->do("UPDATE allocations SET cidr = ?, type = ? WHERE id = ?", undef, ($newblock, $args{newtype}, $prime) );
+        $updsth->execute($newblock, $args{newtype}, $prime);
 
       } # scope
@@ -2404 +2404 @@
       }
       # Update the primary allocation info.
-      $dbh->do("UPDATE allocations SET cidr = ?, type = ? WHERE id = ?", undef, ($newblock, $args{newtype}, $prime) );
+      $updsth->execute($newblock, $args{newtype}, $prime);
       # Delete any lingering free blocks
       $dbh->do("DELETE FROM freeblocks WHERE parent_id = ? AND cidr <<= ?", undef, $binfo->{parent_id}, $newblock);
@@ -2416 +2416 @@
       # keepall, mergepeer, and clearpeer all imply keeping suballocations, where leaf allocations
       # by definition do not have suballocations.
+      # Update the old allocation
+      $updsth->execute($newblock, $args{newtype}, $prime);
       # Snag the new parent info for the return list
       push @retlist, {block => "$newblock", type => $disp_alloctypes{$args{newtype}}, id => $prime};