fix tests

Signed-off-by: yeya24 <benye@amazon.com>

Author: yeya24

integration/parquet_querier_test.go

@@ -25,6 +25,7 @@ import (
 	e2edb "github.com/cortexproject/cortex/integration/e2e/db"
 	"github.com/cortexproject/cortex/integration/e2ecortex"
 	"github.com/cortexproject/cortex/pkg/storage/bucket"
+	cortex_parquet "github.com/cortexproject/cortex/pkg/storage/parquet"
 	"github.com/cortexproject/cortex/pkg/storage/tsdb"
 	"github.com/cortexproject/cortex/pkg/storage/tsdb/bucketindex"
 	"github.com/cortexproject/cortex/pkg/util/log"
@@ -180,7 +181,7 @@ func TestParquetFuzz(t *testing.T) {
 		labels.MustNewMatcher(labels.MatchEqual, "type", "parquet"))))
 }
 
-func TestParquetProjectionPushdown(t *testing.T) {
+func TestParquetProjectionPushdownFuzz(t *testing.T) {
 	s, err := e2e.NewScenario(networkName)
 	require.NoError(t, err)
 	defer s.Close()
@@ -247,14 +248,12 @@ func TestParquetProjectionPushdown(t *testing.T) {
 	statusCodes := []string{"200", "400", "404", "500", "502"}
 	methods := []string{"GET", "POST", "PUT", "DELETE"}
 	now := time.Now()
-	// Make sure query time is old enough to not overlap with ingesters
-	// With query-ingesters-within=2h, queries with maxT < now-2h won't hit ingesters
-	// Using 24h-48h ago ensures no ingester overlap, allowing projection to be enabled
-	start := now.Add(-time.Hour * 48)
-	end := now.Add(-time.Hour * 24)
+	// Make sure query time is old enough to not overlap with ingesters.
+	start := now.Add(-time.Hour * 72)
+	end := now.Add(-time.Hour * 48)
 
 	// Create series with multiple labels
-	for i := 0; i < numSeries; i++ {
+	for i := range numSeries {
 		lbls = append(lbls, labels.FromStrings(
 			labels.MetricName, "http_requests_total",
 			"job", "api-server",
@@ -276,16 +275,17 @@ func TestParquetProjectionPushdown(t *testing.T) {
 
 	storage, err := e2ecortex.NewS3ClientForMinio(minio, flags["-blocks-storage.s3.bucket-name"])
 	require.NoError(t, err)
-	bkt := bucket.NewUserBucketClient("user-1", storage.GetBucket(), nil)
+	bkt := storage.GetBucket()
+	userBucket := bucket.NewUserBucketClient("user-1", bkt, nil)
 
-	err = block.Upload(ctx, log.Logger, bkt, filepath.Join(dir, id.String()), metadata.NoneFunc)
+	err = block.Upload(ctx, log.Logger, userBucket, filepath.Join(dir, id.String()), metadata.NoneFunc)
 	require.NoError(t, err)
 
 	// Wait until we convert the blocks to parquet AND bucket index is updated
-	cortex_testutil.Poll(t, 30*time.Second, true, func() interface{} {
+	cortex_testutil.Poll(t, 300*time.Second, true, func() interface{} {
 		// Check if parquet marker exists
 		markerFound := false
-		err := bkt.Iter(context.Background(), "", func(name string) error {
+		err := userBucket.Iter(context.Background(), "", func(name string) error {
 			if name == fmt.Sprintf("parquet-markers/%v-parquet-converter-mark.json", id.String()) {
 				markerFound = true
 			}
@@ -304,6 +304,7 @@ func TestParquetProjectionPushdown(t *testing.T) {
 		// Verify the block is in the bucket index with parquet metadata
 		for _, b := range idx.Blocks {
 			if b.ID == id && b.Parquet != nil {
+				require.True(t, b.Parquet.Version == cortex_parquet.CurrentVersion)
 				return true
 			}
 		}
@@ -364,7 +365,7 @@ func TestParquetProjectionPushdown(t *testing.T) {
 			// Verify projection worked: series should only have the expected labels
 			for _, sample := range vector {
 				actualLabels := make(map[string]struct{})
-				for _, label := range sample.Metric {
+				for label := range sample.Metric {
 					actualLabels[string(label)] = struct{}{}
 				}