aboutsummaryrefslogtreecommitdiffstats
path: root/library/cpp/containers/intrusive_avl_tree
diff options
context:
space:
mode:
authoryazevnul <yazevnul@yandex-team.ru>2022-02-10 16:46:48 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:46:48 +0300
commit9abfb1a53b7f7b791444d1378e645d8fad9b06ed (patch)
tree49e222ea1c5804306084bb3ae065bb702625360f /library/cpp/containers/intrusive_avl_tree
parent8cbc307de0221f84c80c42dcbe07d40727537e2c (diff)
downloadydb-9abfb1a53b7f7b791444d1378e645d8fad9b06ed.tar.gz
Restoring authorship annotation for <yazevnul@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'library/cpp/containers/intrusive_avl_tree')
-rw-r--r--library/cpp/containers/intrusive_avl_tree/avltree.h72
-rw-r--r--library/cpp/containers/intrusive_avl_tree/ut/avltree_ut.cpp6
2 files changed, 39 insertions, 39 deletions
diff --git a/library/cpp/containers/intrusive_avl_tree/avltree.h b/library/cpp/containers/intrusive_avl_tree/avltree.h
index 717c18cb14..a58c63b07c 100644
--- a/library/cpp/containers/intrusive_avl_tree/avltree.h
+++ b/library/cpp/containers/intrusive_avl_tree/avltree.h
@@ -28,11 +28,11 @@ class TAvlTree: public TNonCopyable {
}
inline bool IsEnd() const noexcept {
- return Ptr_ == nullptr;
+ return Ptr_ == nullptr;
}
inline bool IsBegin() const noexcept {
- return Ptr_ == nullptr;
+ return Ptr_ == nullptr;
}
inline bool IsFirst() const noexcept {
@@ -107,10 +107,10 @@ class TAvlTree: public TNonCopyable {
}
inline static TIteratorBase FindPrev(TTreeItem* el) noexcept {
- if (el->Left_ != nullptr) {
+ if (el->Left_ != nullptr) {
el = el->Left_;
- while (el->Right_ != nullptr) {
+ while (el->Right_ != nullptr) {
el = el->Right_;
}
} else {
@@ -118,7 +118,7 @@ class TAvlTree: public TNonCopyable {
TTreeItem* last = el;
el = el->Parent_;
- if (el == nullptr || el->Right_ == last) {
+ if (el == nullptr || el->Right_ == last) {
break;
}
}
@@ -128,7 +128,7 @@ class TAvlTree: public TNonCopyable {
}
static TTreeItem* FindNext(TTreeItem* el) {
- if (el->Right_ != nullptr) {
+ if (el->Right_ != nullptr) {
el = el->Right_;
while (el->Left_) {
@@ -139,7 +139,7 @@ class TAvlTree: public TNonCopyable {
TTreeItem* last = el;
el = el->Parent_;
- if (el == nullptr || el->Left_ == last) {
+ if (el == nullptr || el->Left_ == last) {
break;
}
}
@@ -202,14 +202,14 @@ public:
el->Tree_ = this;
TTreeItem* curEl = Root_;
- TTreeItem* parentEl = nullptr;
- TTreeItem* lastLess = nullptr;
+ TTreeItem* parentEl = nullptr;
+ TTreeItem* lastLess = nullptr;
while (true) {
- if (curEl == nullptr) {
+ if (curEl == nullptr) {
AttachRebal(el, parentEl, lastLess);
- if (lastFound != nullptr) {
+ if (lastFound != nullptr) {
*lastFound = el;
}
@@ -223,11 +223,11 @@ public:
parentEl = curEl;
curEl = curEl->Right_;
} else {
- if (lastFound != nullptr) {
+ if (lastFound != nullptr) {
*lastFound = curEl;
}
- return nullptr;
+ return nullptr;
}
}
}
@@ -245,12 +245,12 @@ public:
}
}
- return nullptr;
+ return nullptr;
}
inline T* LowerBound(const TTreeItem* el) const noexcept {
TTreeItem* curEl = Root_;
- TTreeItem* lowerBound = nullptr;
+ TTreeItem* lowerBound = nullptr;
while (curEl) {
if (Compare(*el, *curEl)) {
@@ -271,11 +271,11 @@ public:
return this->EraseImpl(el);
}
- return nullptr;
+ return nullptr;
}
inline T* EraseImpl(TTreeItem* el) noexcept {
- el->Tree_ = nullptr;
+ el->Tree_ = nullptr;
TTreeItem* replacement;
TTreeItem* fixfrom;
@@ -330,10 +330,10 @@ public:
Tail_ = el->Parent_;
}
- RemoveEl(el, nullptr);
+ RemoveEl(el, nullptr);
}
- if (fixfrom == nullptr) {
+ if (fixfrom == nullptr) {
return AsT(el);
}
@@ -422,7 +422,7 @@ public:
}
inline iterator End() noexcept {
- return iterator(nullptr, this);
+ return iterator(nullptr, this);
}
inline iterator begin() noexcept {
@@ -507,7 +507,7 @@ private:
}
}
- if (ggp == nullptr) {
+ if (ggp == nullptr) {
Root_ = b;
} else if (ggp->Left_ == gp) {
ggp->Left_ = b;
@@ -522,25 +522,25 @@ private:
c->Parent_ = b;
a->Left_ = t1;
- if (t1 != nullptr) {
+ if (t1 != nullptr) {
t1->Parent_ = a;
}
a->Right_ = t2;
- if (t2 != nullptr) {
+ if (t2 != nullptr) {
t2->Parent_ = a;
}
c->Left_ = t3;
- if (t3 != nullptr) {
+ if (t3 != nullptr) {
t3->Parent_ = c;
}
c->Right_ = t4;
- if (t4 != nullptr) {
+ if (t4 != nullptr) {
t4->Parent_ = c;
}
@@ -584,13 +584,13 @@ private:
long lheight, rheight, balanceProp;
TTreeItem* gp;
- if (el == nullptr || el->Parent_ == nullptr || el->Parent_->Parent_ == nullptr) {
- return nullptr;
+ if (el == nullptr || el->Parent_ == nullptr || el->Parent_->Parent_ == nullptr) {
+ return nullptr;
}
gp = el->Parent_->Parent_;
- while (gp != nullptr) {
+ while (gp != nullptr) {
lheight = gp->Left_ ? gp->Left_->Height_ : 0;
rheight = gp->Right_ ? gp->Right_->Height_ : 0;
balanceProp = lheight - rheight;
@@ -603,12 +603,12 @@ private:
gp = gp->Parent_;
}
- return nullptr;
+ return nullptr;
}
inline TTreeItem* FindFirstUnbalEl(TTreeItem* el) noexcept {
- if (el == nullptr) {
- return nullptr;
+ if (el == nullptr) {
+ return nullptr;
}
while (el) {
@@ -623,7 +623,7 @@ private:
el = el->Parent_;
}
- return nullptr;
+ return nullptr;
}
inline void ReplaceEl(TTreeItem* el, TTreeItem* replacement) noexcept {
@@ -680,11 +680,11 @@ private:
inline void AttachRebal(TTreeItem* el, TTreeItem* parentEl, TTreeItem* lastLess) {
el->Parent_ = parentEl;
- el->Left_ = nullptr;
- el->Right_ = nullptr;
+ el->Left_ = nullptr;
+ el->Right_ = nullptr;
el->Height_ = 1;
- if (parentEl != nullptr) {
+ if (parentEl != nullptr) {
if (lastLess == parentEl) {
parentEl->Left_ = el;
} else {
@@ -707,7 +707,7 @@ private:
TTreeItem* ub = FindFirstUnbalGP(el);
- if (ub != nullptr) {
+ if (ub != nullptr) {
Rebalance(ub);
}
}
diff --git a/library/cpp/containers/intrusive_avl_tree/ut/avltree_ut.cpp b/library/cpp/containers/intrusive_avl_tree/ut/avltree_ut.cpp
index 737da8e1e2..cab2365cce 100644
--- a/library/cpp/containers/intrusive_avl_tree/ut/avltree_ut.cpp
+++ b/library/cpp/containers/intrusive_avl_tree/ut/avltree_ut.cpp
@@ -59,7 +59,7 @@ void TAvlTreeTest::TestLowerBound() {
TIt it_large(1000);
UNIT_ASSERT_EQUAL(its.LowerBound(&it3), &it3);
UNIT_ASSERT_EQUAL(its.LowerBound(&it_zero), &it5);
- UNIT_ASSERT_EQUAL(its.LowerBound(&it_large), nullptr);
+ UNIT_ASSERT_EQUAL(its.LowerBound(&it_large), nullptr);
}
void TAvlTreeTest::TestIterator() {
@@ -81,7 +81,7 @@ void TAvlTreeTest::TestIterator() {
its.Insert(&it2);
TVector<int> res;
- for (const TIt& i : its) {
+ for (const TIt& i : its) {
res.push_back(i.Val);
}
@@ -89,7 +89,7 @@ void TAvlTreeTest::TestIterator() {
UNIT_ASSERT_EQUAL(res, expected);
res.clear();
- for (TIt& i : its) {
+ for (TIt& i : its) {
res.push_back(i.Val);
}
UNIT_ASSERT_EQUAL(res, expected);