From 8cac63f90980b825f78cbd01f45b396297047c2c Mon Sep 17 00:00:00 2001 From: my34 Date: Thu, 10 Feb 2022 16:47:05 +0300 Subject: Restoring authorship annotation for . Commit 2 of 2. --- library/cpp/containers/comptrie/loader/loader.h | 34 ++++++++++----------- .../cpp/containers/comptrie/loader/loader_ut.cpp | 22 ++++++------- .../cpp/containers/comptrie/loader/ut/dummy.trie | Bin 0 -> 25 bytes library/cpp/containers/comptrie/loader/ut/ya.make | 30 +++++++++--------- library/cpp/containers/comptrie/loader/ya.make | 24 +++++++-------- 5 files changed, 55 insertions(+), 55 deletions(-) create mode 100644 library/cpp/containers/comptrie/loader/ut/dummy.trie (limited to 'library/cpp') diff --git a/library/cpp/containers/comptrie/loader/loader.h b/library/cpp/containers/comptrie/loader/loader.h index ef3ba691153..ee10e9b451e 100644 --- a/library/cpp/containers/comptrie/loader/loader.h +++ b/library/cpp/containers/comptrie/loader/loader.h @@ -1,22 +1,22 @@ -#pragma once - +#pragma once + #include #include -#include -#include -#include - -template +#include +#include +#include + +template TrieType LoadTrieFromArchive(const TString& key, - const unsigned char (&data)[N], + const unsigned char (&data)[N], bool ignoreErrors = false) { - TArchiveReader archive(TBlob::NoCopy(data, sizeof(data))); - if (archive.Has(key)) { + TArchiveReader archive(TBlob::NoCopy(data, sizeof(data))); + if (archive.Has(key)) { TAutoPtr trie = archive.ObjectByKey(key); - return TrieType(TBlob::FromStream(*trie)); - } - if (!ignoreErrors) { - ythrow yexception() << "Resource " << key << " not found"; - } - return TrieType(); -} + return TrieType(TBlob::FromStream(*trie)); + } + if (!ignoreErrors) { + ythrow yexception() << "Resource " << key << " not found"; + } + return TrieType(); +} diff --git a/library/cpp/containers/comptrie/loader/loader_ut.cpp b/library/cpp/containers/comptrie/loader/loader_ut.cpp index b95f022416f..345063a31e4 100644 --- a/library/cpp/containers/comptrie/loader/loader_ut.cpp +++ b/library/cpp/containers/comptrie/loader/loader_ut.cpp @@ -1,20 +1,20 @@ #include #include #include - -using TDummyTrie = TCompactTrie; - -namespace { - const unsigned char DATA[] = { + +using TDummyTrie = TCompactTrie; + +namespace { + const unsigned char DATA[] = { #include "data.inc" - }; + }; } - + Y_UNIT_TEST_SUITE(ArchiveLoaderTests) { Y_UNIT_TEST(BaseTest) { TDummyTrie trie = LoadTrieFromArchive("/dummy.trie", DATA, true); UNIT_ASSERT_EQUAL(trie.Size(), 3); - + const TString TrieKyes[3] = { "zero", "one", "two"}; i32 val = -1; @@ -22,9 +22,9 @@ Y_UNIT_TEST_SUITE(ArchiveLoaderTests) { UNIT_ASSERT(trie.Find(TrieKyes[i].data(), TrieKyes[i].size(), &val)); UNIT_ASSERT_EQUAL(i, val); } - + UNIT_CHECK_GENERATED_EXCEPTION( LoadTrieFromArchive("/noname.trie", DATA), yexception); - } -} + } +} diff --git a/library/cpp/containers/comptrie/loader/ut/dummy.trie b/library/cpp/containers/comptrie/loader/ut/dummy.trie new file mode 100644 index 00000000000..4af18add2ff Binary files /dev/null and b/library/cpp/containers/comptrie/loader/ut/dummy.trie differ diff --git a/library/cpp/containers/comptrie/loader/ut/ya.make b/library/cpp/containers/comptrie/loader/ut/ya.make index 6f433c9320f..6c0334d3ea7 100644 --- a/library/cpp/containers/comptrie/loader/ut/ya.make +++ b/library/cpp/containers/comptrie/loader/ut/ya.make @@ -1,18 +1,18 @@ UNITTEST_FOR(library/cpp/containers/comptrie/loader) - + OWNER(my34) - -ARCHIVE( - NAME data.inc - dummy.trie -) - -SRCS( - loader_ut.cpp -) - -PEERDIR( + +ARCHIVE( + NAME data.inc + dummy.trie +) + +SRCS( + loader_ut.cpp +) + +PEERDIR( library/cpp/containers/comptrie/loader -) - -END() +) + +END() diff --git a/library/cpp/containers/comptrie/loader/ya.make b/library/cpp/containers/comptrie/loader/ya.make index 8904c9ddfbc..1e23e442a01 100644 --- a/library/cpp/containers/comptrie/loader/ya.make +++ b/library/cpp/containers/comptrie/loader/ya.make @@ -1,15 +1,15 @@ -LIBRARY() - -OWNER(my34) - -SRCS( - loader.h +LIBRARY() + +OWNER(my34) + +SRCS( + loader.h loader.cpp -) - -PEERDIR( +) + +PEERDIR( library/cpp/archive library/cpp/containers/comptrie -) - -END() +) + +END() -- cgit v1.3