Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/@types/commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -312,4 +312,5 @@ export interface GetJobsCommand extends Command {
environments?: string[]
fromTimestamp?: string
consumerAddrs?: string[]
runningJobs?: boolean
}
4 changes: 3 additions & 1 deletion src/components/core/handler/getJobs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ export class GetJobsHandler extends CommandHandler {
const jobs = await c2d.getJobs(
task.environments,
task.fromTimestamp,
task.consumerAddrs
task.consumerAddrs,
undefined,
task.runningJobs
)
const sanitizedJobs = jobs.map((job) => {
if (job.algorithm) {
Expand Down
11 changes: 9 additions & 2 deletions src/components/database/C2DDatabase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,16 @@ export class C2DDatabase extends AbstractDatabase {
environments?: string[],
fromTimestamp?: string,
consumerAddrs?: string[],
status?: C2DStatusNumber
status?: C2DStatusNumber,
runningJobs?: boolean
): Promise<DBComputeJob[]> {
return await this.provider.getJobs(environments, fromTimestamp, consumerAddrs, status)
return await this.provider.getJobs(
environments,
fromTimestamp,
consumerAddrs,
status,
runningJobs
)
}

async getJobsByStatus(
Expand Down
27 changes: 18 additions & 9 deletions src/components/database/sqliteCompute.ts
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,8 @@ export class SQLiteCompute implements ComputeDatabaseProvider {
environments?: string[],
fromTimestamp?: string,
consumerAddrs?: string[],
status?: C2DStatusNumber
status?: C2DStatusNumber,
runningJobs?: boolean
): Promise<DBComputeJob[]> {
let selectSQL = `SELECT * FROM ${this.schema.name}`

Expand All @@ -458,9 +459,22 @@ export class SQLiteCompute implements ComputeDatabaseProvider {
params.push(...environments)
}

if (fromTimestamp) {
conditions.push(`dateFinished >= ?`)
params.push(fromTimestamp)
if (runningJobs) {
conditions.push(`status = ?`)
params.push(C2DStatusNumber.RunningAlgorithm.toString())
if (fromTimestamp) {
conditions.push(`dateCreated >= ?`)
params.push(fromTimestamp)
}
} else {
if (fromTimestamp) {
conditions.push(`dateFinished >= ?`)
params.push(fromTimestamp)
}
if (status) {
conditions.push(`status = ?`)
params.push(status.toString())
}
}

if (consumerAddrs && consumerAddrs.length > 0) {
Expand All @@ -469,11 +483,6 @@ export class SQLiteCompute implements ComputeDatabaseProvider {
params.push(...consumerAddrs)
}

if (status) {
conditions.push(`status = ?`)
params.push(status.toString())
}

if (conditions.length > 0) {
selectSQL += ` WHERE ${conditions.join(' AND ')}`
}
Expand Down
Loading