You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/07/22 15:42:05 UTC
[1/2] incubator-trafodion git commit: [TRAFODION-2122] daily build
master executor logs contain update statement exception
Repository: incubator-trafodion
Updated Branches:
refs/heads/master d21d49043 -> d01cbaee8
[TRAFODION-2122] daily build master executor logs contain update statement exception
Fixed the extra newline from sqcheck
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/9f6edc66
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/9f6edc66
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/9f6edc66
Branch: refs/heads/master
Commit: 9f6edc66e3ee2aafea736ee409699791b87fdd37
Parents: 81a455e
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Thu Jul 21 18:19:14 2016 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Thu Jul 21 18:19:14 2016 +0000
----------------------------------------------------------------------
core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 2 +-
core/sqf/sql/scripts/sqcheck | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9f6edc66/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp b/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp
index 7623da1..d0ee521 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 << ")";
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9f6edc66/core/sqf/sql/scripts/sqcheck
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqcheck b/core/sqf/sql/scripts/sqcheck
index a81ce92..c7b971a 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"
[2/2] incubator-trafodion git commit: Merge [TRAFODION-2122] PR 613
Fix update statement exception
Posted by db...@apache.org.
Merge [TRAFODION-2122] PR 613 Fix update statement exception
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d01cbaee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d01cbaee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d01cbaee
Branch: refs/heads/master
Commit: d01cbaee817e7adc6b5a058efcc8881ebe9fd25d
Parents: d21d490 9f6edc6
Author: Dave Birdsall <db...@apache.org>
Authored: Fri Jul 22 15:41:09 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Fri Jul 22 15:41:09 2016 +0000
----------------------------------------------------------------------
core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 2 +-
core/sqf/sql/scripts/sqcheck | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------