diff options
author | fedor-miron <fedor-miron@yandex-team.com> | 2023-10-27 11:59:12 +0300 |
---|---|---|
committer | fedor-miron <fedor-miron@yandex-team.com> | 2023-10-27 12:19:35 +0300 |
commit | 7e5fe6b348ea2b8113bb5b83980dd61fada1d15c (patch) | |
tree | 24f748d09bf23c5b55f99c7fa5b37223311475cc | |
parent | eac8545464bfcf121ad35f9f1f95f6272e415f5e (diff) | |
download | ydb-7e5fe6b348ea2b8113bb5b83980dd61fada1d15c.tar.gz |
YQL-16949: remove warn
-rw-r--r-- | ydb/library/yql/providers/yt/gateway/native/ut/yql_yt_native_folders_ut.cpp | 3 | ||||
-rw-r--r-- | ydb/library/yql/providers/yt/gateway/native/yql_yt_native_folders.cpp | 20 |
2 files changed, 6 insertions, 17 deletions
diff --git a/ydb/library/yql/providers/yt/gateway/native/ut/yql_yt_native_folders_ut.cpp b/ydb/library/yql/providers/yt/gateway/native/ut/yql_yt_native_folders_ut.cpp index 9b2a0716e6..cd32af8d01 100644 --- a/ydb/library/yql/providers/yt/gateway/native/ut/yql_yt_native_folders_ut.cpp +++ b/ydb/library/yql/providers/yt/gateway/native/ut/yql_yt_native_folders_ut.cpp @@ -219,9 +219,6 @@ Y_UNIT_TEST(GetFolder) { UNIT_ASSERT_EQUAL( folderRes.ItemsOrFileLink, (std::variant<TVector<IYtGateway::TFolderResult::TFolderItem>, TFileLinkPtr>(EXPECTED_ITEMS))); - - UNIT_ASSERT_EQUAL(folderRes.Issues().Size(), 1); - UNIT_ASSERT_EQUAL(folderRes.Issues().back().Severity, TSeverityIds::S_WARNING); } } diff --git a/ydb/library/yql/providers/yt/gateway/native/yql_yt_native_folders.cpp b/ydb/library/yql/providers/yt/gateway/native/yql_yt_native_folders.cpp index 84b83d6fdd..99d0088803 100644 --- a/ydb/library/yql/providers/yt/gateway/native/yql_yt_native_folders.cpp +++ b/ydb/library/yql/providers/yt/gateway/native/yql_yt_native_folders.cpp @@ -116,12 +116,11 @@ TFileLinkPtr SaveItemsToTempFile(const TExecContext<IYtGateway::TBatchFolderOpti IYtGateway::TBatchFolderResult ExecResolveLinks(const TExecContext<IYtGateway::TResolveOptions>::TPtr& execCtx) { try { auto batchGet = execCtx->GetEntry()->Tx->CreateBatchRequest(); - using TFolderItemWithWarning = std::pair<IYtGateway::TBatchFolderResult::TFolderItem, TMaybe<TIssue>>; - TVector<TFuture<TFolderItemWithWarning>> batchRes; + TVector<TFuture<IYtGateway::TBatchFolderResult::TFolderItem>> batchRes; for (const auto& [item, reqAttributes]: execCtx->Options_.Items()) { if (item.Type != "link") { - batchRes.push_back(MakeFuture<TFolderItemWithWarning>({std::move(item), {}})); + batchRes.push_back(MakeFuture<IYtGateway::TBatchFolderResult::TFolderItem>(std::move(item))); continue; } if (item.Attributes["broken"].AsBool()) { @@ -133,15 +132,12 @@ IYtGateway::TBatchFolderResult ExecResolveLinks(const TExecContext<IYtGateway::T batchRes.push_back( batchGet->Get(targetPath, TGetOptions().AttributeFilter(attrFilter)) - .Apply([path, pos = execCtx->Options_.Pos()] (const auto& f) ->TFolderItemWithWarning { + .Apply([path, pos = execCtx->Options_.Pos()] (const auto& f) { try { const auto linkNode = f.GetValue(); - return {MakeFolderItem(linkNode, path), {}}; + return MakeFolderItem(linkNode, path); } catch (const NYT::TErrorResponse& e) { - auto warn = MakeIssueFromYtError(e.GetError(), e.what(), pos); - warn.Severity = TSeverityIds::S_WARNING; - - return {MakeFolderItem(NYT::TNode::CreateMap(), path), MakeMaybe(warn)}; + return MakeFolderItem(NYT::TNode::CreateMap(), path); } }) ); @@ -156,11 +152,7 @@ IYtGateway::TBatchFolderResult ExecResolveLinks(const TExecContext<IYtGateway::T batchGet->ExecuteBatch(); WaitAll(batchRes).Wait(); for (auto& f : batchRes) { - auto [item, maybeWarn] = f.ExtractValue(); - if (maybeWarn) { - res.AddIssue(maybeWarn.GetRef()); - } - res.Items.push_back(std::move(item)); + res.Items.push_back(f.ExtractValue()); } return res; } |