Merge pull request #1086 from Altinity/fp_antalya_25_8_export_mt_part

Try to fix export mt part test issue

Author: Enmk

tests/queries/0_stateless/03377_object_storage_list_objects_cache.reference

@@ -1,11 +1,11 @@
 -- { echoOn }
 
 -- The cached key should be `dir_`, and that includes all three files: 1, 2 and 3. Cache should return all three, but ClickHouse should filter out the third.
-SELECT _path, * FROM s3(s3_conn, filename='dir_a/dir_b/t_03377_sample_{1..2}.parquet') order by id SETTINGS use_object_storage_list_objects_cache=1;
+SELECT _path, id FROM s3(s3_conn, filename='dir_a/dir_b/t_03377_sample_{1..2}.parquet') order by id SETTINGS use_object_storage_list_objects_cache=1;
 test/dir_a/dir_b/t_03377_sample_1.parquet	1
 test/dir_a/dir_b/t_03377_sample_2.parquet	2
 -- Make sure the filtering did not interfere with the cached values
-SELECT _path, * FROM s3(s3_conn, filename='dir_a/dir_b/t_03377_sample_*.parquet') order by id SETTINGS use_object_storage_list_objects_cache=1;
+SELECT _path, id FROM s3(s3_conn, filename='dir_a/dir_b/t_03377_sample_*.parquet') order by id SETTINGS use_object_storage_list_objects_cache=1;
 test/dir_a/dir_b/t_03377_sample_1.parquet	1
 test/dir_a/dir_b/t_03377_sample_2.parquet	2
 test/dir_a/dir_b/t_03377_sample_3.parquet	3

tests/queries/0_stateless/03377_object_storage_list_objects_cache.sql

@@ -16,10 +16,10 @@ SELECT * FROM s3(s3_conn, filename='dir_**.parquet') Format Null SETTINGS use_ob
 -- { echoOn }
 
 -- The cached key should be `dir_`, and that includes all three files: 1, 2 and 3. Cache should return all three, but ClickHouse should filter out the third.
-SELECT _path, * FROM s3(s3_conn, filename='dir_a/dir_b/t_03377_sample_{1..2}.parquet') order by id SETTINGS use_object_storage_list_objects_cache=1;
+SELECT _path, id FROM s3(s3_conn, filename='dir_a/dir_b/t_03377_sample_{1..2}.parquet') order by id SETTINGS use_object_storage_list_objects_cache=1;
 
 -- Make sure the filtering did not interfere with the cached values
-SELECT _path, * FROM s3(s3_conn, filename='dir_a/dir_b/t_03377_sample_*.parquet') order by id SETTINGS use_object_storage_list_objects_cache=1;
+SELECT _path, id FROM s3(s3_conn, filename='dir_a/dir_b/t_03377_sample_*.parquet') order by id SETTINGS use_object_storage_list_objects_cache=1;
 
 SYSTEM FLUSH LOGS;
 

tests/queries/0_stateless/03572_export_replicated_merge_tree_part_to_object_storage.sh

@@ -35,7 +35,8 @@ query "ALTER TABLE $rmt_table EXPORT PART '$part_2020' TO TABLE $s3_table SETTIN
 
 query "SELECT * FROM $s3_table ORDER BY id"
 
-query "CREATE TABLE $rmt_table_roundtrip ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/$rmt_table_roundtrip', 'replica1') PARTITION BY year ORDER BY tuple() AS SELECT * FROM $s3_table"
+query "CREATE TABLE $rmt_table_roundtrip (id UInt64, year UInt16) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/$rmt_table_roundtrip', 'replica1') PARTITION BY year ORDER BY tuple()"
+query "INSERT INTO $rmt_table_roundtrip SELECT * FROM $s3_table"
 
 echo "---- Data in roundtrip ReplicatedMergeTree table (should match s3_table)"
 query "SELECT * FROM $rmt_table_roundtrip ORDER BY id"