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

MCOL-1347 BRM_INFO is fixed and could be used for BRM debugging.

Browse Source
This commit is contained in:
Roman Nozdrin
2018-12-05 13:39:21 -08:00
parent e0357d4c13
commit 3fc1893ce9
3 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
versioning/BRM/dbrm.cpp
View File

@ -1647,10 +1647,10 @@ int DBRM::deletePartition(const std::vector<OID_t>& oids,
{ {
TRACER_WRITENOW("deletePartition"); TRACER_WRITENOW("deletePartition");
std::ostringstream oss; std::ostringstream oss;
oss << "partitionNum: " oss << "partitionNum: ";
std::set<LogicalPartition>::const_iterator partIt; std::set<LogicalPartition>::const_iterator partIt;
for (partIt = partitionNums.begin(); partIt != partitionNums.end(); ++partIt) for (partIt = partitionNums.begin(); partIt != partitionNums.end(); ++partIt)
oss << (*it) << " " oss << (*partIt) << " ";
oss << "; OIDS: "; oss << "; OIDS: ";
std::vector<OID_t>::const_iterator it; std::vector<OID_t>::const_iterator it;
for (it=oids.begin(); it!=oids.end(); ++it) for (it=oids.begin(); it!=oids.end(); ++it)
@ -1696,10 +1696,10 @@ int DBRM::markPartitionForDeletion(const std::vector<OID_t>& oids,
{ {
TRACER_WRITENOW("markPartitionForDeletion"); TRACER_WRITENOW("markPartitionForDeletion");
std::ostringstream oss; std::ostringstream oss;
oss << "partitionNum: " oss << "partitionNum: ";
std::set<LogicalPartition>::const_iterator partIt; std::set<LogicalPartition>::const_iterator partIt;
for (partIt = partitionNums.begin(); partIt != partitionNums.end(); ++partIt) for (partIt = partitionNums.begin(); partIt != partitionNums.end(); ++partIt)
oss << (*it) << " " oss << (*partIt) << " ";
oss << "; OIDS: "; oss << "; OIDS: ";
std::vector<OID_t>::const_iterator it; std::vector<OID_t>::const_iterator it;
for (it=oids.begin(); it!=oids.end(); ++it) for (it=oids.begin(); it!=oids.end(); ++it)
@ -1784,10 +1784,10 @@ int DBRM::restorePartition(const std::vector<OID_t>& oids,
{ {
TRACER_WRITENOW("restorePartition"); TRACER_WRITENOW("restorePartition");
std::ostringstream oss; std::ostringstream oss;
oss << "partitionNum: " oss << "partitionNum: ";
std::set<LogicalPartition>::const_iterator partIt; std::set<LogicalPartition>::const_iterator partIt;
for (partIt = partitionNums.begin(); partIt != partitionNums.end(); ++partIt) for (partIt = partitionNums.begin(); partIt != partitionNums.end(); ++partIt)
oss << (*it) << " " oss << (*partIt) << " ";
oss << "; OIDS: "; oss << "; OIDS: ";
std::vector<OID_t>::const_iterator it; std::vector<OID_t>::const_iterator it;
for (it=oids.begin(); it!=oids.end(); ++it) for (it=oids.begin(); it!=oids.end(); ++it)

25
versioning/BRM/extentmap.cpp
View File

@ -59,7 +59,6 @@ namespace bi=boost::interprocess;
#include "IDBDataFile.h" #include "IDBDataFile.h"
#include "IDBPolicy.h" #include "IDBPolicy.h"
#ifdef BRM_INFO #ifdef BRM_INFO
#error BRM_INFO is broken right now
#include "tracer.h" #include "tracer.h"
#include "configcpp.h" #include "configcpp.h"
#endif #endif
@ -4113,12 +4112,12 @@ void ExtentMap::setLocalHWM(int OID, uint32_t partitionNum,
if ((oldHWMExtentIndex != -1) && (oldHWMExtentIndex != lastExtentIndex)) { if ((oldHWMExtentIndex != -1) && (oldHWMExtentIndex != lastExtentIndex)) {
makeUndoRecord(&fExtentMap[oldHWMExtentIndex], sizeof(EMEntry)); makeUndoRecord(&fExtentMap[oldHWMExtentIndex], sizeof(EMEntry));
fExtentMap[oldHWMExtentIndex].HWM = 0; fExtentMap[oldHWMExtentIndex].HWM = 0;
#ifdef BRM_DEBUG #ifdef BRM_INFO
addedAnExtent = true; addedAnExtent = true;
#endif #endif
} }
#ifdef BRM_DEBUG #ifdef BRM_INFO
if (firstNode) { if (firstNode) {
ostringstream os; ostringstream os;
os << "ExtentMap::setLocalHWM(): firstLBID=" << fExtentMap[lastExtentIndex].range.start << os << "ExtentMap::setLocalHWM(): firstLBID=" << fExtentMap[lastExtentIndex].range.start <<
@ -4381,9 +4380,9 @@ void ExtentMap::deletePartition(const set<OID_t>& oids,
TRACER_WRITENOW("deletePartition"); TRACER_WRITENOW("deletePartition");
ostringstream oss; ostringstream oss;
set<LogicalPartition>::const_iterator partIt; set<LogicalPartition>::const_iterator partIt;
oss << "partitionNums: " oss << "partitionNums: ";
for (partIt=partitionNums.begin(); it!=partitionNums.end(); ++it) for (partIt=partitionNums.begin(); partIt!=partitionNums.end(); ++partIt)
oss << (*it) << " "; oss << (*partIt) << " ";
oss << endl; oss << endl;
oss << "OIDS: "; oss << "OIDS: ";
@ -4474,9 +4473,9 @@ void ExtentMap::markPartitionForDeletion(const set<OID_t>& oids,
TRACER_WRITENOW("markPartitionForDeletion"); TRACER_WRITENOW("markPartitionForDeletion");
ostringstream oss; ostringstream oss;
set<LogicalPartition>::const_iterator partIt; set<LogicalPartition>::const_iterator partIt;
oss << "partitionNums: " oss << "partitionNums: ";
for (partIt=partitionNums.begin(); it!=partitionNums.end(); ++it) for (partIt=partitionNums.begin(); partIt!=partitionNums.end(); ++partIt)
oss << (*it) << " "; oss << (*partIt) << " ";
oss << endl; oss << endl;
oss << "OIDS: "; oss << "OIDS: ";
@ -4618,9 +4617,9 @@ void ExtentMap::restorePartition(const set<OID_t>& oids,
TRACER_WRITENOW("restorePartition"); TRACER_WRITENOW("restorePartition");
ostringstream oss; ostringstream oss;
set<LogicalPartition>::const_iterator partIt; set<LogicalPartition>::const_iterator partIt;
oss << "partitionNums: " oss << "partitionNums: ";
for (partIt=partitionNums.begin(); it!=partitionNums.end(); ++it) for (partIt=partitionNums.begin(); partIt!=partitionNums.end(); ++partIt)
oss << (*it) << " "; oss << (*partIt) << " ";
oss << endl; oss << endl;
oss << "OIDS: "; oss << "OIDS: ";
set<OID_t>::const_iterator it; set<OID_t>::const_iterator it;
@ -4768,7 +4767,7 @@ bool ExtentMap::isDBRootEmpty(uint16_t dbroot)
if (fDebug) if (fDebug)
{ {
TRACER_WRITELATER("isDBRootEmpty"); TRACER_WRITELATER("isDBRootEmpty");
TRACER_ADDINPUT(OID); TRACER_ADDINPUT(dbroot);
TRACER_WRITE; TRACER_WRITE;
} }
#endif #endif

2
versioning/BRM/tracer.cpp
View File

@ -30,6 +30,8 @@
#include <ctime> #include <ctime>
#endif #endif
#include <unistd.h>
#define TRACER_DLLEXPORT #define TRACER_DLLEXPORT
#include "tracer.h" #include "tracer.h"
#undef TRACER_DLLEXPORT #undef TRACER_DLLEXPORT