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/02/23 00:28:11 UTC
[1/2] incubator-trafodion git commit: [TRAFODION-1838] Send CQDs down
to child process on CREATE TABLE LIKE
Repository: incubator-trafodion
Updated Branches:
refs/heads/master c87d4c1f6 -> e46493afd
[TRAFODION-1838] Send CQDs down to child process on CREATE TABLE LIKE
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/5c302fd5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/5c302fd5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/5c302fd5
Branch: refs/heads/master
Commit: 5c302fd5b67313b538dcc0feba7a644b84e9a7db
Parents: 766c62e
Author: Dave Birdsall <db...@apache.org>
Authored: Sat Feb 20 01:07:43 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Sat Feb 20 01:07:43 2016 +0000
----------------------------------------------------------------------
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 3 +++
core/sql/ustat/hs_update.cpp | 3 +--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5c302fd5/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
index 4f8d7a7..7a0498d 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
@@ -356,6 +356,9 @@ void CmpSeabaseDDL::createSeabaseTableLike(
query += keyClause;
}
+ // send any user CQDs down
+ Lng32 retCode = sendAllControls(FALSE, FALSE, TRUE);
+
ExeCliInterface cliInterface(STMTHEAP, NULL, NULL,
CmpCommon::context()->sqlSession()->getParentQid());
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5c302fd5/core/sql/ustat/hs_update.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_update.cpp b/core/sql/ustat/hs_update.cpp
index 5b2471d..29f054b 100644
--- a/core/sql/ustat/hs_update.cpp
+++ b/core/sql/ustat/hs_update.cpp
@@ -355,7 +355,6 @@ Lng32 UpdateStats(char *input, NABoolean requestedByCompiler)
LM->Log(LM->msg);
}
- char *buf = new (CmpCommon::statementHeap()) char[allowedCqdsSize];
char* filterString = new (STMTHEAP) char[allowedCqdsSize+1];
// We need to make a copy of the CQD value here since strtok
// overwrites delims with nulls in stored cqd value.
@@ -377,6 +376,7 @@ Lng32 UpdateStats(char *input, NABoolean requestedByCompiler)
{
NAString quotedString;
ToQuotedString (quotedString, value);
+ char buf[strlen(name)+quotedString.length()+4+1+1+1]; // room for "CQD %s %s;" and null terminator
sprintf(buf, "CQD %s %s;", name, quotedString.data());
retcode = HSFuncExecQuery(buf);
@@ -387,7 +387,6 @@ Lng32 UpdateStats(char *input, NABoolean requestedByCompiler)
}
NADELETEBASIC(filterString, STMTHEAP);
- NADELETEBASIC(buf, STMTHEAP);
}
else // size is zero or too large
{
[2/2] incubator-trafodion git commit: Merge [TRAFODION-1838] PR 333
Fix UPDATE STATS problem with nullable key
Posted by db...@apache.org.
Merge [TRAFODION-1838] PR 333 Fix UPDATE STATS problem with nullable key
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/e46493af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/e46493af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/e46493af
Branch: refs/heads/master
Commit: e46493afde634026f9e8011cbb85af6ec90ea0ac
Parents: c87d4c1 5c302fd
Author: Dave Birdsall <db...@apache.org>
Authored: Mon Feb 22 23:27:26 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Mon Feb 22 23:27:26 2016 +0000
----------------------------------------------------------------------
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 3 +++
core/sql/ustat/hs_update.cpp | 3 +--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------