refactor: slightly change sql query

evgeniy-scherbina · evgeniy-scherbina · commit 3014491dddbe · 2025-02-28T10:40:53.000-05:00
diff --git a/coderd/database/querier_test.go b/coderd/database/querier_test.go
@@ -1303,7 +1303,7 @@ func TestQueuePosition(t *testing.T) {
 	// Ensure that queue positions are updated now that the first job has been acquired!
 	for index, job := range queued {
 		if index == 0 {
-			require.Equal(t, job.QueuePosition, int64(0))
+			require.Equal(t, job.QueuePosition, int64(-1))
 			continue
 		}
 		require.Equal(t, job.QueuePosition, int64(index))
@@ -2199,8 +2199,8 @@ func TestGetProvisionerJobsByIDsWithQueuePosition(t *testing.T) {
 				{"a": "1", "b": "2"},
 				{"a": "1"},
 			},
-			queueSizes:     []int64{2, 2, 0},
-			queuePositions: []int64{1, 1, 0},
+			queueSizes:     []int64{2, 2, -1},
+			queuePositions: []int64{1, 1, -1},
 		},
 		// Includes an additional provisioner
 		{
@@ -2344,8 +2344,8 @@ func TestGetProvisionerJobsByIDsWithQueuePosition(t *testing.T) {
 				{"b": "2"},
 			},
 			daemonTags:     []database.StringMap{},
-			queueSizes:     []int64{0, 0, 0},
-			queuePositions: []int64{0, 0, 0},
+			queueSizes:     []int64{-1, -1, -1},
+			queuePositions: []int64{-1, -1, -1},
 		},
 		// N jobs (1 job with 0 tags) & N provisioners
 		{
@@ -2378,8 +2378,8 @@ func TestGetProvisionerJobsByIDsWithQueuePosition(t *testing.T) {
 				{"a": "1"},
 				{"b": "2"},
 			},
-			queueSizes:     []int64{0, 2, 2, 2},
-			queuePositions: []int64{0, 1, 2, 2},
+			queueSizes:     []int64{-1, 2, 2, 2},
+			queuePositions: []int64{-1, 1, 2, 2},
 		},
 		// 0 jobs & 0 provisioners
 		{
@@ -2601,14 +2601,14 @@ func TestGetProvisionerJobsByIDsWithQueuePosition_MixedStatuses(t *testing.T) {
 	for _, job := range actualJobs {
 		queueSizes = append(queueSizes, job.QueueSize)
 	}
-	assert.EqualValues(t, []int64{0, 0, 0, 0, 0, 2, 2}, queueSizes, "expected queue positions to be set correctly")
+	assert.EqualValues(t, []int64{-1, -1, -1, -1, -1, 2, 2}, queueSizes, "expected queue positions to be set correctly")
 
 	// Then: the queue position should be set correctly:
 	var queuePositions []int64
 	for _, job := range actualJobs {
 		queuePositions = append(queuePositions, job.QueuePosition)
 	}
-	assert.EqualValues(t, []int64{0, 0, 0, 0, 0, 1, 2}, queuePositions, "expected queue positions to be set correctly")
+	assert.EqualValues(t, []int64{-1, -1, -1, -1, -1, 1, 2}, queuePositions, "expected queue positions to be set correctly")
 }
 
 func TestGetProvisionerJobsByIDsWithQueuePosition_OrderValidation(t *testing.T) {
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/provisionerjobs.sql b/coderd/database/queries/provisionerjobs.sql
@@ -85,8 +85,8 @@ final_jobs AS (
 	SELECT
 		fpj.id,
 		fpj.created_at,
-		COALESCE(MIN(rj.queue_position), 0) :: BIGINT AS queue_position, -- Best queue position across provisioners
-		COALESCE(MAX(rj.queue_size), 0) :: BIGINT AS queue_size -- Max queue size across provisioners
+		COALESCE(MIN(rj.queue_position), -1) :: BIGINT AS queue_position, -- Best queue position across provisioners
+		COALESCE(MAX(rj.queue_size), -1) :: BIGINT AS queue_size -- Max queue size across provisioners
 	FROM
 		filtered_provisioner_jobs fpj -- Use the pre-filtered dataset instead of full provisioner_jobs
 			LEFT JOIN ranked_jobs rj
