grahamc/hydra2 - Change JO3DDLJMWMKCNKANQC5N7E7ZW5ZZMF6T3YODH2NHDUKHILGX7G3AC

hydra-evaluator: deal in jobset IDs

Created by Graham Christensen on January 25, 2021

JO3DDLJMWMKCNKANQC5N7E7ZW5ZZMF6T3YODH2NHDUKHILGX7G3AC

Dependencies

In channels

main

Change contents

Insertion in src/hydra-evaluator/hydra-evaluator.cc at line 15 [5.575]

[5.760]


typedef std::pair<std::string, std::string> JobsetSymbolicIdentity;
class JobsetIdentity {
    public:
    std::string project;
    std::string jobset;
    int id;
    JobsetIdentity(const std::string& project, const std::string& jobset, const int id)
        : project{ project }, jobset{ jobset }, id{ id }
    {
    }

Replacement in src/hydra-evaluator/hydra-evaluator.cc at line 31 [5.575]

B:BD[5.761] → [4.0:60]

typedef std::pair<std::string, std::string> JobsetIdentity;

[5.761]

[6.165]

    friend bool operator== (const JobsetIdentity &lhs, const JobsetIdentity &rhs);
    friend bool operator!= (const JobsetIdentity &lhs, const JobsetIdentity &rhs);
    friend bool operator< (const JobsetIdentity &lhs, const JobsetIdentity &rhs);
    friend bool operator== (const JobsetIdentity &lhs, const JobsetSymbolicIdentity &rhs);
    friend bool operator!= (const JobsetIdentity &lhs, const JobsetSymbolicIdentity &rhs);
    std::string display() const {
        return str(format("%1%:%2% (jobset#%3%)") % project % jobset % id);
    }
};
bool operator==(const JobsetIdentity & lhs, const JobsetIdentity & rhs)
{
    return lhs.id == rhs.id;
}
bool operator!=(const JobsetIdentity & lhs, const JobsetIdentity & rhs)
{
    return lhs.id != rhs.id;
}
bool operator<(const JobsetIdentity & lhs, const JobsetIdentity & rhs)
{
    return lhs.id < rhs.id;
}
bool operator==(const JobsetIdentity & lhs, const JobsetSymbolicIdentity & rhs)
{
    return lhs.project == rhs.first && lhs.jobset == rhs.second;
}

Insertion in src/hydra-evaluator/hydra-evaluator.cc at line 63 [5.575]

[6.166]

[7.0]

bool operator!=(const JobsetIdentity & lhs, const JobsetSymbolicIdentity & rhs)
{
    return ! (lhs == rhs);
}

Replacement in src/hydra-evaluator/hydra-evaluator.cc at line 92 [5.575]
B:BD[5.1102] → [4.146:189]
```
    std::optional<JobsetIdentity> evalOne;
```
[5.1102]
[6.220]
```
    std::optional<JobsetSymbolicIdentity> evalOne;
```

Replacement in src/hydra-evaluator/hydra-evaluator.cc at line 121 [5.575]

B:BD[8.28] → [3.0:113]

            ("select project, j.name, lastCheckedTime, triggerTime, checkInterval, j.enabled as jobset_enabled "

[8.28]

[3.113]

            ("select j.id as id, project, j.name, lastCheckedTime, triggerTime, checkInterval, j.enabled as jobset_enabled "

Replacement in src/hydra-evaluator/hydra-evaluator.cc at line 132 [5.575]

B:BD[5.1840] → [4.230:335]

            auto name = JobsetIdentity{row["project"].as<std::string>(), row["name"].as<std::string>()};

[5.1840]

[6.222]

            auto name = JobsetIdentity{row["project"].as<std::string>(), row["name"].as<std::string>(), row["id"].as<int>()};

Replacement in src/hydra-evaluator/hydra-evaluator.cc at line 166 [5.575]

B:BD[5.2480] → [5.2480:2573]

                printInfo("forgetting jobset ‘%s:%s’", i->first.first, i->first.second);

[5.2480]

[5.2573]

                printInfo("forgetting jobset ‘%s’", i->first.display());

Replacement in src/hydra-evaluator/hydra-evaluator.cc at line 175 [5.575]

B:BD[6.451] → [6.451:589]

        printInfo("starting evaluation of jobset ‘%s:%s’ (last checked %d s ago)",
            jobset.name.first, jobset.name.second,

[6.451]

[6.589]

        printInfo("starting evaluation of jobset ‘%s’ (last checked %d s ago)",
            jobset.name.display(),

Replacement in src/hydra-evaluator/hydra-evaluator.cc at line 183 [5.575]

B:BD[8.116] → [8.116:203]

                ("update Jobsets set startTime = $1 where project = $2 and name = $3",

[8.116]

[8.203]

                ("update Jobsets set startTime = $1 where id = $2",

Replacement in src/hydra-evaluator/hydra-evaluator.cc at line 185 [5.575]

B:BD[8.225] → [8.225:299]

                 jobset.name.first,
                 jobset.name.second);

[8.225]

[6.952]

                 jobset.name.id);

Replacement in src/hydra-evaluator/hydra-evaluator.cc at line 192 [5.575]

B:BD[5.2877] → [2.0:91]

            Strings args = { "hydra-eval-jobset", jobset.name.first, jobset.name.second };

[5.2877]

[5.3022]

            Strings args = { "hydra-eval-jobset", jobset.name.project, jobset.name.jobset };

Replacement in src/hydra-evaluator/hydra-evaluator.cc at line 206 [5.575]

B:BD[9.111] → [7.764:885]

            debug("shouldEvaluate %s:%s? no: already running",
                  jobset.name.first, jobset.name.second);

[9.111]

            debug("shouldEvaluate %s? no: already running",
                  jobset.name.display());

Replacement in src/hydra-evaluator/hydra-evaluator.cc at line 213 [5.575]

B:BD[9.277] → [7.959:1075]

            debug("shouldEvaluate %s:%s? yes: requested",
                  jobset.name.first, jobset.name.second);

[9.277]

            debug("shouldEvaluate %s? yes: requested",
                  jobset.name.display());

Replacement in src/hydra-evaluator/hydra-evaluator.cc at line 221 [5.575]

B:BD[9.480] → [7.1076:1200]

            debug("shouldEvaluate %s:%s? no: checkInterval <= 0",
                  jobset.name.first, jobset.name.second);

[9.480]

            debug("shouldEvaluate %s? no: checkInterval <= 0",
                  jobset.name.display());

Replacement in src/hydra-evaluator/hydra-evaluator.cc at line 238 [5.575]

B:BD[7.1718] → [7.1718:1777]

                     "where project = $1 and jobset = $2 "

[7.1718]

[7.1777]

                     "where jobset_id = $1 "

Replacement in src/hydra-evaluator/hydra-evaluator.cc at line 240 [5.575]

B:BD[7.1826] → [7.1826:1903]

                  (jobset.name.first)
                  (jobset.name.second)

[7.1826]

[7.1903]

                  (jobset.name.id)

Replacement in src/hydra-evaluator/hydra-evaluator.cc at line 245 [5.575]

B:BD[7.2039] → [7.2039:2190]

                    debug("shouldEvaluate(one-at-a-time) %s:%s? yes: no prior eval",
                          jobset.name.first, jobset.name.second);

[7.2039]

[7.2190]

                    debug("shouldEvaluate(one-at-a-time) %s? yes: no prior eval",
                          jobset.name.display());

Replacement in src/hydra-evaluator/hydra-evaluator.cc at line 265 [5.575]

B:BD[7.2891] → [7.2891:3049]

                    debug("shouldEvaluate(one-at-a-time) %s:%s? yes: no unfinished builds",
                          jobset.name.first, jobset.name.second);

[7.2891]

[7.3049]

                    debug("shouldEvaluate(one-at-a-time) %s? yes: no unfinished builds",
                          jobset.name.display());

Replacement in src/hydra-evaluator/hydra-evaluator.cc at line 270 [5.575]

B:BD[7.3207] → [7.3207:3274]

                           jobset.name.first, jobset.name.second);

[7.3207]

[7.3274]

                           jobset.name.display());

Replacement in src/hydra-evaluator/hydra-evaluator.cc at line 277 [5.575]

B:BD[7.3421] → [7.3421:3576]

                debug("shouldEvaluate(oneshot/scheduled) %s:%s? yes: checkInterval elapsed",
                      jobset.name.first, jobset.name.second);

[7.3421]

[7.3576]

                debug("shouldEvaluate(oneshot/scheduled) %s? yes: checkInterval elapsed",
                      jobset.name.display());

Replacement in src/hydra-evaluator/hydra-evaluator.cc at line 403 [5.575]

∅:D[6.1440] → [10.0:73]

B:BD[5.7818] → [10.0:73]

B:BD[10.73] → [6.1441:1533]

                        printInfo("evaluation of jobset ‘%s:%s’ %s",
                            jobset.name.first, jobset.name.second, statusToString(status));

[6.1440]

[6.1533]

                        printInfo("evaluation of jobset ‘%s’ %s",
                            jobset.name.display(), statusToString(status));

Replacement in src/hydra-evaluator/hydra-evaluator.cc at line 420 [5.575]

B:BD[8.345] → [8.345:613]

                                ("update Jobsets set triggerTime = null where project = $1 and name = $2 and startTime is not null and triggerTime <= startTime",
                                 jobset.name.first,
                                 jobset.name.second);

[8.345]

[6.2346]

                                ("update Jobsets set triggerTime = null where id = $1 and startTime is not null and triggerTime <= startTime",
                                 jobset.name.id);

Replacement in src/hydra-evaluator/hydra-evaluator.cc at line 425 [5.575]

B:BD[8.659] → [8.659:870]

                                ("update Jobsets set startTime = null where project = $1 and name = $2",
                                 jobset.name.first,
                                 jobset.name.second);

[8.659]

[11.31]

                                ("update Jobsets set startTime = null where id = $1",
                                 jobset.name.id);

Replacement in src/hydra-evaluator/hydra-evaluator.cc at line 430 [5.575]

B:BD[8.920] → [8.920:1086]

                                    ("update Jobsets set errorMsg = $1, lastCheckedTime = $2, errorTime = $2, fetchErrorMsg = null where project = $3 and name = $4",

[8.920]

[8.1086]

                                    ("update Jobsets set errorMsg = $1, lastCheckedTime = $2, errorTime = $2, fetchErrorMsg = null where id = $3",

Replacement in src/hydra-evaluator/hydra-evaluator.cc at line 433 [5.575]

B:BD[8.1211] → [8.1211:1325]

                                     jobset.name.first,
                                     jobset.name.second);

[8.1211]

[11.584]

                                     jobset.name.id);

Replacement in src/hydra-evaluator/hydra-evaluator.cc at line 514 [5.575]

B:BD[12.152] → [4.336:406]

                evaluator.evalOne = JobsetIdentity(args[0], args[1]);

[12.152]

[12.218]

                evaluator.evalOne = JobsetSymbolicIdentity(args[0], args[1]);