From 3fc1893ce9026722b16b8eb791df7c9bc9c8e637 Mon Sep 17 00:00:00 2001
From: Roman Nozdrin <roman.nozdrin@mariadb.com>
Date: Wed, 5 Dec 2018 13:39:21 -0800
Subject: [PATCH] MCOL-1347 BRM_INFO is fixed and could be used for BRM
 debugging.

---
 versioning/BRM/dbrm.cpp      | 12 ++++++------
 versioning/BRM/extentmap.cpp | 25 ++++++++++++-------------
 versioning/BRM/tracer.cpp    |  2 ++
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/versioning/BRM/dbrm.cpp b/versioning/BRM/dbrm.cpp
index aa452d39f..742f01089 100644
--- a/versioning/BRM/dbrm.cpp
+++ b/versioning/BRM/dbrm.cpp
@@ -1647,10 +1647,10 @@ 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;
 		for (it=oids.begin(); it!=oids.end(); ++it)
@@ -1696,10 +1696,10 @@ 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;
 		for (it=oids.begin(); it!=oids.end(); ++it)
@@ -1784,10 +1784,10 @@ 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;
 		for (it=oids.begin(); it!=oids.end(); ++it)
diff --git a/versioning/BRM/extentmap.cpp b/versioning/BRM/extentmap.cpp
index b464cbeef..8792b20dd 100644
--- a/versioning/BRM/extentmap.cpp
+++ b/versioning/BRM/extentmap.cpp
@@ -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
@@ -4113,12 +4112,12 @@ void ExtentMap::setLocalHWM(int OID, uint32_t partitionNum,
 	if ((oldHWMExtentIndex != -1) && (oldHWMExtentIndex != lastExtentIndex)) {
 		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) {
 		ostringstream os;
 		os << "ExtentMap::setLocalHWM(): firstLBID=" << fExtentMap[lastExtentIndex].range.start <<
@@ -4381,9 +4380,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: ";
@@ -4474,9 +4473,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: ";
@@ -4618,9 +4617,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: ";
 		set<OID_t>::const_iterator it;
@@ -4768,7 +4767,7 @@ bool ExtentMap::isDBRootEmpty(uint16_t dbroot)
 	if (fDebug)
 	{
 		TRACER_WRITELATER("isDBRootEmpty");
-		TRACER_ADDINPUT(OID);
+		TRACER_ADDINPUT(dbroot);
 		TRACER_WRITE;
 	}
 #endif
diff --git a/versioning/BRM/tracer.cpp b/versioning/BRM/tracer.cpp
index 33693f62f..66ab2e969 100644
--- a/versioning/BRM/tracer.cpp
+++ b/versioning/BRM/tracer.cpp
@@ -30,6 +30,8 @@
 #include <ctime>
 #endif
 
+#include <unistd.h>
+
 #define TRACER_DLLEXPORT
 #include "tracer.h"
 #undef TRACER_DLLEXPORT