You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2017/05/31 18:47:50 UTC
[49/50] [abbrv] incubator-trafodion git commit: Fixes addressing
multiple failure in SQL Regressions (core 116).
Fixes addressing multiple failure in SQL Regressions (core 116).
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/53148a77
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/53148a77
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/53148a77
Branch: refs/heads/master
Commit: 53148a772fc60d27154aad41e8a2ba8bfca0027e
Parents: b1f77f4
Author: Zalo Correa <za...@esgyn.com>
Authored: Thu May 25 17:07:11 2017 -0700
Committer: Zalo Correa <za...@esgyn.com>
Committed: Thu May 25 17:07:11 2017 -0700
----------------------------------------------------------------------
core/sqf/src/seabed/src/ms.cpp | 7 +++----
core/sqf/src/seabed/src/msmon.cpp | 2 ++
core/sqf/src/seatrans/tm/hbasetmlib2/idtmclicom.h | 6 ++++--
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLrepos.cpp | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLview.cpp | 4 ++--
7 files changed, 14 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/53148a77/core/sqf/src/seabed/src/ms.cpp
----------------------------------------------------------------------
diff --git a/core/sqf/src/seabed/src/ms.cpp b/core/sqf/src/seabed/src/ms.cpp
index f887547..28db69b 100644
--- a/core/sqf/src/seabed/src/ms.cpp
+++ b/core/sqf/src/seabed/src/ms.cpp
@@ -1391,11 +1391,11 @@ SB_THROWS_FATAL {
true, // args
&lv_cmdline,
lv_cmdline.size());
-#if 0
+
#ifdef SQ_PHANDLE_VERIFIER
- sprintf(&lv_line, "msg_init - p-id=%d/%d" PFVY ", tid=%ld, pname=%s, cmdline=%s, %s\n",
+ snprintf(&lv_line, sizeof(lv_line), "msg_init - p-id=%d/%d" PFVY ", tid=%ld, pname=%s, cmdline=%s, %s\n",
#else
- sprintf(&lv_line, "msg_init - p-id=%d/%d, tid=%ld, pname=%s, cmdline=%s, %s\n",
+ snprintf(&lv_line, sizeof(lv_line), "msg_init - p-id=%d/%d, tid=%ld, pname=%s, cmdline=%s, %s\n",
#endif
gv_ms_su_nid,
gv_ms_su_pid,
@@ -1406,7 +1406,6 @@ SB_THROWS_FATAL {
ga_ms_su_pname,
&lv_cmdline,
ms_seabed_vers());
-#endif
// setup timer module
sb_timer_init();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/53148a77/core/sqf/src/seabed/src/msmon.cpp
----------------------------------------------------------------------
diff --git a/core/sqf/src/seabed/src/msmon.cpp b/core/sqf/src/seabed/src/msmon.cpp
index 696375d..2e6a487 100644
--- a/core/sqf/src/seabed/src/msmon.cpp
+++ b/core/sqf/src/seabed/src/msmon.cpp
@@ -7145,6 +7145,8 @@ int msg_mon_send_process_info(const char *pp_where,
pp_msg->u.request.u.process_info.target_verifier = pv_verif;
#endif
pp_msg->u.request.u.process_info.type = static_cast<PROCESSTYPE>(pv_ptype);
+ ms_util_string_clear(pp_msg->u.request.u.process_info.target_process_pattern,
+ sizeof(pp_msg->u.request.u.process_info.target_process_pattern));
if (pp_name == NULL) {
ms_util_string_clear(pp_msg->u.request.u.process_info.target_process_name,
sizeof(pp_msg->u.request.u.process_info.target_process_name));
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/53148a77/core/sqf/src/seatrans/tm/hbasetmlib2/idtmclicom.h
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/idtmclicom.h b/core/sqf/src/seatrans/tm/hbasetmlib2/idtmclicom.h
index 5277bbb..53da50d 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/idtmclicom.h
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/idtmclicom.h
@@ -328,6 +328,8 @@ static int do_cli_open(JNIEnv *j_env, SB_Phandle_Type *pp_phandle, int *pp_oid)
int lv_hash;
int lv_scount;
+ if (gv_verbose)
+ printf("cli: do_cli_open() pid=%d\n", getpid());
lv_ferr = do_get_servers(&lp_pi, &lv_count);
if (lv_ferr == XZFIL_ERR_OK) {
lv_scount = do_get_servers2(lp_pi, lv_count, MAX_P, lp_snames);
@@ -448,8 +450,8 @@ static int do_get_servers2(MS_Mon_Process_Info_Type *pp_pi,
lv_scount = 0;
for (lv_inx = 0; lv_inx < pv_count; lv_inx++) {
lp_sname = pp_pi[lv_inx].process_name;
- if (gv_verbose)
- printf("cli(%d): sname=%s\n", getpid(), lp_sname);
+ if (gv_verbose)
+ printf("cli(%d): sname=%s\n", getpid(), lp_sname?lp_sname:"");
if (memcmp(lp_sname, "$TSID", 5) == 0) {
if (isdigit(lp_sname[5])) {
if (gv_verbose)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/53148a77/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp b/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
index fa61ab4..398bcb2 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
@@ -530,7 +530,7 @@ short CmpSeabaseDDL::processDDLandCreateDescs(
exprNode = parser.parseDML((const char*)gluedQuery, strlen(gluedQuery),
CharInfo::ISO88591);
- NADELETEBASIC(gluedQuery, STMTHEAP);
+ NADELETEBASICARRAY(gluedQuery, STMTHEAP);
if (! exprNode)
return resetCQDs(hbaseSerialization, hbVal, -1);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/53148a77/core/sql/sqlcomp/CmpSeabaseDDLrepos.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLrepos.cpp b/core/sql/sqlcomp/CmpSeabaseDDLrepos.cpp
index 20af639..55ea7d2 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLrepos.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLrepos.cpp
@@ -107,7 +107,7 @@ short CmpSeabaseDDL::createRepos(ExeCliInterface * cliInterface)
param_[1] = SEABASE_REPOS_SCHEMA;
str_sprintf(queryBuf, gluedQuery, param_[0], param_[1]);
- NADELETEBASIC(gluedQuery, STMTHEAP);
+ NADELETEBASICARRAY(gluedQuery, STMTHEAP);
if (beginXnIfNotInProgress(cliInterface, xnWasStartedHere))
goto label_error;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/53148a77/core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp b/core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp
index 67148e1..2ee9892 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp
@@ -1671,7 +1671,7 @@ short CmpSeabaseDDL::createLibmgrProcs(ExeCliInterface * cliInterface)
strlen(SEABASE_LIBMGR_LIBRARY) + gluedQuerySize + 200];
str_sprintf(queryBuf, gluedQuery, param_[0], param_[1], param_[2], param_[3], param_[4]);
- NADELETEBASIC(gluedQuery, STMTHEAP);
+ NADELETEBASICARRAY(gluedQuery, STMTHEAP);
cliRC = cliInterface->executeImmediate(queryBuf);
if (cliRC < 0)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/53148a77/core/sql/sqlcomp/CmpSeabaseDDLview.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLview.cpp b/core/sql/sqlcomp/CmpSeabaseDDLview.cpp
index e90596f..0b8a690 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLview.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLview.cpp
@@ -1494,7 +1494,7 @@ short CmpSeabaseDDL::createMetadataViews(ExeCliInterface * cliInterface)
}
else
{
- NADELETEBASIC(gluedQuery, STMTHEAP);
+ NADELETEBASICARRAY(gluedQuery, STMTHEAP);
continue;
}
@@ -1504,7 +1504,7 @@ short CmpSeabaseDDL::createMetadataViews(ExeCliInterface * cliInterface)
param_[10], param_[11], param_[12], param_[13], param_[14],
param_[15], param_[16], param_[17], param_[18]);
- NADELETEBASIC(gluedQuery, STMTHEAP);
+ NADELETEBASICARRAY(gluedQuery, STMTHEAP);
NABoolean xnWasStartedHere = FALSE;
if (beginXnIfNotInProgress(cliInterface, xnWasStartedHere))