{"header":{"message":"Namespace cleanup","description":null,"timestamp":"2015-07-07T08:29:43Z","authors":[{"email":"eelco.dolstra@logicblox.com","name":"Eelco Dolstra"}]},"hash":"OG3Z3QGCG2FNDGF4VQYWOXLZCF7LGTZCUMGKUCBNAPAQ5FRFHQ2AC","authors":[],"deps":{"hashes":[["OG3Z3QGCG2FNDGF4VQYWOXLZCF7LGTZCUMGKUCBNAPAQ5FRFHQ2AC","Namespace cleanup"],["AA",null],["HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC","Refactor"],["N4IROACVZ4MU73J5SM6WXJMKQSFR3VN5SOKENNNZNEGMTGB2Q3HAC","Move buildRemote() into State"]],"deps":["HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC"],"known":["N4IROACVZ4MU73J5SM6WXJMKQSFR3VN5SOKENNNZNEGMTGB2Q3HAC"]},"hunks":[{"Edit":{"inode":{"change":2,"pos":93},"path":"src/hydra-queue-runner/db.hh","line":6,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":149},"to":{"change":2,"start":149,"end":171},"introduced_by":2}],"inode":{"change":2,"pos":93}}},"contents":[{"Del":{"text":"","pos":"HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC:149"}},{"Del":{"text":"using namespace nix;","pos":"HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC:170"}}]}},{"Replacement":{"inode":{"change":2,"pos":93},"path":"src/hydra-queue-runner/db.hh","line":12,"ins":{"up_context":[{"change":2,"pos":266}],"down_context":[{"change":2,"pos":288}],"flag":"BLOCK","start":0,"end":27,"inode":{"change":2,"pos":93}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":266},"to":{"change":2,"start":266,"end":288},"introduced_by":2}],"inode":{"change":2,"pos":93}},"ins_contents":[{"Add":{"text":" std::string getFlags()","pos":"OG3Z3QGCG2FNDGF4VQYWOXLZCF7LGTZCUMGKUCBNAPAQ5FRFHQ2AC:26"}}],"del_contents":[{"Del":{"text":" string getFlags()","pos":"HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC:287"}}]}},{"Replacement":{"inode":{"change":2,"pos":93},"path":"src/hydra-queue-runner/db.hh","line":14,"ins":{"up_context":[{"change":2,"pos":294}],"down_context":[{"change":2,"pos":444}],"flag":"BLOCK","start":28,"end":215,"inode":{"change":2,"pos":93}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":294},"to":{"change":2,"start":294,"end":444},"introduced_by":2}],"inode":{"change":2,"pos":93}},"ins_contents":[{"Add":{"text":" using namespace nix;","pos":"OG3Z3QGCG2FNDGF4VQYWOXLZCF7LGTZCUMGKUCBNAPAQ5FRFHQ2AC:56"}},{"Add":{"text":" auto s = getEnv(\"HYDRA_DBI\", \"dbi:Pg:dbname=hydra;\");","pos":"OG3Z3QGCG2FNDGF4VQYWOXLZCF7LGTZCUMGKUCBNAPAQ5FRFHQ2AC:118"}},{"Add":{"text":" std::string prefix = \"dbi:Pg:\";","pos":"OG3Z3QGCG2FNDGF4VQYWOXLZCF7LGTZCUMGKUCBNAPAQ5FRFHQ2AC:158"}},{"Add":{"text":" if (std::string(s, 0, prefix.size()) != prefix)","pos":"OG3Z3QGCG2FNDGF4VQYWOXLZCF7LGTZCUMGKUCBNAPAQ5FRFHQ2AC:214"}}],"del_contents":[{"Del":{"text":" string s = getEnv(\"HYDRA_DBI\", \"dbi:Pg:dbname=hydra;\");","pos":"HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC:357"}},{"Del":{"text":" string prefix = \"dbi:Pg:\";","pos":"HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC:392"}},{"Del":{"text":" if (string(s, 0, prefix.size()) != prefix)","pos":"HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC:443"}}]}},{"Replacement":{"inode":{"change":2,"pos":93},"path":"src/hydra-queue-runner/db.hh","line":29,"ins":{"up_context":[{"change":2,"pos":829}],"down_context":[{"change":2,"pos":892}],"flag":"BLOCK","start":216,"end":284,"inode":{"change":2,"pos":93}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":829},"to":{"change":2,"start":829,"end":892},"introduced_by":2}],"inode":{"change":2,"pos":93}},"ins_contents":[{"Add":{"text":" void operator() (const std::string & payload, int pid) override","pos":"OG3Z3QGCG2FNDGF4VQYWOXLZCF7LGTZCUMGKUCBNAPAQ5FRFHQ2AC:283"}}],"del_contents":[{"Del":{"text":" void operator() (const string & payload, int pid) override","pos":"HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC:891"}}]}},{"Edit":{"inode":{"change":2,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":19,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1439},"to":{"change":2,"start":1439,"end":1461},"introduced_by":2}],"inode":{"change":2,"pos":1128}}},"contents":[{"Del":{"text":"","pos":"HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC:1439"}},{"Del":{"text":"using namespace nix;","pos":"HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC:1460"}}]}},{"Replacement":{"inode":{"change":2,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":71,"ins":{"up_context":[{"change":2,"pos":2067}],"down_context":[{"change":2,"pos":2121}],"flag":"BLOCK","start":285,"end":354,"inode":{"change":2,"pos":1128}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":2067},"to":{"change":2,"start":2067,"end":2121},"introduced_by":2}],"inode":{"change":2,"pos":1128}},"ins_contents":[{"Add":{"text":" nix::Path drvPath;","pos":"OG3Z3QGCG2FNDGF4VQYWOXLZCF7LGTZCUMGKUCBNAPAQ5FRFHQ2AC:307"}},{"Add":{"text":" std::map outputs;","pos":"OG3Z3QGCG2FNDGF4VQYWOXLZCF7LGTZCUMGKUCBNAPAQ5FRFHQ2AC:353"}}],"del_contents":[{"Del":{"text":" Path drvPath;","pos":"HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC:2084"}},{"Del":{"text":" std::map outputs;","pos":"HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC:2120"}}]}},{"Replacement":{"inode":{"change":2,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":87,"ins":{"up_context":[{"change":2,"pos":2373}],"down_context":[{"change":2,"pos":2411}],"flag":"BLOCK","start":355,"end":403,"inode":{"change":2,"pos":1128}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":2373},"to":{"change":2,"start":2373,"end":2411},"introduced_by":2}],"inode":{"change":2,"pos":1128}},"ins_contents":[{"Add":{"text":" nix::Path drvPath;","pos":"OG3Z3QGCG2FNDGF4VQYWOXLZCF7LGTZCUMGKUCBNAPAQ5FRFHQ2AC:377"}},{"Add":{"text":" nix::Derivation drv;","pos":"OG3Z3QGCG2FNDGF4VQYWOXLZCF7LGTZCUMGKUCBNAPAQ5FRFHQ2AC:402"}}],"del_contents":[{"Del":{"text":" Path drvPath;","pos":"HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC:2390"}},{"Del":{"text":" Derivation drv;","pos":"HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC:2410"}}]}},{"Replacement":{"inode":{"change":2,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":161,"ins":{"up_context":[{"change":2,"pos":4357}],"down_context":[{"change":2,"pos":4385}],"flag":"BLOCK","start":404,"end":437,"inode":{"change":2,"pos":1128}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4357},"to":{"change":2,"start":4357,"end":4385},"introduced_by":2}],"inode":{"change":2,"pos":1128}},"ins_contents":[{"Add":{"text":" nix::Path hydraData, logDir;","pos":"OG3Z3QGCG2FNDGF4VQYWOXLZCF7LGTZCUMGKUCBNAPAQ5FRFHQ2AC:436"}}],"del_contents":[{"Del":{"text":" Path hydraData, logDir;","pos":"HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC:4384"}}]}},{"Replacement":{"inode":{"change":2,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":163,"ins":{"up_context":[{"change":2,"pos":4386}],"down_context":[{"change":2,"pos":4416}],"flag":"BLOCK","start":438,"end":473,"inode":{"change":2,"pos":1128}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4386},"to":{"change":2,"start":4386,"end":4416},"introduced_by":2}],"inode":{"change":2,"pos":1128}},"ins_contents":[{"Add":{"text":" nix::StringSet localPlatforms;","pos":"OG3Z3QGCG2FNDGF4VQYWOXLZCF7LGTZCUMGKUCBNAPAQ5FRFHQ2AC:472"}}],"del_contents":[{"Del":{"text":" StringSet localPlatforms;","pos":"HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC:4415"}}]}},{"Replacement":{"inode":{"change":2,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":173,"ins":{"up_context":[{"change":2,"pos":4741}],"down_context":[{"change":2,"pos":4787}],"flag":"BLOCK","start":474,"end":525,"inode":{"change":2,"pos":1128}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4741},"to":{"change":2,"start":4741,"end":4787},"introduced_by":2}],"inode":{"change":2,"pos":1128}},"ins_contents":[{"Add":{"text":" typedef std::map Steps;","pos":"OG3Z3QGCG2FNDGF4VQYWOXLZCF7LGTZCUMGKUCBNAPAQ5FRFHQ2AC:524"}}],"del_contents":[{"Del":{"text":" typedef std::map Steps;","pos":"HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC:4786"}}]}},{"Replacement":{"inode":{"change":2,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":188,"ins":{"up_context":[{"change":2,"pos":5162}],"down_context":[{"change":2,"pos":5215}],"flag":"BLOCK","start":526,"end":584,"inode":{"change":2,"pos":1128}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":5162},"to":{"change":2,"start":5162,"end":5215},"introduced_by":2}],"inode":{"change":2,"pos":1128}},"ins_contents":[{"Add":{"text":" typedef std::map Machines;","pos":"OG3Z3QGCG2FNDGF4VQYWOXLZCF7LGTZCUMGKUCBNAPAQ5FRFHQ2AC:583"}}],"del_contents":[{"Del":{"text":" typedef std::map Machines;","pos":"HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC:5214"}}]}},{"Replacement":{"inode":{"change":2,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":191,"ins":{"up_context":[{"change":2,"pos":5277}],"down_context":[{"change":2,"pos":5300}],"flag":"BLOCK","start":585,"end":613,"inode":{"change":2,"pos":1128}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":5277},"to":{"change":2,"start":5277,"end":5300},"introduced_by":2}],"inode":{"change":2,"pos":1128}},"ins_contents":[{"Add":{"text":" nix::Path machinesFile;","pos":"OG3Z3QGCG2FNDGF4VQYWOXLZCF7LGTZCUMGKUCBNAPAQ5FRFHQ2AC:612"}}],"del_contents":[{"Del":{"text":" Path machinesFile;","pos":"HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC:5299"}}]}},{"Replacement":{"inode":{"change":2,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":217,"ins":{"up_context":[{"change":2,"pos":6122}],"down_context":[{"change":2,"pos":6169}],"flag":"BLOCK","start":614,"end":666,"inode":{"change":2,"pos":1128}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":6122},"to":{"change":2,"start":6122,"end":6169},"introduced_by":2}],"inode":{"change":2,"pos":1128}},"ins_contents":[{"Add":{"text":" Sync> logCompressorQueue;","pos":"OG3Z3QGCG2FNDGF4VQYWOXLZCF7LGTZCUMGKUCBNAPAQ5FRFHQ2AC:665"}}],"del_contents":[{"Del":{"text":" Sync> logCompressorQueue;","pos":"HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC:6168"}}]}},{"Replacement":{"inode":{"change":2,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":249,"ins":{"up_context":[{"change":2,"pos":7362}],"down_context":[{"change":2,"pos":7453}],"flag":"BLOCK","start":667,"end":763,"inode":{"change":2,"pos":1128}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":7362},"to":{"change":2,"start":7362,"end":7453},"introduced_by":2}],"inode":{"change":2,"pos":1128}},"ins_contents":[{"Add":{"text":" const std::string & machine, BuildStepStatus status, const std::string & errorMsg = \"\",","pos":"OG3Z3QGCG2FNDGF4VQYWOXLZCF7LGTZCUMGKUCBNAPAQ5FRFHQ2AC:762"}}],"del_contents":[{"Del":{"text":" const std::string & machine, BuildStepStatus status, const string & errorMsg = \"\",","pos":"HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC:7452"}}]}},{"Replacement":{"inode":{"change":2,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":258,"ins":{"up_context":[{"change":2,"pos":7626}],"down_context":[{"change":2,"pos":7732}],"flag":"BLOCK","start":764,"end":875,"inode":{"change":2,"pos":1128}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":7626},"to":{"change":2,"start":7626,"end":7732},"introduced_by":2}],"inode":{"change":2,"pos":1128}},"ins_contents":[{"Add":{"text":" void getQueuedBuilds(Connection & conn, std::shared_ptr store, unsigned int & lastBuildId);","pos":"OG3Z3QGCG2FNDGF4VQYWOXLZCF7LGTZCUMGKUCBNAPAQ5FRFHQ2AC:874"}}],"del_contents":[{"Del":{"text":" void getQueuedBuilds(Connection & conn, std::shared_ptr store, unsigned int & lastBuildId);","pos":"HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC:7731"}}]}},{"Replacement":{"inode":{"change":2,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":262,"ins":{"up_context":[{"change":2,"pos":7785}],"down_context":[{"change":2,"pos":7956}],"flag":"BLOCK","start":876,"end":1062,"inode":{"change":2,"pos":1128}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":7785},"to":{"change":2,"start":7785,"end":7956},"introduced_by":2}],"inode":{"change":2,"pos":1128}},"ins_contents":[{"Add":{"text":" Step::ptr createStep(std::shared_ptr store, const nix::Path & drvPath,","pos":"OG3Z3QGCG2FNDGF4VQYWOXLZCF7LGTZCUMGKUCBNAPAQ5FRFHQ2AC:965"}},{"Add":{"text":" Build::ptr referringBuild, Step::ptr referringStep, std::set & finishedDrvs,","pos":"OG3Z3QGCG2FNDGF4VQYWOXLZCF7LGTZCUMGKUCBNAPAQ5FRFHQ2AC:1061"}}],"del_contents":[{"Del":{"text":" Step::ptr createStep(std::shared_ptr store, const Path & drvPath,","pos":"HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC:7864"}},{"Del":{"text":" Build::ptr referringBuild, Step::ptr referringStep, std::set & finishedDrvs,","pos":"HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC:7955"}}]}},{"Replacement":{"inode":{"change":2,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":277,"ins":{"up_context":[{"change":2,"pos":8377}],"down_context":[{"change":2,"pos":8447}],"flag":"BLOCK","start":1063,"end":1138,"inode":{"change":2,"pos":1128}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":8377},"to":{"change":2,"start":8377,"end":8447},"introduced_by":2}],"inode":{"change":2,"pos":1128}},"ins_contents":[{"Add":{"text":" bool doBuildStep(std::shared_ptr store, Step::ptr step,","pos":"OG3Z3QGCG2FNDGF4VQYWOXLZCF7LGTZCUMGKUCBNAPAQ5FRFHQ2AC:1137"}}],"del_contents":[{"Del":{"text":" bool doBuildStep(std::shared_ptr store, Step::ptr step,","pos":"HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC:8446"}}]}},{"Replacement":{"inode":{"change":2,"pos":1128},"path":"src/hydra-queue-runner/state.hh","line":299,"ins":{"up_context":[{"change":2,"pos":9006}],"down_context":[{"change":2,"pos":9058}],"flag":"BLOCK","start":1139,"end":1196,"inode":{"change":2,"pos":1128}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":9006},"to":{"change":2,"start":9006,"end":9058},"introduced_by":2}],"inode":{"change":2,"pos":1128}},"ins_contents":[{"Add":{"text":" std::shared_ptr acquireGlobalLock();","pos":"OG3Z3QGCG2FNDGF4VQYWOXLZCF7LGTZCUMGKUCBNAPAQ5FRFHQ2AC:1195"}}],"del_contents":[{"Del":{"text":" std::shared_ptr acquireGlobalLock();","pos":"HJOEIMLRDVQ2KZI5HGL2HKGBM3AHP7YIKGKDAGFUNKRUXVRB24NAC:9057"}}]}}],"owner":"grahamc","repo":"hydra2","token":"wtG/wBVykZVPVSpI2g5pb+C471sZurSCvUOnizDJjds=","login":null}

…

Dependencies

Change contents

Review