ZYM/BH-TicketSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replaced illegal STL

Browse Source
This commit is contained in:
happyZYM
2024-05-01 03:08:31 +00:00
parent 27ed3f9a55
commit 6c20530cc8
5 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bpt/include/bpt/bpt.hpp
View File

@ -1,12 +1,9 @@
#ifndef BPT_HPP #ifndef BPT_HPP
#define BPT_HPP #define BPT_HPP
#include <algorithm>
#include <cassert> #include <cassert>
#include <cstdio>
#include <cstring> #include <cstring>
#include <queue>
#include <shared_mutex> #include <shared_mutex>
#include <vector> #include "vector.hpp"
#include "bpt/bpt_page.hpp" #include "bpt/bpt_page.hpp"
#include "bpt/buffer_pool_manager.h" #include "bpt/buffer_pool_manager.h"
#include "bpt/config.h" #include "bpt/config.h"
@ -25,7 +22,7 @@ class BPlusTreeIndexer {
private: private:
struct PositionSignType { struct PositionSignType {
std::vector<std::pair<BasicPageGuard, in_page_key_count_t>> path; sjtu::vector<std::pair<BasicPageGuard, in_page_key_count_t>> path;
bool is_end{false}; bool is_end{false};
}; };
PositionSignType FindPosition(const KeyType &key) { // Finish Design PositionSignType FindPosition(const KeyType &key) { // Finish Design

8
bpt/include/bpt/buffer_pool_manager.h
View File

@ -1,11 +1,11 @@
#ifndef BUFFER_POOL_MANAGER_H #ifndef BUFFER_POOL_MANAGER_H
#define BUFFER_POOL_MANAGER_H #define BUFFER_POOL_MANAGER_H
#include <cstddef> #include <cstddef>
#include <list>
#include <memory> #include <memory>
#include <mutex> #include <mutex>
#include <shared_mutex> #include <shared_mutex>
#include <unordered_map> #include "map.hpp"
#include "list.hpp"
#include "bpt/config.h" #include "bpt/config.h"
#include "bpt/disk_manager.h" #include "bpt/disk_manager.h"
#include "bpt/replacer.h" #include "bpt/replacer.h"
@ -395,7 +395,7 @@ class BufferPoolManager {
std::mutex latch; std::mutex latch;
#endif #endif
Page *pages_; Page *pages_;
std::unordered_map<page_id_t, frame_id_t> page_table_; sjtu::map<page_id_t, frame_id_t> page_table_;
std::list<frame_id_t> free_list_; sjtu::list<frame_id_t> free_list_;
}; };
#endif #endif

2
bpt/src/buffer_pool_manager.cpp
View File

@ -102,7 +102,7 @@ BufferPoolManager::BufferPoolManager(size_t pool_size, size_t replacer_k, DiskMa
// Initially, every page is in the free list. // Initially, every page is in the free list.
for (size_t i = 0; i < pool_size; ++i) { for (size_t i = 0; i < pool_size; ++i) {
free_list_.emplace_back(static_cast<int>(i)); free_list_.push_back(static_cast<frame_id_t>(i));
} }
} }
BufferPoolManager::~BufferPoolManager() { BufferPoolManager::~BufferPoolManager() {

6
stlite/map.hpp
View File

@ -711,6 +711,12 @@ class map {
RedBlackTreeNodeType::DeleteNode(pos.raw_pointer, tree_root); RedBlackTreeNodeType::DeleteNode(pos.raw_pointer, tree_root);
--node_count; --node_count;
} }
void erase(const Key &key) {
RedBlackTreeNodeType *result = tree_root->Find(key);
if (result == nullptr) return;
RedBlackTreeNodeType::DeleteNode(result, tree_root);
--node_count;
}
/** /**
* Returns the number of elements with key * Returns the number of elements with key
* that compares equivalent to the specified argument, * that compares equivalent to the specified argument,

6
stlite/vector.hpp
View File

@ -339,7 +339,7 @@ class vector {
* access the last element. * access the last element.
* throw container_is_empty if size == 0 * throw container_is_empty if size == 0
*/ */
const T &back() const { T &back() const {
if (current_length == 0) [[unlikely]] if (current_length == 0) [[unlikely]]
throw container_is_empty(); throw container_is_empty();
return raw_end[-1]; return raw_end[-1];
@ -494,7 +494,7 @@ class vector {
/** /**
* adds an element to the end. * adds an element to the end.
*/ */
void push_back(const T &value) { void push_back(T value) {
if (current_length == allocated_length) [[unlikely]] { if (current_length == allocated_length) [[unlikely]] {
size_t new_allocated_length = allocated_length * 2; size_t new_allocated_length = allocated_length * 2;
T *new_raw_beg = alloc.allocate(new_allocated_length); T *new_raw_beg = alloc.allocate(new_allocated_length);
@ -507,7 +507,7 @@ class vector {
raw_end = raw_beg + current_length; raw_end = raw_beg + current_length;
allocated_length = new_allocated_length; allocated_length = new_allocated_length;
} }
std::allocator_traits<decltype(alloc)>::construct(alloc, raw_end, value); std::allocator_traits<decltype(alloc)>::construct(alloc, raw_end, std::move(value));
raw_end++; raw_end++;
current_length++; current_length++;
} }