* Simplification: registerSubstitutes -> registerSubstitute. We no

  longer need the former since there we no longer have the
  substitutes-rev table (which triggered a O(n^2) cost in updating
  them).

4 files changed, 12 insertions, 24 deletions

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 7dd7412e9..e5089bdb4 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -887,7 +887,6 @@ bool DerivationGoal::prepareBuild()
         /* Add the relevant output closures of the input derivation
            `*i' as input paths.  Only add the closures of output paths
            that are specified as inputs. */
-        /* !!! is `*i' present? */
         assert(isValidPath(i->first));
         Derivation inDrv = derivationFromPath(i->first);
         for (StringSet::iterator j = i->second.begin();
diff --git a/src/libstore/store.cc b/src/libstore/store.cc
index 02bf9803b..0dd4e1ed2 100644
--- a/src/libstore/store.cc
+++ b/src/libstore/store.cc
@@ -331,26 +331,19 @@ static void writeSubstitutes(const Transaction & txn,
 }
 
 
-void registerSubstitutes(const Transaction & txn,
-    const SubstitutePairs & subPairs)
+void registerSubstitute(const Transaction & txn,
+    const Path & srcPath, const Substitute & sub)
 {
-    for (SubstitutePairs::const_iterator i = subPairs.begin();
-         i != subPairs.end(); ++i)
-    {
-        const Path & srcPath(i->first);
-        const Substitute & sub(i->second);
-
-        assertStorePath(srcPath);
+    assertStorePath(srcPath);
     
-        Substitutes subs = readSubstitutes(txn, srcPath);
+    Substitutes subs = readSubstitutes(txn, srcPath);
 
-        /* New substitutes take precedence over old ones.  If the
-           substitute is already present, it's moved to the front. */
-        remove(subs.begin(), subs.end(), sub);
-        subs.push_front(sub);
+    /* New substitutes take precedence over old ones.  If the
+       substitute is already present, it's moved to the front. */
+    remove(subs.begin(), subs.end(), sub);
+    subs.push_front(sub);
         
-        writeSubstitutes(txn, srcPath, subs);
-    }
+    writeSubstitutes(txn, srcPath, subs);
 }
 
 
diff --git a/src/libstore/store.hh b/src/libstore/store.hh
index d59634a83..20f50cbfb 100644
--- a/src/libstore/store.hh
+++ b/src/libstore/store.hh
@@ -41,9 +41,8 @@ void createStoreTransaction(Transaction & txn);
 void copyPath(const Path & src, const Path & dst);
 
 /* Register a substitute. */
-typedef list<pair<Path, Substitute> > SubstitutePairs;
-void registerSubstitutes(const Transaction & txn,
-    const SubstitutePairs & subPairs);
+void registerSubstitute(const Transaction & txn,
+    const Path & srcPath, const Substitute & sub);
 
 /* Return the substitutes for the given path. */
 Substitutes querySubstitutes(const Path & srcPath);
diff --git a/src/nix-store/main.cc b/src/nix-store/main.cc
index 51e587255..ed93f2065 100644
--- a/src/nix-store/main.cc
+++ b/src/nix-store/main.cc
@@ -170,7 +170,6 @@ static void opSubstitute(Strings opFlags, Strings opArgs)
     if (!opArgs.empty())
         throw UsageError("no arguments expected");
 
-    SubstitutePairs subPairs;
     Transaction txn;
     createStoreTransaction(txn);
 
@@ -196,12 +195,10 @@ static void opSubstitute(Strings opFlags, Strings opArgs)
             references.insert(s);
         }
         if (!cin || cin.eof()) throw Error("missing input");
-        subPairs.push_back(pair<Path, Substitute>(srcPath, sub));
+        registerSubstitute(txn, srcPath, sub);
         setReferences(txn, srcPath, references);
     }
 
-    registerSubstitutes(txn, subPairs);
-    
     txn.commit();
 }