Merge a3ff83a into 1f60fc8

Author: swalrus1

ydb/tests/olap/lib/ydb_cluster.py

@@ -8,7 +8,7 @@
 from ydb.tests.olap.lib.utils import get_external_param
 from copy import deepcopy
 from time import sleep, time
-from typing import List, Optional
+from typing import List, Optional, Callable
 from enum import Enum
 
 LOGGER = logging.getLogger()
@@ -172,17 +172,20 @@ def get_ydb_driver(cls):
         return cls._ydb_driver
 
     @classmethod
-    def list_directory(cls, root_path: str, rel_path: str) -> List[ydb.SchemeEntry]:
+    def list_directory_tree(cls, root_path: str, rel_path: str, kind_order_key: Optional[Callable[[ydb.SchemeEntryType], int]] = None) -> List[ydb.SchemeEntry]:
         path = f'{root_path}/{rel_path}' if root_path else rel_path
         LOGGER.info(f'list {path}')
         result = []
-        for child in cls.get_ydb_driver().scheme_client.list_directory(path).children:
+        entries = cls.get_ydb_driver().scheme_client.list_directory(path).children
+        if kind_order_key:
+            entries = sorted(entries, key=lambda x: kind_order_key(x.type))
+        for child in entries:
             if child.name == '.sys':
                 continue
             child.name = f'{rel_path}/{child.name}'
             result.append(child)
             if child.is_directory() or child.is_column_store():
-                result += cls.list_directory(root_path, child.name)
+                result += cls.list_directory_tree(root_path, child.name, kind_order_key)
         return result
 
     @classmethod

ydb/tests/olap/scenario/helpers/scenario_tests_helper.py

@@ -657,7 +657,7 @@ def describe_table(self, path: str, settings: ydb.DescribeTableSettings = None)
         )
 
     @allure.step('List path {path}')
-    def list_path(self, path: str, folder: str) -> List[ydb.SchemeEntry]:
+    def list_path_tree(self, path: str, folder: str) -> List[ydb.SchemeEntry]:
         """Recursively describe the path in the database under test.
 
         If the path is a directory or TableStore, then all subpaths are included in the description.
@@ -679,8 +679,20 @@ def list_path(self, path: str, folder: str) -> List[ydb.SchemeEntry]:
         if self_descr is None:
             return []
 
+        kind_order = [
+            ydb.SchemeEntryType.COLUMN_TABLE,
+            ydb.SchemeEntryType.COLUMN_STORE,
+            ydb.SchemeEntryType.EXTERNAL_DATA_SOURCE,
+        ]
+
+        def kind_order_key_reversed(kind):
+            try:
+                return -kind_order.index(kind)
+            except ValueError:
+                return -len(kind_order)
+
         if self_descr.is_directory():
-            return list(reversed(YdbCluster.list_directory(root_path, path))) + [self_descr]
+            return list(reversed(YdbCluster.list_directory_tree(root_path, path, kind_order_key_reversed))) + [self_descr]
         else:
             return self_descr
 
@@ -701,7 +713,7 @@ def remove_path(self, path: str, folder: str = '') -> None:
         import ydb.tests.olap.scenario.helpers.drop_helper as dh
 
         root_path = self.get_full_path(folder)
-        for e in self.list_path(path, folder):
+        for e in self.list_path_tree(path, folder):
             if e.is_any_table():
                 self.execute_scheme_query(dh.DropTable(os.path.join(folder, e.name)))
             elif e.is_column_store():