ma27/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Update libpqxx usage to move away from deprecated API interactions.

Browse source
This commit is contained in:
Kevin Quick 2020-01-11 22:38:40 -08:00
parent 5c0c7d52a0
commit 7bb6b5e206
No known key found for this signature in database
GPG key ID: E6D7733599CC0A21
4 changed files with 168 additions and 170 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/hydra-evaluator/hydra-evaluator.cc
View file

@ -59,9 +59,9 @@ struct Evaluator
pqxx::work txn(*conn); pqxx::work txn(*conn);
auto res = txn.parameterized auto res = txn.exec
("select project, j.name, lastCheckedTime, triggerTime, checkInterval from Jobsets j join Projects p on j.project = p.name " ("select project, j.name, lastCheckedTime, triggerTime, checkInterval from Jobsets j join Projects p on j.project = p.name "
"where j.enabled != 0 and p.enabled != 0").exec(); "where j.enabled != 0 and p.enabled != 0");
auto state(state_.lock()); auto state(state_.lock());
@ -107,12 +107,11 @@ struct Evaluator
{ {
auto conn(dbPool.get()); auto conn(dbPool.get());
pqxx::work txn(*conn); pqxx::work txn(*conn);
txn.parameterized txn.exec_params0
("update Jobsets set startTime = $1 where project = $2 and name = $3") ("update Jobsets set startTime = $1 where project = $2 and name = $3",
(now) now,
(jobset.name.first) jobset.name.first,
(jobset.name.second) jobset.name.second);
.exec();
txn.commit(); txn.commit();
} }
@ -266,27 +265,24 @@ struct Evaluator
/* Clear the trigger time to prevent this /* Clear the trigger time to prevent this
jobset from getting stuck in an endless jobset from getting stuck in an endless
failing eval loop. */ failing eval loop. */
txn.parameterized txn.exec_params0
("update Jobsets set triggerTime = null where project = $1 and name = $2 and startTime is not null and triggerTime <= startTime") ("update Jobsets set triggerTime = null where project = $1 and name = $2 and startTime is not null and triggerTime <= startTime",
(jobset.name.first) jobset.name.first,
(jobset.name.second) jobset.name.second);
.exec();
/* Clear the start time. */ /* Clear the start time. */
txn.parameterized txn.exec_params0
("update Jobsets set startTime = null where project = $1 and name = $2") ("update Jobsets set startTime = null where project = $1 and name = $2",
(jobset.name.first) jobset.name.first,
(jobset.name.second) jobset.name.second);
.exec();
if (!WIFEXITED(status) || WEXITSTATUS(status) > 1) { if (!WIFEXITED(status) || WEXITSTATUS(status) > 1) {
txn.parameterized txn.exec_params0
("update Jobsets set errorMsg = $1, lastCheckedTime = $2, errorTime = $2, fetchErrorMsg = null where project = $3 and name = $4") ("update Jobsets set errorMsg = $1, lastCheckedTime = $2, errorTime = $2, fetchErrorMsg = null where project = $3 and name = $4",
(fmt("evaluation %s", statusToString(status))) fmt("evaluation %s", statusToString(status)),
(now) now,
(jobset.name.first) jobset.name.first,
(jobset.name.second) jobset.name.second);
.exec();
} }
txn.commit(); txn.commit();
@ -311,7 +307,7 @@ struct Evaluator
{ {
auto conn(dbPool.get()); auto conn(dbPool.get());
pqxx::work txn(*conn); pqxx::work txn(*conn);
txn.parameterized("update Jobsets set startTime = null").exec(); txn.exec("update Jobsets set startTime = null");
txn.commit(); txn.commit();
} }

16
src/hydra-queue-runner/builder.cc
View file

@ -424,13 +424,13 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
for (auto & build2 : indirect) { for (auto & build2 : indirect) {
if (build2->finishedInDB) continue; if (build2->finishedInDB) continue;
printMsg(lvlError, format("marking build %1% as failed") % build2->id); printMsg(lvlError, format("marking build %1% as failed") % build2->id);
txn.parameterized txn.exec_params0
("update Builds set finished = 1, buildStatus = $2, startTime = $3, stopTime = $4, isCachedBuild = $5, notificationPendingSince = $4 where id = $1 and finished = 0") ("update Builds set finished = 1, buildStatus = $2, startTime = $3, stopTime = $4, isCachedBuild = $5, notificationPendingSince = $4 where id = $1 and finished = 0",
(build2->id) build2->id,
((int) (build2->drvPath != step->drvPath && result.buildStatus() == bsFailed ? bsDepFailed : result.buildStatus())) (int) (build2->drvPath != step->drvPath && result.buildStatus() == bsFailed ? bsDepFailed : result.buildStatus()),
(result.startTime) result.startTime,
(result.stopTime) result.stopTime,
(result.stepStatus == bsCachedFailure ? 1 : 0).exec(); result.stepStatus == bsCachedFailure ? 1 : 0);
nrBuildsDone++; nrBuildsDone++;
} }
@ -438,7 +438,7 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
won't be built again. */ won't be built again. */
if (result.stepStatus != bsCachedFailure && result.canCache) if (result.stepStatus != bsCachedFailure && result.canCache)
for (auto & path : step->drv.outputPaths()) for (auto & path : step->drv.outputPaths())
txn.parameterized("insert into FailedPaths values ($1)")(path).exec(); txn.exec_params0("insert into FailedPaths values ($1)", path);
txn.commit(); txn.commit();
} }

187
src/hydra-queue-runner/hydra-queue-runner.cc
View file

@ -1,5 +1,6 @@
#include <iostream> #include <iostream>
#include <thread> #include <thread>
#include <optional>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -226,18 +227,18 @@ void State::monitorMachinesFile()
void State::clearBusy(Connection & conn, time_t stopTime) void State::clearBusy(Connection & conn, time_t stopTime)
{ {
pqxx::work txn(conn); pqxx::work txn(conn);
txn.parameterized txn.exec_params0
("update BuildSteps set busy = 0, status = $1, stopTime = $2 where busy != 0") ("update BuildSteps set busy = 0, status = $1, stopTime = $2 where busy != 0",
((int) bsAborted) (int) bsAborted,
(stopTime, stopTime != 0).exec(); stopTime != 0 ? std::make_optional(stopTime) : std::nullopt);
txn.commit(); txn.commit();
} }
unsigned int State::allocBuildStep(pqxx::work & txn, BuildID buildId) unsigned int State::allocBuildStep(pqxx::work & txn, BuildID buildId)
{ {
auto res = txn.parameterized("select max(stepnr) from BuildSteps where build = $1")(buildId).exec(); auto res = txn.exec_params1("select max(stepnr) from BuildSteps where build = $1", buildId);
return res[0][0].is_null() ? 1 : res[0][0].as<int>() + 1; return res[0].is_null() ? 1 : res[0].as<int>() + 1;
} }
@ -247,27 +248,27 @@ unsigned int State::createBuildStep(pqxx::work & txn, time_t startTime, BuildID
restart: restart:
auto stepNr = allocBuildStep(txn, buildId); auto stepNr = allocBuildStep(txn, buildId);
auto r = txn.parameterized auto r = txn.exec_params
("insert into BuildSteps (build, stepnr, type, drvPath, busy, startTime, system, status, propagatedFrom, errorMsg, stopTime, machine) values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12) on conflict do nothing") ("insert into BuildSteps (build, stepnr, type, drvPath, busy, startTime, system, status, propagatedFrom, errorMsg, stopTime, machine) values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12) on conflict do nothing",
(buildId) buildId,
(stepNr) stepNr,
(0) // == build 0, // == build
(step->drvPath) step->drvPath,
(status == bsBusy ? 1 : 0) status == bsBusy ? 1 : 0,
(startTime, startTime != 0) startTime != 0 ? std::make_optional(startTime) : std::nullopt,
(step->drv.platform) step->drv.platform,
((int) status, status != bsBusy) status != bsBusy ? std::make_optional((int) status) : std::nullopt,
(propagatedFrom, propagatedFrom != 0) propagatedFrom != 0 ? std::make_optional(propagatedFrom) : std::nullopt, // internal::params
(errorMsg, errorMsg != "") errorMsg != "" ? std::make_optional(errorMsg) : std::nullopt,
(startTime, startTime != 0 && status != bsBusy) startTime != 0 && status != bsBusy ? std::make_optional(startTime) : std::nullopt,
(machine).exec(); machine);
if (r.affected_rows() == 0) goto restart; if (r.affected_rows() == 0) goto restart;
for (auto & output : step->drv.outputs) for (auto & output : step->drv.outputs)
txn.parameterized txn.exec_params0
("insert into BuildStepOutputs (build, stepnr, name, path) values ($1, $2, $3, $4)") ("insert into BuildStepOutputs (build, stepnr, name, path) values ($1, $2, $3, $4)",
(buildId)(stepNr)(output.first)(output.second.path).exec(); buildId, stepNr, output.first, output.second.path);
if (status == bsBusy) if (status == bsBusy)
txn.exec(fmt("notify step_started, '%d\t%d'", buildId, stepNr)); txn.exec(fmt("notify step_started, '%d\t%d'", buildId, stepNr));
@ -278,12 +279,11 @@ unsigned int State::createBuildStep(pqxx::work & txn, time_t startTime, BuildID
void State::updateBuildStep(pqxx::work & txn, BuildID buildId, unsigned int stepNr, StepState stepState) void State::updateBuildStep(pqxx::work & txn, BuildID buildId, unsigned int stepNr, StepState stepState)
{ {
if (txn.parameterized if (txn.exec_params
("update BuildSteps set busy = $1 where build = $2 and stepnr = $3 and busy != 0 and status is null") ("update BuildSteps set busy = $1 where build = $2 and stepnr = $3 and busy != 0 and status is null",
((int) stepState) (int) stepState,
(buildId) buildId,
(stepNr) stepNr).affected_rows() != 1)
.exec().affected_rows() != 1)
throw Error("step %d of build %d is in an unexpected state", stepNr, buildId); throw Error("step %d of build %d is in an unexpected state", stepNr, buildId);
} }
@ -293,16 +293,15 @@ void State::finishBuildStep(pqxx::work & txn, const RemoteResult & result,
{ {
assert(result.startTime); assert(result.startTime);
assert(result.stopTime); assert(result.stopTime);
txn.parameterized txn.exec_params0
("update BuildSteps set busy = 0, status = $1, errorMsg = $4, startTime = $5, stopTime = $6, machine = $7, overhead = $8, timesBuilt = $9, isNonDeterministic = $10 where build = $2 and stepnr = $3") ("update BuildSteps set busy = 0, status = $1, errorMsg = $4, startTime = $5, stopTime = $6, machine = $7, overhead = $8, timesBuilt = $9, isNonDeterministic = $10 where build = $2 and stepnr = $3",
((int) result.stepStatus)(buildId)(stepNr) (int) result.stepStatus, buildId, stepNr,
(result.errorMsg, result.errorMsg != "") result.errorMsg != "" ? std::make_optional(result.errorMsg) : std::nullopt,
(result.startTime)(result.stopTime) result.startTime, result.stopTime,
(machine, machine != "") machine != "" ? std::make_optional(machine) : std::nullopt,
(result.overhead, result.overhead != 0) result.overhead != 0 ? std::make_optional(result.overhead) : std::nullopt,
(result.timesBuilt, result.timesBuilt > 0) result.timesBuilt > 0 ? std::make_optional(result.timesBuilt) : std::nullopt,
(result.isNonDeterministic, result.timesBuilt > 1) result.timesBuilt > 1 ? std::make_optional(result.isNonDeterministic) : std::nullopt);
.exec();
assert(result.logFile.find('\t') == std::string::npos); assert(result.logFile.find('\t') == std::string::npos);
txn.exec(fmt("notify step_finished, '%d\t%d\t%s'", txn.exec(fmt("notify step_finished, '%d\t%d\t%s'",
buildId, stepNr, result.logFile)); buildId, stepNr, result.logFile));
@ -315,22 +314,22 @@ int State::createSubstitutionStep(pqxx::work & txn, time_t startTime, time_t sto
restart: restart:
auto stepNr = allocBuildStep(txn, build->id); auto stepNr = allocBuildStep(txn, build->id);
auto r = txn.parameterized auto r = txn.exec_params
("insert into BuildSteps (build, stepnr, type, drvPath, busy, status, startTime, stopTime) values ($1, $2, $3, $4, $5, $6, $7, $8) on conflict do nothing") ("insert into BuildSteps (build, stepnr, type, drvPath, busy, status, startTime, stopTime) values ($1, $2, $3, $4, $5, $6, $7, $8) on conflict do nothing",
(build->id) build->id,
(stepNr) stepNr,
(1) // == substitution 1, // == substitution
(drvPath) drvPath,
(0) 0,
(0) 0,
(startTime) startTime,
(stopTime).exec(); stopTime);
if (r.affected_rows() == 0) goto restart; if (r.affected_rows() == 0) goto restart;
txn.parameterized txn.exec_params0
("insert into BuildStepOutputs (build, stepnr, name, path) values ($1, $2, $3, $4)") ("insert into BuildStepOutputs (build, stepnr, name, path) values ($1, $2, $3, $4)",
(build->id)(stepNr)(outputName)(storePath).exec(); build->id, stepNr, outputName, storePath);
return stepNr; return stepNr;
} }
@ -397,50 +396,50 @@ void State::markSucceededBuild(pqxx::work & txn, Build::ptr build,
{ {
if (build->finishedInDB) return; if (build->finishedInDB) return;
if (txn.parameterized("select 1 from Builds where id = $1 and finished = 0")(build->id).exec().empty()) return; if (txn.exec_params("select 1 from Builds where id = $1 and finished = 0", build->id).empty()) return;
txn.parameterized txn.exec_params0
("update Builds set finished = 1, buildStatus = $2, startTime = $3, stopTime = $4, size = $5, closureSize = $6, releaseName = $7, isCachedBuild = $8, notificationPendingSince = $4 where id = $1") ("update Builds set finished = 1, buildStatus = $2, startTime = $3, stopTime = $4, size = $5, closureSize = $6, releaseName = $7, isCachedBuild = $8, notificationPendingSince = $4 where id = $1",
(build->id) build->id,
((int) (res.failed ? bsFailedWithOutput : bsSuccess)) (int) (res.failed ? bsFailedWithOutput : bsSuccess),
(startTime) startTime,
(stopTime) stopTime,
(res.size) res.size,
(res.closureSize) res.closureSize,
(res.releaseName, res.releaseName != "") res.releaseName != "" ? std::make_optional(res.releaseName) : std::nullopt,
(isCachedBuild ? 1 : 0).exec(); isCachedBuild ? 1 : 0);
txn.parameterized("delete from BuildProducts where build = $1")(build->id).exec(); txn.exec_params0("delete from BuildProducts where build = $1", build->id);
unsigned int productNr = 1; unsigned int productNr = 1;
for (auto & product : res.products) { for (auto & product : res.products) {
txn.parameterized txn.exec_params0
("insert into BuildProducts (build, productnr, type, subtype, fileSize, sha1hash, sha256hash, path, name, defaultPath) values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)") ("insert into BuildProducts (build, productnr, type, subtype, fileSize, sha1hash, sha256hash, path, name, defaultPath) values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)",
(build->id) build->id,
(productNr++) productNr++,
(product.type) product.type,
(product.subtype) product.subtype,
(product.fileSize, product.isRegular) product.isRegular ? std::make_optional(product.fileSize) : std::nullopt,
(product.sha1hash.to_string(Base16, false), product.isRegular) product.isRegular ? std::make_optional(product.sha1hash.to_string(Base16, false)) : std::nullopt,
(product.sha256hash.to_string(Base16, false), product.isRegular) product.isRegular ? std::make_optional(product.sha256hash.to_string(Base16, false)) : std::nullopt,
(product.path) product.path,
(product.name) product.name,
(product.defaultPath).exec(); product.defaultPath);
} }
txn.parameterized("delete from BuildMetrics where build = $1")(build->id).exec(); txn.exec_params0("delete from BuildMetrics where build = $1", build->id);
for (auto & metric : res.metrics) { for (auto & metric : res.metrics) {
txn.parameterized txn.exec_params0
("insert into BuildMetrics (build, name, unit, value, project, jobset, job, timestamp) values ($1, $2, $3, $4, $5, $6, $7, $8)") ("insert into BuildMetrics (build, name, unit, value, project, jobset, job, timestamp) values ($1, $2, $3, $4, $5, $6, $7, $8)",
(build->id) build->id,
(metric.second.name) metric.second.name,
(metric.second.unit, metric.second.unit != "") metric.second.unit != "" ? std::make_optional(metric.second.unit) : std::nullopt,
(metric.second.value) metric.second.value,
(build->projectName) build->projectName,
(build->jobsetName) build->jobsetName,
(build->jobName) build->jobName,
(build->timestamp).exec(); build->timestamp);
} }
nrBuildsDone++; nrBuildsDone++;
@ -451,7 +450,7 @@ bool State::checkCachedFailure(Step::ptr step, Connection & conn)
{ {
pqxx::work txn(conn); pqxx::work txn(conn);
for (auto & path : step->drv.outputPaths()) for (auto & path : step->drv.outputPaths())
if (!txn.parameterized("select 1 from FailedPaths where path = $1")(path).exec().empty()) if (!txn.exec_params("select 1 from FailedPaths where path = $1", path).empty())
return true; return true;
return false; return false;
} }
@ -677,7 +676,7 @@ void State::dumpStatus(Connection & conn, bool log)
pqxx::work txn(conn); pqxx::work txn(conn);
// FIXME: use PostgreSQL 9.5 upsert. // FIXME: use PostgreSQL 9.5 upsert.
txn.exec("delete from SystemStatus where what = 'queue-runner'"); txn.exec("delete from SystemStatus where what = 'queue-runner'");
txn.parameterized("insert into SystemStatus values ('queue-runner', $1)")(out.str()).exec(); txn.exec_params0("insert into SystemStatus values ('queue-runner', $1)", out.str());
txn.exec("notify status_dumped"); txn.exec("notify status_dumped");
txn.commit(); txn.commit();
} }
@ -807,11 +806,11 @@ void State::run(BuildID buildOne)
pqxx::work txn(*conn); pqxx::work txn(*conn);
for (auto & step : steps) { for (auto & step : steps) {
printMsg(lvlError, format("cleaning orphaned step %d of build %d") % step.second % step.first); printMsg(lvlError, format("cleaning orphaned step %d of build %d") % step.second % step.first);
txn.parameterized txn.exec_params0
("update BuildSteps set busy = 0, status = $1 where build = $2 and stepnr = $3 and busy != 0") ("update BuildSteps set busy = 0, status = $1 where build = $2 and stepnr = $3 and busy != 0",
((int) bsAborted) (int) bsAborted,
(step.first) step.first,
(step.second).exec(); step.second);
} }
txn.commit(); txn.commit();
} catch (std::exception & e) { } catch (std::exception & e) {

87
src/hydra-queue-runner/queue-monitor.cc
View file

@ -90,10 +90,10 @@ bool State::getQueuedBuilds(Connection & conn,
{ {
pqxx::work txn(conn); pqxx::work txn(conn);
auto res = txn.parameterized auto res = txn.exec_params
("select id, project, jobset, job, drvPath, maxsilent, timeout, timestamp, globalPriority, priority from Builds " ("select id, project, jobset, job, drvPath, maxsilent, timeout, timestamp, globalPriority, priority from Builds "
"where id > $1 and finished = 0 order by globalPriority desc, id") "where id > $1 and finished = 0 order by globalPriority desc, id",
(lastBuildId).exec(); lastBuildId);
for (auto const & row : res) { for (auto const & row : res) {
auto builds_(builds.lock()); auto builds_(builds.lock());
@ -137,11 +137,11 @@ bool State::getQueuedBuilds(Connection & conn,
if (!build->finishedInDB) { if (!build->finishedInDB) {
auto mc = startDbUpdate(); auto mc = startDbUpdate();
pqxx::work txn(conn); pqxx::work txn(conn);
txn.parameterized txn.exec_params0
("update Builds set finished = 1, buildStatus = $2, startTime = $3, stopTime = $3 where id = $1 and finished = 0") ("update Builds set finished = 1, buildStatus = $2, startTime = $3, stopTime = $3 where id = $1 and finished = 0",
(build->id) build->id,
((int) bsAborted) (int) bsAborted,
(time(0)).exec(); time(0));
txn.commit(); txn.commit();
build->finishedInDB = true; build->finishedInDB = true;
nrBuildsDone++; nrBuildsDone++;
@ -169,16 +169,16 @@ bool State::getQueuedBuilds(Connection & conn,
derivation path, then by output path. */ derivation path, then by output path. */
BuildID propagatedFrom = 0; BuildID propagatedFrom = 0;
auto res = txn.parameterized auto res = txn.exec_params1
("select max(build) from BuildSteps where drvPath = $1 and startTime != 0 and stopTime != 0 and status = 1") ("select max(build) from BuildSteps where drvPath = $1 and startTime != 0 and stopTime != 0 and status = 1",
(ex.step->drvPath).exec(); ex.step->drvPath);
if (!res[0][0].is_null()) propagatedFrom = res[0][0].as<BuildID>(); if (!res[0].is_null()) propagatedFrom = res[0].as<BuildID>();
if (!propagatedFrom) { if (!propagatedFrom) {
for (auto & output : ex.step->drv.outputs) { for (auto & output : ex.step->drv.outputs) {
auto res = txn.parameterized auto res = txn.exec_params
("select max(s.build) from BuildSteps s join BuildStepOutputs o on s.build = o.build where path = $1 and startTime != 0 and stopTime != 0 and status = 1") ("select max(s.build) from BuildSteps s join BuildStepOutputs o on s.build = o.build where path = $1 and startTime != 0 and stopTime != 0 and status = 1",
(output.second.path).exec(); output.second.path);
if (!res[0][0].is_null()) { if (!res[0][0].is_null()) {
propagatedFrom = res[0][0].as<BuildID>(); propagatedFrom = res[0][0].as<BuildID>();
break; break;
@ -187,12 +187,12 @@ bool State::getQueuedBuilds(Connection & conn,
} }
createBuildStep(txn, 0, build->id, ex.step, "", bsCachedFailure, "", propagatedFrom); createBuildStep(txn, 0, build->id, ex.step, "", bsCachedFailure, "", propagatedFrom);
txn.parameterized txn.exec_params
("update Builds set finished = 1, buildStatus = $2, startTime = $3, stopTime = $3, isCachedBuild = 1, notificationPendingSince = $3 " ("update Builds set finished = 1, buildStatus = $2, startTime = $3, stopTime = $3, isCachedBuild = 1, notificationPendingSince = $3 "
"where id = $1 and finished = 0") "where id = $1 and finished = 0",
(build->id) build->id,
((int) (ex.step->drvPath == build->drvPath ? bsFailed : bsDepFailed)) (int) (ex.step->drvPath == build->drvPath ? bsFailed : bsDepFailed),
(time(0)).exec(); time(0));
notifyBuildFinished(txn, build->id, {}); notifyBuildFinished(txn, build->id, {});
txn.commit(); txn.commit();
build->finishedInDB = true; build->finishedInDB = true;
@ -554,22 +554,25 @@ Jobset::ptr State::createJobset(pqxx::work & txn,
if (i != jobsets_->end()) return i->second; if (i != jobsets_->end()) return i->second;
} }
auto res = txn.parameterized auto res = txn.exec_params1
("select schedulingShares from Jobsets where project = $1 and name = $2") ("select schedulingShares from Jobsets where project = $1 and name = $2",
(projectName)(jobsetName).exec(); projectName,
jobsetName);
if (res.empty()) throw Error("missing jobset - can't happen"); if (res.empty()) throw Error("missing jobset - can't happen");
auto shares = res[0]["schedulingShares"].as<unsigned int>(); auto shares = res["schedulingShares"].as<unsigned int>();
auto jobset = std::make_shared<Jobset>(); auto jobset = std::make_shared<Jobset>();
jobset->setShares(shares); jobset->setShares(shares);
/* Load the build steps from the last 24 hours. */ /* Load the build steps from the last 24 hours. */
res = txn.parameterized auto res2 = txn.exec_params
("select s.startTime, s.stopTime from BuildSteps s join Builds b on build = id " ("select s.startTime, s.stopTime from BuildSteps s join Builds b on build = id "
"where s.startTime is not null and s.stopTime > $1 and project = $2 and jobset = $3") "where s.startTime is not null and s.stopTime > $1 and project = $2 and jobset = $3",
(time(0) - Jobset::schedulingWindow * 10)(projectName)(jobsetName).exec(); time(0) - Jobset::schedulingWindow * 10,
for (auto const & row : res) { projectName,
jobsetName);
for (auto const & row : res2) {
time_t startTime = row["startTime"].as<time_t>(); time_t startTime = row["startTime"].as<time_t>();
time_t stopTime = row["stopTime"].as<time_t>(); time_t stopTime = row["stopTime"].as<time_t>();
jobset->addStep(startTime, stopTime - startTime); jobset->addStep(startTime, stopTime - startTime);
@ -603,25 +606,25 @@ BuildOutput State::getBuildOutputCached(Connection & conn, nix::ref<nix::Store>
pqxx::work txn(conn); pqxx::work txn(conn);
for (auto & output : drv.outputs) { for (auto & output : drv.outputs) {
auto r = txn.parameterized auto r = txn.exec_params1
("select id, buildStatus, releaseName, closureSize, size from Builds b " ("select id, buildStatus, releaseName, closureSize, size from Builds b "
"join BuildOutputs o on b.id = o.build " "join BuildOutputs o on b.id = o.build "
"where finished = 1 and (buildStatus = 0 or buildStatus = 6) and path = $1") "where finished = 1 and (buildStatus = 0 or buildStatus = 6) and path = $1",
(output.second.path).exec(); output.second.path);
if (r.empty()) continue; if (r.empty()) continue;
BuildID id = r[0][0].as<BuildID>(); BuildID id = r[0].as<BuildID>();
printMsg(lvlInfo, format("reusing build %d") % id); printMsg(lvlInfo, format("reusing build %d") % id);
BuildOutput res; BuildOutput res;
res.failed = r[0][1].as<int>() == bsFailedWithOutput; res.failed = r[1].as<int>() == bsFailedWithOutput;
res.releaseName = r[0][2].is_null() ? "" : r[0][2].as<std::string>(); res.releaseName = r[2].is_null() ? "" : r[2].as<std::string>();
res.closureSize = r[0][3].is_null() ? 0 : r[0][3].as<unsigned long long>(); res.closureSize = r[3].is_null() ? 0 : r[3].as<unsigned long long>();
res.size = r[0][4].is_null() ? 0 : r[0][4].as<unsigned long long>(); res.size = r[4].is_null() ? 0 : r[4].as<unsigned long long>();
auto products = txn.parameterized auto products = txn.exec_params
("select type, subtype, fileSize, sha1hash, sha256hash, path, name, defaultPath from BuildProducts where build = $1 order by productnr") ("select type, subtype, fileSize, sha1hash, sha256hash, path, name, defaultPath from BuildProducts where build = $1 order by productnr",
(id).exec(); id);
for (auto row : products) { for (auto row : products) {
BuildProduct product; BuildProduct product;
@ -645,9 +648,9 @@ BuildOutput State::getBuildOutputCached(Connection & conn, nix::ref<nix::Store>
res.products.emplace_back(product); res.products.emplace_back(product);
} }
auto metrics = txn.parameterized auto metrics = txn.exec_params
("select name, unit, value from BuildMetrics where build = $1") ("select name, unit, value from BuildMetrics where build = $1",
(id).exec(); id);
for (auto row : metrics) { for (auto row : metrics) {
BuildMetric metric; BuildMetric metric;