Skip to content

Improve code of class BePlusTree #8433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 10, 2025
+156 −192
Merged

Improve code of class BePlusTree #8433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd29c12
Remove a lot of casts of void* to the ItemList* and NodeList*.
hvlad Feb 9, 2025
6079111
Replace NULL by nullptr, use uppercase for constants (LeafCount, Node…
hvlad Feb 9, 2025
67ac091
Removed never used MallocAllocator and use common FB_NEW_POOL and del…
hvlad Feb 9, 2025
9aea53e
Follow @AlexPeshkoff suggestions:
hvlad Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/common/classes/GenericMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ class GenericMap : public AutoStorage
typedef typename KeyValuePair::first_type KeyType;
typedef typename KeyValuePair::second_type ValueType;

typedef BePlusTree<KeyValuePair*, KeyType, MemoryPool, FirstObjectKey<KeyValuePair>, KeyComparator> ValuesTree;
typedef BePlusTree<KeyValuePair*, KeyType, FirstObjectKey<KeyValuePair>, KeyComparator> ValuesTree;
typedef typename ValuesTree::Accessor TreeAccessor;
typedef typename ValuesTree::ConstAccessor ConstTreeAccessor;

Expand Down Expand Up @@ -139,10 +139,10 @@ class GenericMap : public AutoStorage
friend class Accessor;
friend class ConstAccessor;

GenericMap() : tree(&getPool()), mCount(0) { }
GenericMap() : tree(getPool()), mCount(0) { }

explicit GenericMap(MemoryPool& a_pool)
: AutoStorage(a_pool), tree(&getPool()), mCount(0)
: AutoStorage(a_pool), tree(getPool()), mCount(0)
{ }

~GenericMap()
Expand Down
6 changes: 3 additions & 3 deletions src/common/classes/sparse_bitmap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ class SparseBitmap : public AutoStorage
public:
// Default constructor, stack placement
SparseBitmap() :
singular(false), singular_value(0), tree(&getPool()), defaultAccessor(this)
singular(false), singular_value(0), tree(getPool()), defaultAccessor(this)
{ }

// Pooled constructor
explicit SparseBitmap(MemoryPool& p) :
AutoStorage(p), singular(false), singular_value(0), tree(&getPool()), defaultAccessor(this)
AutoStorage(p), singular(false), singular_value(0), tree(getPool()), defaultAccessor(this)
{ }

// Default accessor methods
Expand Down Expand Up @@ -225,7 +225,7 @@ class SparseBitmap : public AutoStorage
}
};

typedef BePlusTree<Bucket, T, MemoryPool, Bucket> BitmapTree;
typedef BePlusTree<Bucket, T, Bucket> BitmapTree;
typedef typename BitmapTree::Accessor BitmapTreeAccessor;

// Set if bitmap contains a single value only
Expand Down
Loading
Loading