diff --git a/versioning/BRM/extentmap.cpp b/versioning/BRM/extentmap.cpp index 84eb88b08..7e842f482 100644 --- a/versioning/BRM/extentmap.cpp +++ b/versioning/BRM/extentmap.cpp @@ -1577,6 +1577,9 @@ void ExtentMap::loadVersion4or5(T* in, bool upgradeV4ToV5) nbytes += in->read((char*)&emNumElements, sizeof(uint32_t)); nbytes += in->read((char*)&flNumElements, sizeof(uint32_t)); idbassert(emNumElements > 0); + cout << "Expected EM entries:" << emNumElements << endl; + cout << "Expected free list entries:" << flNumElements << endl; + if (nbytes != (2 * sizeof(uint32_t))) { @@ -1695,25 +1698,6 @@ void ExtentMap::loadVersion4or5(T* in, bool upgradeV4ToV5) } fEMRBTreeShminfo->currentSize = (emNumElements * EM_RB_TREE_NODE_SIZE) + EM_RB_TREE_EMPTY_SIZE; - - cout << "lbid\tsz\toid\tfbo\thwm\tpart#\tseg#\tDBRoot\twid\tst\thi\tlo\tsq\tv" << endl; - - // for (const auto& lbidEMEntryPair : *fExtentMapRBTRee) - for (auto& lbidEMEntryPair : *fExtentMapRBTree) - { - const EMEntry& emEntry = lbidEMEntryPair.second; - cout << emEntry.range.start << '\t' << emEntry.range.size << '\t' << emEntry.fileID << '\t' - << emEntry.blockOffset << '\t' << emEntry.HWM << '\t' << emEntry.partitionNum << '\t' - << emEntry.segmentNum << '\t' << emEntry.dbRoot << '\t' << emEntry.status << '\t' - << emEntry.partition.cprange.hiVal << '\t' << emEntry.partition.cprange.loVal << '\t' - << emEntry.partition.cprange.sequenceNum << '\t' << (int)(emEntry.partition.cprange.isValid) << endl; - } - - cout << "Free list entries:" << endl; - cout << "start\tsize" << endl; - - for (uint32_t i = 0; i < flNumElements; i++) - cout << fFreeList[i].start << '\t' << fFreeList[i].size << endl; } void ExtentMap::load(const string& filename, bool fixFL)