diff options
author | yazevnul <yazevnul@yandex-team.ru> | 2022-02-10 16:46:46 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:46:46 +0300 |
commit | 8cbc307de0221f84c80c42dcbe07d40727537e2c (patch) | |
tree | 625d5a673015d1df891e051033e9fcde5c7be4e5 /library/cpp/archive | |
parent | 30d1ef3941e0dc835be7609de5ebee66958f215a (diff) | |
download | ydb-8cbc307de0221f84c80c42dcbe07d40727537e2c.tar.gz |
Restoring authorship annotation for <yazevnul@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'library/cpp/archive')
-rw-r--r-- | library/cpp/archive/yarchive.cpp | 78 | ||||
-rw-r--r-- | library/cpp/archive/yarchive.h | 14 | ||||
-rw-r--r-- | library/cpp/archive/yarchive_ut.cpp | 4 |
3 files changed, 48 insertions, 48 deletions
diff --git a/library/cpp/archive/yarchive.cpp b/library/cpp/archive/yarchive.cpp index 1becc3e5da..78aaa17525 100644 --- a/library/cpp/archive/yarchive.cpp +++ b/library/cpp/archive/yarchive.cpp @@ -2,33 +2,33 @@ #include <util/generic/algorithm.h> #include <util/generic/hash.h> -#include <util/generic/utility.h> +#include <util/generic/utility.h> #include <util/generic/vector.h> #include <util/generic/yexception.h> -#include <util/memory/blob.h> -#include <util/memory/tempbuf.h> -#include <util/stream/input.h> -#include <util/stream/length.h> -#include <util/stream/mem.h> -#include <util/stream/output.h> -#include <util/stream/zlib.h> -#include <util/system/byteorder.h> -#include <util/ysaveload.h> +#include <util/memory/blob.h> +#include <util/memory/tempbuf.h> +#include <util/stream/input.h> +#include <util/stream/length.h> +#include <util/stream/mem.h> +#include <util/stream/output.h> +#include <util/stream/zlib.h> +#include <util/system/byteorder.h> +#include <util/ysaveload.h> template <class T> -static inline void ESSave(IOutputStream* out, const T& t_in) { +static inline void ESSave(IOutputStream* out, const T& t_in) { T t = HostToLittle(t_in); out->Write((const void*)&t, sizeof(t)); } -static inline void ESSave(IOutputStream* out, const TString& s) { +static inline void ESSave(IOutputStream* out, const TString& s) { ESSave(out, (ui32) s.size()); out->Write(s.data(), s.size()); } template <class T> -static inline T ESLoad(IInputStream* in) { +static inline T ESLoad(IInputStream* in) { T t = T(); if (in->Load(&t, sizeof(t)) != sizeof(t)) { @@ -39,7 +39,7 @@ static inline T ESLoad(IInputStream* in) { } template <> -inline TString ESLoad<TString>(IInputStream* in) { +inline TString ESLoad<TString>(IInputStream* in) { size_t len = ESLoad<ui32>(in); TString ret; TTempBuf tmp; @@ -69,7 +69,7 @@ namespace { { } - inline TArchiveRecordDescriptor(IInputStream* in) + inline TArchiveRecordDescriptor(IInputStream* in) : Off_(ESLoad<ui64>(in)) , Len_(ESLoad<ui64>(in)) , Name_(ESLoad<TString>(in)) @@ -78,7 +78,7 @@ namespace { inline ~TArchiveRecordDescriptor() = default; - inline void SaveTo(IOutputStream* out) const { + inline void SaveTo(IOutputStream* out) const { ESSave(out, Off_); ESSave(out, Len_); ESSave(out, Name_); @@ -109,7 +109,7 @@ class TArchiveWriter::TImpl { using TDict = THashMap<TString, TArchiveRecordDescriptorRef>; public: - inline TImpl(IOutputStream& out, bool compress) + inline TImpl(IOutputStream& out, bool compress) : Off_(0) , Out_(&out) , UseCompression(compress) @@ -123,15 +123,15 @@ public: } inline void Finish() { - TCountingOutput out(Out_); + TCountingOutput out(Out_); { TZLibCompress compress(&out); ESSave(&compress, (ui32)Dict_.size()); - for (const auto& kv : Dict_) { - kv.second->SaveTo(&compress); + for (const auto& kv : Dict_) { + kv.second->SaveTo(&compress); } ESSave(&compress, static_cast<ui8>(UseCompression)); @@ -139,15 +139,15 @@ public: compress.Finish(); } - ESSave(Out_, out.Counter()); + ESSave(Out_, out.Counter()); Out_->Flush(); } - inline void Add(const TString& key, IInputStream* src) { + inline void Add(const TString& key, IInputStream* src) { Y_ENSURE(!Dict_.contains(key), "key " << key.data() << " already stored"); - TCountingOutput out(Out_); + TCountingOutput out(Out_); if (UseCompression) { TZLibCompress compress(&out); TransferData(src, &compress); @@ -166,10 +166,10 @@ public: out.Finish(); } - TArchiveRecordDescriptorRef descr(new TArchiveRecordDescriptor(Off_, out.Counter(), key)); + TArchiveRecordDescriptorRef descr(new TArchiveRecordDescriptor(Off_, out.Counter(), key)); Dict_[key] = descr; - Off_ += out.Counter(); + Off_ += out.Counter(); } inline void AddSynonym(const TString& existingKey, const TString& newKey) { @@ -184,12 +184,12 @@ public: private: ui64 Off_; - IOutputStream* Out_; + IOutputStream* Out_; TDict Dict_; const bool UseCompression; }; -TArchiveWriter::TArchiveWriter(IOutputStream* out, bool compress) +TArchiveWriter::TArchiveWriter(IOutputStream* out, bool compress) : Impl_(new TImpl(*out, compress)) { } @@ -214,7 +214,7 @@ void TArchiveWriter::Finish() { } } -void TArchiveWriter::Add(const TString& key, IInputStream* src) { +void TArchiveWriter::Add(const TString& key, IInputStream* src) { Y_ENSURE(Impl_.Get(), "archive already closed"); Impl_->Add(key, src); @@ -287,8 +287,8 @@ public: Recs_.push_back(descr); Dict_[descr->Name()] = descr; } - Sort(Recs_.begin(), Recs_.end(), [](const auto& lhs, const auto& rhs) -> bool { - return lhs->Offset() < rhs->Offset(); + Sort(Recs_.begin(), Recs_.end(), [](const auto& lhs, const auto& rhs) -> bool { + return lhs->Offset() < rhs->Offset(); }); try { @@ -311,11 +311,11 @@ public: ythrow yexception() << "incorrect index"; } - inline bool Has(const TStringBuf key) const { + inline bool Has(const TStringBuf key) const { return Dict_.contains(key); } - inline TAutoPtr<IInputStream> ObjectByKey(const TStringBuf key) const { + inline TAutoPtr<IInputStream> ObjectByKey(const TStringBuf key) const { TBlob subBlob = BlobByKey(key); if (UseDecompression) { @@ -325,7 +325,7 @@ public: } } - inline TBlob ObjectBlobByKey(const TStringBuf key) const { + inline TBlob ObjectBlobByKey(const TStringBuf key) const { TBlob subBlob = BlobByKey(key); if (UseDecompression) { @@ -336,8 +336,8 @@ public: } } - inline TBlob BlobByKey(const TStringBuf key) const { - const auto it = Dict_.find(key); + inline TBlob BlobByKey(const TStringBuf key) const { + const auto it = Dict_.find(key); Y_ENSURE(it != Dict_.end(), "key " << key.data() << " not found"); @@ -377,19 +377,19 @@ TString TArchiveReader::KeyByIndex(size_t n) const { return Impl_->KeyByIndex(n); } -bool TArchiveReader::Has(const TStringBuf key) const { +bool TArchiveReader::Has(const TStringBuf key) const { return Impl_->Has(key); } -TAutoPtr<IInputStream> TArchiveReader::ObjectByKey(const TStringBuf key) const { +TAutoPtr<IInputStream> TArchiveReader::ObjectByKey(const TStringBuf key) const { return Impl_->ObjectByKey(key); } -TBlob TArchiveReader::ObjectBlobByKey(const TStringBuf key) const { +TBlob TArchiveReader::ObjectBlobByKey(const TStringBuf key) const { return Impl_->ObjectBlobByKey(key); } -TBlob TArchiveReader::BlobByKey(const TStringBuf key) const { +TBlob TArchiveReader::BlobByKey(const TStringBuf key) const { return Impl_->BlobByKey(key); } diff --git a/library/cpp/archive/yarchive.h b/library/cpp/archive/yarchive.h index 8120bcb940..50aaa253f2 100644 --- a/library/cpp/archive/yarchive.h +++ b/library/cpp/archive/yarchive.h @@ -2,15 +2,15 @@ #include "models_archive_reader.h" -#include <util/generic/fwd.h> +#include <util/generic/fwd.h> #include <util/generic/ptr.h> -class IInputStream; -class IOutputStream; - -class TBlob; - +class IInputStream; +class IOutputStream; + +class TBlob; + //noncompressed data will be stored with default alignment DEVTOOLS-4384 static constexpr size_t ArchiveWriterDefaultDataAlignment = 16; @@ -21,7 +21,7 @@ public: void Flush(); void Finish(); - void Add(const TString& key, IInputStream* src); + void Add(const TString& key, IInputStream* src); void AddSynonym(const TString& existingKey, const TString& newKey); private: diff --git a/library/cpp/archive/yarchive_ut.cpp b/library/cpp/archive/yarchive_ut.cpp index 602a1cdbbd..21b9eec40f 100644 --- a/library/cpp/archive/yarchive_ut.cpp +++ b/library/cpp/archive/yarchive_ut.cpp @@ -5,7 +5,7 @@ #include <util/string/cast.h> #include <util/stream/file.h> #include <util/system/tempfile.h> -#include <util/memory/blob.h> +#include <util/memory/blob.h> class TArchiveTest: public TTestBase { UNIT_TEST_SUITE(TArchiveTest) @@ -56,7 +56,7 @@ void TArchiveTest::TestRead() { for (size_t i = 0; i < 1000; ++i) { const TString key = "/" + ToString(i); - TAutoPtr<IInputStream> is = r.ObjectByKey(key); + TAutoPtr<IInputStream> is = r.ObjectByKey(key); const TString data = is->ReadAll(); UNIT_ASSERT_EQUAL(data, "data" + ToString(i * 1000) + "dataend"); |