grahamc/hydra2 - Change DPYJFBXU55M7PFYHARO5FSZ4GFNZQQI4GYV5YTIXC77FUCVUU3PAC

hydra-eval-jobs: Support meta.license being a list

TODO: PostgreSQL has an array column type, we should use it for the license and maintainers columns.

Created by Eelco Dolstra on November 4, 2013

DPYJFBXU55M7PFYHARO5FSZ4GFNZQQI4GYV5YTIXC77FUCVUU3PAC

Dependencies

In channels

main

Change contents

Insertion in src/c/hydra-eval-jobs.cc at line 109 [5.303]

[3.730]

[4.1405]

}
static string queryMetaField(MetaInfo & meta, const string & name)
{
    string res;
    MetaValue value = meta[name];
    if (value.type == MetaValue::tpString)
        res = value.stringValue;
    else if (value.type == MetaValue::tpStrings) {
        foreach (Strings::const_iterator, i, value.stringValues) {
            if (res.size() != 0) res += ", ";
            res += *i;
        }
    }
    return res;

Replacement in src/c/hydra-eval-jobs.cc at line 155 [5.303]

B:BD[3.983] → [3.983:1056]

            xmlAttrs["license"] = queryMetaFieldString(meta, "license");

[3.983]

[3.1056]

            xmlAttrs["license"] = queryMetaField(meta, "license");

Insertion in src/c/hydra-eval-jobs.cc at line 157 [5.303]

[3.1131]

[2.0]

            xmlAttrs["maintainers"] = queryMetaField(meta, "maintainers");

Deletion in src/c/hydra-eval-jobs.cc at line 168 [5.303]

∅:D[2.260] → [6.1:510]

B:BD[6.1] → [6.1:510]

∅:D[6.510] → [3.1269:1270]

B:BD[3.1269] → [3.1269:1270]

            string maintainers;
            MetaValue value = meta["maintainers"];
            if (value.type == MetaValue::tpString)
                maintainers = value.stringValue;
            else if (value.type == MetaValue::tpStrings) {
                foreach (Strings::const_iterator, i, value.stringValues) {
                    if (maintainers.size() != 0) maintainers += ", ";
                    maintainers += *i;
                }
            }
            xmlAttrs["maintainers"] = maintainers;