* Refactoring: move all database manipulation into store.cc.

* Removed `--query --generators'.

1 files changed, 0 insertions, 64 deletions

diff --git a/src/globals.hh b/src/globals.hh
index 816cb4766efb..1b4d0bde3ffe 100644
--- a/src/globals.hh
+++ b/src/globals.hh
@@ -3,65 +3,8 @@
 
 #include <string>
 
-#include "db.hh"
-
 using namespace std;
 
-
-extern Database nixDB;
-
-
-/* Database tables. */
-
-
-/* dbValidPaths :: Path -> ()
-
-   The existence of a key $p$ indicates that path $p$ is valid (that
-   is, produced by a succesful build). */
-extern TableId dbValidPaths;
-
-
-/* dbSuccessors :: Path -> Path
-
-   Each pair $(p_1, p_2)$ in this mapping records the fact that the
-   Nix expression stored at path $p_1$ has a successor expression
-   stored at path $p_2$.
-
-   Note that a term $y$ is a successor of $x$ iff there exists a
-   sequence of rewrite steps that rewrites $x$ into $y$.
-*/
-extern TableId dbSuccessors;
-
-
-/* dbSuccessorsRev :: Path -> [Path]
-
-   The reverse mapping of dbSuccessors (i.e., it stores the
-   predecessors of a Nix expression).
-*/
-extern TableId dbSuccessorsRev;
-
-
-/* dbSubstitutes :: Path -> [Path]
-
-   Each pair $(p, [ps])$ tells Nix that it can realise any of the
-   Nix expressions stored at paths $ps$ to produce a path $p$.
-
-   The main purpose of this is for distributed caching of derivates.
-   One system can compute a derivate and put it on a website (as a Nix
-   archive), for instance, and then another system can register a
-   substitute for that derivate.  The substitute in this case might be
-   a Nix expression that fetches the Nix archive.
-*/
-extern TableId dbSubstitutes;
-
-
-/* dbSubstitutesRev :: Path -> [Path]
-
-   The reverse mapping of dbSubstitutes.
-*/
-extern TableId dbSubstitutesRev;
-
-
 /* Path names. */
 
 /* nixStore is the directory where we generally store atomic and
@@ -83,11 +26,4 @@ extern string nixDBPath;
 extern bool keepFailed;
 
 
-/* Open the database environment. */
-void openDB();
-
-/* Create the required database tables. */
-void initDB();
-
-
 #endif /* !__GLOBALS_H */