feat: small block(4K) read for 2M chunk size (#406)
This commit is contained in:
@@ -201,11 +201,21 @@ struct BufferPoolMemoryBlock {
|
||||
void *data)
|
||||
: buffer_pool_handle_(handle), buffer_block_id_(block_id), data_(data) {}
|
||||
|
||||
static BufferPoolMemoryBlock MakeOwned(void *owned_data) {
|
||||
BufferPoolMemoryBlock b;
|
||||
b.owns_buffer_ = true;
|
||||
b.data_ = owned_data;
|
||||
return b;
|
||||
}
|
||||
|
||||
BufferPoolMemoryBlock(const BufferPoolMemoryBlock &rhs)
|
||||
: buffer_pool_handle_(rhs.buffer_pool_handle_),
|
||||
buffer_block_id_(rhs.buffer_block_id_),
|
||||
data_(rhs.data_) {
|
||||
if (buffer_pool_handle_) {
|
||||
if (rhs.owns_buffer_) {
|
||||
owns_buffer_ = false;
|
||||
buffer_pool_handle_ = nullptr;
|
||||
} else if (buffer_pool_handle_) {
|
||||
buffer_pool_handle_->acquire_one(buffer_block_id_);
|
||||
}
|
||||
}
|
||||
@@ -216,7 +226,10 @@ struct BufferPoolMemoryBlock {
|
||||
buffer_pool_handle_ = rhs.buffer_pool_handle_;
|
||||
buffer_block_id_ = rhs.buffer_block_id_;
|
||||
data_ = rhs.data_;
|
||||
if (buffer_pool_handle_) {
|
||||
if (rhs.owns_buffer_) {
|
||||
owns_buffer_ = false;
|
||||
buffer_pool_handle_ = nullptr;
|
||||
} else if (buffer_pool_handle_) {
|
||||
buffer_pool_handle_->acquire_one(buffer_block_id_);
|
||||
}
|
||||
}
|
||||
@@ -226,8 +239,10 @@ struct BufferPoolMemoryBlock {
|
||||
BufferPoolMemoryBlock(BufferPoolMemoryBlock &&rhs) noexcept
|
||||
: buffer_pool_handle_(rhs.buffer_pool_handle_),
|
||||
buffer_block_id_(rhs.buffer_block_id_),
|
||||
owns_buffer_(rhs.owns_buffer_),
|
||||
data_(rhs.data_) {
|
||||
rhs.buffer_pool_handle_ = nullptr;
|
||||
rhs.owns_buffer_ = false;
|
||||
rhs.data_ = nullptr;
|
||||
}
|
||||
|
||||
@@ -236,8 +251,10 @@ struct BufferPoolMemoryBlock {
|
||||
release();
|
||||
buffer_pool_handle_ = rhs.buffer_pool_handle_;
|
||||
buffer_block_id_ = rhs.buffer_block_id_;
|
||||
owns_buffer_ = rhs.owns_buffer_;
|
||||
data_ = rhs.data_;
|
||||
rhs.buffer_pool_handle_ = nullptr;
|
||||
rhs.owns_buffer_ = false;
|
||||
rhs.data_ = nullptr;
|
||||
}
|
||||
return *this;
|
||||
@@ -260,7 +277,12 @@ struct BufferPoolMemoryBlock {
|
||||
|
||||
private:
|
||||
void release() {
|
||||
if (buffer_pool_handle_) {
|
||||
if (owns_buffer_) {
|
||||
if (data_) {
|
||||
ailego_free(data_);
|
||||
}
|
||||
owns_buffer_ = false;
|
||||
} else if (buffer_pool_handle_) {
|
||||
buffer_pool_handle_->release_one(buffer_block_id_);
|
||||
buffer_pool_handle_ = nullptr;
|
||||
}
|
||||
@@ -269,6 +291,7 @@ struct BufferPoolMemoryBlock {
|
||||
|
||||
ailego::VecBufferPoolHandle *buffer_pool_handle_{nullptr};
|
||||
size_t buffer_block_id_{0};
|
||||
bool owns_buffer_{false};
|
||||
void *data_{nullptr};
|
||||
};
|
||||
|
||||
|
||||
@@ -638,9 +638,16 @@ HnswStreamerEntity::get_neighbors_typed<BufferPoolMemoryBlock>(
|
||||
LOG_ERROR("Read neighbor header failed, ret=%zu", ret);
|
||||
return NeighborsT<BufferPoolMemoryBlock>();
|
||||
}
|
||||
BufferPoolMemoryBlock block(mem_block.buffer_pool_handle_,
|
||||
mem_block.buffer_block_id_, mem_block.data_);
|
||||
mem_block.buffer_pool_handle_ = nullptr;
|
||||
BufferPoolMemoryBlock block;
|
||||
if (mem_block.type_ == IndexStorage::MemoryBlock::MBT_HEAP_SCRATCH) {
|
||||
block = BufferPoolMemoryBlock::MakeOwned(mem_block.data_);
|
||||
mem_block.data_ = nullptr;
|
||||
mem_block.type_ = IndexStorage::MemoryBlock::MBT_UNKNOWN;
|
||||
} else {
|
||||
block = BufferPoolMemoryBlock(mem_block.buffer_pool_handle_,
|
||||
mem_block.buffer_block_id_, mem_block.data_);
|
||||
mem_block.buffer_pool_handle_ = nullptr;
|
||||
}
|
||||
return NeighborsT<BufferPoolMemoryBlock>(std::move(block));
|
||||
}
|
||||
|
||||
@@ -688,10 +695,19 @@ inline int HnswStreamerEntity::get_vector_typed<BufferPoolMemoryBlock>(
|
||||
loc.second, read_size, ret);
|
||||
return IndexError_ReadData;
|
||||
}
|
||||
vec_blocks[i] =
|
||||
BufferPoolMemoryBlock(mem_block.buffer_pool_handle_,
|
||||
vec_blocks[i] = [&]() {
|
||||
if (mem_block.type_ == IndexStorage::MemoryBlock::MBT_HEAP_SCRATCH) {
|
||||
BufferPoolMemoryBlock b =
|
||||
BufferPoolMemoryBlock::MakeOwned(mem_block.data_);
|
||||
mem_block.data_ = nullptr;
|
||||
mem_block.type_ = IndexStorage::MemoryBlock::MBT_UNKNOWN;
|
||||
return b;
|
||||
}
|
||||
BufferPoolMemoryBlock b(mem_block.buffer_pool_handle_,
|
||||
mem_block.buffer_block_id_, mem_block.data_);
|
||||
mem_block.buffer_pool_handle_ = nullptr;
|
||||
mem_block.buffer_pool_handle_ = nullptr;
|
||||
return b;
|
||||
}();
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -352,9 +352,16 @@ VamanaStreamerEntity::get_neighbors_typed<BufferPoolMemoryBlock>(
|
||||
LOG_ERROR("Read neighbor header failed, ret=%zu", ret);
|
||||
return NeighborsT<BufferPoolMemoryBlock>();
|
||||
}
|
||||
BufferPoolMemoryBlock block(mem_block.buffer_pool_handle_,
|
||||
mem_block.buffer_block_id_, mem_block.data_);
|
||||
mem_block.buffer_pool_handle_ = nullptr;
|
||||
BufferPoolMemoryBlock block;
|
||||
if (mem_block.type_ == IndexStorage::MemoryBlock::MBT_HEAP_SCRATCH) {
|
||||
block = BufferPoolMemoryBlock::MakeOwned(mem_block.data_);
|
||||
mem_block.data_ = nullptr;
|
||||
mem_block.type_ = IndexStorage::MemoryBlock::MBT_UNKNOWN;
|
||||
} else {
|
||||
block = BufferPoolMemoryBlock(mem_block.buffer_pool_handle_,
|
||||
mem_block.buffer_block_id_, mem_block.data_);
|
||||
mem_block.buffer_pool_handle_ = nullptr;
|
||||
}
|
||||
return NeighborsT<BufferPoolMemoryBlock>(std::move(block));
|
||||
}
|
||||
|
||||
@@ -392,10 +399,19 @@ inline int VamanaStreamerEntity::get_vector_typed<BufferPoolMemoryBlock>(
|
||||
LOG_ERROR("Read vector failed, ret=%zu", ret);
|
||||
return IndexError_ReadData;
|
||||
}
|
||||
vec_blocks[i] =
|
||||
BufferPoolMemoryBlock(mem_block.buffer_pool_handle_,
|
||||
vec_blocks[i] = [&]() {
|
||||
if (mem_block.type_ == IndexStorage::MemoryBlock::MBT_HEAP_SCRATCH) {
|
||||
BufferPoolMemoryBlock b =
|
||||
BufferPoolMemoryBlock::MakeOwned(mem_block.data_);
|
||||
mem_block.data_ = nullptr;
|
||||
mem_block.type_ = IndexStorage::MemoryBlock::MBT_UNKNOWN;
|
||||
return b;
|
||||
}
|
||||
BufferPoolMemoryBlock b(mem_block.buffer_pool_handle_,
|
||||
mem_block.buffer_block_id_, mem_block.data_);
|
||||
mem_block.buffer_pool_handle_ = nullptr;
|
||||
mem_block.buffer_pool_handle_ = nullptr;
|
||||
return b;
|
||||
}();
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user