Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix submissions_status RPC when UNION ALL doesn't keep the order #1201

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix submissions_status RPC when UNION ALL doesn't keep the order #1201

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions cms/server/admin/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

import logging

from sqlalchemy import func, not_
from sqlalchemy import func, not_, literal_column

from cms import config, ServiceCoord, get_service_shards
from cms.db import SessionGen, Dataset, Submission, SubmissionResult, Task
Expand Down Expand Up @@ -176,13 +176,17 @@ def submissions_status(contest_id):
.filter(Task.contest_id == contest_id)
queries['total'] = total_query

stats = {}
# Add a "key" column for keeping track of each stats, in case they
# get shuffled.
for key, query in queries.items():
key_column = literal_column("'%s'" % key).label("key")
queries[key] = query.add_column(key_column)

keys = list(queries.keys())
results = queries[keys[0]].union_all(
*(queries[key] for key in keys[1:])).all()

for i, k in enumerate(keys):
stats[k] = results[i][0]
stats = {key: value for value, key in results}
stats['compiling'] += 2 * stats['total'] - sum(stats.values())

return stats