Merge 'rebased'

Author: wil93

AUTHORS.txt

@@ -15,16 +15,20 @@ Vytis Banaitis <[email protected]>
 Giovanni Campagna (aka gcampax) <[email protected]>
 Cheng, Ting-Yuan (aka magrady24) <[email protected]>
 William Di Luigi (aka wil93) <[email protected]>
+Johannes Kapfhammer (aka kapf) <[email protected]>
 Vittorio Gambaletta (aka VittGam) <[email protected]>
 David Greenaway <[email protected]>
 Fabian Gundlach (aka fagu) <[email protected]>
 Masaki Hara (aka qnighy) <[email protected]>
-Artem Iglikov (aka arti) <[email protected]>
+Artem Iglikov (aka artikz) <[email protected]>
 Damien Leroy <[email protected]>
+Tubérculo Martínez <[email protected]>
 Evgeny Martynov <[email protected]>
 Kento Nikaido (aka snukent) <[email protected]>
 William Pettersson <[email protected]>
+Ludwig Schmidt <[email protected]>
 Federico Scrinzi (aka volpino) <[email protected]>
+Konstantin Tretyakov <[email protected]>
 Luca Versari <[email protected]>
 Hyungsuk Yoon <[email protected]>
 Kenneth Wong <[email protected]>

REQUIREMENTS.txt

@@ -17,3 +17,4 @@ gevent>=1.0
 werkzeug>=0.8
 pycups>=1.9
 PyPDF2>=1.19
+patool>=1.7

cms/__init__.py

@@ -36,8 +36,10 @@
 __all__ = [
     "LANG_C", "LANG_CPP", "LANG_PASCAL", "LANG_PYTHON", "LANG_PHP",
     "LANGUAGE_NAMES", "LANGUAGES", "DEFAULT_LANGUAGES",
-    "SOURCE_EXT_TO_LANGUAGE_MAP",
+    "SOURCE_EXT_TO_LANGUAGE_MAP", "filename_to_language",
     "LANGUAGE_TO_SOURCE_EXT_MAP", "LANGUAGE_TO_HEADER_EXT_MAP",
+    "LANGUAGE_TO_OBJ_EXT_MAP",
+    "SCORE_MODE_MAX", "SCORE_MODE_MAX_TOKENED_LAST",
     # log
     # Nothing intended for external use, no need to advertise anything.
     # util
@@ -102,7 +104,34 @@
     LANG_CPP: ".h",
     LANG_PASCAL: "lib.pas",
 }
+LANGUAGE_TO_OBJ_EXT_MAP = {
+    LANG_C: ".o",
+    LANG_CPP: ".o",
+    LANG_PASCAL: ".o",
+}
+
+
+def filename_to_language(filename):
+    """Determine the programming language of filename from its extension.
+
+    filename (string): the file to test.
+
+    return (string|None): the extension of filename, or None if it is
+        not a recognized language.
+
+    """
+    for source_ext, language in SOURCE_EXT_TO_LANGUAGE_MAP.iteritems():
+        if filename.endswith(source_ext):
+            return language
+    return None
+
+
+# Task score modes.
 
+# Maximum score amongst all submissions.
+SCORE_MODE_MAX = "max"
+# Maximum score among all tokened submissions and the last submission.
+SCORE_MODE_MAX_TOKENED_LAST = "max_tokened_last"
 
 from .util import ConfigError, mkdir, utf8_decoder, Address, ServiceCoord, \
     get_safe_shard, get_service_address, get_service_shards, \

cms/conf.py

@@ -3,7 +3,7 @@
 
 # Contest Management System - http://cms-dev.github.io/
 # Copyright © 2010-2014 Giovanni Mascellani <[email protected]>
-# Copyright © 2010-2012 Stefano Maggiolo <[email protected]>
+# Copyright © 2010-2015 Stefano Maggiolo <[email protected]>
 # Copyright © 2010-2012 Matteo Boscariol <[email protected]>
 # Copyright © 2013 Luca Wehrstedt <[email protected]>
 # Copyright © 2014 Fabian Gundlach <[email protected]>
@@ -41,8 +41,8 @@
 class Config(object):
     """This class will contain the configuration for CMS. This needs
     to be populated at the initilization stage. This is loaded by
-    default with some sane data. See cms.conf.sample in the examples
-    for information on the meaning of the fields.
+    default with some sane data. See cms.conf.sample in the config
+    directory for information on the meaning of the fields.
 
     """
     def __init__(self):
@@ -68,8 +68,12 @@ def __init__(self):
         self.use_cgroups = True
         self.sandbox_implementation = 'isolate'
 
+        # Sandbox.
+        self.max_file_size = 1048576
+
         # WebServers.
-        self.secret_key = "8e045a51e4b102ea803c06f92841a1fb"
+        self.secret_key_default = "8e045a51e4b102ea803c06f92841a1fb"
+        self.secret_key = self.secret_key_default
         self.tornado_debug = False
 
         # ContestWebServer.
@@ -134,11 +138,11 @@ def __init__(self):
             self.cache_dir = "cache"
             self.data_dir = "lib"
             self.run_dir = "run"
-            paths = [os.path.join(".", "examples", "cms.conf")]
+            paths = [os.path.join(".", "config", "cms.conf")]
             if '__file__' in globals():
                 paths += [os.path.abspath(os.path.join(
                           os.path.dirname(__file__),
-                          '..', 'examples', 'cms.conf'))]
+                          '..', 'config', 'cms.conf'))]
             paths += [os.path.join("/", "usr", "local", "etc", "cms.conf"),
                       os.path.join("/", "etc", "cms.conf")]
 

cms/db/__init__.py

@@ -3,7 +3,7 @@
 
 # Contest Management System - http://cms-dev.github.io/
 # Copyright © 2010-2012 Giovanni Mascellani <[email protected]>
-# Copyright © 2010-2012 Stefano Maggiolo <[email protected]>
+# Copyright © 2010-2015 Stefano Maggiolo <[email protected]>
 # Copyright © 2010-2012 Matteo Boscariol <[email protected]>
 # Copyright © 2013 Bernard Blackham <[email protected]>
 # Copyright © 2013 Luca Wehrstedt <[email protected]>
@@ -32,7 +32,7 @@
 import logging
 
 from sqlalchemy import create_engine
-from sqlalchemy.orm import joinedload, configure_mappers
+from sqlalchemy.orm import configure_mappers, joinedload, subqueryload
 
 from cms import config
 
@@ -85,11 +85,11 @@
 
 # Instantiate or import these objects.
 
-version = 13
+version = 14
 
 
 engine = create_engine(config.database, echo=config.database_debug,
-                       pool_size=20, pool_recycle=120)
+                       pool_size=20, max_overflow=20, pool_recycle=120)
 
 
 from .session import Session, ScopedSession, SessionGen, \
@@ -125,7 +125,7 @@
 # file because of circular dependencies.
 
 def get_submissions(self):
-    """Returns a list of submissions (with the information about the
+    """Return a list of submissions (with the information about the
     corresponding task) referring to the contest.
 
     returns (list): list of submissions.
@@ -138,11 +138,11 @@ def get_submissions(self):
 
 
 def get_submission_results(self):
-    """Returns a list of submission results for all submissions in
+    """Return a list of submission results for all submissions in
     the current contest, as evaluated against the active dataset
     for each task.
 
-    returns (list): list of submission results.
+    returns ([SubmissionResult]): list of submission results.
 
     """
     return self.sa_session.query(SubmissionResult)\
@@ -152,7 +152,7 @@ def get_submission_results(self):
 
 
 def get_user_tests(self):
-    """Returns a list of user tests (with the information about the
+    """Return a list of user tests (with the information about the
     corresponding user) referring to the contest.
 
     return (list): list of user tests.
@@ -182,6 +182,34 @@ def get_user_test_results(self):
 Contest.get_user_test_results = get_user_test_results
 
 
+# The following is a method of Dataset that cannot be put in the right
+# file because of circular dependencies.
+
+def get_submission_results_for_dataset(self, dataset):
+    """Return a list of all submission results against the specified
+    dataset.
+
+    Also preloads the executable and evaluation objects relative to
+    the submission results.
+
+    returns ([SubmissionResult]): list of submission results.
+
+    """
+    # We issue this query manually to optimize it: we load all
+    # executables and evaluations at once instead of having SA
+    # lazy-load them when we access them for each SubmissionResult,
+    # one at a time.
+    return self.sa_session\
+        .query(SubmissionResult)\
+        .filter(SubmissionResult.dataset == dataset)\
+        .options(joinedload(SubmissionResult.submission))\
+        .options(subqueryload(SubmissionResult.executables))\
+        .options(subqueryload(SubmissionResult.evaluations))\
+        .all()
+
+Dataset.get_submission_results = get_submission_results_for_dataset
+
+
 # The following is a method of User that cannot be put in the right
 # file because of circular dependencies.
 

cms/db/filecacher.py

@@ -780,7 +780,7 @@ def check_backend_integrity(self, delete=False):
 
         """
         clean = True
-        for digest, description in self.list():
+        for digest, _ in self.list():
             fobj = self.backend.get_file(digest)
             hasher = hashlib.sha1()
             try:

cms/db/submission.py

@@ -3,7 +3,7 @@
 
 # Contest Management System - http://cms-dev.github.io/
 # Copyright © 2010-2012 Giovanni Mascellani <[email protected]>
-# Copyright © 2010-2012 Stefano Maggiolo <[email protected]>
+# Copyright © 2010-2014 Stefano Maggiolo <[email protected]>
 # Copyright © 2010-2012 Matteo Boscariol <[email protected]>
 # Copyright © 2012-2013 Luca Wehrstedt <[email protected]>
 # Copyright © 2013 Bernard Blackham <[email protected]>
@@ -362,10 +362,11 @@ def get_evaluation(self, testcase):
         """Return the Evaluation of this SR on the given Testcase, if any
 
         testcase (Testcase): the testcase the returned evaluation will
-                             belong to
-        return (Evaluation): the (only!) evaluation of this submission
-                             result on the given testcase, or None if
-                             there isn't any.
+            belong to.
+
+        return (Evaluation|None): the (only!) evaluation of this
+            submission result on the given testcase, or None if there
+            isn't any.
 
         """
         # Use IDs to avoid triggering a lazy-load query.
@@ -388,6 +389,13 @@ def compiled(self):
         """
         return self.compilation_outcome is not None
 
+    @staticmethod
+    def filter_compiled():
+        """Return a filtering expression for compiled submission results.
+
+        """
+        return SubmissionResult.compilation_outcome != None  # noqa
+
     def compilation_failed(self):
         """Return whether the submission result did not compile.
 
@@ -398,6 +406,14 @@ def compilation_failed(self):
         """
         return self.compilation_outcome == "fail"
 
+    @staticmethod
+    def filter_compilation_failed():
+        """Return a filtering expression for submission results failing
+        compilation.
+
+        """
+        return SubmissionResult.compilation_outcome == "fail"
+
     def compilation_succeeded(self):
         """Return whether the submission compiled.
 
@@ -408,6 +424,14 @@ def compilation_succeeded(self):
         """
         return self.compilation_outcome == "ok"
 
+    @staticmethod
+    def filter_compilation_succeeded():
+        """Return a filtering expression for submission results passing
+        compilation.
+
+        """
+        return SubmissionResult.compilation_outcome == "ok"
+
     def evaluated(self):
         """Return whether the submission result has been evaluated.
 
@@ -416,6 +440,13 @@ def evaluated(self):
         """
         return self.evaluation_outcome is not None
 
+    @staticmethod
+    def filter_evaluated():
+        """Return a filtering lambda for evaluated submission results.
+
+        """
+        return SubmissionResult.evaluation_outcome != None  # noqa
+
     def needs_scoring(self):
         """Return whether the submission result needs to be scored.
 
@@ -436,6 +467,17 @@ def scored(self):
             "public_score", "public_score_details",
             "ranking_score_details"])
 
+    @staticmethod
+    def filter_scored():
+        """Return a filtering lambda for scored submission results.
+
+        """
+        return ((SubmissionResult.score != None)
+                & (SubmissionResult.score_details != None)
+                & (SubmissionResult.public_score != None)
+                & (SubmissionResult.public_score_details != None)
+                & (SubmissionResult.ranking_score_details != None))  # noqa
+
     def invalidate_compilation(self):
         """Blank all compilation and evaluation outcomes, and the score.