Fix recursive remove path (#16923)

Author: iddqdex

ydb/public/lib/ydb_cli/commands/ydb_workload.cpp

@@ -391,6 +391,7 @@ void TWorkloadCommandBase::CleanTables(NYdbWorkload::IWorkloadQueryGenerator& wo
     auto pathsToDelete = workloadGen.GetCleanPaths();
     TRemoveDirectoryRecursiveSettings settings;
     settings.NotExistsIsOk(true);
+    settings.CreateProgressBar(true);
     for (const auto& path : pathsToDelete) {
         Cout << "Remove path " << path << "..."  << Endl;
         auto fullPath = config.Database + "/" + path.c_str();

ydb/public/lib/ydb_cli/common/recursive_remove.cpp

@@ -222,38 +222,41 @@ TStatus RemoveDirectoryRecursive(
 
 TStatus RemovePathRecursive(
     const TDriver& driver,
-    const TString& path,
+    const TSchemeEntry& entry,
     const TRemoveDirectoryRecursiveSettings& settings
 ) {
     TSchemeClient schemeClient(driver);
-    auto entity = schemeClient.DescribePath(path).ExtractValueSync();
-    if (!entity.IsSuccess()) {
-        if (settings.NotExistsIsOk_ && entity.GetStatus() == EStatus::SCHEME_ERROR && entity.GetIssues().ToString().find("Path not found") != TString::npos) {
-            return TStatus(EStatus::SUCCESS, {});
-        }
-        return entity;
-    }
-
     TTableClient tableClient(driver);
     TTopicClient topicClient(driver);
     NQuery::TQueryClient queryClient(driver);
     NCoordination::TClient coordinationClient(driver);
     auto remover = NInternal::CreateDefaultRemover(schemeClient, tableClient, topicClient, queryClient, coordinationClient, settings);
-    return remover(entity.GetEntry());
+    return remover(entry);
 }
 
 TStatus RemovePathRecursive(
     const TDriver& driver,
-    const TSchemeEntry& entry,
+    const TString& path,
     const TRemoveDirectoryRecursiveSettings& settings
 ) {
     TSchemeClient schemeClient(driver);
-    TTableClient tableClient(driver);
-    TTopicClient topicClient(driver);
-    NQuery::TQueryClient queryClient(driver);
-    NCoordination::TClient coordinationClient(driver);
-    auto remover = NInternal::CreateDefaultRemover(schemeClient, tableClient, topicClient, queryClient, coordinationClient, settings);
-    return remover(entry);
+    const auto entity = schemeClient.DescribePath(path).ExtractValueSync();
+    if (!entity.IsSuccess()) {
+        if (settings.NotExistsIsOk_ && entity.GetStatus() == EStatus::SCHEME_ERROR && entity.GetIssues().ToString().find("Path not found") != TString::npos) {
+            return TStatus(EStatus::SUCCESS, {});
+        }
+        return entity;
+    }
+
+    auto entry = entity.GetEntry();
+    entry.Name = path;
+    switch (entry.Type) {
+        case NYdb::NScheme::ESchemeEntryType::ColumnStore:
+        case NYdb::NScheme::ESchemeEntryType::Directory:
+            return RemoveDirectoryRecursive(driver, path, settings);
+        default:
+            return RemovePathRecursive(driver, entity.GetEntry(), settings);
+    }
 }
 
 namespace NInternal {

ydb/public/lib/ydb_cli/common/recursive_remove.h

@@ -41,12 +41,6 @@ TStatus RemovePathRecursive(
     const TRemoveDirectoryRecursiveSettings& settings = {}
 );
 
-TStatus RemovePathRecursive(
-    const TDriver& driver,
-    const NScheme::TSchemeEntry& entry,
-    const TRemoveDirectoryRecursiveSettings& settings = {}
-);
-
 namespace NInternal {
 
     using TRemover = std::function<TStatus(const NScheme::TSchemeEntry&)>;