From de8ef1eb2d59e4eb9b379079606c8ecfab859f24 Mon Sep 17 00:00:00 2001 From: Sergey Zefirov Date: Mon, 22 Mar 2021 11:53:15 +0300 Subject: [PATCH] A test to investigate problems, without expected results Debug logs Debug logs - fix typo Debug logs Debug logs debug logs debug logs debug logs debug logs debug logs debug logs debug logs debug logs Solution to test Remove debug logs --- writeengine/bulk/we_brmreporter.cpp | 13 +++++++------ writeengine/splitter/we_brmupdater.cpp | 9 +++++++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/writeengine/bulk/we_brmreporter.cpp b/writeengine/bulk/we_brmreporter.cpp index 5517325e1..44a53d7e4 100644 --- a/writeengine/bulk/we_brmreporter.cpp +++ b/writeengine/bulk/we_brmreporter.cpp @@ -314,6 +314,7 @@ void BRMReporter::sendCPToFile( ) fCPInfo[i].min << ' ' << fCPInfo[i].seqNum << ' ' << fCPInfo[i].type << ' ' << + fCPInfo[i].colWidth << ' ' << fCPInfo[i].newExtent << std::endl; } else @@ -412,13 +413,13 @@ int BRMReporter::openRptFile( ) return rc; } - fRptFile << "#CP: startLBID max min seqnum type newExtent" << std::endl; - fRptFile << "#HWM: oid partition segment hwm" << std::endl; - fRptFile << "#ROWS: numRowsRead numRowsInserted" << std::endl; + fRptFile << "#CP: startLBID max min seqnum type colwidth newExtent" << std::endl; + fRptFile << "#HWM: oid partition segment hwm" << std::endl; + fRptFile << "#ROWS: numRowsRead numRowsInserted" << std::endl; fRptFile << "#DATA: columNum columnType columnOid numOutOfRangeValues" << std::endl; - fRptFile << "#ERR: error message file" << std::endl; - fRptFile << "#BAD: bad data file, with rejected rows" << std::endl; - fRptFile << "#MERR: critical error messages in cpimport.bin" << std::endl; + fRptFile << "#ERR: error message file" << std::endl; + fRptFile << "#BAD: bad data file, with rejected rows" << std::endl; + fRptFile << "#MERR: critical error messages in cpimport.bin" << std::endl; return NO_ERROR; } diff --git a/writeengine/splitter/we_brmupdater.cpp b/writeengine/splitter/we_brmupdater.cpp index ea728fb27..eb75f8001 100644 --- a/writeengine/splitter/we_brmupdater.cpp +++ b/writeengine/splitter/we_brmupdater.cpp @@ -353,6 +353,15 @@ bool WEBrmUpdater::prepareCasualPartitionInfo() pTok = strtok(NULL, " "); + if (pTok) + cpInfoMerge.colWidth = boost::lexical_cast(pTok); + else + { + //cout << "CP Entry : " << aEntry << endl; + throw (runtime_error("Bad column width in CP entry string")); + } + pTok = strtok(NULL, " "); + if (pTok) cpInfoMerge.newExtent = (atoi(pTok) != 0); else