grahamc/hydra - Change X46KWQFNQ4KFKCZHPT5UXKCFGV57WXUWPOHLUHQKIF3ZIQYGZBQQC

Fix incorrect removed jobs in eval pages

PostgreSQL and Perl have different sort orders, in particular when comparing job names such as "aspell.x86_64-linux" and "aspellDicts.cs.i686-freebsd". This confused the evaluation comparison code, causing some jobs to appear as "removed". So now we do all the sorting in Perl.

Fixes #105.

Created by Eelco Dolstra on August 28, 2013

X46KWQFNQ4KFKCZHPT5UXKCFGV57WXUWPOHLUHQKIF3ZIQYGZBQQC

Dependencies

In channels

main

upstream

Change contents

Replacement in src/lib/Hydra/Controller/JobsetEval.pm at line 54 [4.1302]

∅:D[3.1316] → [4.2110:2227]

∅:D[2.2209] → [4.2110:2227]

B:BD[4.2110] → [4.2110:2227]

B:BD[4.2227] → [3.1317:1474]

    my @builds = $eval->builds->search({}, { order_by => ["job", "system", "id"], columns => [@buildListColumns] });
    my @builds2 = defined $eval2
        ? $eval2->builds->search({}, { order_by => ["job", "system", "id"], columns => [@buildListColumns] })
        : ();

[2.2209]

[4.2346]

    sub cmpBuilds {
        my ($a, $b) = @_;
        return $a->get_column('job') cmp $b->get_column('job')
            || $a->get_column('system') cmp $b->get_column('system')
    }

Insertion in src/lib/Hydra/Controller/JobsetEval.pm at line 60 [4.1302]

[4.2347]

[4.2476]

    my @builds = $eval->builds->search({}, { columns => [@buildListColumns] });
    my @builds2 = defined $eval2 ? $eval2->builds->search({}, { columns => [@buildListColumns] }) : ();
    @builds  = sort { cmpBuilds($a, $b) } @builds;
    @builds2 = sort { cmpBuilds($a, $b) } @builds2;

Replacement in src/lib/Hydra/Controller/JobsetEval.pm at line 80 [4.1302]

B:BD[4.2754] → [4.2754:2914]

            my $d = $build->get_column('job') cmp $build2->get_column('job')
                || $build->get_column('system') cmp $build2->get_column('system');

[4.2754]

[3.1499]

            my $d = cmpBuilds($build, $build2);