Fixes

Author: grphil

clients/resources/static/admin/admin.js

@@ -40,7 +40,7 @@ func (c *Connector) SendNewSubmission(
 	language string,
 	fileName string,
 	fileReader io.Reader,
-) (uint, error) {
+) (SubmissionID uint, err error) {
 	r := c.connection.R()
 	r.SetContext(ctx)
 	r.SetFormData(map[string]string{

common/connectors/masterconn/connector.go

@@ -32,7 +32,7 @@ type Request struct {
 	// For any download, if DownloadBytes == false, the DownloadFolder should be specified
 	DownloadFolder string `json:"-"`
 
-	// Specify a custom filename for the downloaded file. Can be empty
+	// Specify a custom filename for the downloaded file. Can be nil for auto filename detection
 	DownloadFilename *string `json:"-"`
 
 	// For downloads, DownloadHead can be specified so that only first DownloadHead bytes will be loaded

common/connectors/storageconn/structs.go

@@ -14,8 +14,8 @@ const (
 )
 
 type Problem struct {
-	ID        uint           `gorm:"primarykey" json:"id" yaml:"id"`
-	CreatedAt time.Time      `json:"created_at" yaml:"created_at"`
+	ID        uint           `gorm:"primarykey" json:"ID" yaml:"ID"`
+	CreatedAt time.Time      `json:"created_at" yaml:"CreatedAt"`
 	UpdatedAt time.Time      `json:"updated_at" yaml:"updated_at"`
 	DeletedAt gorm.DeletedAt `gorm:"index" json:"-" yaml:"-"`
 

common/db/models/problem.go

@@ -25,30 +25,26 @@ func buildTestResult(job *invokerconn.Job, result *masterconn.InvokerJobResult)
 	return testResult
 }
 
+const (
+	timeRoundFactor   = 1000
+	memoryRoundFactor = 1024
+)
+
 func roundTime(time customfields.Time) *customfields.Time {
-	roundFactor := customfields.Time(1000)
-	if time < roundFactor {
-		return &time
-	}
-	time = (time + roundFactor - 1) / roundFactor * roundFactor
-	roundFactor *= roundFactor
-	if time < roundFactor {
-		return &time
-	}
-	time = (time + roundFactor - 1) / roundFactor * roundFactor
-	return &time
+	return roundValue(time, timeRoundFactor)
 }
 
 func roundMemory(memory customfields.Memory) *customfields.Memory {
-	memoryFactor := customfields.Memory(1024)
-	if memory < memoryFactor {
-		return &memory
-	}
-	memory = (memory + memoryFactor - 1) / memoryFactor * memoryFactor
-	memoryFactor *= memoryFactor
-	if memory < memoryFactor {
-		return &memory
+	return roundValue(memory, memoryRoundFactor)
+}
+
+func roundValue[T ~uint64](value T, roundFactor T) *T {
+	for _ = range 2 {
+		if value < roundFactor {
+			return &value
+		}
+		value = (value + roundFactor - 1) / roundFactor * roundFactor
+		roundFactor *= roundFactor
 	}
-	memory = (memory + memoryFactor - 1) / memoryFactor * memoryFactor
-	return &memory
+	return &value
 }

master/queue/jobgenerators/common.go

@@ -67,7 +67,7 @@ func (i *ICPCGenerator) NextJob() *invokerconn.Job {
 	return job
 }
 
-func (i *ICPCGenerator) hasFail() {
+func (i *ICPCGenerator) setFail() {
 	for i.firstTestToGive <= i.problem.TestsNumber {
 		i.internalTestResults[i.firstTestToGive] = models.TestResult{
 			TestNumber: i.firstTestToGive,
@@ -112,38 +112,41 @@ func (i *ICPCGenerator) incTestedPrefix() (*models.Submission, error) {
 // compileJobCompleted must be done with acquired mutex
 func (i *ICPCGenerator) compileJobCompleted(job *invokerconn.Job, result *masterconn.InvokerJobResult) (*models.Submission, error) {
 	if job.Type != invokerconn.CompileJob {
-		logger.Panic("Treating %v as compile job", job.Type)
+		logger.Panic("Treating job %d of type %v as compile job", job.ID, job.Type)
 	}
 	i.state = compilationFinished
 	switch result.Verdict {
 	case verdict.CD:
 		// skip
 	case verdict.CE:
 		i.submission.Verdict = result.Verdict
-		i.hasFail()
+		i.setFail()
 	default:
 		i.internalTestResults[1] = models.TestResult{
 			TestNumber: 1,
 			Verdict:    verdict.CF,
 			Error:      fmt.Sprintf("unknown verdict for compilation completed: %v", result.Verdict),
 		}
 		i.firstTestToGive++
-		i.hasFail()
+		i.setFail()
 	}
 	return i.incTestedPrefix()
 }
 
 // testJobCompleted must be done with acquired mutex
 func (i *ICPCGenerator) testJobCompleted(job *invokerconn.Job, result *masterconn.InvokerJobResult) (*models.Submission, error) {
+	if job.Type != invokerconn.TestJob {
+		logger.Panic("Treating job %d of type %v as test job", job.ID, job.Type)
+	}
 	switch result.Verdict {
 	case verdict.OK:
 		// skip
 	case verdict.PT, verdict.WA, verdict.RT, verdict.ML, verdict.TL, verdict.WL, verdict.SE, verdict.CF:
-		i.hasFail()
+		i.setFail()
 	default:
 		result.Verdict = verdict.CF
 		result.Error = fmt.Sprintf("unknown verdict for test job: %v", result.Verdict)
-		i.hasFail()
+		i.setFail()
 	}
 	i.internalTestResults[job.Test] = buildTestResult(job, result)
 	return i.incTestedPrefix()