apply workaround for #1077

Author: filimonov

tests/queries/0_stateless/03642_tiered_distributed.reference

@@ -175,25 +175,25 @@ Read predicate-filtered data with analyzer enabled and prefer localhost replica
 Check if the subqueries were recorded in query_log
 Row 1:
 ──────
-type:             QueryFinish
-is_initial_query: 1
-tbl:              ['_table_function.remote','db.test_tiered_watermark']
-qry:              SELECT * FROM test_tiered_watermark ORDER BY id DESC SETTINGS enable_analyzer = 1, prefer_localhost_replica = 0, log_queries=1, serialize_query_plan=0, log_comment = 'test_tiered_watermark', max_threads=1 FORMAT Null;
-log_comment:      test_tiered_watermark
+type:              QueryFinish
+is_initial_query2: 1
+tbl:               ['_table_function.remote','db.test_tiered_watermark']
+qry:               SELECT * FROM test_tiered_watermark ORDER BY id DESC SETTINGS enable_analyzer = 1, prefer_localhost_replica = 0, log_queries=1, serialize_query_plan=0, log_comment = 'test_tiered_watermark', max_threads=1 FORMAT Null;
+log_comment:       test_tiered_watermark
 
 Row 2:
 ──────
-type:             QueryFinish
-is_initial_query: 0
-tbl:              ['db.test_tiered_watermark_after']
-qry:              SELECT `__table1`.`id` AS `id`, `__table1`.`name` AS `name`, `__table1`.`date` AS `date`, `__table1`.`value` AS `value` FROM `db`.`test_tiered_watermark_after` AS `__table1` WHERE `__table1`.`date` >= '2025-09-01' ORDER BY `__table1`.`id` DESC
-log_comment:      test_tiered_watermark
+type:              QueryFinish
+is_initial_query2: 0
+tbl:               ['db.test_tiered_watermark_after']
+qry:               SELECT `__table1`.`id` AS `id`, `__table1`.`name` AS `name`, `__table1`.`date` AS `date`, `__table1`.`value` AS `value` FROM `db`.`test_tiered_watermark_after` AS `__table1` WHERE `__table1`.`date` >= '2025-09-01' ORDER BY `__table1`.`id` DESC
+log_comment:       test_tiered_watermark
 
 Row 3:
 ──────
-type:             QueryFinish
-is_initial_query: 0
-tbl:              ['db.test_tiered_watermark_before']
-qry:              SELECT `__table1`.`id` AS `id`, `__table1`.`name` AS `name`, `__table1`.`date` AS `date`, `__table1`.`value` AS `value` FROM `db`.`test_tiered_watermark_before` AS `__table1` WHERE `__table1`.`date` < '2025-09-01' ORDER BY `__table1`.`id` DESC
-log_comment:      test_tiered_watermark
+type:              QueryFinish
+is_initial_query2: 0
+tbl:               ['db.test_tiered_watermark_before']
+qry:               SELECT `__table1`.`id` AS `id`, `__table1`.`name` AS `name`, `__table1`.`date` AS `date`, `__table1`.`value` AS `value` FROM `db`.`test_tiered_watermark_before` AS `__table1` WHERE `__table1`.`date` < '2025-09-01' ORDER BY `__table1`.`id` DESC
+log_comment:       test_tiered_watermark
 Clean up predicate filtering tables

tests/queries/0_stateless/03642_tiered_distributed.sql

@@ -274,13 +274,14 @@ SELECT 'Read predicate-filtered data with analyzer enabled and prefer localhost
 SELECT * FROM test_tiered_watermark ORDER BY id SETTINGS enable_analyzer = 1, prefer_localhost_replica = 1;
 
 -- other combinations of settings work, but give a bit different content in the query_log
+-- See the problem around is_initial_query described in https://github.com/Altinity/ClickHouse/issues/1077
 SELECT 'Check if the subqueries were recorded in query_log';
 
 SELECT * FROM test_tiered_watermark ORDER BY id DESC SETTINGS enable_analyzer = 1, prefer_localhost_replica = 0, log_queries=1, serialize_query_plan=0, log_comment = 'test_tiered_watermark', max_threads=1 FORMAT Null;
 SYSTEM FLUSH LOGS;
 SELECT
     type,
-    is_initial_query,
+    query_id = initial_query_id AS is_initial_query2,
     arraySort(arrayMap(x -> replaceAll(x, currentDatabase(), 'db'), tables)) as tbl,
     replaceAll(query, currentDatabase(), 'db') as qry,
     log_comment
@@ -294,7 +295,7 @@ WHERE
         event_time > now() - 300
         and log_comment = 'test_tiered_watermark'
         and current_database = currentDatabase()
-        and is_initial_query )
+        and query_id = initial_query_id )
 ORDER BY tbl, event_time_microseconds
 FORMAT Vertical;