X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FData.pm;h=a9c128d0cbb330c914eefdd6a85024495db214e7;hb=7f90c3b14dc4fef413b0203bddc0826cc3d6e49b;hp=8c2fb173fcb62909de6f8140c64147451278eca6;hpb=d2c2ee95623de944b4a0780d5d99694f9c1316da;p=gruntmaster-data.git diff --git a/lib/Gruntmaster/Data.pm b/lib/Gruntmaster/Data.pm index 8c2fb17..a9c128d 100644 --- a/lib/Gruntmaster/Data.pm +++ b/lib/Gruntmaster/Data.pm @@ -3,8 +3,8 @@ use 5.014; use warnings; use parent qw/Exporter/; -our $VERSION = '5999.000_013'; -our @EXPORT = qw/dbinit purge db user_list user_entry problem_list problem_entry contest_list contest_entry contest_has_problem job_list job_entry create_job standings update_status rerun_job take_job finish_job/; ## no critic (ProhibitAutomaticExportation) +our $VERSION = '5999.000_016'; +our @EXPORT = qw/dbinit purge db user_list user_entry problem_list problem_entry contest_list contest_entry contest_has_problem job_list job_entry create_job standings update_status rerun_job rerun_problem take_job finish_job open_problem/; our @EXPORT_OK = @EXPORT; use JSON::MaybeXS qw/decode_json/; @@ -36,6 +36,7 @@ my %statements = ( job_entry_sth => 'SELECT * FROM job_entry WHERE id = ?', + rerun_problem_sth => 'UPDATE jobs SET daemon=NULL,result=-2,result_text=NULL,results=NULL,errors=NULL WHERE problem = ?', rerun_job_sth => 'UPDATE jobs SET daemon=NULL,result=-2,result_text=NULL,results=NULL,errors=NULL WHERE id = ?', take_job_sth => 'UPDATE jobs SET daemon=? WHERE id = (SELECT id FROM jobs WHERE daemon IS NULL LIMIT 1 FOR UPDATE) RETURNING id', ); @@ -191,7 +192,10 @@ sub standings { $opens{$problem, $owner} = $time; } - my $jobs = $db->select('job_entry', '*', {contest => $ct->{id}}, 'id'); + # result IS NULL if job was never run + # result = -2 if job is being rerun + my %where = (contest => $ct->{id}, result => {'>=', 0}); + my $jobs = $db->select('job_entry', '*', \%where, 'id'); while (my $job = $jobs->hash) { my $open = $opens{$job->{problem}, $job->{owner}} // $ct->{start}; @@ -242,6 +246,12 @@ sub update_status { $db->commit } +sub rerun_problem { + my ($problem) = @_; + _query rerun_problem_sth => $problem; + purge '/log/'; +} + sub rerun_job { my ($id) = @_; _query rerun_job_sth => $id; @@ -252,12 +262,18 @@ sub rerun_job { sub take_job { my ($daemon) = @_; my $id = _query(take_job_sth => $daemon)->list; - return $id ? db->select(jobs => '*', {id => $id})->hash : undef; + return unless $id; + purge '/log/'; + purge "/log/$id"; + db->select(jobs => '*', {id => $id})->hash } sub finish_job { my ($job, $private, %args) = @_; db->update(jobs => \%args, {id => $job->{id}}); + purge '/log/'; + purge '/log/' . $job->{id}; + purge '/st/' . $job->{contest} if $job->{contest}; return if $private; my $status = { problem => $job->{problem}, @@ -268,6 +284,18 @@ sub finish_job { eval { db->insert(problem_status => $status) } or db->update(problem_status => $status, {owner => $job->{owner}, problem => $job->{problem}}); + purge '/us/' . $job->{owner}; +} + +sub open_problem { + my ($contest, $problem, $owner, $time) = @_; + my $ct = contest_entry($contest); + return unless $ct->{id} && $time >= $ct->{start} && $time < $ct->{stop}; ## no critic (ProhibitNegativeExpressionsInUnlessAndUntilConditions) + eval { db->insert(opens => { ## no critic (RequireCheckingReturnValueOfEval) + contest => $contest, + problem => $problem, + owner => $owner, + time => $time}) }; } my @PURGE_HOSTS = exists $ENV{PURGE_HOSTS} ? split ' ', $ENV{PURGE_HOSTS} : (); @@ -289,167 +317,158 @@ Gruntmaster::Data - Gruntmaster 6000 Online Judge -- database interface and tool =head1 SYNOPSIS - my $db = Gruntmaster::Data->connect('dbi:Pg:'); - - my $problem = $db->problem('my_problem'); - $problem->update({timeout => 2.5}); # Set time limit to 2.5 seconds - $problem->rerun; # And rerun all jobs for this problem - - # ... - - my $contest = $db->contests->create({ # Create a new contest - id => 'my_contest', - name => 'My Awesome Contest', - start => time + 100, - end => time + 1900, - }); - $db->contest_problems->create({ # Add a problem to the contest - contest => 'my_contest', - problem => 'my_problem', - }); - - say 'The contest has not started yet' if $contest->is_pending; - - # ... - - my @jobs = $db->jobs->search({contest => 'my_contest', owner => 'MGV'})->all; - $_->rerun for @jobs; # Rerun all jobs sent by MGV in my_contest =head1 DESCRIPTION -Gruntmaster::Data is the interface to the Gruntmaster 6000 database. Read the L documentation for usage information. +Gruntmaster::Data is the interface to the Gruntmaster 6000 database. -In addition to the typical DBIx::Class::Schema methods, this module contains several convenience methods: +All functions are exported by default. =over -=item contests +=item B(I<@args>) -Equivalent to C<< $schema->resultset('Contest') >> +This function connects to the database. I<@args> are the arguments +passed to the L constructor. -=item contest_problems +=item B(I<$url_path>) -Equivalent to C<< $schema->resultset('ContestProblem') >> +Purges a relative URL from the Varnish Cache by sending PURGE +$url_path requests to all hosts in the PURGE_HOSTS environment +variable. -=item jobs +=item B -Equivalent to C<< $schema->resultset('Job') >> +Returns a L object for interacting with the database +directly. Use this when no other function in this module is suitable. -=item problems +=item B -Equivalent to C<< $schema->resultset('Problem') >> +Returns an arrayref of the top 200 users. -=item users +=item B(I<$id>) -Equivalent to C<< $schema->resultset('User') >> +Returns a hashref describing the user I<$id>. -=item contest($id) +=item B([I<%args>]) -Equivalent to C<< $schema->resultset('Contest')->find($id) >> +Returns an arrayref of problems. -=item job($id) +Takes the following named arguments: -Equivalent to C<< $schema->resultset('Job')->find($id) >> +=over -=item problem($id) +=item owner -Equivalent to C<< $schema->resultset('Problem')->find($id) >> +Only show problems owned by this user -=item user($id) +=item contest -Equivalent to C<< $schema->resultset('User')->find($id) >> +Only show problems in this contest -=item user_list +=item private -Returns a list of users as an arrayref containing hashrefs. +If true, include private problems. Always true if contest is present. -=item user_entry($id) +=item solution -Returns a hashref with information about the user $id. +If true, include problem solutions -=item problem_list([%args]) +=back -Returns a list of problems grouped by level. A hashref with levels as keys. +=item B(i<$id>, [I<$contest>]) -Takes the following arguments: +Returns a hashref describing the problem I<$id>. If $contest is +present, contest start and stop times are included, and the solution +is deleted. -=over +=item B -=item owner +Returns an arrayref of contests. -Only show problems owned by this user +=item B(I<$id>) -=item contest +Returns a hashref describing the contest I<$id>. -Only show problems in this contest - -=back +=item B(I<$contest>, I<$problem>) -=item problem_entry($id, [$contest, $user]) +Returns true if the contest I<$contest> includes the problem +I<$problem>, false otherwise. -Returns a hashref with information about the problem $id. If $contest and $user are present, problem open data is updated. +=item B([I<%args>]) -=item contest_list([%args]) +In scalar context, returns an arrayref of jobs. In list context, +returns an arrayref of jobs and a hashref of information about pages. -Returns a list of contests grouped by state. A hashref with the following keys: +Takes the following named arguments: =over -=item pending +=item page -An arrayref of hashrefs representing pending contests +Show this page of the job log. Defaults to 1. -=item running +=item owner -An arrayref of hashrefs representing running contests +Only show jobs submitted by this user. -=item finished +=item contest -An arrayref of hashrefs representing finished contests +Only show jobs submitted in this contest. -=back +=item problem -Takes the following arguments: +Only show jobs submitted for this problem. -=over +=item result -=item owner +Only show jobs with this result (see the constants in +L). + +=item private -Only show contests owned by this user. +If true, include private jobs. Defaults to false. =back -=item contest_entry($id) +=item B(I<$id>) -Returns a hashref with information about the contest $id. +Returns a hashref describing the job I<$id>. -=item job_list([%args]) +=item B(I<%args>) -Returns a list of jobs as an arrayref containing hashrefs. Takes the following arguments: +Insert a new job into the database. This function also updates the +lastjob field for the job's owner. -=over +=item B(I<$ct>) -=item owner +Returns an arrayref of the standings of contest I<$ct>. -Only show jobs submitted by this user. +=item B -=item contest +Rebuilds the problem_status and contest_status tables. -Only show jobs submitted in this contest. +=item B(I<$id>) -=item problem +Marks the job $id as pending and clears its results, so that it will +be run again by the daemon. -Only show jobs submitted for this problem. +=item B(I<$daemon>) -=item page +Marks a random job as being run by I<$daemon>. Returns a hashref +describing the job, or undef if no job was available. -Show this page of results. Defaults to 1. Pages have 10 entries, and the first page has the most recent jobs. +=item B(I<$job>, I<$private>, I<%results>) -=back +Updates the job $job with the results in %results. If $private is +false, also updates the problem_status table. -=item job_entry($id) +=item B(I<$contest>, I<$problem>, I<$owner>, I<$time>) -Returns a hashref with information about the job $id. +Notes that I<$owner> has opened the problem I<$problem> of contest +I<$contest> at time I<$time>. If the C table already contains +this (I<$contest>, I<$problem>, I<$owner>) triplet, this function does +nothing. =back @@ -459,10 +478,10 @@ Marius Gavrilescu Emarius@ieval.roE =head1 COPYRIGHT AND LICENSE -Copyright (C) 2014 by Marius Gavrilescu +Copyright (C) 2014-2016 by Marius Gavrilescu This library is free software; you can redistribute it and/or modify -it under the same terms as Perl itself, either Perl version 5.18.1 or, +it under the same terms as Perl itself, either Perl version 5.20.1 or, at your option, any later version of Perl 5 you may have available.