Merge branch 'ah-fix-flaky-ch-tests-2' into 'master'

Fix flaky CH tests

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/145637



Merged-by: Harsimar Sandhu <hsandhu@gitlab.com>
Approved-by: Pedro Pombeiro <noreply@pedro.pombei.ro>
Approved-by: Harsimar Sandhu <hsandhu@gitlab.com>
Reviewed-by: Pedro Pombeiro <noreply@pedro.pombei.ro>
Reviewed-by: Vladimir Shushlin <vshushlin@gitlab.com>
Co-authored-by: Adam Hegyi <ahegyi@gitlab.com>

app/services/click_house/sync_strategies/event_sync_strategy.rb

@@ -10,7 +10,7 @@ class EventSyncStrategy < BaseSyncStrategy
           CASE
             WHEN project_id IS NOT NULL THEN (SELECT array_to_string(traversal_ids, '/') || '/' FROM namespaces WHERE id = (SELECT project_namespace_id FROM projects WHERE id = events.project_id LIMIT 1) LIMIT 1)
             WHEN group_id IS NOT NULL THEN (SELECT array_to_string(traversal_ids, '/') || '/' FROM namespaces WHERE id = events.group_id LIMIT 1)
-            ELSE ''
+            ELSE '0/'
           END
         ) AS path
       SQL

spec/lib/gitlab/database/click_house_client_spec.rb

@@ -52,7 +52,7 @@ def format_row(event)
 
       describe 'RSpec hooks' do
         it 'ensures that tables are empty' do
-          results = ClickHouse::Client.select('SELECT * FROM FINAL events', :main)
+          results = ClickHouse::Client.select('SELECT * FROM events FINAL', :main)
           expect(results).to be_empty
         end
 

spec/services/click_house/rebuild_materialized_view_service_spec.rb

@@ -64,7 +64,7 @@ def run_service(new_state = state)
     SQL
 
     table_query = <<~SQL
-      SELECT view_definition FROM information_schema.tables
+      SELECT table_name FROM information_schema.tables
       WHERE table_name = 'tmp_contributions' AND
       table_schema = '#{connection.database_name}'
     SQL

spec/services/click_house/sync_strategies/event_sync_strategy_spec.rb

@@ -24,7 +24,7 @@
         expected_records = [
           hash_including('id' => project_event2.id, 'path' => "#{group.id}/#{project.project_namespace.id}/",
             'target_type' => 'Issue'),
-          hash_including('id' => event_without_parent.id, 'path' => '', 'target_type' => ''),
+          hash_including('id' => event_without_parent.id, 'path' => '0/', 'target_type' => ''),
           hash_including('id' => group_event.id, 'path' => "#{group.id}/", 'target_type' => ''),
           hash_including('id' => project_event1.id, 'path' => "#{group.id}/#{project.project_namespace.id}/",
             'target_type' => 'Issue')

spec/workers/click_house/event_authors_consistency_cron_worker_spec.rb

@@ -59,12 +59,12 @@
 
     context 'when the previous job was not finished' do
       it 'continues the processing from the cursor' do
-        ClickHouse::SyncCursor.update_cursor_for(:event_authors_consistency_check, deleted_user_id1)
+        ClickHouse::SyncCursor.update_cursor_for(:event_authors_consistency_check, deleted_user_id2)
 
         worker.perform
 
         # the previous records should remain
-        expect(leftover_author_ids).to contain_exactly(user1.id, user2.id)
+        expect(leftover_author_ids).to contain_exactly(user1.id, user2.id, deleted_user_id1)
       end
     end