Skip to content

KIKIMR-19671 Add RemovePathRecursive function #680

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ivanmorozov333 merged 2 commits into from
Dec 26, 2023
Merged

KIKIMR-19671 Add RemovePathRecursive function #680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6cfb7e
KIKIMR-19671 add RemovePathRecursive function
iddqdex Dec 22, 2023
51f31e2
fix style
iddqdex Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 39 additions & 30 deletions ydb/public/lib/ydb_cli/common/recursive_remove.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,30 @@ TStatus Remove(TRemoveFunc<TClient, TSettings> func, TSchemeClient& schemeClient
}
}

TStatus Remove(
TSchemeClient& schemeClient, TTableClient* tableClient, TTopicClient* topicClient, const TSchemeEntry& entry,
ERecursiveRemovePrompt prompt, const TRemoveDirectorySettings& settings)
{
switch (entry.Type) {
case ESchemeEntryType::Directory:
return Remove(&RemoveDirectory, schemeClient, &schemeClient, entry, prompt, settings);

case ESchemeEntryType::ColumnStore:
return Remove(&RemoveColumnStore, schemeClient, tableClient, entry, prompt, settings);

case ESchemeEntryType::ColumnTable:
case ESchemeEntryType::Table:
return Remove(&RemoveTable, schemeClient, tableClient, entry, prompt, settings);

case ESchemeEntryType::Topic:
return Remove(&RemoveTopic, schemeClient, topicClient, entry, prompt, settings);

default:
return TStatus(EStatus::UNSUPPORTED, MakeIssues(TStringBuilder()
<< "Unsupported entry type: " << entry.Type));
}
}

TStatus RemoveDirectoryRecursive(
TSchemeClient& schemeClient,
TTableClient* tableClient,
Expand Down Expand Up @@ -120,36 +144,8 @@ TStatus RemoveDirectoryRecursive(
// output order is: Root, Recursive(children)...
// we need to reverse it to delete recursively
for (auto it = recursiveListResult.Entries.rbegin(); it != recursiveListResult.Entries.rend(); ++it) {
const auto& entry = *it;
switch (entry.Type) {
case ESchemeEntryType::Directory:
if (auto result = Remove(&RemoveDirectory, schemeClient, &schemeClient, entry, prompt, settings); !result.IsSuccess()) {
return result;
}
break;

case ESchemeEntryType::ColumnStore:
if (auto result = Remove(&RemoveColumnStore, schemeClient, tableClient, entry, prompt, settings); !result.IsSuccess()) {
return result;
}
break;

case ESchemeEntryType::ColumnTable:
case ESchemeEntryType::Table:
if (auto result = Remove(&RemoveTable, schemeClient, tableClient, entry, prompt, settings); !result.IsSuccess()) {
return result;
}
break;

case ESchemeEntryType::Topic:
if (auto result = Remove(&RemoveTopic, schemeClient, topicClient, entry, prompt, settings); !result.IsSuccess()) {
return result;
}
break;

default:
return TStatus(EStatus::UNSUPPORTED, MakeIssues(TStringBuilder()
<< "Unsupported entry type: " << entry.Type));
if (auto result = Remove(schemeClient, tableClient, topicClient, *it, prompt, settings); !result.IsSuccess()) {
return result;
}
if (createProgressBar) {
bar->AddProgress(1);
Expand Down Expand Up @@ -183,4 +179,17 @@ TStatus RemoveDirectoryRecursive(
return RemoveDirectoryRecursive(schemeClient, &tableClient, &topicClient, path, prompt, settings, removeSelf, createProgressBar);
}

NYdb::TStatus RemovePathRecursive(NScheme::TSchemeClient& schemeClient, NTable::TTableClient& tableClient, NTopic::TTopicClient& topicClient, const TString& path, ERecursiveRemovePrompt prompt, const NScheme::TRemoveDirectorySettings& settings /*= {}*/, bool createProgressBar /*= true*/) {
auto entity = schemeClient.DescribePath(path).ExtractValueSync();
if (!entity.IsSuccess()) {
return entity;
}
switch (entity.GetEntry().Type) {
case ESchemeEntryType::Directory:
case ESchemeEntryType::ColumnStore:
return RemoveDirectoryRecursive(schemeClient, tableClient, topicClient, path, prompt, settings, true, createProgressBar);
default:
return Remove(schemeClient, &tableClient, &topicClient, entity.GetEntry(), prompt, settings);
}
}
}
9 changes: 9 additions & 0 deletions ydb/public/lib/ydb_cli/common/recursive_remove.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,13 @@ TStatus RemoveDirectoryRecursive(
bool removeSelf = true,
bool createProgressBar = true);

TStatus RemovePathRecursive(
NScheme::TSchemeClient& schemeClient,
NTable::TTableClient& tableClient,
NTopic::TTopicClient& topicClient,
const TString& path,
ERecursiveRemovePrompt prompt,
const NScheme::TRemoveDirectorySettings& settings = {},
bool createProgressBar = true);

}