evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nicer error logging for BTree Repacker

Browse Source 
recoverAll was really just sitting there
This commit is contained in:
Kae 2024-08-08 12:09:47 +10:00
parent b2afd65144
commit ffc1f95789
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/core/StarBTreeDatabase.cpp
View File

@ -196,6 +196,11 @@ void BTreeDatabase::forAll(function<void(ByteArray, ByteArray)> v) {
m_impl.forAll(std::move(v)); m_impl.forAll(std::move(v));
} }
void BTreeDatabase::recoverAll(function<void(ByteArray, ByteArray)> v, function<void(String const&, std::exception const&)> e) {
ReadLocker readLocker(m_lock);
m_impl.recoverAll(std::move(v), std::move(e));
}
bool BTreeDatabase::insert(ByteArray const& k, ByteArray const& data) { bool BTreeDatabase::insert(ByteArray const& k, ByteArray const& data) {
WriteLocker writeLocker(m_lock); WriteLocker writeLocker(m_lock);
checkKeySize(k); checkKeySize(k);

1
source/core/StarBTreeDatabase.hpp
View File

@ -64,6 +64,7 @@ public:
void forEach(ByteArray const& lower, ByteArray const& upper, function<void(ByteArray, ByteArray)> v); void forEach(ByteArray const& lower, ByteArray const& upper, function<void(ByteArray, ByteArray)> v);
void forAll(function<void(ByteArray, ByteArray)> v); void forAll(function<void(ByteArray, ByteArray)> v);
void recoverAll(function<void(ByteArray, ByteArray)> v, function<void(String const&, std::exception const&)> e);
// Returns true if a value was overwritten // Returns true if a value was overwritten
bool insert(ByteArray const& k, ByteArray const& data); bool insert(ByteArray const& k, ByteArray const& data);

15
source/utility/btree_repacker.cpp
View File

@ -36,11 +36,16 @@ int main(int argc, char** argv) {
newDb.open(); newDb.open();
coutf("Repacking {}...\n", bTreePath); coutf("Repacking {}...\n", bTreePath);
//copy the data over //copy the data over
unsigned count = 0; unsigned count = 0, overwritten = 0;
db.forAll([&count, &newDb](ByteArray key, ByteArray data) { auto visitor = [&](ByteArray key, ByteArray data) {
newDb.insert(key, data); if (newDb.insert(key, data))
++overwritten;
++count; ++count;
}); };
auto errorHandler = [&](String const& error, std::exception const& e) {
coutf("{}: {}\n", error, e.what());
};
db.recoverAll(visitor, errorHandler);
//close the old db //close the old db
db.close(); db.close();
@ -48,7 +53,7 @@ int main(int argc, char** argv) {
newDb.commit(); newDb.commit();
newDb.close(); newDb.close();
coutf("Repacked BTree to {} in {}s\n", outputFilename, Time::monotonicTime() - startTime); coutf("Repacked BTree to {} in {:.6f}s\n({} inserts, {} overwritten)\n", outputFilename, Time::monotonicTime() - startTime, count, overwritten);
return 0; return 0;
} catch (std::exception const& e) { } catch (std::exception const& e) {