diff options
author | Vlad Yaroslavlev <vladon@vladon.com> | 2022-02-10 16:46:25 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:46:25 +0300 |
commit | 344ea37b4a345701ab0e67de2266a1c1bd7baf2d (patch) | |
tree | 1a2c5ffcf89eb53ecd79dbc9bc0a195c27404d0c /library/cpp/archive | |
parent | 706b83ed7de5a473436620367af31fc0ceecde07 (diff) | |
download | ydb-344ea37b4a345701ab0e67de2266a1c1bd7baf2d.tar.gz |
Restoring authorship annotation for Vlad Yaroslavlev <vladon@vladon.com>. Commit 2 of 2.
Diffstat (limited to 'library/cpp/archive')
-rw-r--r-- | library/cpp/archive/yarchive.cpp | 30 | ||||
-rw-r--r-- | library/cpp/archive/yarchive.h | 2 | ||||
-rw-r--r-- | library/cpp/archive/yarchive_ut.cpp | 20 |
3 files changed, 26 insertions, 26 deletions
diff --git a/library/cpp/archive/yarchive.cpp b/library/cpp/archive/yarchive.cpp index 34badecc37c..1becc3e5dac 100644 --- a/library/cpp/archive/yarchive.cpp +++ b/library/cpp/archive/yarchive.cpp @@ -41,7 +41,7 @@ static inline T ESLoad(IInputStream* in) { template <> inline TString ESLoad<TString>(IInputStream* in) { size_t len = ESLoad<ui32>(in); - TString ret; + TString ret; TTempBuf tmp; while (len) { @@ -62,7 +62,7 @@ inline TString ESLoad<TString>(IInputStream* in) { namespace { class TArchiveRecordDescriptor: public TSimpleRefCount<TArchiveRecordDescriptor> { public: - inline TArchiveRecordDescriptor(ui64 off, ui64 len, const TString& name) + inline TArchiveRecordDescriptor(ui64 off, ui64 len, const TString& name) : Off_(off) , Len_(len) , Name_(name) @@ -72,7 +72,7 @@ namespace { inline TArchiveRecordDescriptor(IInputStream* in) : Off_(ESLoad<ui64>(in)) , Len_(ESLoad<ui64>(in)) - , Name_(ESLoad<TString>(in)) + , Name_(ESLoad<TString>(in)) { } @@ -84,29 +84,29 @@ namespace { ESSave(out, Name_); } - inline const TString& Name() const noexcept { + inline const TString& Name() const noexcept { return Name_; } - inline ui64 Length() const noexcept { + inline ui64 Length() const noexcept { return Len_; } - inline ui64 Offset() const noexcept { + inline ui64 Offset() const noexcept { return Off_; } private: ui64 Off_; ui64 Len_; - TString Name_; + TString Name_; }; typedef TIntrusivePtr<TArchiveRecordDescriptor> TArchiveRecordDescriptorRef; } class TArchiveWriter::TImpl { - using TDict = THashMap<TString, TArchiveRecordDescriptorRef>; + using TDict = THashMap<TString, TArchiveRecordDescriptorRef>; public: inline TImpl(IOutputStream& out, bool compress) @@ -194,7 +194,7 @@ TArchiveWriter::TArchiveWriter(IOutputStream* out, bool compress) { } -TArchiveWriter::~TArchiveWriter() { +TArchiveWriter::~TArchiveWriter() { try { Finish(); } catch (...) { @@ -253,7 +253,7 @@ namespace { } class TArchiveReader::TImpl { - typedef THashMap<TString, TArchiveRecordDescriptorRef> TDict; + typedef THashMap<TString, TArchiveRecordDescriptorRef> TDict; public: inline TImpl(const TBlob& blob) @@ -299,11 +299,11 @@ public: } } - inline size_t Count() const noexcept { + inline size_t Count() const noexcept { return Recs_.size(); } - inline TString KeyByIndex(size_t n) const { + inline TString KeyByIndex(size_t n) const { if (n < Count()) { return Recs_[n]->Name(); } @@ -357,7 +357,7 @@ public: private: TBlob Blob_; - TVector<TArchiveRecordDescriptorRef> Recs_; + TVector<TArchiveRecordDescriptorRef> Recs_; TDict Dict_; bool UseDecompression; }; @@ -369,11 +369,11 @@ TArchiveReader::TArchiveReader(const TBlob& data) TArchiveReader::~TArchiveReader() {} -size_t TArchiveReader::Count() const noexcept { +size_t TArchiveReader::Count() const noexcept { return Impl_->Count(); } -TString TArchiveReader::KeyByIndex(size_t n) const { +TString TArchiveReader::KeyByIndex(size_t n) const { return Impl_->KeyByIndex(n); } diff --git a/library/cpp/archive/yarchive.h b/library/cpp/archive/yarchive.h index 76a074f8495..8120bcb9402 100644 --- a/library/cpp/archive/yarchive.h +++ b/library/cpp/archive/yarchive.h @@ -17,7 +17,7 @@ static constexpr size_t ArchiveWriterDefaultDataAlignment = 16; class TArchiveWriter { public: explicit TArchiveWriter(IOutputStream* out, bool compress = true); - ~TArchiveWriter(); + ~TArchiveWriter(); void Flush(); void Finish(); diff --git a/library/cpp/archive/yarchive_ut.cpp b/library/cpp/archive/yarchive_ut.cpp index bd15cf825ee..602a1cdbbde 100644 --- a/library/cpp/archive/yarchive_ut.cpp +++ b/library/cpp/archive/yarchive_ut.cpp @@ -26,12 +26,12 @@ UNIT_TEST_SUITE_REGISTRATION(TArchiveTest); #define ARCHIVE "./test.ar" void TArchiveTest::CreateArchive() { - TFixedBufferFileOutput out(ARCHIVE); + TFixedBufferFileOutput out(ARCHIVE); TArchiveWriter w(&out); for (size_t i = 0; i < 1000; ++i) { - const TString path = "/" + ToString(i); - const TString data = "data" + ToString(i * 1000) + "dataend"; + const TString path = "/" + ToString(i); + const TString data = "data" + ToString(i * 1000) + "dataend"; TStringInput si(data); w.Add(path, &si); @@ -55,9 +55,9 @@ void TArchiveTest::TestRead() { UNIT_ASSERT_EQUAL(r.Count(), 1000); for (size_t i = 0; i < 1000; ++i) { - const TString key = "/" + ToString(i); + const TString key = "/" + ToString(i); TAutoPtr<IInputStream> is = r.ObjectByKey(key); - const TString data = is->ReadAll(); + const TString data = is->ReadAll(); UNIT_ASSERT_EQUAL(data, "data" + ToString(i * 1000) + "dataend"); } @@ -66,15 +66,15 @@ void TArchiveTest::TestRead() { void TArchiveTest::TestOffsetOrder() { CreateArchive(); TTempFile tmpFile(ARCHIVE); - TBlob blob1 = TBlob::FromFileSingleThreaded(ARCHIVE); - TArchiveReader r(blob1); + TBlob blob1 = TBlob::FromFileSingleThreaded(ARCHIVE); + TArchiveReader r(blob1); const void* prevOffset = nullptr; for (size_t i = 0; i < r.Count(); ++i) { - const TString key = r.KeyByIndex(i); - TBlob blob2 = r.BlobByKey(key); - const void* offset = blob2.Data(); + const TString key = r.KeyByIndex(i); + TBlob blob2 = r.BlobByKey(key); + const void* offset = blob2.Data(); if (i) { UNIT_ASSERT(prevOffset < offset); |