From 9f6edc66e3ee2aafea736ee409699791b87fdd37 Mon Sep 17 00:00:00 2001 From: Anuradha Hegde Date: Thu, 21 Jul 2016 18:19:14 +0000 Subject: [PATCH] [TRAFODION-2122] daily build master executor logs contain update statement exception Fixed the extra newline from sqcheck --- core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 2 +- core/sqf/sql/scripts/sqcheck | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp b/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp index 7623da12cc..d0ee5213ca 100644 --- a/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp +++ b/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp @@ -822,7 +822,7 @@ static void* SessionWatchDog(void* arg) ss << "OVF_BUFFER_BYTES_READ= " << pQueryUpdate->m_ovf_buffer_bytes_read << ","; ss << "NUM_NODES= " << pQueryUpdate->m_num_nodes << ","; ss << "UDR_PROCESS_BUSY_TIME= " << pQueryUpdate->m_udr_process_busy_time << ","; - ss << "PERTABLE_STATS= " << pQueryUpdate->m_pertable_stats; + ss << "PERTABLE_STATS= " << pQueryUpdate->m_pertable_stats << ","; ss << "LAST_UPDATED_TIME= CONVERTTIMESTAMP(" << lastUpdatedTime << ")"; ss << " where QUERY_ID = '" << pQueryUpdate->m_query_id.c_str() << "'"; ss << " and EXEC_START_UTC_TS = CONVERTTIMESTAMP(" << pQueryUpdate->m_exec_start_utc_ts << ")"; diff --git a/core/sqf/sql/scripts/sqcheck b/core/sqf/sql/scripts/sqcheck index a81ce92b71..c7b971ac0e 100755 --- a/core/sqf/sql/scripts/sqcheck +++ b/core/sqf/sql/scripts/sqcheck @@ -594,7 +594,7 @@ else echo -e "RMS\t\t$cfg_rms_cnt\t\t$act_rms_cnt\t ${down_rms[*]}" echo -e "DcsMaster\t$cfg_dcsmaster_cnt\t\t$actual_dcsmaster_cnt\t $down_dcsmaster_cnt" echo -e "DcsServer\t$cfg_dcsserver_cnt\t\t$actual_dcsserver_cnt\t $down_dcsserver_cnt" - echo -e "mxosrvr\t\t$cfg_mxo_cnt\t\t$act_mxo_cnt\t ${act_mxo_down_cnt}\n" + echo -e "mxosrvr\t\t$cfg_mxo_cnt\t\t$act_mxo_cnt\t ${act_mxo_down_cnt}" echo -e "RestServer\t$cfg_restserver_cnt\t\t$actual_restserver_cnt\t $down_restserver_cnt\n" elif [[ $sqck_component == "dtm" ]]; then echo -e "DTM\t\t$cfg_dtm_cnt\t\t$act_dtm_cnt\t ${down_dtms[*]}\n"