More tests

Author: ianton-ru

tests/integration/helpers/iceberg_utils.py

@@ -291,7 +291,7 @@ def get_creation_expression(
         if run_on_cluster:
             assert table_function
             return f"""
-                iceberg{engine_part}Cluster('cluster_single_node', {storage_arg}, path = '/iceberg_data/default/{table_name}/', format={format})
+                iceberg{engine_part}Cluster('cluster_simple', {storage_arg}, path = '/iceberg_data/default/{table_name}/', format={format})
             """
         else:
             if table_function:
@@ -477,6 +477,17 @@ def default_upload_directory(
         raise Exception(f"Unknown iceberg storage type: {storage_type}")
 
 
+def additional_upload_directory(
+    started_cluster, node, storage_type, local_path, remote_path, **kwargs
+):
+    if storage_type == "local":
+        return LocalUploader(started_cluster.instances[node]).upload_directory(
+            local_path, remote_path, **kwargs
+        )
+    else:
+        raise Exception(f"Unknown iceberg storage type for additional uploading: {storage_type}")
+
+
 def default_download_directory(
     started_cluster, storage_type, remote_path, local_path, **kwargs
 ):
@@ -500,6 +511,7 @@ def execute_spark_query_general(
     )
     return
 
+
 def get_last_snapshot(path_to_table):
     import json
     import os

tests/integration/test_storage_iceberg/configs/config.d/cluster.xml

@@ -16,13 +16,5 @@
                 </replica>
             </shard>
         </cluster_simple>
-        <cluster_single_node>
-            <shard>
-                <replica>
-                    <host>node1</host>
-                    <port>9000</port>
-                </replica>
-            </shard>
-        </cluster_single_node>
     </remote_servers>
 </clickhouse>

tests/integration/test_storage_iceberg/test.py

@@ -38,6 +38,7 @@
 
 from helpers.iceberg_utils import (
     default_upload_directory,
+    additional_upload_directory,
     default_download_directory,
     execute_spark_query_general,
     get_creation_expression,
@@ -410,7 +411,7 @@ def count_secondary_subqueries(started_cluster, query_id, expected, comment):
 
 
 @pytest.mark.parametrize("format_version", ["1", "2"])
-@pytest.mark.parametrize("storage_type", ["s3", "azure"])
+@pytest.mark.parametrize("storage_type", ["s3", "azure", "local"])
 def test_cluster_table_function(started_cluster, format_version, storage_type):
 
     instance = started_cluster.instances["node1"]
@@ -443,6 +444,19 @@ def add_df(mode):
 
         logging.info(f"Adding another dataframe. result files: {files}")
 
+        if storage_type == "local":
+            # For local storage we need to upload data from each node
+            for node_name, replica in started_cluster.instances.items():
+                if node_name == "node1":
+                    continue
+                additional_upload_directory(
+                    started_cluster,
+                    node_name,
+                    storage_type,
+                    f"/iceberg_data/default/{TABLE_NAME}/",
+                    f"/iceberg_data/default/{TABLE_NAME}/",
+                )
+
         return files
 
     files = add_df(mode="overwrite")
@@ -480,7 +494,7 @@ def make_query_from_function(
             storage_type_in_named_collection=storage_type_in_named_collection,
         )
         query_id = str(uuid.uuid4())
-        settings = "SETTINGS object_storage_cluster='cluster_simple'" if alt_syntax else ""
+        settings = f"SETTINGS object_storage_cluster='cluster_simple'" if (alt_syntax and not run_on_cluster) else ""
         if remote:
             query = f"SELECT * FROM remote('node2', {expr}) {settings}"
         else: