Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3014491

Browse files
refactor: slightly change sql query
1 parent61a9f58 commit3014491

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

‎coderd/database/querier_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,7 +1303,7 @@ func TestQueuePosition(t *testing.T) {
13031303
// Ensure that queue positions are updated now that the first job has been acquired!
13041304
forindex,job:=rangequeued {
13051305
ifindex==0 {
1306-
require.Equal(t,job.QueuePosition,int64(0))
1306+
require.Equal(t,job.QueuePosition,int64(-1))
13071307
continue
13081308
}
13091309
require.Equal(t,job.QueuePosition,int64(index))
@@ -2199,8 +2199,8 @@ func TestGetProvisionerJobsByIDsWithQueuePosition(t *testing.T) {
21992199
{"a":"1","b":"2"},
22002200
{"a":"1"},
22012201
},
2202-
queueSizes: []int64{2,2,0},
2203-
queuePositions: []int64{1,1,0},
2202+
queueSizes: []int64{2,2,-1},
2203+
queuePositions: []int64{1,1,-1},
22042204
},
22052205
// Includes an additional provisioner
22062206
{
@@ -2344,8 +2344,8 @@ func TestGetProvisionerJobsByIDsWithQueuePosition(t *testing.T) {
23442344
{"b":"2"},
23452345
},
23462346
daemonTags: []database.StringMap{},
2347-
queueSizes: []int64{0,0,0},
2348-
queuePositions: []int64{0,0,0},
2347+
queueSizes: []int64{-1,-1,-1},
2348+
queuePositions: []int64{-1,-1,-1},
23492349
},
23502350
// N jobs (1 job with 0 tags) & N provisioners
23512351
{
@@ -2378,8 +2378,8 @@ func TestGetProvisionerJobsByIDsWithQueuePosition(t *testing.T) {
23782378
{"a":"1"},
23792379
{"b":"2"},
23802380
},
2381-
queueSizes: []int64{0,2,2,2},
2382-
queuePositions: []int64{0,1,2,2},
2381+
queueSizes: []int64{-1,2,2,2},
2382+
queuePositions: []int64{-1,1,2,2},
23832383
},
23842384
// 0 jobs & 0 provisioners
23852385
{
@@ -2601,14 +2601,14 @@ func TestGetProvisionerJobsByIDsWithQueuePosition_MixedStatuses(t *testing.T) {
26012601
for_,job:=rangeactualJobs {
26022602
queueSizes=append(queueSizes,job.QueueSize)
26032603
}
2604-
assert.EqualValues(t, []int64{0,0,0,0,0,2,2},queueSizes,"expected queue positions to be set correctly")
2604+
assert.EqualValues(t, []int64{-1,-1,-1,-1,-1,2,2},queueSizes,"expected queue positions to be set correctly")
26052605

26062606
// Then: the queue position should be set correctly:
26072607
varqueuePositions []int64
26082608
for_,job:=rangeactualJobs {
26092609
queuePositions=append(queuePositions,job.QueuePosition)
26102610
}
2611-
assert.EqualValues(t, []int64{0,0,0,0,0,1,2},queuePositions,"expected queue positions to be set correctly")
2611+
assert.EqualValues(t, []int64{-1,-1,-1,-1,-1,1,2},queuePositions,"expected queue positions to be set correctly")
26122612
}
26132613

26142614
funcTestGetProvisionerJobsByIDsWithQueuePosition_OrderValidation(t*testing.T) {

‎coderd/database/queries.sql.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/queries/provisionerjobs.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ final_jobs AS (
8585
SELECT
8686
fpj.id,
8787
fpj.created_at,
88-
COALESCE(MIN(rj.queue_position),0) ::BIGINTAS queue_position,-- Best queue position across provisioners
89-
COALESCE(MAX(rj.queue_size),0) ::BIGINTAS queue_size-- Max queue size across provisioners
88+
COALESCE(MIN(rj.queue_position),-1) ::BIGINTAS queue_position,-- Best queue position across provisioners
89+
COALESCE(MAX(rj.queue_size),-1) ::BIGINTAS queue_size-- Max queue size across provisioners
9090
FROM
9191
filtered_provisioner_jobs fpj-- Use the pre-filtered dataset instead of full provisioner_jobs
9292
LEFT JOIN ranked_jobs rj

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp