update tests

Signed-off-by: yeya24 <[email protected]>

Author: yeya24

integration/parquet_querier_test.go

@@ -305,7 +305,7 @@ func TestParquetProjectionPushdown(t *testing.T) {
 	testCases := []struct {
 		name           string
 		query          string
-		expectedLabels []string // Labels that should be present in result (besides __name__)
+		expectedLabels []string // Labels that should be present in result
 	}{
 		{
 			name:           "simple_sum_by_job",
@@ -346,17 +346,19 @@ func TestParquetProjectionPushdown(t *testing.T) {
 					actualLabels[label.Name] = struct{}{}
 				}
 
+				// Check that all expected labels are present
+				for _, expectedLabel := range tc.expectedLabels {
+					_, ok := actualLabels[expectedLabel]
+					require.True(t, ok,
+						"series should have %s label", expectedLabel)
+				}
+
 				// Check that no unexpected labels are present
 				for lbl := range actualLabels {
 					if !slices.Contains(tc.expectedLabels, lbl) {
-						require.Fail(t, "series should not have %s label", lbl)
+						require.Fail(t, "series should not have unexpected label: %s", lbl)
 					}
 				}
-				// Check that all expected labels are present
-				for _, expectedLabel := range tc.expectedLabels {
-					require.True(t, actualLabels[expectedLabel],
-						"series should have %s label", expectedLabel)
-				}
 			}
 		})
 	}

pkg/querier/parquet_queryable.go

@@ -510,7 +510,8 @@ func (q *parquetQuerierWithFallback) Select(ctx context.Context, sortSeries bool
 	}
 
 	queryIngesters := q.queryIngestersWithin == 0 || maxt >= util.TimeToMillis(time.Now().Add(-q.queryIngestersWithin).Add(-q.projectionHintsIngesterBuffer))
-	disableProjection := len(remaining) > 0 || queryIngesters
+	// Only enable projection if ProjectionInclude is true.
+	disableProjection := len(remaining) > 0 || queryIngesters || !hints.ProjectionInclude
 	// Reset projection hints if there are mixed blocks (both parquet and non-parquet) or the query needs to merge results between ingester and parquet blocks
 	if disableProjection {
 		hints.ProjectionLabels = nil

pkg/querier/parquet_queryable_test.go

@@ -643,6 +643,7 @@ func TestSelectProjectionHints(t *testing.T) {
 		projectionHintsIngesterBuffer time.Duration
 		hasRemainingBlocks            bool // Whether there are non-parquet (TSDB) blocks
 		inputProjectionLabels         []string
+		inputProjectionInclude        bool     // Input ProjectionInclude value
 		expectedProjectionLabels      []string // nil means projection disabled
 		expectedProjectionInclude     bool
 	}{
@@ -653,6 +654,7 @@ func TestSelectProjectionHints(t *testing.T) {
 			projectionHintsIngesterBuffer: 1 * time.Hour,
 			hasRemainingBlocks:            false,
 			inputProjectionLabels:         []string{"__name__", "job"},
+			inputProjectionInclude:        true,
 			expectedProjectionLabels:      []string{"__name__", "job"}, // Preserved
 			expectedProjectionInclude:     true,
 		},
@@ -663,6 +665,7 @@ func TestSelectProjectionHints(t *testing.T) {
 			projectionHintsIngesterBuffer: 1 * time.Hour,
 			hasRemainingBlocks:            true, // Mixed blocks
 			inputProjectionLabels:         []string{"__name__", "job"},
+			inputProjectionInclude:        true,
 			expectedProjectionLabels:      nil, // Reset
 			expectedProjectionInclude:     false,
 		},
@@ -673,6 +676,7 @@ func TestSelectProjectionHints(t *testing.T) {
 			projectionHintsIngesterBuffer: 1 * time.Hour,
 			hasRemainingBlocks:            false,
 			inputProjectionLabels:         []string{"__name__", "job"},
+			inputProjectionInclude:        true,
 			expectedProjectionLabels:      nil, // Reset (maxT >= now - 2h - 1h = now - 3h)
 			expectedProjectionInclude:     false,
 		},
@@ -683,6 +687,7 @@ func TestSelectProjectionHints(t *testing.T) {
 			projectionHintsIngesterBuffer: 1 * time.Hour,
 			hasRemainingBlocks:            false,
 			inputProjectionLabels:         []string{"__name__", "job"},
+			inputProjectionInclude:        true,
 			expectedProjectionLabels:      nil, // Reset (maxT = now - 2.5h, threshold = now - 3h, so 2.5h > 3h means disabled)
 			expectedProjectionInclude:     false,
 		},
@@ -693,6 +698,7 @@ func TestSelectProjectionHints(t *testing.T) {
 			projectionHintsIngesterBuffer: 1 * time.Hour,
 			hasRemainingBlocks:            false,
 			inputProjectionLabels:         []string{"__name__", "job"},
+			inputProjectionInclude:        true,
 			expectedProjectionLabels:      nil, // Reset
 			expectedProjectionInclude:     false,
 		},
@@ -703,6 +709,7 @@ func TestSelectProjectionHints(t *testing.T) {
 			projectionHintsIngesterBuffer: 1 * time.Hour,
 			hasRemainingBlocks:            false,
 			inputProjectionLabels:         []string{"__name__", "job"},
+			inputProjectionInclude:        true,
 			expectedProjectionLabels:      []string{"__name__", "job"}, // Preserved
 			expectedProjectionInclude:     true,
 		},
@@ -713,6 +720,7 @@ func TestSelectProjectionHints(t *testing.T) {
 			projectionHintsIngesterBuffer: 0, // No buffer
 			hasRemainingBlocks:            false,
 			inputProjectionLabels:         []string{"__name__", "job"},
+			inputProjectionInclude:        true,
 			expectedProjectionLabels:      []string{"__name__", "job"}, // Preserved
 			expectedProjectionInclude:     true,
 		},
@@ -723,9 +731,21 @@ func TestSelectProjectionHints(t *testing.T) {
 			projectionHintsIngesterBuffer: 1 * time.Hour,
 			hasRemainingBlocks:            false,
 			inputProjectionLabels:         []string{"__name__", "job"},
+			inputProjectionInclude:        true,
 			expectedProjectionLabels:      nil, // Reset
 			expectedProjectionInclude:     false,
 		},
+		"projection disabled: ProjectionInclude is false, disable projection": {
+			minT:                          util.TimeToMillis(now.Add(-10 * time.Hour)),
+			maxT:                          util.TimeToMillis(now.Add(-5 * time.Hour)),
+			queryIngestersWithin:          2 * time.Hour,
+			projectionHintsIngesterBuffer: 1 * time.Hour,
+			hasRemainingBlocks:            false,
+			inputProjectionLabels:         []string{"job"},
+			inputProjectionInclude:        false,
+			expectedProjectionLabels:      nil,
+			expectedProjectionInclude:     false,
+		},
 	}
 
 	for testName, testData := range tests {
@@ -782,7 +802,7 @@ func TestSelectProjectionHints(t *testing.T) {
 				Start:             testData.minT,
 				End:               testData.maxT,
 				ProjectionLabels:  testData.inputProjectionLabels,
-				ProjectionInclude: true,
+				ProjectionInclude: testData.inputProjectionInclude,
 			}
 
 			// Execute Select