1 files changed, 1 insertions, 75 deletions

diff --git a/spec/lib/gitlab/database/batch_count_spec.rb b/spec/lib/gitlab/database/batch_count_spec.rb
index 9831510f014..028bdce852e 100644
--- a/spec/lib/gitlab/database/batch_count_spec.rb
+++ b/spec/lib/gitlab/database/batch_count_spec.rb
@@ -270,8 +270,6 @@ RSpec.describe Gitlab::Database::BatchCount do
     end
 
     it "defaults the batch size to #{Gitlab::Database::BatchCounter::DEFAULT_DISTINCT_BATCH_SIZE}" do
-      stub_feature_flags(loose_index_scan_for_distinct_values: false)
-
       min_id = model.minimum(:id)
       relation = instance_double(ActiveRecord::Relation)
       allow(model).to receive_message_chain(:select, public_send: relation)
@@ -317,85 +315,13 @@ RSpec.describe Gitlab::Database::BatchCount do
       end
     end
 
-    context 'when the loose_index_scan_for_distinct_values feature flag is off' do
-      it_behaves_like 'when batch fetch query is canceled' do
-        let(:mode) { :distinct }
-        let(:operation) { :count }
-        let(:operation_args) { nil }
-        let(:column) { nil }
-
-        subject { described_class.method(:batch_distinct_count) }
-
-        before do
-          stub_feature_flags(loose_index_scan_for_distinct_values: false)
-        end
-      end
-    end
-
-    context 'when the loose_index_scan_for_distinct_values feature flag is on' do
+    it_behaves_like 'when batch fetch query is canceled' do
       let(:mode) { :distinct }
       let(:operation) { :count }
       let(:operation_args) { nil }
       let(:column) { nil }
 
-      let(:batch_size) { 10_000 }
-
       subject { described_class.method(:batch_distinct_count) }
-
-      before do
-        stub_feature_flags(loose_index_scan_for_distinct_values: true)
-      end
-
-      it 'reduces batch size by half and retry fetch' do
-        too_big_batch_relation_mock = instance_double(ActiveRecord::Relation)
-
-        count_method = double(send: 1)
-
-        allow(too_big_batch_relation_mock).to receive(:send).and_raise(ActiveRecord::QueryCanceled)
-        allow(Gitlab::Database::LooseIndexScanDistinctCount).to receive_message_chain(:new, :build_query).with(from: 0, to: batch_size).and_return(too_big_batch_relation_mock)
-        allow(Gitlab::Database::LooseIndexScanDistinctCount).to receive_message_chain(:new, :build_query).with(from: 0, to: batch_size / 2).and_return(count_method)
-        allow(Gitlab::Database::LooseIndexScanDistinctCount).to receive_message_chain(:new, :build_query).with(from: batch_size / 2, to: batch_size).and_return(count_method)
-
-        subject.call(model, column, batch_size: batch_size, start: 0, finish: batch_size - 1)
-      end
-
-      context 'when all retries fail' do
-        let(:batch_count_query) { 'SELECT COUNT(id) FROM relation WHERE id BETWEEN 0 and 1' }
-
-        before do
-          relation = instance_double(ActiveRecord::Relation)
-          allow(Gitlab::Database::LooseIndexScanDistinctCount).to receive_message_chain(:new, :build_query).and_return(relation)
-          allow(relation).to receive(:send).and_raise(ActiveRecord::QueryCanceled.new('query timed out'))
-          allow(relation).to receive(:to_sql).and_return(batch_count_query)
-        end
-
-        it 'logs failing query' do
-          expect(Gitlab::AppJsonLogger).to receive(:error).with(
-            event: 'batch_count',
-            relation: model.table_name,
-            operation: operation,
-            operation_args: operation_args,
-            start: 0,
-            mode: mode,
-            query: batch_count_query,
-            message: 'Query has been canceled with message: query timed out'
-          )
-          expect(subject.call(model, column, batch_size: batch_size, start: 0)).to eq(-1)
-        end
-      end
-
-      context 'when LooseIndexScanDistinctCount raises error' do
-        let(:column) { :creator_id }
-        let(:error_class) { Gitlab::Database::LooseIndexScanDistinctCount::ColumnConfigurationError }
-
-        it 'rescues ColumnConfigurationError' do
-          allow(Gitlab::Database::LooseIndexScanDistinctCount).to receive(:new).and_raise(error_class.new('error message'))
-
-          expect(Gitlab::AppJsonLogger).to receive(:error).with(a_hash_including(message: 'LooseIndexScanDistinctCount column error: error message'))
-
-          expect(subject.call(Project, column, batch_size: 10_000, start: 0)).to eq(-1)
-        end
-      end
     end
   end