Namespace cleanup

Dependencies

• [2] HJOEIMLR Refactor
• [3] N4IROACV Move buildRemote() into State

Change contents

• edit in src/hydra-queue-runner/db.hh at line 6
  [2.149]→[2.149:171](∅→∅)
  −

  − using namespace nix;
• replacement in src/hydra-queue-runner/db.hh at line 12
  [2.266]→[2.266:288](∅→∅)
  − string getFlags()
  [2.266]

  [2.288]
  + std::string getFlags()
• replacement in src/hydra-queue-runner/db.hh at line 14
  [2.294]→[2.294:444](∅→∅)
  − string s = getEnv("HYDRA_DBI", "dbi:Pg:dbname=hydra;");

  − string prefix = "dbi:Pg:";

  − if (string(s, 0, prefix.size()) != prefix)
  [2.294]

  [2.444]
  + using namespace nix;

  + auto s = getEnv("HYDRA_DBI", "dbi:Pg:dbname=hydra;");

  + std::string prefix = "dbi:Pg:";

  + if (std::string(s, 0, prefix.size()) != prefix)
• replacement in src/hydra-queue-runner/db.hh at line 29
  [2.829]→[2.829:892](∅→∅)
  − void operator() (const string & payload, int pid) override
  [2.829]

  [2.892]
  + void operator() (const std::string & payload, int pid) override
• edit in src/hydra-queue-runner/state.hh at line 19
  [2.1439]→[2.1439:1461](∅→∅)
  −

  − using namespace nix;
• replacement in src/hydra-queue-runner/state.hh at line 71
  [2.2067]→[2.2067:2121](∅→∅)
  − Path drvPath;

  − std::map<string, Path> outputs;
  [2.2067]

  [2.2121]
  + nix::Path drvPath;

  + std::map<std::string, nix::Path> outputs;
• replacement in src/hydra-queue-runner/state.hh at line 87
  [2.2373]→[2.2373:2411](∅→∅)
  − Path drvPath;

  − Derivation drv;
  [2.2373]

  [2.2411]
  + nix::Path drvPath;

  + nix::Derivation drv;
• replacement in src/hydra-queue-runner/state.hh at line 161
  [2.4357]→[2.4357:4385](∅→∅)
  − Path hydraData, logDir;
  [2.4357]

  [2.4385]
  + nix::Path hydraData, logDir;
• replacement in src/hydra-queue-runner/state.hh at line 163
  [2.4386]→[2.4386:4416](∅→∅)
  − StringSet localPlatforms;
  [2.4386]

  [2.4416]
  + nix::StringSet localPlatforms;
• replacement in src/hydra-queue-runner/state.hh at line 173
  [2.4741]→[2.4741:4787](∅→∅)
  − typedef std::map<Path, Step::wptr> Steps;
  [2.4741]

  [2.4787]
  + typedef std::map<nix::Path, Step::wptr> Steps;
• replacement in src/hydra-queue-runner/state.hh at line 188
  [2.5162]→[2.5162:5215](∅→∅)
  − typedef std::map<string, Machine::ptr> Machines;
  [2.5162]

  [2.5215]
  + typedef std::map<std::string, Machine::ptr> Machines;
• replacement in src/hydra-queue-runner/state.hh at line 191
  [2.5277]→[2.5277:5300](∅→∅)
  − Path machinesFile;
  [2.5277]

  [2.5300]
  + nix::Path machinesFile;
• replacement in src/hydra-queue-runner/state.hh at line 217
  [2.6122]→[2.6122:6169](∅→∅)
  − Sync<std::queue<Path>> logCompressorQueue;
  [2.6122]

  [2.6169]
  + Sync<std::queue<nix::Path>> logCompressorQueue;
• replacement in src/hydra-queue-runner/state.hh at line 249
  [2.7362]→[2.7362:7453](∅→∅)
  − const std::string & machine, BuildStepStatus status, const string & errorMsg = "",
  [2.7362]

  [2.7453]
  + const std::string & machine, BuildStepStatus status, const std::string & errorMsg = "",
• replacement in src/hydra-queue-runner/state.hh at line 258
  [2.7626]→[2.7626:7732](∅→∅)
  − void getQueuedBuilds(Connection & conn, std::shared_ptr<StoreAPI> store, unsigned int & lastBuildId);
  [2.7626]

  [2.7732]
  + void getQueuedBuilds(Connection & conn, std::shared_ptr<nix::StoreAPI> store, unsigned int & lastBuildId);
• replacement in src/hydra-queue-runner/state.hh at line 262
  [2.7785]→[2.7785:7956](∅→∅)
  − Step::ptr createStep(std::shared_ptr<StoreAPI> store, const Path & drvPath,

  − Build::ptr referringBuild, Step::ptr referringStep, std::set<Path> & finishedDrvs,
  [2.7785]

  [2.7956]
  + Step::ptr createStep(std::shared_ptr<nix::StoreAPI> store, const nix::Path & drvPath,

  + Build::ptr referringBuild, Step::ptr referringStep, std::set<nix::Path> & finishedDrvs,
• replacement in src/hydra-queue-runner/state.hh at line 277
  [2.8377]→[2.8377:8447](∅→∅)
  − bool doBuildStep(std::shared_ptr<StoreAPI> store, Step::ptr step,
  [2.8377]

  [2.8447]
  + bool doBuildStep(std::shared_ptr<nix::StoreAPI> store, Step::ptr step,
• replacement in src/hydra-queue-runner/state.hh at line 299
  [2.9006]→[2.9006:9058](∅→∅)
  − std::shared_ptr<PathLocks> acquireGlobalLock();
  [2.9006]

  [2.9058]
  + std::shared_ptr<nix::PathLocks> acquireGlobalLock();