Home Explore Help
Sign In
SMusatov
/
ydb
mirror of https://github.com/ydb-platform/ydb.git
1
0
Fork 0
Files
Browse Source

Restoring authorship annotation for <risenberg@yandex-team.ru>. Commit 1 of 2.

risenberg 3 years ago
parent
6a705ee267
commit
ec551e975c
10 changed files with 78 additions and 78 deletions
Split View Show Diff Stats
  1. 1 1
      library/cpp/containers/comptrie/chunked_helpers_trie.h
  2. 2 2
      library/cpp/containers/comptrie/comptrie_builder.h
  3. 6 6
      library/cpp/containers/comptrie/comptrie_builder.inl
  4. 1 1
      library/cpp/getopt/small/opt.cpp
  5. 3 3
      library/cpp/http/io/stream_ut.cpp
  6. 5 5
      library/cpp/lfalloc/lf_allocX64.h
  7. 23 23
      library/cpp/string_utils/parse_size/parse_size.cpp
  8. 8 8
      library/cpp/string_utils/parse_size/parse_size.h
  9. 19 19
      library/cpp/string_utils/parse_size/parse_size_ut.cpp
  10. 10 10
      util/draft/holder_vector.h

+ 1 - 1
library/cpp/containers/comptrie/chunked_helpers_trie.h
View File 

@@ -166,7 +166,7 @@ public:
 
 
     void Save(IOutputStream& out, bool minimize = false) const {
 
         if (minimize) {
 
-            CompactTrieMinimize<TBuilder>(out, Builder, false);
 
+            CompactTrieMinimize<TBuilder>(out, Builder, false); 
         } else {
 
             Builder.Save(out);
 
         }

+ 2 - 2
library/cpp/containers/comptrie/comptrie_builder.h
View File 

@@ -120,9 +120,9 @@ protected:
 
 template <class TPacker>
 
 size_t CompactTrieMinimize(IOutputStream& os, const char* data, size_t datalength, bool verbose = false, const TPacker& packer = TPacker(), NCompactTrie::EMinimizeMode mode = NCompactTrie::MM_DEFAULT);
 
 
-template <class TTrieBuilder>
 
+template <class TTrieBuilder> 
 size_t CompactTrieMinimize(IOutputStream& os, const TTrieBuilder& builder, bool verbose = false);
 
-
 
+ 
 //----------------------------------------------------------------------------------------------------------------
 
 // Lay the trie in memory in such a way that there are less cache misses when jumping from root to leaf.
 
 // The trie becomes about 2% larger, but the access became about 25% faster in our experiments.

+ 6 - 6
library/cpp/containers/comptrie/comptrie_builder.inl
View File 

@@ -1065,13 +1065,13 @@ size_t CompactTrieMinimize(IOutputStream& os, const char* data, size_t datalengt
 
     using namespace NCompactTrie;
 
     return CompactTrieMinimizeImpl(os, data, datalength, verbose, &packer, mode);
 
 }
 
-
 
-template <class TTrieBuilder>
 
+ 
+template <class TTrieBuilder> 
 size_t CompactTrieMinimize(IOutputStream& os, const TTrieBuilder& builder, bool verbose /*=false*/) {
 
-    TBufferStream buftmp;
 
-    size_t len = builder.Save(buftmp);
 
-    return CompactTrieMinimize<typename TTrieBuilder::TPacker>(os, buftmp.Buffer().Data(), len, verbose);
 
-}
 
+    TBufferStream buftmp; 
+    size_t len = builder.Save(buftmp); 
+    return CompactTrieMinimize<typename TTrieBuilder::TPacker>(os, buftmp.Buffer().Data(), len, verbose); 
+} 
 
 //----------------------------------------------------------------------------------------------------------------
 
 // Lay the trie in memory in such a way that there are less cache misses when jumping from root to leaf.

+ 1 - 1
library/cpp/getopt/small/opt.cpp
View File 

@@ -20,7 +20,7 @@ void Opt::Init(int argc, char* argv[], const char* optString, const Ion* longOpt
 
     Ions_ = longOptions;
 
     Err = true;
 
     GotError_ = false;
 
-    Ind = argc;
 
+    Ind = argc; 
 
     Opts_.Reset(new TOptsNoDefault(optString));
 
     for (const Ion* o = longOptions; o != nullptr && o->name != nullptr; ++o) {

+ 3 - 3
library/cpp/http/io/stream_ut.cpp
View File 

@@ -409,16 +409,16 @@ Y_UNIT_TEST_SUITE(THttpStreamTest) {
 
         r += "<html>Hello</html>";
 
         TStringInput stringInput(r);
 
         THttpInput input(&stringInput);
 
-
 
+ 
         const THttpHeaders& httpHeaders = input.Headers();
 
         UNIT_ASSERT_VALUES_EQUAL(httpHeaders.Count(), 3u);
 
-
 
+ 
         THttpHeaders::TConstIterator it = httpHeaders.Begin();
 
         UNIT_ASSERT_VALUES_EQUAL(it->ToString(), TString(headerLine1));
 
         UNIT_ASSERT_VALUES_EQUAL((++it)->ToString(), TString::Join(headerLine2, headerLine3));
 
         UNIT_ASSERT_VALUES_EQUAL((++it)->ToString(), TString(headerLine4));
 
     }
 
-
 
+ 
     Y_UNIT_TEST(ContentLengthRemoval) {
 
         TMemoryInput request("GET / HTTP/1.1\r\nAccept-Encoding: gzip\r\n\r\n");
 
         THttpInput i(&request);

+ 5 - 5
library/cpp/lfalloc/lf_allocX64.h
View File 

@@ -300,14 +300,14 @@ enum EMMapMode {
 
     MM_NORMAL, // memory for small allocs
 
     MM_HUGE    // memory for large allocs
 
 };
 
-
 
+ 
 #ifndef _MSC_VER
 
-inline void VerifyMmapResult(void* result) {
 
+inline void VerifyMmapResult(void* result) { 
     if (Y_UNLIKELY(result == MAP_FAILED))
 
         NMalloc::AbortFromCorruptedAllocator("negative size requested? or just out of mem");
 
-}
 
+} 
 #endif
 
-
 
+ 
 #if !defined(_MSC_VER) && !defined(_freebsd_) && defined(_64_)
 
 static char* AllocWithMMapLinuxImpl(uintptr_t sz, EMMapMode mode) {
 
     char* volatile* areaPtr;
 
@@ -349,7 +349,7 @@ static char* AllocWithMMapLinuxImpl(uintptr_t sz, EMMapMode mode) {
 
             continue;
 
 
         char* largeBlock = (char*)mmap(prevAllocPtr, sz, mapProt, mapFlags, -1, 0);
 
-        VerifyMmapResult(largeBlock);
 
+        VerifyMmapResult(largeBlock); 
         if (largeBlock == prevAllocPtr)
 
             return largeBlock;
 
         if (largeBlock)

+ 23 - 23
library/cpp/string_utils/parse_size/parse_size.cpp
View File 

@@ -3,36 +3,36 @@
 
 #include <util/generic/yexception.h>
 
 #include <util/generic/ylimits.h>
 
 #include <util/string/cast.h>
 
-#include <util/stream/output.h>
 
+#include <util/stream/output.h> 
 
-namespace {
 
+namespace { 
     enum ESuffixShifts {
 
         ESS_KILO_BYTES = 10,
 
         ESS_MEGA_BYTES = 20,
 
         ESS_GIGA_BYTES = 30,
 
         ESS_TERA_BYTES = 40,
 
     };
 
-
 
+ 
     bool TryShiftValue(ui64& value, ui64 shift) {
 
         if (value > (Max<ui64>() >> shift)) {
 
             return false;
 
         }
 
-
 
+ 
         value <<= shift;
 
         return true;
 
-    }
 
-
 
+    } 
+ 
     ui64 ShiftValue(ui64 value, ui64 shift) {
 
         if (!TryShiftValue(value, shift)) {
 
             ythrow yexception() << "value overflow '" << value << " << " << shift << "'";
 
         } else {
 
             return value;
 
         }
 
-    }
 
-
 
-}
 
-
 
-namespace NSize {
 
+    } 
+ 
+} 
+ 
+namespace NSize { 
     ui64 ParseSize(TStringBuf str) {
 
         if (! str.size())
 
             ythrow yexception() << "Wrong size " << str;
 
@@ -56,7 +56,7 @@ namespace NSize {
 
             default:
 
                 ythrow yexception() << "Unknown suffix " << str;
 
         }
 
-
 
+ 
         ui64 value = FromString<ui64>(str.substr(0, str.size() - 1));
 
 
         if (!TryShiftValue(value, shift)) {
 
@@ -77,19 +77,19 @@ namespace NSize {
 
     TSize FromGigaBytes(ui64 value) {
 
         return TSize(ShiftValue(value, ESS_GIGA_BYTES));
 
     }
 
-
 
+ 
     TSize FromTeraBytes(ui64 value) {
 
         return TSize(ShiftValue(value, ESS_TERA_BYTES));
 
     }
 
-
 
-}
 
-
 
-template <>
 
-NSize::TSize FromStringImpl<NSize::TSize>(const char* data, size_t len) {
 
-    return NSize::TSize(NSize::ParseSize(TStringBuf(data, len)));
 
-}
 
-
 
+ 
+} 
+ 
 template <>
 
+NSize::TSize FromStringImpl<NSize::TSize>(const char* data, size_t len) { 
+    return NSize::TSize(NSize::ParseSize(TStringBuf(data, len))); 
+} 
+ 
+template <> 
 void Out<NSize::TSize>(IOutputStream& os, const NSize::TSize& size) {
 
-    os << size.GetValue();
 
-}
 
+    os << size.GetValue(); 
+}

+ 8 - 8
library/cpp/string_utils/parse_size/parse_size.h
View File 

@@ -2,9 +2,9 @@
 
 
 #include <util/generic/strbuf.h>
 
 
-namespace NSize {
 
+namespace NSize { 
     ui64 ParseSize(TStringBuf size);
 
-
 
+ 
     // Convenient disk size representation with string parsing and integer comparison
 
     class TSize {
 
     public:
 
@@ -12,22 +12,22 @@ namespace NSize {
 
             : Value(value)
 
         {
 
         }
 
-
 
+ 
         ui64 GetValue() const {
 
             return Value;
 
         }
 
-
 
+ 
         operator ui64() const {
 
             return Value;
 
         }
 
-
 
+ 
     private:
 
         ui64 Value;
 
     };
 
-
 
+ 
     TSize FromKiloBytes(ui64 value);
 
     TSize FromMegaBytes(ui64 value);
 
     TSize FromGigaBytes(ui64 value);
 
     TSize FromTeraBytes(ui64 value);
 
-
 
-}
 
+ 
+}

+ 19 - 19
library/cpp/string_utils/parse_size/parse_size_ut.cpp
View File 

@@ -2,8 +2,8 @@
 
 
 #include <library/cpp/testing/unittest/registar.h>
 
 
-using namespace NSize;
 
-
 
+using namespace NSize; 
+ 
 class TParseSizeTest: public TTestBase {
 
     UNIT_TEST_SUITE(TParseSizeTest);
 
 
@@ -12,9 +12,9 @@ class TParseSizeTest: public TTestBase {
 
     UNIT_TEST(TestMegaBytes);
 
     UNIT_TEST(TestGigaBytes);
 
     UNIT_TEST(TestTeraBytes);
 
-    UNIT_TEST(TestOverflow);
 
-    UNIT_TEST(TestStaticCreators);
 
-    UNIT_TEST(TestToString);
 
+    UNIT_TEST(TestOverflow); 
+    UNIT_TEST(TestStaticCreators); 
+    UNIT_TEST(TestToString); 
 
     UNIT_TEST_SUITE_END();
 
 
@@ -43,21 +43,21 @@ private:
 
         UNIT_ASSERT(ParseSize("10t") == 1024ul * 1024ul * 1024ul * 1024ul * 10ul);
 
     }
 
 
-    void TestStaticCreators() {
 
-        UNIT_ASSERT_EQUAL(FromKiloBytes(10), 1024ul * 10ul);
 
-        UNIT_ASSERT_EQUAL(FromMegaBytes(10), 1024ul * 1024ul * 10ul);
 
-        UNIT_ASSERT_EQUAL(FromGigaBytes(10), 1024ul * 1024ul * 1024ul * 10ul);
 
-        UNIT_ASSERT_EQUAL(FromTeraBytes(10), 1024ul * 1024ul * 1024ul * 1024ul * 10ul);
 
-    }
 
-
 
-    void TestOverflow() {
 
-        UNIT_ASSERT_EXCEPTION(ParseSize("20000000000G"), yexception);
 
-        UNIT_ASSERT_EXCEPTION(FromGigaBytes(20000000000ull), yexception);
 
-    }
 
-
 
-    void TestToString() {
 
+    void TestStaticCreators() { 
+        UNIT_ASSERT_EQUAL(FromKiloBytes(10), 1024ul * 10ul); 
+        UNIT_ASSERT_EQUAL(FromMegaBytes(10), 1024ul * 1024ul * 10ul); 
+        UNIT_ASSERT_EQUAL(FromGigaBytes(10), 1024ul * 1024ul * 1024ul * 10ul); 
+        UNIT_ASSERT_EQUAL(FromTeraBytes(10), 1024ul * 1024ul * 1024ul * 1024ul * 10ul); 
+    } 
+ 
+    void TestOverflow() { 
+        UNIT_ASSERT_EXCEPTION(ParseSize("20000000000G"), yexception); 
+        UNIT_ASSERT_EXCEPTION(FromGigaBytes(20000000000ull), yexception); 
+    } 
+ 
+    void TestToString() { 
         UNIT_ASSERT_VALUES_EQUAL(ToString(FromKiloBytes(1)), TString("1024"));
 
-    }
 
+    } 
 };
 
 
 UNIT_TEST_SUITE_REGISTRATION(TParseSizeTest);

+ 10 - 10
util/draft/holder_vector.h
View File 

@@ -9,11 +9,11 @@ class THolderVector: public TVector<T*>, public TNonCopyable {
 
     using TBase = TVector<T*>;
 
 
 public:
 
-    explicit THolderVector(size_t n = 0)
 
+    explicit THolderVector(size_t n = 0) 
         : TBase(n)
 
     {
 
-    }
 
-
 
+    } 
+ 
     ~THolderVector() {
 
         Clear();
 
     }
 
@@ -50,14 +50,14 @@ public:
 
     }
 
 
     void Reset(size_t i, THolder<T> t) {
 
-        T* current = (*this)[i];
 
-        if (current) {
 
+        T* current = (*this)[i]; 
+        if (current) { 
             Y_ASSERT(current != t.Get());
 
-            D::Destroy(current);
 
-        }
 
-        (*this)[i] = t.Release();
 
-    }
 
-
 
+            D::Destroy(current); 
+        } 
+        (*this)[i] = t.Release(); 
+    } 
+ 
     void PopBack() {
 
         if (size()) {
 
             D::Destroy(back());

Some files were not shown because too many files changed in this diff