From 0a495b174248170253325ad3efa4560199bb42e6 Mon Sep 17 00:00:00 2001 From: benthompson15 Date: Fri, 12 Jun 2020 18:14:21 -0500 Subject: [PATCH] MCOL-4033: add columnstore version to header of output files. --- oamapps/columnstoreSupport/columnstoreSupport.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/oamapps/columnstoreSupport/columnstoreSupport.cpp b/oamapps/columnstoreSupport/columnstoreSupport.cpp index 02b71785f..b5a9eb441 100644 --- a/oamapps/columnstoreSupport/columnstoreSupport.cpp +++ b/oamapps/columnstoreSupport/columnstoreSupport.cpp @@ -35,6 +35,7 @@ #include "configcpp.h" #include "installdir.h" #include "mcsSupportUtil.h" +#include "columnstoreversion.h" using namespace std; using namespace oam; @@ -105,13 +106,14 @@ void childReportThread(threadInfo_t& st) "\n" " System %s\n" " columnstoreSupportReport script ran from Module %s on %s\n" + " SoftwareVersion = %s-%s" "\n" "********************************************************************************\n" "\n" " %s report\n" "\n" "********************************************************************************\n", - systemName.c_str(),localModule.c_str(),currentDate.c_str(),reportType.c_str()); + systemName.c_str(),localModule.c_str(),currentDate.c_str(),columnstore_version.c_str(),columnstore_release.c_str(),reportType.c_str()); } cout << "Get " + reportType + " report data for " + remoteModuleName + " " << endl; @@ -166,13 +168,14 @@ void reportThread(string reporttype) "\n" " System %s\n" " columnstoreSupportReport script ran from Module %s on %s\n" + " SoftwareVersion = %s-%s" "\n" "********************************************************************************\n" "\n" " %s report\n" "\n" "********************************************************************************\n", - systemName.c_str(),localModule.c_str(),currentDate.c_str(),reportType.c_str()); + systemName.c_str(),localModule.c_str(),currentDate.c_str(),columnstore_version.c_str(),columnstore_release.c_str(),reportType.c_str()); fclose(pOutputFile); // run on child servers and get report @@ -750,13 +753,14 @@ int main(int argc, char* argv[]) "\n" " System %s\n" " columnstoreSupportReport script ran from Module %s on %s\n" + " SoftwareVersion = %s-%s" "\n" "********************************************************************************\n" "\n" " DBMS report\n" "\n" "********************************************************************************\n", - systemName.c_str(),localModule.c_str(),currentDate.c_str()); + systemName.c_str(),localModule.c_str(),currentDate.c_str(),columnstore_version.c_str(),columnstore_release.c_str()); fclose(pOutputFile);