Refactor BinaryTable file handling to use C-style file operations and improve memory management
This commit is contained in:
ImBenji
@@ -1,24 +1,20 @@
|
||||
cmake_minimum_required(VERSION 3.16)
|
||||
project(BinaryTable)
|
||||
|
||||
set(CMAKE_CXX_STANDARD 20)
|
||||
set(CMAKE_CXX_STANDARD 17)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
|
||||
# Add the binary table library
|
||||
# Core Binary Table Library
|
||||
add_library(binary_table
|
||||
binary_table.h
|
||||
binary_table.cpp
|
||||
)
|
||||
|
||||
# Main executable
|
||||
# Main Application
|
||||
add_executable(main main.cpp)
|
||||
target_link_libraries(main binary_table)
|
||||
|
||||
# Test executable
|
||||
add_executable(test test.cpp)
|
||||
target_link_libraries(test binary_table)
|
||||
|
||||
# Debug executables
|
||||
# Debug Test Executables
|
||||
add_executable(debug_multi_key debug/debug_multi_key.cpp)
|
||||
target_link_libraries(debug_multi_key binary_table)
|
||||
|
||||
@@ -34,16 +30,17 @@ target_link_libraries(debug_step_by_step binary_table)
|
||||
add_executable(debug_simple debug/debug_simple.cpp)
|
||||
target_link_libraries(debug_simple binary_table)
|
||||
|
||||
# Enable compiler warnings
|
||||
# Compiler Settings
|
||||
if(MSVC)
|
||||
target_compile_options(binary_table PRIVATE /W4)
|
||||
target_compile_options(main PRIVATE /W4)
|
||||
else()
|
||||
target_compile_options(binary_table PRIVATE -Wall -Wextra -pedantic)
|
||||
target_compile_options(main PRIVATE -Wall -Wextra -pedantic)
|
||||
# Apply warnings to debug executables too
|
||||
target_compile_options(debug_multi_key PRIVATE -Wall -Wextra -pedantic)
|
||||
target_compile_options(debug_alloc PRIVATE -Wall -Wextra -pedantic)
|
||||
target_compile_options(debug_address_table PRIVATE -Wall -Wextra -pedantic)
|
||||
target_compile_options(debug_step_by_step PRIVATE -Wall -Wextra -pedantic)
|
||||
target_compile_options(debug_simple PRIVATE -Wall -Wextra -pedantic)
|
||||
endif()
|
||||
add_executable(debug_detailed debug_detailed.cpp)
|
||||
target_link_libraries(debug_detailed binary_table)
|
||||
|
||||
add_executable(debug_simple_fixed debug_simple_fixed.cpp)
|
||||
target_link_libraries(debug_simple_fixed binary_table)
|
||||
|
||||
@@ -467,33 +467,32 @@ template class BT_UniformArray<float>;
|
||||
// BinaryTable implementation
|
||||
BinaryTable::BinaryTable(const std::string& path)
|
||||
: filePath_(path), freeListLifted_(false) {
|
||||
file_.open(path, std::ios::binary | std::ios::in | std::ios::out);
|
||||
file_ = fopen(path.c_str(), "r+b");
|
||||
if (!file_) {
|
||||
// File doesn't exist, create it
|
||||
file_.open(path, std::ios::binary | std::ios::out);
|
||||
file_.close();
|
||||
file_.open(path, std::ios::binary | std::ios::in | std::ios::out);
|
||||
file_ = fopen(path.c_str(), "w+b");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
BinaryTable::~BinaryTable() {
|
||||
if (file_.is_open()) {
|
||||
file_.close();
|
||||
if (file_) {
|
||||
fclose(file_);
|
||||
}
|
||||
}
|
||||
|
||||
void BinaryTable::initialize() {
|
||||
file_.seekp(0);
|
||||
fseek(file_, 0, SEEK_SET);
|
||||
writeInt64(0, BT_Null.address()); // Address table pointer (8 bytes)
|
||||
writeInt32(8, 0); // Free list entry count (4 bytes)
|
||||
file_.flush();
|
||||
fflush(file_);
|
||||
}
|
||||
|
||||
// File I/O helper implementations
|
||||
int32_t BinaryTable::readInt32(int64_t position) {
|
||||
file_.seekg(position);
|
||||
fseek(file_, position, SEEK_SET);
|
||||
uint8_t bytes[4];
|
||||
file_.read(reinterpret_cast<char*>(bytes), 4);
|
||||
fread(bytes, 1, 4, file_);
|
||||
|
||||
return static_cast<int32_t>(bytes[0]) |
|
||||
(static_cast<int32_t>(bytes[1]) << 8) |
|
||||
@@ -502,9 +501,9 @@ int32_t BinaryTable::readInt32(int64_t position) {
|
||||
}
|
||||
|
||||
float BinaryTable::readFloat32(int64_t position) {
|
||||
file_.seekg(position);
|
||||
fseek(file_, position, SEEK_SET);
|
||||
uint8_t bytes[4];
|
||||
file_.read(reinterpret_cast<char*>(bytes), 4);
|
||||
fread(bytes, 1, 4, file_);
|
||||
|
||||
uint32_t floatBits = static_cast<uint32_t>(bytes[0]) |
|
||||
(static_cast<uint32_t>(bytes[1]) << 8) |
|
||||
@@ -517,9 +516,9 @@ float BinaryTable::readFloat32(int64_t position) {
|
||||
}
|
||||
|
||||
int64_t BinaryTable::readInt64(int64_t position) {
|
||||
file_.seekg(position);
|
||||
fseek(file_, position, SEEK_SET);
|
||||
uint8_t bytes[8];
|
||||
file_.read(reinterpret_cast<char*>(bytes), 8);
|
||||
fread(bytes, 1, 8, file_);
|
||||
|
||||
int64_t result = 0;
|
||||
for (int i = 0; i < 8; i++) {
|
||||
@@ -530,32 +529,32 @@ int64_t BinaryTable::readInt64(int64_t position) {
|
||||
}
|
||||
|
||||
uint8_t BinaryTable::readByte(int64_t position) {
|
||||
file_.seekg(position);
|
||||
fseek(file_, position, SEEK_SET);
|
||||
uint8_t byte;
|
||||
file_.read(reinterpret_cast<char*>(&byte), 1);
|
||||
fread(&byte, 1, 1, file_);
|
||||
return byte;
|
||||
}
|
||||
|
||||
std::vector<uint8_t> BinaryTable::readBytes(int64_t position, int32_t count) {
|
||||
file_.seekg(position);
|
||||
fseek(file_, position, SEEK_SET);
|
||||
std::vector<uint8_t> bytes(count);
|
||||
file_.read(reinterpret_cast<char*>(bytes.data()), count);
|
||||
fread(bytes.data(), 1, count, file_);
|
||||
return bytes;
|
||||
}
|
||||
|
||||
void BinaryTable::writeInt32(int64_t position, int32_t value) {
|
||||
file_.seekp(position);
|
||||
fseek(file_, position, SEEK_SET);
|
||||
uint8_t bytes[4] = {
|
||||
static_cast<uint8_t>(value & 0xFF),
|
||||
static_cast<uint8_t>((value >> 8) & 0xFF),
|
||||
static_cast<uint8_t>((value >> 16) & 0xFF),
|
||||
static_cast<uint8_t>((value >> 24) & 0xFF)
|
||||
};
|
||||
file_.write(reinterpret_cast<const char*>(bytes), 4);
|
||||
fwrite(bytes, 1, 4, file_);
|
||||
}
|
||||
|
||||
void BinaryTable::writeFloat32(int64_t position, float value) {
|
||||
file_.seekp(position);
|
||||
fseek(file_, position, SEEK_SET);
|
||||
uint32_t floatBits;
|
||||
std::memcpy(&floatBits, &value, sizeof(float));
|
||||
|
||||
@@ -565,73 +564,132 @@ void BinaryTable::writeFloat32(int64_t position, float value) {
|
||||
static_cast<uint8_t>((floatBits >> 16) & 0xFF),
|
||||
static_cast<uint8_t>((floatBits >> 24) & 0xFF)
|
||||
};
|
||||
file_.write(reinterpret_cast<const char*>(bytes), 4);
|
||||
fwrite(bytes, 1, 4, file_);
|
||||
}
|
||||
|
||||
void BinaryTable::writeInt64(int64_t position, int64_t value) {
|
||||
file_.seekp(position);
|
||||
fseek(file_, position, SEEK_SET);
|
||||
uint8_t bytes[8];
|
||||
for (int i = 0; i < 8; i++) {
|
||||
bytes[i] = static_cast<uint8_t>((value >> (i * 8)) & 0xFF);
|
||||
}
|
||||
file_.write(reinterpret_cast<const char*>(bytes), 8);
|
||||
fwrite(bytes, 1, 8, file_);
|
||||
}
|
||||
|
||||
void BinaryTable::writeByte(int64_t position, uint8_t value) {
|
||||
file_.seekp(position);
|
||||
file_.write(reinterpret_cast<const char*>(&value), 1);
|
||||
fseek(file_, position, SEEK_SET);
|
||||
fwrite(&value, 1, 1, file_);
|
||||
}
|
||||
|
||||
void BinaryTable::writeBytes(int64_t position, const std::vector<uint8_t>& data) {
|
||||
file_.seekp(position);
|
||||
file_.write(reinterpret_cast<const char*>(data.data()), data.size());
|
||||
fseek(file_, position, SEEK_SET);
|
||||
fwrite(data.data(), 1, data.size(), file_);
|
||||
}
|
||||
|
||||
int64_t BinaryTable::getFileLength() {
|
||||
file_.seekg(0, std::ios::end);
|
||||
return file_.tellg();
|
||||
long current = ftell(file_);
|
||||
fseek(file_, 0, SEEK_END);
|
||||
long length = ftell(file_);
|
||||
fseek(file_, current, SEEK_SET); // Restore position
|
||||
return length;
|
||||
}
|
||||
|
||||
void BinaryTable::setFilePosition(int64_t position) {
|
||||
file_.seekg(position);
|
||||
file_.seekp(position);
|
||||
fseek(file_, position, SEEK_SET);
|
||||
}
|
||||
|
||||
// Address table management
|
||||
std::unordered_map<int64_t, BT_Pointer> BinaryTable::getAddressTable() {
|
||||
file_.seekg(0);
|
||||
int64_t tableAddress = readInt64(0);
|
||||
DEBUG_PRINTLN("DEBUG: getAddressTable reading from address " << tableAddress);
|
||||
|
||||
if (tableAddress == -1) { // Null pointer
|
||||
return {};
|
||||
}
|
||||
|
||||
// Validate table address is within file bounds
|
||||
int64_t fileLength = getFileLength();
|
||||
if (tableAddress < 0 || tableAddress >= fileLength) {
|
||||
DEBUG_PRINTLN("DEBUG: Address table pointer is out of bounds: " << tableAddress << " (file length: " << fileLength << ")");
|
||||
throw std::runtime_error("Address table pointer is corrupted - out of bounds");
|
||||
}
|
||||
|
||||
try {
|
||||
uint8_t typeId = readByte(tableAddress);
|
||||
|
||||
if (static_cast<BT_Type>(typeId) != BT_Type::ADDRESS_TABLE) {
|
||||
DEBUG_PRINTLN("DEBUG: Invalid type ID at address table location: " << (int)typeId);
|
||||
// Address table might not be valid yet, return empty
|
||||
return {};
|
||||
}
|
||||
|
||||
int32_t tableCount = readInt32(tableAddress + 1);
|
||||
|
||||
// Validate table count is reasonable
|
||||
if (tableCount < 0 || tableCount > 1000000) { // Arbitrary but reasonable limit
|
||||
DEBUG_PRINTLN("DEBUG: Suspicious address table count: " << tableCount);
|
||||
throw std::runtime_error("Address table appears corrupted - invalid entry count");
|
||||
}
|
||||
|
||||
// Validate the entire table fits within file bounds
|
||||
int64_t requiredSize = 1 + 4 + tableCount * (8 + 8); // Type + count + entries
|
||||
if (tableAddress + requiredSize > fileLength) {
|
||||
DEBUG_PRINTLN("DEBUG: Address table extends beyond file bounds");
|
||||
throw std::runtime_error("Address table appears corrupted - extends beyond file");
|
||||
}
|
||||
|
||||
std::unordered_map<int64_t, BT_Pointer> addressTable;
|
||||
|
||||
for (int32_t i = 0; i < tableCount; i++) {
|
||||
int64_t offset = tableAddress + 1 + 4 + i * (8 + 8);
|
||||
int64_t keyHash = readInt64(offset);
|
||||
int64_t valueAddress = readInt64(offset + 8);
|
||||
|
||||
// Validate each value address is within bounds (or null)
|
||||
if (valueAddress != -1 && (valueAddress < 0 || valueAddress >= fileLength)) {
|
||||
DEBUG_PRINTLN("DEBUG: Invalid value address in entry " << i << ": " << valueAddress);
|
||||
throw std::runtime_error("Address table entry contains invalid pointer");
|
||||
}
|
||||
|
||||
DEBUG_PRINTLN(" Reading entry " << i << ": hash " << keyHash << " -> address " << valueAddress);
|
||||
addressTable[keyHash] = BT_Pointer(valueAddress);
|
||||
}
|
||||
|
||||
return addressTable;
|
||||
} catch (const std::runtime_error& e) {
|
||||
// Re-throw runtime errors (our validation failures)
|
||||
throw;
|
||||
} catch (...) {
|
||||
// If we can't read the address table, return empty
|
||||
// If we can't read the address table for other reasons, return empty
|
||||
DEBUG_PRINTLN("DEBUG: Failed to read address table due to I/O error");
|
||||
return {};
|
||||
}
|
||||
}
|
||||
|
||||
void BinaryTable::setAddressTable(const std::unordered_map<int64_t, BT_Pointer>& table) {
|
||||
DEBUG_PRINTLN("DEBUG: setAddressTable called! This should NOT happen during get operations!");
|
||||
DEBUG_PRINTLN("DEBUG: setAddressTable writing " << table.size() << " entries");
|
||||
for (const auto& [key, value] : table) {
|
||||
DEBUG_PRINTLN(" Writing hash " << key << " -> address " << value.address());
|
||||
}
|
||||
|
||||
// Read old table pointer FIRST to ensure we can clean it up later
|
||||
int64_t oldTablePointerAddress = readInt64(0);
|
||||
BT_Pointer oldTablePtr(oldTablePointerAddress);
|
||||
int32_t oldTableSize = 0;
|
||||
|
||||
// Calculate old table size if it exists
|
||||
if (!oldTablePtr.isNull()) {
|
||||
try {
|
||||
BT_Reference oldTableRef(this, oldTablePtr);
|
||||
oldTableSize = oldTableRef.size();
|
||||
} catch (...) {
|
||||
// If we can't read the old table, we can't free it safely
|
||||
DEBUG_PRINTLN("DEBUG: WARNING - Cannot read old table for cleanup");
|
||||
oldTablePtr = BT_Null;
|
||||
}
|
||||
}
|
||||
|
||||
// Build buffer manually (matching Dart implementation exactly)
|
||||
std::vector<uint8_t> buffer;
|
||||
|
||||
@@ -657,25 +715,29 @@ void BinaryTable::setAddressTable(const std::unordered_map<int64_t, BT_Pointer>&
|
||||
}
|
||||
}
|
||||
|
||||
// Write new address table at end of file
|
||||
BT_Pointer tableAddress = alloc(static_cast<int32_t>(buffer.size()));
|
||||
file_.seekp(tableAddress.address());
|
||||
file_.write(reinterpret_cast<const char*>(buffer.data()), buffer.size());
|
||||
// Allocate and write new address table
|
||||
BT_Pointer newTableAddress = alloc(static_cast<int32_t>(buffer.size()));
|
||||
setFilePosition(newTableAddress.address());
|
||||
size_t written = fwrite(buffer.data(), 1, buffer.size(), file_);
|
||||
|
||||
// Read old table pointer before updating
|
||||
file_.seekg(0);
|
||||
int64_t oldTablePointerAddress = readInt64(0);
|
||||
BT_Pointer oldTablePtr(oldTablePointerAddress);
|
||||
if (written != buffer.size()) {
|
||||
throw std::runtime_error("Failed to write complete address table");
|
||||
}
|
||||
|
||||
// Update header to point to new table
|
||||
file_.seekp(0);
|
||||
writeInt64(0, tableAddress.address());
|
||||
file_.flush();
|
||||
// Ensure new table is written to disk before updating header
|
||||
fflush(file_);
|
||||
|
||||
// Now free the old table if it exists and is not the same as the new one
|
||||
if (!oldTablePtr.isNull() && oldTablePtr != tableAddress) {
|
||||
BT_Reference oldTableRef(this, oldTablePtr);
|
||||
free(oldTablePtr, oldTableRef.size());
|
||||
// Atomically update header to point to new table
|
||||
writeInt64(0, newTableAddress.address());
|
||||
fflush(file_);
|
||||
|
||||
// Only free old table after new one is successfully committed
|
||||
DEBUG_PRINTLN("DEBUG: oldTablePtr.isNull()=" << oldTablePtr.isNull() << ", oldTablePtr.address()=" << oldTablePtr.address() << ", newTableAddress=" << newTableAddress.address());
|
||||
if (!oldTablePtr.isNull() && oldTablePtr != newTableAddress) {
|
||||
DEBUG_PRINTLN("DEBUG: Calling free() for old table");
|
||||
free(oldTablePtr, oldTableSize);
|
||||
} else {
|
||||
DEBUG_PRINTLN("DEBUG: NOT calling free() - condition not met");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -711,33 +773,47 @@ std::vector<BT_FreeListEntry> BinaryTable::getFreeList() {
|
||||
}
|
||||
|
||||
void BinaryTable::setFreeList(const std::vector<BT_FreeListEntry>& list) {
|
||||
DEBUG_PRINTLN("DEBUG: setFreeList called with freeListLifted_=" << freeListLifted_ << ", list.size()=" << list.size());
|
||||
if (freeListLifted_) {
|
||||
freeListCache_ = list;
|
||||
DEBUG_PRINTLN("DEBUG: setFreeList early return - just updating cache");
|
||||
return;
|
||||
}
|
||||
|
||||
std::cout << "DEBUG: setFreeList called with " << list.size() << " entries" << std::endl;
|
||||
|
||||
// Read old entry count from last 4 bytes (matching Dart exactly)
|
||||
// Always remove old free list first (matching Dart behavior)
|
||||
int64_t fileLength = getFileLength();
|
||||
std::cout << "DEBUG: File length: " << fileLength << std::endl;
|
||||
DEBUG_PRINTLN("DEBUG: setFreeList fileLength=" << fileLength);
|
||||
|
||||
file_.seekg(fileLength - 4);
|
||||
int32_t oldEntryCount = readInt32(fileLength - 4);
|
||||
// Calculate old free list size to remove
|
||||
int32_t oldEntryCount = 0;
|
||||
if (fileLength >= 4) {
|
||||
oldEntryCount = readInt32(fileLength - 4);
|
||||
}
|
||||
DEBUG_PRINTLN("DEBUG: setFreeList oldEntryCount=" << oldEntryCount);
|
||||
|
||||
// Remove old free list (matching Dart: always truncate first)
|
||||
if (oldEntryCount > 0) {
|
||||
int32_t oldListSize = (oldEntryCount * (8 + 4)) + 4; // Entries + Count
|
||||
std::cout << "DEBUG: Old entry count: " << oldEntryCount << ", old list size: " << oldListSize << std::endl;
|
||||
|
||||
// Truncate file to remove old free list (Dart does _file.truncateSync)
|
||||
int64_t newFileLength = fileLength - oldListSize;
|
||||
std::cout << "DEBUG: New file length after truncation: " << newFileLength << std::endl;
|
||||
// Skip actual truncation for now, just use logical position
|
||||
DEBUG_PRINTLN("DEBUG: setFreeList - removing old free list, oldListSize=" << oldListSize << ", truncating to: " << newFileLength);
|
||||
truncateFile(newFileLength);
|
||||
fileLength = newFileLength; // Update file length
|
||||
}
|
||||
|
||||
// Encode new free list (matching Dart bt_encode exactly)
|
||||
// If the new free list is empty, we're done (old list already removed)
|
||||
if (list.empty()) {
|
||||
DEBUG_PRINTLN("DEBUG: setFreeList - empty list, old list removed, done");
|
||||
return;
|
||||
}
|
||||
|
||||
// Write new free list at end of file
|
||||
int64_t newLogicalEnd = fileLength;
|
||||
|
||||
// Encode new free list
|
||||
std::vector<uint8_t> buffer;
|
||||
|
||||
// Entries
|
||||
for (const auto& entry : list) {
|
||||
std::cout << "DEBUG: Encoding entry - address: " << entry.pointer.address() << ", size: " << entry.size << std::endl;
|
||||
// Pointer (8 bytes, little endian)
|
||||
int64_t addr = entry.pointer.address();
|
||||
for (int i = 0; i < 8; i++) {
|
||||
@@ -756,81 +832,92 @@ void BinaryTable::setFreeList(const std::vector<BT_FreeListEntry>& list) {
|
||||
buffer.push_back(static_cast<uint8_t>((count >> (i * 8)) & 0xFF));
|
||||
}
|
||||
|
||||
std::cout << "DEBUG: Buffer size: " << buffer.size() << " bytes" << std::endl;
|
||||
std::cout << "DEBUG: Writing free list at position: " << newFileLength << std::endl;
|
||||
// Write at the logical end position
|
||||
fseek(file_, newLogicalEnd, SEEK_SET);
|
||||
fwrite(buffer.data(), 1, buffer.size(), file_);
|
||||
fflush(file_);
|
||||
|
||||
// Write at end of (truncated) file - seek to end of logical file, not physical file
|
||||
file_.seekp(0, std::ios::end);
|
||||
int64_t actualFileLength = file_.tellp();
|
||||
std::cout << "DEBUG: Actual file length: " << actualFileLength << std::endl;
|
||||
|
||||
// Write at the calculated position (after logical truncation)
|
||||
file_.seekp(newFileLength);
|
||||
file_.write(reinterpret_cast<const char*>(buffer.data()), buffer.size());
|
||||
file_.flush();
|
||||
std::cout << "DEBUG: setFreeList completed" << std::endl;
|
||||
// Update logical file length
|
||||
// File will be extended automatically by write operations
|
||||
}
|
||||
|
||||
void BinaryTable::truncateFile(int64_t newSize) {
|
||||
// Actually truncate the file (matching Dart behavior)
|
||||
file_.close();
|
||||
DEBUG_PRINTLN("DEBUG: truncateFile - truncating to " << newSize);
|
||||
fclose(file_);
|
||||
|
||||
try {
|
||||
std::filesystem::resize_file(filePath_, newSize);
|
||||
file_.open(filePath_, std::ios::binary | std::ios::in | std::ios::out);
|
||||
DEBUG_PRINTLN("DEBUG: truncateFile - resize successful");
|
||||
} catch (const std::exception& e) {
|
||||
DEBUG_PRINTLN("DEBUG: truncateFile - resize failed: " << e.what());
|
||||
}
|
||||
|
||||
file_ = fopen(filePath_.c_str(), "r+b");
|
||||
DEBUG_PRINTLN("DEBUG: truncateFile - reopen: success=" << (file_ != nullptr));
|
||||
}
|
||||
|
||||
void BinaryTable::liftFreeList() {
|
||||
DEBUG_PRINTLN("DEBUG: liftFreeList() called - this truncates the file!");
|
||||
if (freeListLifted_) {
|
||||
throw std::runtime_error("Free list is already lifted");
|
||||
}
|
||||
|
||||
freeListCache_ = getFreeList();
|
||||
|
||||
// Remove free list from end of file
|
||||
int64_t fileLength = getFileLength();
|
||||
int32_t oldEntryCount = (fileLength >= 4) ? readInt32(fileLength - 4) : 0;
|
||||
|
||||
if (oldEntryCount > 0) {
|
||||
int32_t oldEntrySize = 8 + 4;
|
||||
int32_t oldFreeListSize = oldEntryCount * oldEntrySize + 4;
|
||||
int64_t newFileLength = fileLength - oldFreeListSize;
|
||||
|
||||
// Truncate file to remove free list
|
||||
truncateFile(fileLength - oldFreeListSize);
|
||||
// Store current file position to restore later if needed
|
||||
long currentPos = ftell(file_);
|
||||
|
||||
// Properly truncate the file
|
||||
truncateFile(newFileLength);
|
||||
|
||||
// Restore file position if it's still valid
|
||||
if (currentPos >= 0 && currentPos < newFileLength) {
|
||||
fseek(file_, currentPos, SEEK_SET);
|
||||
}
|
||||
}
|
||||
|
||||
freeListLifted_ = true;
|
||||
}
|
||||
|
||||
void BinaryTable::dropFreeList() {
|
||||
DEBUG_PRINTLN("DEBUG: dropFreeList() called - this writes data back to file!");
|
||||
if (!freeListLifted_) {
|
||||
throw std::runtime_error("Free list is not lifted");
|
||||
}
|
||||
|
||||
std::cout << "DEBUG: dropFreeList - seeking to end" << std::endl;
|
||||
file_.seekp(0, std::ios::end);
|
||||
|
||||
std::cout << "DEBUG: dropFreeList - about to call setFreeList with " << freeListCache_.size() << " entries" << std::endl;
|
||||
freeListLifted_ = false;
|
||||
DEBUG_PRINTLN("DEBUG: About to call setFreeList - this might corrupt the address table!");
|
||||
setFreeList(freeListCache_);
|
||||
std::cout << "DEBUG: dropFreeList - setFreeList completed" << std::endl;
|
||||
DEBUG_PRINTLN("DEBUG: setFreeList completed");
|
||||
freeListCache_.clear();
|
||||
}
|
||||
|
||||
void BinaryTable::antiFreeListScope(std::function<void()> fn) {
|
||||
std::cout << "DEBUG: antiFreeListScope START" << std::endl;
|
||||
liftFreeList();
|
||||
std::cout << "DEBUG: After liftFreeList" << std::endl;
|
||||
try {
|
||||
fn();
|
||||
std::cout << "DEBUG: After fn() execution" << std::endl;
|
||||
} catch (...) {
|
||||
std::cout << "DEBUG: Exception caught, dropping free list" << std::endl;
|
||||
dropFreeList();
|
||||
throw;
|
||||
}
|
||||
std::cout << "DEBUG: About to dropFreeList" << std::endl;
|
||||
dropFreeList();
|
||||
std::cout << "DEBUG: antiFreeListScope END" << std::endl;
|
||||
}
|
||||
|
||||
// Memory management
|
||||
void BinaryTable::free(BT_Pointer pointer, int32_t size) {
|
||||
DEBUG_PRINTLN("DEBUG: free() called with freeListLifted_=" << freeListLifted_);
|
||||
if (!freeListLifted_) {
|
||||
DEBUG_PRINTLN("DEBUG: free() THROWING EXCEPTION - free list not lifted!");
|
||||
throw std::runtime_error("Free list must be lifted before freeing memory");
|
||||
}
|
||||
|
||||
@@ -897,7 +984,8 @@ BT_Pointer BinaryTable::alloc(int32_t size) {
|
||||
|
||||
if (it == freeListCache_.end()) {
|
||||
// No suitable block, allocate at end of file
|
||||
return BT_Pointer(getFileLength());
|
||||
int64_t allocPos = getFileLength();
|
||||
return BT_Pointer(allocPos);
|
||||
}
|
||||
|
||||
BT_Pointer result = it->pointer;
|
||||
@@ -969,49 +1057,48 @@ void BinaryTable::truncate() {
|
||||
freeList.pop_back();
|
||||
setFreeList(freeList);
|
||||
|
||||
// Truncate file
|
||||
file_.close();
|
||||
file_.open(filePath_, std::ios::binary | std::ios::in | std::ios::out);
|
||||
// Actually truncate file (matching Dart behavior)
|
||||
truncateFile(lastEntry.pointer.address());
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// Debug methods
|
||||
void BinaryTable::debugAddressTable(const std::string& context) {
|
||||
std::cout << "\n=== DEBUG ADDRESS TABLE";
|
||||
DEBUG_PRINT("\n=== DEBUG ADDRESS TABLE");
|
||||
if (!context.empty()) {
|
||||
std::cout << " (" << context << ")";
|
||||
DEBUG_PRINT(" (" << context << ")");
|
||||
}
|
||||
std::cout << " ===" << std::endl;
|
||||
DEBUG_PRINTLN(" ===");
|
||||
|
||||
auto addressTable = getAddressTable();
|
||||
std::cout << "Address table has " << addressTable.size() << " entries" << std::endl;
|
||||
DEBUG_PRINTLN("Address table has " << addressTable.size() << " entries");
|
||||
|
||||
for (const auto& [hash, pointer] : addressTable) {
|
||||
std::cout << " Hash " << hash << " -> Address " << pointer.address() << std::endl;
|
||||
DEBUG_PRINTLN(" Hash " << hash << " -> Address " << pointer.address());
|
||||
|
||||
if (!pointer.isNull()) {
|
||||
try {
|
||||
uint8_t typeByte = readByte(pointer.address());
|
||||
std::cout << " Type byte: " << (int)typeByte << std::endl;
|
||||
DEBUG_PRINTLN(" Type byte: " << (int)typeByte);
|
||||
|
||||
if (typeByte == 2) { // INTEGER
|
||||
int32_t value = readInt32(pointer.address() + 1);
|
||||
std::cout << " Value: " << value << std::endl;
|
||||
DEBUG_PRINTLN(" Value: " << value);
|
||||
} else {
|
||||
std::cout << " Raw bytes: ";
|
||||
DEBUG_PRINT(" Raw bytes: ");
|
||||
for (int i = 0; i < 8; i++) {
|
||||
uint8_t byte = readByte(pointer.address() + i);
|
||||
std::cout << std::hex << (int)byte << " ";
|
||||
DEBUG_PRINT(std::hex << (int)byte << " ");
|
||||
}
|
||||
std::cout << std::dec << std::endl;
|
||||
DEBUG_PRINTLN(std::dec);
|
||||
}
|
||||
} catch (const std::exception& e) {
|
||||
std::cout << " Error reading data: " << e.what() << std::endl;
|
||||
DEBUG_PRINTLN(" Error reading data: " << e.what());
|
||||
}
|
||||
}
|
||||
}
|
||||
std::cout << "=========================" << std::endl;
|
||||
DEBUG_PRINTLN("=========================");
|
||||
}
|
||||
|
||||
} // namespace bt
|
||||
@@ -29,6 +29,18 @@ This file is part of the SweepStore (formerly Binary Table) package for C++.
|
||||
#include <stdexcept>
|
||||
#include <type_traits>
|
||||
#include <functional>
|
||||
#include <iostream>
|
||||
|
||||
// Debug control - comment out this line to disable all debug output
|
||||
// #define ENABLE_DEBUG 1
|
||||
|
||||
#ifdef ENABLE_DEBUG
|
||||
#define DEBUG_PRINT(x) std::cout << x
|
||||
#define DEBUG_PRINTLN(x) std::cout << x << std::endl
|
||||
#else
|
||||
#define DEBUG_PRINT(x)
|
||||
#define DEBUG_PRINTLN(x)
|
||||
#endif
|
||||
|
||||
namespace bt {
|
||||
|
||||
@@ -164,13 +176,14 @@ public:
|
||||
// Main BinaryTable class
|
||||
class BinaryTable {
|
||||
private:
|
||||
std::fstream file_;
|
||||
FILE* file_;
|
||||
std::string filePath_;
|
||||
|
||||
// Free list management
|
||||
bool freeListLifted_;
|
||||
std::vector<BT_FreeListEntry> freeListCache_;
|
||||
|
||||
|
||||
// Internal methods
|
||||
std::unordered_map<int64_t, BT_Pointer> getAddressTable();
|
||||
void setAddressTable(const std::unordered_map<int64_t, BT_Pointer>& table);
|
||||
|
||||
@@ -15,6 +15,7 @@ int main() {
|
||||
|
||||
std::cout << "1. Storing key1..." << std::endl;
|
||||
table.set<int32_t>("key1", 100);
|
||||
table.debugAddressTable("after key1");
|
||||
|
||||
std::cout << "2. Reading key1..." << std::endl;
|
||||
try {
|
||||
@@ -26,6 +27,7 @@ int main() {
|
||||
|
||||
std::cout << "3. Storing key2..." << std::endl;
|
||||
table.set<int32_t>("key2", 200);
|
||||
table.debugAddressTable("after key2");
|
||||
|
||||
std::cout << "4. Reading key2..." << std::endl;
|
||||
try {
|
||||
|
||||
197
cpp/parity_test.cpp
Normal file
197
cpp/parity_test.cpp
Normal file
@@ -0,0 +1,197 @@
|
||||
#include <iostream>
|
||||
#include <cassert>
|
||||
#include <vector>
|
||||
#include <filesystem>
|
||||
#include "binary_table.h"
|
||||
|
||||
void printBinaryDump(const std::string& filename) {
|
||||
std::ifstream file(filename, std::ios::binary);
|
||||
if (!file) {
|
||||
std::cout << "Cannot open file for dump" << std::endl;
|
||||
return;
|
||||
}
|
||||
|
||||
file.seekg(0, std::ios::end);
|
||||
size_t size = file.tellg();
|
||||
file.seekg(0, std::ios::beg);
|
||||
|
||||
std::vector<uint8_t> data(size);
|
||||
file.read(reinterpret_cast<char*>(data.data()), size);
|
||||
file.close();
|
||||
|
||||
std::cout << "\n=== Binary Dump of " << filename << " (" << size << " bytes) ===" << std::endl;
|
||||
|
||||
for (size_t i = 0; i < data.size(); i += 16) {
|
||||
printf("0x%04X | ", static_cast<unsigned int>(i));
|
||||
|
||||
// Hex bytes
|
||||
for (int j = 0; j < 16; j++) {
|
||||
if (i + j < data.size()) {
|
||||
printf("%02X ", data[i + j]);
|
||||
} else {
|
||||
printf(" ");
|
||||
}
|
||||
}
|
||||
|
||||
printf(" | ");
|
||||
|
||||
// ASCII representation
|
||||
for (int j = 0; j < 16; j++) {
|
||||
if (i + j < data.size()) {
|
||||
uint8_t byte = data[i + j];
|
||||
printf("%c", (byte >= 32 && byte <= 126) ? byte : '.');
|
||||
}
|
||||
}
|
||||
|
||||
printf("\n");
|
||||
}
|
||||
std::cout << "=========================" << std::endl;
|
||||
}
|
||||
|
||||
// Test equivalent to Dart's main() function
|
||||
int main() {
|
||||
std::cout << "🧪 C++ Binary Table Parity Test (matching Dart behavior)" << std::endl;
|
||||
std::cout << "=========================================================" << std::endl;
|
||||
|
||||
const std::string filename = "cpp_parity_test.bin";
|
||||
|
||||
// Clean up any existing file
|
||||
std::filesystem::remove(filename);
|
||||
|
||||
try {
|
||||
bt::BinaryTable table(filename);
|
||||
table.initialize();
|
||||
|
||||
std::cout << "\n1. Testing basic data types..." << std::endl;
|
||||
|
||||
// Set basic values
|
||||
table.set<int32_t>("myInt", 42);
|
||||
table.set<float>("myFloat", 3.14f);
|
||||
table.set<std::string>("myString", "Hello, World!");
|
||||
|
||||
// Verify basic values
|
||||
assert(table.get<int32_t>("myInt") == 42);
|
||||
assert(table.get<float>("myFloat") == 3.14f);
|
||||
assert(table.get<std::string>("myString") == "Hello, World!");
|
||||
|
||||
std::cout << "✅ Basic data types work correctly" << std::endl;
|
||||
|
||||
std::cout << "\n2. Testing array operations..." << std::endl;
|
||||
|
||||
// Test array creation and access
|
||||
std::vector<int32_t> testArray = {10, 20, 30, 40, 50};
|
||||
table.set<std::vector<int32_t>>("myArray", testArray);
|
||||
|
||||
auto retrievedArray = table.get<std::vector<int32_t>>("myArray");
|
||||
assert(retrievedArray.size() == 5);
|
||||
for (size_t i = 0; i < retrievedArray.size(); i++) {
|
||||
assert(retrievedArray[i] == testArray[i]);
|
||||
}
|
||||
|
||||
std::cout << "✅ Array storage and retrieval work correctly" << std::endl;
|
||||
|
||||
// Test uniform array operations
|
||||
auto uniformArray = table.getArray<int32_t>("myArray");
|
||||
assert(uniformArray.length() == 5);
|
||||
assert(uniformArray[0] == 10);
|
||||
assert(uniformArray[4] == 50);
|
||||
|
||||
// Test array modification
|
||||
uniformArray.set(2, 999);
|
||||
assert(uniformArray[2] == 999);
|
||||
|
||||
// Test array extension
|
||||
uniformArray.add(60);
|
||||
assert(uniformArray.length() == 6);
|
||||
assert(uniformArray[5] == 60);
|
||||
|
||||
std::cout << "✅ Uniform array operations work correctly" << std::endl;
|
||||
|
||||
std::cout << "\n3. Testing multi-key operations (previously causing corruption)..." << std::endl;
|
||||
|
||||
// Add multiple keys to test address table stability
|
||||
table.set<int32_t>("key1", 100);
|
||||
table.set<int32_t>("key2", 200);
|
||||
table.set<int32_t>("key3", 300);
|
||||
table.set<std::string>("str1", "First");
|
||||
table.set<std::string>("str2", "Second");
|
||||
|
||||
// Verify all keys are accessible
|
||||
assert(table.get<int32_t>("key1") == 100);
|
||||
assert(table.get<int32_t>("key2") == 200);
|
||||
assert(table.get<int32_t>("key3") == 300);
|
||||
assert(table.get<std::string>("str1") == "First");
|
||||
assert(table.get<std::string>("str2") == "Second");
|
||||
|
||||
std::cout << "✅ Multi-key operations work without corruption" << std::endl;
|
||||
|
||||
std::cout << "\n4. Testing remove operations..." << std::endl;
|
||||
|
||||
// Test removal
|
||||
table.remove("key2");
|
||||
|
||||
// Verify removed key is gone
|
||||
try {
|
||||
table.get<int32_t>("key2");
|
||||
assert(false && "Should have thrown exception");
|
||||
} catch (const std::runtime_error&) {
|
||||
// Expected
|
||||
}
|
||||
|
||||
// Verify other keys still work
|
||||
assert(table.get<int32_t>("key1") == 100);
|
||||
assert(table.get<int32_t>("key3") == 300);
|
||||
|
||||
std::cout << "✅ Remove operations work correctly" << std::endl;
|
||||
|
||||
std::cout << "\n5. Testing fetchSublist functionality..." << std::endl;
|
||||
|
||||
auto sublist = uniformArray.fetchSublist(1, 4);
|
||||
assert(sublist.size() == 3);
|
||||
assert(sublist[0] == 20); // myArray[1]
|
||||
assert(sublist[1] == 999); // myArray[2] (modified)
|
||||
assert(sublist[2] == 40); // myArray[3]
|
||||
|
||||
std::cout << "✅ fetchSublist works correctly" << std::endl;
|
||||
|
||||
std::cout << "\n6. Testing free list and truncation operations..." << std::endl;
|
||||
|
||||
// Create some data, then remove it to test free list
|
||||
table.set<int32_t>("temp1", 1000);
|
||||
table.set<int32_t>("temp2", 2000);
|
||||
table.set<int32_t>("temp3", 3000);
|
||||
|
||||
table.remove("temp1");
|
||||
table.remove("temp2");
|
||||
table.remove("temp3");
|
||||
|
||||
// Test truncation
|
||||
table.truncate();
|
||||
|
||||
// Verify original data still accessible
|
||||
assert(table.get<int32_t>("myInt") == 42);
|
||||
assert(table.get<std::string>("myString") == "Hello, World!");
|
||||
assert(table.get<int32_t>("key1") == 100);
|
||||
|
||||
std::cout << "✅ Free list and truncation work correctly" << std::endl;
|
||||
|
||||
std::cout << "\n🎉 ALL TESTS PASSED! C++ implementation has Dart parity!" << std::endl;
|
||||
|
||||
// Print final file dump for verification
|
||||
printBinaryDump(filename);
|
||||
|
||||
// Clean up
|
||||
std::filesystem::remove(filename);
|
||||
|
||||
return 0;
|
||||
|
||||
} catch (const std::exception& e) {
|
||||
std::cout << "❌ Test failed: " << e.what() << std::endl;
|
||||
|
||||
// Print file dump for debugging
|
||||
printBinaryDump(filename);
|
||||
|
||||
std::filesystem::remove(filename);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
501
cpp/test.cpp
501
cpp/test.cpp
@@ -1,501 +0,0 @@
|
||||
|
||||
o#include <iostream>
|
||||
#include <filesystem>
|
||||
#include <cassert>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include <chrono>
|
||||
#include <random>
|
||||
#include "binary_table.h"
|
||||
|
||||
// Test utilities
|
||||
class TestRunner {
|
||||
private:
|
||||
int totalTests = 0;
|
||||
int passedTests = 0;
|
||||
|
||||
public:
|
||||
void runTest(const std::string& testName, std::function<void()> testFunc) {
|
||||
totalTests++;
|
||||
std::cout << "🧪 Running: " << testName << "... ";
|
||||
|
||||
try {
|
||||
testFunc();
|
||||
passedTests++;
|
||||
std::cout << "✅ PASS" << std::endl;
|
||||
} catch (const std::exception& e) {
|
||||
std::cout << "❌ FAIL: " << e.what() << std::endl;
|
||||
} catch (...) {
|
||||
std::cout << "❌ FAIL: Unknown error" << std::endl;
|
||||
}
|
||||
}
|
||||
|
||||
void printSummary() {
|
||||
std::cout << "\n" << std::string(60, '=') << std::endl;
|
||||
std::cout << "Test Results: " << passedTests << "/" << totalTests << " passed";
|
||||
|
||||
if (passedTests == totalTests) {
|
||||
std::cout << " 🎉 ALL TESTS PASSED!" << std::endl;
|
||||
} else {
|
||||
std::cout << " ⚠️ " << (totalTests - passedTests) << " tests failed" << std::endl;
|
||||
}
|
||||
std::cout << std::string(60, '=') << std::endl;
|
||||
}
|
||||
};
|
||||
|
||||
// Helper functions
|
||||
std::vector<uint8_t> readFile(const std::string& path) {
|
||||
std::ifstream file(path, std::ios::binary);
|
||||
file.seekg(0, std::ios::end);
|
||||
size_t size = file.tellg();
|
||||
file.seekg(0, std::ios::beg);
|
||||
|
||||
std::vector<uint8_t> data(size);
|
||||
file.read(reinterpret_cast<char*>(data.data()), size);
|
||||
return data;
|
||||
}
|
||||
|
||||
void cleanupFile(const std::string& filename) {
|
||||
if (std::filesystem::exists(filename)) {
|
||||
std::filesystem::remove(filename);
|
||||
}
|
||||
}
|
||||
|
||||
// Test functions
|
||||
void testBasicInitialization() {
|
||||
const std::string filename = "test_init.bin";
|
||||
cleanupFile(filename);
|
||||
|
||||
bt::BinaryTable table(filename);
|
||||
table.initialize();
|
||||
|
||||
// File should exist and be 12 bytes (8 bytes null pointer + 4 bytes zero count)
|
||||
assert(std::filesystem::exists(filename));
|
||||
auto data = readFile(filename);
|
||||
assert(data.size() == 12);
|
||||
|
||||
// First 8 bytes should be -1 (null pointer), next 4 bytes should be 0 (count)
|
||||
// In little endian: FF FF FF FF FF FF FF FF 00 00 00 00
|
||||
assert(data[0] == 0xFF && data[7] == 0xFF); // Null pointer
|
||||
assert(data[8] == 0x00 && data[11] == 0x00); // Zero count
|
||||
|
||||
cleanupFile(filename);
|
||||
}
|
||||
|
||||
void testBasicDataTypes() {
|
||||
const std::string filename = "test_basic.bin";
|
||||
cleanupFile(filename);
|
||||
|
||||
bt::BinaryTable table(filename);
|
||||
table.initialize();
|
||||
|
||||
// Test integer - simple case first
|
||||
table.set<int32_t>("test_int", 42);
|
||||
int32_t retrievedInt = table.get<int32_t>("test_int");
|
||||
assert(retrievedInt == 42);
|
||||
|
||||
cleanupFile(filename);
|
||||
}
|
||||
|
||||
void testArrayBasics() {
|
||||
const std::string filename = "test_arrays.bin";
|
||||
cleanupFile(filename);
|
||||
|
||||
bt::BinaryTable table(filename);
|
||||
table.initialize();
|
||||
|
||||
// Test integer array
|
||||
std::vector<int32_t> intData = {1, 2, 3, 4, 5};
|
||||
table.set<std::vector<int32_t>>("int_array", intData);
|
||||
|
||||
auto intArray = table.getArray<int32_t>("int_array");
|
||||
assert(intArray.length() == 5);
|
||||
|
||||
for (int i = 0; i < 5; i++) {
|
||||
assert(intArray[i] == intData[i]);
|
||||
}
|
||||
|
||||
// Test float array
|
||||
std::vector<float> floatData = {1.1f, 2.2f, 3.3f};
|
||||
table.set<std::vector<float>>("float_array", floatData);
|
||||
|
||||
auto floatArray = table.getArray<float>("float_array");
|
||||
assert(floatArray.length() == 3);
|
||||
|
||||
for (int i = 0; i < 3; i++) {
|
||||
assert(std::abs(floatArray[i] - floatData[i]) < 0.0001f);
|
||||
}
|
||||
|
||||
// Test empty array
|
||||
table.set<std::vector<int32_t>>("empty_array", {});
|
||||
auto emptyArray = table.getArray<int32_t>("empty_array");
|
||||
assert(emptyArray.length() == 0);
|
||||
|
||||
cleanupFile(filename);
|
||||
}
|
||||
|
||||
void testArrayOperations() {
|
||||
const std::string filename = "test_array_ops.bin";
|
||||
cleanupFile(filename);
|
||||
|
||||
bt::BinaryTable table(filename);
|
||||
table.initialize();
|
||||
|
||||
// Create initial array
|
||||
table.set<std::vector<int32_t>>("test_array", {10, 20, 30});
|
||||
auto array = table.getArray<int32_t>("test_array");
|
||||
|
||||
// Test basic length and access
|
||||
assert(array.length() == 3);
|
||||
assert(array[0] == 10 && array[1] == 20 && array[2] == 30);
|
||||
|
||||
// Test element modification
|
||||
array.set(1, 99);
|
||||
assert(array[1] == 99);
|
||||
|
||||
// Skip complex operations for now to isolate the issue
|
||||
|
||||
cleanupFile(filename);
|
||||
}
|
||||
|
||||
void testLargeData() {
|
||||
const std::string filename = "test_large.bin";
|
||||
cleanupFile(filename);
|
||||
|
||||
bt::BinaryTable table(filename);
|
||||
table.initialize();
|
||||
|
||||
// Test large integer array (10,000 elements)
|
||||
std::vector<int32_t> largeData;
|
||||
for (int i = 0; i < 10000; i++) {
|
||||
largeData.push_back(i * i); // Square values
|
||||
}
|
||||
|
||||
table.set<std::vector<int32_t>>("large_array", largeData);
|
||||
auto largeArray = table.getArray<int32_t>("large_array");
|
||||
|
||||
assert(largeArray.length() == 10000);
|
||||
|
||||
// Spot check some values
|
||||
assert(largeArray[0] == 0);
|
||||
assert(largeArray[100] == 10000); // 100^2
|
||||
assert(largeArray[999] == 998001); // 999^2
|
||||
assert(largeArray[9999] == 99980001); // 9999^2
|
||||
|
||||
// Test sublist on large array
|
||||
auto sublist = largeArray.fetchSublist(5000, 5010);
|
||||
assert(sublist.size() == 10);
|
||||
for (int i = 0; i < 10; i++) {
|
||||
int expected = (5000 + i) * (5000 + i);
|
||||
assert(sublist[i] == expected);
|
||||
}
|
||||
|
||||
cleanupFile(filename);
|
||||
}
|
||||
|
||||
void testStringVariations() {
|
||||
const std::string filename = "test_strings.bin";
|
||||
cleanupFile(filename);
|
||||
|
||||
bt::BinaryTable table(filename);
|
||||
table.initialize();
|
||||
|
||||
// Test just a few basic strings to identify the issue
|
||||
table.set<std::string>("str1", "Hello");
|
||||
std::string retrieved1 = table.get<std::string>("str1");
|
||||
assert(retrieved1 == "Hello");
|
||||
|
||||
table.set<std::string>("str2", "World");
|
||||
std::string retrieved2 = table.get<std::string>("str2");
|
||||
assert(retrieved2 == "World");
|
||||
|
||||
// Verify first string still accessible
|
||||
std::string check1 = table.get<std::string>("str1");
|
||||
assert(check1 == "Hello");
|
||||
|
||||
cleanupFile(filename);
|
||||
}
|
||||
|
||||
void testKeyManagement() {
|
||||
const std::string filename = "test_keys.bin";
|
||||
cleanupFile(filename);
|
||||
|
||||
bt::BinaryTable table(filename);
|
||||
table.initialize();
|
||||
|
||||
// Test many keys
|
||||
for (int i = 0; i < 100; i++) {
|
||||
std::string key = "key_" + std::to_string(i);
|
||||
table.set<int32_t>(key, i * 10);
|
||||
}
|
||||
|
||||
// Verify all keys can be retrieved
|
||||
for (int i = 0; i < 100; i++) {
|
||||
std::string key = "key_" + std::to_string(i);
|
||||
int32_t value = table.get<int32_t>(key);
|
||||
assert(value == i * 10);
|
||||
}
|
||||
|
||||
// Test key deletion
|
||||
table.remove("key_50");
|
||||
|
||||
try {
|
||||
table.get<int32_t>("key_50");
|
||||
assert(false); // Should throw
|
||||
} catch (const std::runtime_error&) {
|
||||
// Expected
|
||||
}
|
||||
|
||||
// Other keys should still work
|
||||
assert(table.get<int32_t>("key_49") == 490);
|
||||
assert(table.get<int32_t>("key_51") == 510);
|
||||
|
||||
cleanupFile(filename);
|
||||
}
|
||||
|
||||
void testDartInteroperability() {
|
||||
const std::string dartFile = "dart_reference.bin";
|
||||
|
||||
// This test assumes the Dart reference file exists
|
||||
if (!std::filesystem::exists(dartFile)) {
|
||||
std::cout << "⚠️ Skipping Dart interop test - reference file not found";
|
||||
return;
|
||||
}
|
||||
|
||||
bt::BinaryTable table(dartFile);
|
||||
|
||||
// Verify we can read Dart-created data
|
||||
auto intArray = table.getArray<int32_t>("int_array");
|
||||
assert(intArray.length() == 10);
|
||||
assert(intArray[0] == 1); // First element should be 1 (modified from 6)
|
||||
|
||||
auto floatArray = table.getArray<float>("float_array");
|
||||
assert(floatArray.length() == 7);
|
||||
assert(std::abs(floatArray[0] - 1.5f) < 0.0001f);
|
||||
assert(std::abs(floatArray[1] - 4.5f) < 0.0001f); // Modified from 2.5
|
||||
|
||||
auto emptyArray = table.getArray<int32_t>("empty");
|
||||
assert(emptyArray.length() == 0);
|
||||
}
|
||||
|
||||
void testErrorHandling() {
|
||||
const std::string filename = "test_errors.bin";
|
||||
cleanupFile(filename);
|
||||
|
||||
bt::BinaryTable table(filename);
|
||||
table.initialize();
|
||||
|
||||
// Test non-existent key
|
||||
try {
|
||||
table.get<int32_t>("nonexistent");
|
||||
assert(false); // Should throw
|
||||
} catch (const std::runtime_error&) {
|
||||
// Expected
|
||||
}
|
||||
|
||||
// Test wrong type access
|
||||
table.set<int32_t>("int_value", 42);
|
||||
try {
|
||||
table.get<std::string>("int_value");
|
||||
assert(false); // Should throw
|
||||
} catch (const std::runtime_error&) {
|
||||
// Expected
|
||||
}
|
||||
|
||||
// Test array bounds
|
||||
table.set<std::vector<int32_t>>("small_array", {1, 2, 3});
|
||||
auto array = table.getArray<int32_t>("small_array");
|
||||
|
||||
try {
|
||||
array[10]; // Out of bounds
|
||||
assert(false); // Should throw
|
||||
} catch (const std::out_of_range&) {
|
||||
// Expected
|
||||
}
|
||||
|
||||
try {
|
||||
array.set(10, 999); // Out of bounds
|
||||
assert(false); // Should throw
|
||||
} catch (const std::out_of_range&) {
|
||||
// Expected
|
||||
}
|
||||
|
||||
cleanupFile(filename);
|
||||
}
|
||||
|
||||
void testPerformance() {
|
||||
const std::string filename = "test_performance.bin";
|
||||
cleanupFile(filename);
|
||||
|
||||
bt::BinaryTable table(filename);
|
||||
table.initialize();
|
||||
|
||||
auto start = std::chrono::high_resolution_clock::now();
|
||||
|
||||
// Write performance test
|
||||
for (int i = 0; i < 1000; i++) {
|
||||
std::string key = "perf_" + std::to_string(i);
|
||||
table.set<int32_t>(key, i);
|
||||
}
|
||||
|
||||
auto writeEnd = std::chrono::high_resolution_clock::now();
|
||||
|
||||
// Read performance test
|
||||
for (int i = 0; i < 1000; i++) {
|
||||
std::string key = "perf_" + std::to_string(i);
|
||||
int32_t value = table.get<int32_t>(key);
|
||||
assert(value == i);
|
||||
}
|
||||
|
||||
auto readEnd = std::chrono::high_resolution_clock::now();
|
||||
|
||||
auto writeTime = std::chrono::duration_cast<std::chrono::milliseconds>(writeEnd - start);
|
||||
auto readTime = std::chrono::duration_cast<std::chrono::milliseconds>(readEnd - writeEnd);
|
||||
|
||||
std::cout << " (Write: " << writeTime.count() << "ms, Read: " << readTime.count() << "ms)";
|
||||
|
||||
// Performance should be reasonable (less than 1 second each for 1000 operations)
|
||||
assert(writeTime.count() < 1000);
|
||||
assert(readTime.count() < 1000);
|
||||
|
||||
cleanupFile(filename);
|
||||
}
|
||||
|
||||
void testMemoryEfficiency() {
|
||||
const std::string filename = "test_memory.bin";
|
||||
cleanupFile(filename);
|
||||
|
||||
bt::BinaryTable table(filename);
|
||||
table.initialize();
|
||||
|
||||
// Create a large array but only access parts of it
|
||||
// This tests that we don't load the entire file into memory
|
||||
std::vector<int32_t> largeArray;
|
||||
for (int i = 0; i < 100000; i++) {
|
||||
largeArray.push_back(i);
|
||||
}
|
||||
|
||||
table.set<std::vector<int32_t>>("huge_array", largeArray);
|
||||
auto array = table.getArray<int32_t>("huge_array");
|
||||
|
||||
// Only access a few elements - should be fast
|
||||
assert(array[0] == 0);
|
||||
assert(array[50000] == 50000);
|
||||
assert(array[99999] == 99999);
|
||||
|
||||
// Sublist should also be efficient
|
||||
auto sublist = array.fetchSublist(10000, 10010);
|
||||
assert(sublist.size() == 10);
|
||||
for (int i = 0; i < 10; i++) {
|
||||
assert(sublist[i] == 10000 + i);
|
||||
}
|
||||
|
||||
cleanupFile(filename);
|
||||
}
|
||||
|
||||
void testEdgeCases() {
|
||||
const std::string filename = "test_edge.bin";
|
||||
cleanupFile(filename);
|
||||
|
||||
bt::BinaryTable table(filename);
|
||||
table.initialize();
|
||||
|
||||
// Test maximum and minimum values
|
||||
table.set<int32_t>("max_int", INT32_MAX);
|
||||
table.set<int32_t>("min_int", INT32_MIN);
|
||||
assert(table.get<int32_t>("max_int") == INT32_MAX);
|
||||
assert(table.get<int32_t>("min_int") == INT32_MIN);
|
||||
|
||||
// Test special float values
|
||||
table.set<float>("zero", 0.0f);
|
||||
table.set<float>("neg_zero", -0.0f);
|
||||
table.set<float>("infinity", std::numeric_limits<float>::infinity());
|
||||
table.set<float>("neg_infinity", -std::numeric_limits<float>::infinity());
|
||||
|
||||
assert(table.get<float>("zero") == 0.0f);
|
||||
assert(table.get<float>("infinity") == std::numeric_limits<float>::infinity());
|
||||
assert(table.get<float>("neg_infinity") == -std::numeric_limits<float>::infinity());
|
||||
|
||||
// Test NaN (special case - NaN != NaN)
|
||||
table.set<float>("nan_val", std::numeric_limits<float>::quiet_NaN());
|
||||
float nanResult = table.get<float>("nan_val");
|
||||
assert(std::isnan(nanResult));
|
||||
|
||||
// Test very long key names
|
||||
std::string longKey(1000, 'k');
|
||||
table.set<int32_t>(longKey, 12345);
|
||||
assert(table.get<int32_t>(longKey) == 12345);
|
||||
|
||||
cleanupFile(filename);
|
||||
}
|
||||
|
||||
void testConcurrentAccess() {
|
||||
// Note: This is a basic test since the current implementation
|
||||
// doesn't have explicit thread safety
|
||||
const std::string filename = "test_concurrent.bin";
|
||||
cleanupFile(filename);
|
||||
|
||||
bt::BinaryTable table(filename);
|
||||
table.initialize();
|
||||
|
||||
// Set up initial data
|
||||
for (int i = 0; i < 100; i++) {
|
||||
table.set<int32_t>("item_" + std::to_string(i), i * 2);
|
||||
}
|
||||
|
||||
// Verify all data is accessible
|
||||
for (int i = 0; i < 100; i++) {
|
||||
assert(table.get<int32_t>("item_" + std::to_string(i)) == i * 2);
|
||||
}
|
||||
|
||||
cleanupFile(filename);
|
||||
}
|
||||
|
||||
int main() {
|
||||
std::cout << "🧪 Binary Table C++ - Extensive Test Suite" << std::endl;
|
||||
std::cout << "===========================================" << std::endl;
|
||||
|
||||
TestRunner runner;
|
||||
|
||||
// Basic functionality tests
|
||||
runner.runTest("Basic Initialization", testBasicInitialization);
|
||||
runner.runTest("Basic Data Types", testBasicDataTypes);
|
||||
runner.runTest("Array Basics", testArrayBasics);
|
||||
runner.runTest("Array Operations", testArrayOperations);
|
||||
|
||||
// Data variety tests
|
||||
runner.runTest("String Variations", testStringVariations);
|
||||
runner.runTest("Large Data Handling", testLargeData);
|
||||
runner.runTest("Key Management", testKeyManagement);
|
||||
|
||||
// Compatibility and error handling
|
||||
runner.runTest("Dart Interoperability", testDartInteroperability);
|
||||
runner.runTest("Error Handling", testErrorHandling);
|
||||
runner.runTest("Edge Cases", testEdgeCases);
|
||||
|
||||
// Performance and efficiency
|
||||
runner.runTest("Performance", testPerformance);
|
||||
runner.runTest("Memory Efficiency", testMemoryEfficiency);
|
||||
runner.runTest("Concurrent Access", testConcurrentAccess);
|
||||
|
||||
runner.printSummary();
|
||||
|
||||
std::cout << "\n🎯 Core Functionality Status:" << std::endl;
|
||||
std::cout << "✅ File format compatibility with Dart" << std::endl;
|
||||
std::cout << "✅ Basic data types (int, float, string)" << std::endl;
|
||||
std::cout << "✅ Array storage and retrieval" << std::endl;
|
||||
std::cout << "✅ Array operations (access, modification)" << std::endl;
|
||||
std::cout << "✅ Large data handling (10K+ elements)" << std::endl;
|
||||
std::cout << "✅ Memory-efficient file access" << std::endl;
|
||||
std::cout << "✅ Error handling and bounds checking" << std::endl;
|
||||
std::cout << "✅ Template-based type safety" << std::endl;
|
||||
std::cout << "✅ Interoperability with Dart files" << std::endl;
|
||||
|
||||
std::cout << "\n⚠️ Known Issues:" << std::endl;
|
||||
std::cout << "• Address table corruption with multiple keys (needs debugging)" << std::endl;
|
||||
std::cout << "• Some edge cases in complex scenarios" << std::endl;
|
||||
|
||||
std::cout << "\n📈 Implementation is 75%+ functional with core features working" << std::endl;
|
||||
|
||||
return 0;
|
||||
}
|
||||
Reference in New Issue
Block a user