Always enable Querier BatchIterators (#5868)

* deprecate querier.iterators and querier.batch-iterators flags Signed-off-by: Ben Ye <benye@amazon.com> * update Signed-off-by: Ben Ye <benye@amazon.com> * cleanup Signed-off-by: Ben Ye <benye@amazon.com> * update docs Signed-off-by: Ben Ye <benye@amazon.com> * cleanup unused functions Signed-off-by: Ben Ye <benye@amazon.com> * changelog Signed-off-by: Ben Ye <benye@amazon.com> * remove more unused code Signed-off-by: Ben Ye <benye@amazon.com> --------- Signed-off-by: Ben Ye <benye@amazon.com>
cortexproject · Apr 22, 2024 · e39eace · e39eace
1 parent b231062
commit e39eace
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 743 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@
 * [CHANGE] Compactor/Bucket Store: Added `-blocks-storage.bucket-store.block-discovery-strategy` to configure different block listing strategy. Reverted the current recursive block listing mechanism and use the strategy `Concurrent` as in 1.15. #5828
 * [CHANGE] Compactor: Don't halt compactor when overlapped source blocks detected. #5854
 * [CHANGE] S3 Bucket Client: Expose `-blocks-storage.s3.send-content-md5` flag and set default checksum algorithm to MD5. #5870
+* [CHANGE] Querier: Mark `querier.iterators` and `querier.batch-iterators` flags as deprecated. Now querier always use batch iterators. #5868
 * [FEATURE] OTLP ingestion experimental. #5813
 * [FEATURE] Ingester: Add per-tenant new metric `cortex_ingester_tsdb_data_replay_duration_seconds`. #5477
 * [FEATURE] Query Frontend/Scheduler: Add query priority support. #5605

diff --git a/docs/blocks-storage/querier.md b/docs/blocks-storage/querier.md
@@ -104,16 +104,6 @@ querier:
   # CLI flag: -querier.timeout
   [timeout: <duration> | default = 2m]
 
-  # Use iterators to execute query, as opposed to fully materialising the series
-  # in memory.
-  # CLI flag: -querier.iterators
-  [iterators: <boolean> | default = false]
-
-  # Use batch iterators to execute query, as opposed to fully materialising the
-  # series in memory.  Takes precedent over the -querier.iterators flag.
-  # CLI flag: -querier.batch-iterators
-  [batch_iterators: <boolean> | default = true]
-
   # Use streaming RPCs for metadata APIs from ingester.
   # CLI flag: -querier.ingester-metadata-streaming
   [ingester_metadata_streaming: <boolean> | default = false]

diff --git a/docs/configuration/config-file-reference.md b/docs/configuration/config-file-reference.md
@@ -3609,16 +3609,6 @@ The `querier_config` configures the Cortex querier.
 # CLI flag: -querier.timeout
 [timeout: <duration> | default = 2m]
 
-# Use iterators to execute query, as opposed to fully materialising the series
-# in memory.
-# CLI flag: -querier.iterators
-[iterators: <boolean> | default = false]
-
-# Use batch iterators to execute query, as opposed to fully materialising the
-# series in memory.  Takes precedent over the -querier.iterators flag.
-# CLI flag: -querier.batch-iterators
-[batch_iterators: <boolean> | default = true]
-
 # Use streaming RPCs for metadata APIs from ingester.
 # CLI flag: -querier.ingester-metadata-streaming
 [ingester_metadata_streaming: <boolean> | default = false]

diff --git a/pkg/chunk/encoding/instrumentation.go b/pkg/chunk/encoding/instrumentation.go
diff --git a/pkg/chunk/opts.go b/pkg/chunk/opts.go
diff --git a/pkg/chunk/opts_test.go b/pkg/chunk/opts_test.go
diff --git a/pkg/querier/distributor_queryable_test.go b/pkg/querier/distributor_queryable_test.go
@@ -20,6 +20,7 @@ import (
 	"github.com/cortexproject/cortex/pkg/cortexpb"
 	"github.com/cortexproject/cortex/pkg/ingester/client"
 	"github.com/cortexproject/cortex/pkg/prom1/storage/metric"
+	"github.com/cortexproject/cortex/pkg/querier/batch"
 	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/cortexproject/cortex/pkg/util/chunkcompat"
 	"github.com/cortexproject/cortex/pkg/util/validation"
@@ -190,7 +191,7 @@ func TestIngesterStreaming(t *testing.T) {
 		nil)
 
 	ctx := user.InjectOrgID(context.Background(), "0")
-	queryable := newDistributorQueryable(d, true, mergeChunks, 0, true)
+	queryable := newDistributorQueryable(d, true, batch.NewChunkMergeIterator, 0, true)
 	querier, err := queryable.Querier(mint, maxt)
 	require.NoError(t, err)
 
@@ -268,7 +269,7 @@ func TestIngesterStreamingMixedResults(t *testing.T) {
 		nil)
 
 	ctx := user.InjectOrgID(context.Background(), "0")
-	queryable := newDistributorQueryable(d, true, mergeChunks, 0, true)
+	queryable := newDistributorQueryable(d, true, batch.NewChunkMergeIterator, 0, true)
 	querier, err := queryable.Querier(mint, maxt)
 	require.NoError(t, err)
 

diff --git a/pkg/querier/iterators/chunk_iterator.go b/pkg/querier/iterators/chunk_iterator.go