database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

feat(brm): MCOL-5623 This patch changes the logic applied to save function for EM (#3076)

Browse Source
This commit is contained in:
Denis Khalikov
2023-12-27 09:48:29 +03:00
committed by GitHub
parent 7ca4b9da32
commit 318db3ef84
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
versioning/BRM/extentmap.cpp
View File

@ -1859,16 +1859,35 @@ void ExtentMap::save(const string& filename)
throw; throw;
} }
for (auto& lbidEMEntryPair : *fExtentMapRBTree) // MCOL-5623 Prepare `ExtentMap` buffer before write.
const size_t emNumOfElements = fExtentMapRBTree->size();
auto emIterator = fExtentMapRBTree->begin();
size_t emIndex = 0;
while (emIndex < emNumOfElements)
{ {
EMEntry& emEntry = lbidEMEntryPair.second; const size_t emNumOfElementsInBatch = std::min(EM_SAVE_NUM_PER_BATCH, emNumOfElements - emIndex);
const uint32_t writeSize = sizeof(EMEntry); const size_t emSizeInBatch = emNumOfElementsInBatch * sizeof(EMEntry);
char* writePos = reinterpret_cast<char*>(&emEntry); std::unique_ptr<char[]> extentMapBuffer(new char[emSizeInBatch]);
uint32_t progress = 0;
while (progress < writeSize) const size_t endOfBatch = std::min(emIndex + EM_SAVE_NUM_PER_BATCH, emNumOfElements);
size_t offset = 0;
while (emIndex < endOfBatch)
{ {
auto err = out->write(writePos + progress, writeSize - progress); EMEntry& emEntry = emIterator->second;
const size_t writeSize = sizeof(EMEntry);
char* source = reinterpret_cast<char*>(&emEntry);
std::memcpy(&extentMapBuffer[offset], source, writeSize);
offset += writeSize;
std::advance(emIterator, 1);
++emIndex;
}
// Double check.
idbassert(offset == emSizeInBatch);
offset = 0;
while (offset < emSizeInBatch)
{
auto err = out->write(&extentMapBuffer[offset], emSizeInBatch - offset);
if (err < 0) if (err < 0)
{ {
releaseFreeList(READ); releaseFreeList(READ);
@ -1876,7 +1895,7 @@ void ExtentMap::save(const string& filename)
releaseEMEntryTable(READ); releaseEMEntryTable(READ);
throw ios_base::failure("ExtentMap::save(): write failed. Check the error log."); throw ios_base::failure("ExtentMap::save(): write failed. Check the error log.");
} }
progress += err; offset += err;
} }
} }

1
versioning/BRM/extentmap.h
View File

@ -1061,6 +1061,7 @@ class ExtentMap : public Undoable
static const constexpr size_t EM_INCREMENT = EM_INCREMENT_ROWS * sizeof(EMEntry); static const constexpr size_t EM_INCREMENT = EM_INCREMENT_ROWS * sizeof(EMEntry);
static const constexpr size_t EM_FREELIST_INITIAL_SIZE = 50 * sizeof(InlineLBIDRange); static const constexpr size_t EM_FREELIST_INITIAL_SIZE = 50 * sizeof(InlineLBIDRange);
static const constexpr size_t EM_FREELIST_INCREMENT = 50 * sizeof(InlineLBIDRange); static const constexpr size_t EM_FREELIST_INCREMENT = 50 * sizeof(InlineLBIDRange);
static const constexpr size_t EM_SAVE_NUM_PER_BATCH = 1000000;
// RBTree constants. // RBTree constants.
static const size_t EM_RB_TREE_NODE_SIZE = sizeof(EMEntry) + 8 * sizeof(uint64_t); static const size_t EM_RB_TREE_NODE_SIZE = sizeof(EMEntry) + 8 * sizeof(uint64_t);
static const size_t EM_RB_TREE_EMPTY_SIZE = 1024; static const size_t EM_RB_TREE_EMPTY_SIZE = 1024;