database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

Merge branch 'develop-1.1' into 1.1-merge-up-2018-12-20b

Browse Source
This commit is contained in:
Andrew Hutchings
2018-12-20 20:55:00 +00:00
parent a6df2be47b e28924b60f
commit 82bd9e29f5
9 changed files with 41 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
versioning/BRM/dbrm.cpp
View File

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

28
versioning/BRM/extentmap.cpp
View File

@ -59,7 +59,6 @@ namespace bi = boost::interprocess;
#include "IDBDataFile.h"
#include "IDBPolicy.h"
#ifdef BRM_INFO
#error BRM_INFO is broken right now
#include "tracer.h"
#include "configcpp.h"
#endif
@ -4603,12 +4602,12 @@ void ExtentMap::setLocalHWM(int OID, uint32_t partitionNum,
{
makeUndoRecord(&fExtentMap[oldHWMExtentIndex], sizeof(EMEntry));
fExtentMap[oldHWMExtentIndex].HWM = 0;
#ifdef BRM_DEBUG
#ifdef BRM_INFO
addedAnExtent = true;
#endif
}
#ifdef BRM_DEBUG
#ifdef BRM_INFO
if (firstNode)
{
@ -4921,10 +4920,9 @@ void ExtentMap::deletePartition(const set<OID_t>& oids,
TRACER_WRITENOW("deletePartition");
ostringstream oss;
set<LogicalPartition>::const_iterator partIt;
oss << "partitionNums: "
for (partIt = partitionNums.begin(); it != partitionNums.end(); ++it)
oss << (*it) << " ";
oss << "partitionNums: ";
for (partIt=partitionNums.begin(); partIt!=partitionNums.end(); ++partIt)
oss << (*partIt) << " ";
oss << endl;
oss << "OIDS: ";
@ -5026,10 +5024,9 @@ void ExtentMap::markPartitionForDeletion(const set<OID_t>& oids,
TRACER_WRITENOW("markPartitionForDeletion");
ostringstream oss;
set<LogicalPartition>::const_iterator partIt;
oss << "partitionNums: "
for (partIt = partitionNums.begin(); it != partitionNums.end(); ++it)
oss << (*it) << " ";
oss << "partitionNums: ";
for (partIt=partitionNums.begin(); partIt!=partitionNums.end(); ++partIt)
oss << (*partIt) << " ";
oss << endl;
oss << "OIDS: ";
@ -5193,10 +5190,9 @@ void ExtentMap::restorePartition(const set<OID_t>& oids,
TRACER_WRITENOW("restorePartition");
ostringstream oss;
set<LogicalPartition>::const_iterator partIt;
oss << "partitionNums: "
for (partIt = partitionNums.begin(); it != partitionNums.end(); ++it)
oss << (*it) << " ";
oss << "partitionNums: ";
for (partIt=partitionNums.begin(); partIt!=partitionNums.end(); ++partIt)
oss << (*partIt) << " ";
oss << endl;
oss << "OIDS: ";
@ -5365,7 +5361,7 @@ bool ExtentMap::isDBRootEmpty(uint16_t dbroot)
if (fDebug)
{
TRACER_WRITELATER("isDBRootEmpty");
TRACER_ADDINPUT(OID);
TRACER_ADDINPUT(dbroot);
TRACER_WRITE;
}

2
versioning/BRM/tracer.cpp
View File

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