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 2017/03/13 20:03:15 UTC
[1/3] incubator-trafodion git commit: fix memory corruption caused by
Int32 vs Int64 in executeImmediate calls. (cherry picked from commit
dd2ad5c59c85882466c1c170e0edd6527a6d13a8)
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 2aac3f78b -> 03fd04081
fix memory corruption caused by Int32 vs Int64 in executeImmediate calls.
(cherry picked from commit dd2ad5c59c85882466c1c170e0edd6527a6d13a8)
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b281c923
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b281c923
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b281c923
Branch: refs/heads/master
Commit: b281c92336bde5985a032ef342047c8c01847163
Parents: a567996
Author: Prashanth Vasudev <va...@edev11.esgyn.local>
Authored: Sat Mar 4 04:08:16 2017 +0000
Committer: Prashant Vasudev <pr...@esgyn.com>
Committed: Mon Mar 13 07:16:37 2017 +0000
----------------------------------------------------------------------
core/sql/cli/Cli.cpp | 4 ++--
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 6 +++---
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b281c923/core/sql/cli/Cli.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Cli.cpp b/core/sql/cli/Cli.cpp
index bcefedf..ce40fae 100644
--- a/core/sql/cli/Cli.cpp
+++ b/core/sql/cli/Cli.cpp
@@ -9717,7 +9717,7 @@ Lng32 SQLCLI_LOBcliInterface
// set parserflags to allow ghost table
currContext.setSqlParserFlags(0x1);
- Lng32 numChunks = 0;
+ Int64 numChunks = 0;
Lng32 len;
cliRC = cliInterface->executeImmediate(query, (char*)&numChunks, &len, FALSE);
@@ -10366,7 +10366,7 @@ Lng32 SQLCLI_LOB_GC_Interface
// set parserflags to allow ghost table
currContext.setSqlParserFlags(0x1);
- Lng32 numEntries = 0;
+ Int64 numEntries = 0;
Lng32 len;
cliRC = cliInterface->executeImmediate(query, (char*)&numEntries, &len, FALSE);
str_sprintf(logBuf,"Number of entries in descchunktable %s is %d",lobDescChunksName, numEntries);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b281c923/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp b/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
index 933e91d..13e3f9a 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
@@ -9690,7 +9690,7 @@ Lng32 cliRC = 0;
fromOwnerID);
int32_t length = 0;
-int32_t rowCount = 0;
+Int64 rowCount = 0;
cliRC = cliInterface.executeImmediate(buf,(char*)&rowCount,&length,NULL);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b281c923/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp b/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp
index 046ece1..eb88c5b 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp
@@ -457,7 +457,7 @@ void CmpSeabaseDDL::dropSeabaseSchema(StmtDDLDropSchema * dropSchemaNode)
bool isVolatile = (memcmp(schName.data(),"VOLATILE_SCHEMA",strlen("VOLATILE_SCHEMA")) == 0);
int32_t length = 0;
- int32_t rowCount = 0;
+ Int64 rowCount = 0;
bool someObjectsCouldNotBeDropped = false;
char errorObjs[1010];
Queue * objectsQueue = NULL;
@@ -1006,7 +1006,7 @@ void CmpSeabaseDDL::alterSeabaseSchema(StmtDDLAlterSchema * alterSchemaNode)
bool isVolatile = (memcmp(schName.data(),"VOLATILE_SCHEMA",strlen("VOLATILE_SCHEMA")) == 0);
int32_t length = 0;
- int32_t rowCount = 0;
+ Int64 rowCount = 0;
bool someObjectsCouldNotBeAltered = false;
char errorObjs[1010];
Queue * objectsQueue = NULL;
@@ -1397,7 +1397,7 @@ char buf[4000];
catalogName.data(),schemaName.data(),newOwnerID);
int32_t length = 0;
-int32_t rowCount = 0;
+Int64 rowCount = 0;
cliRC = cliInterface.executeImmediate(buf,(char*)&rowCount,&length,NULL);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b281c923/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
index a15b11c..51cbef3 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
@@ -7791,7 +7791,7 @@ void CmpSeabaseDDL::alterSeabaseTableAddPKeyConstraint(
// this new primary key.
// Do this optimization in mode_special_4 only.
Lng32 len = 0;
- Lng32 rowCount = 0;
+ Int64 rowCount = 0;
NABoolean ms4 = FALSE;
if (CmpCommon::getDefault(MODE_SPECIAL_4) == DF_ON)
{
[3/3] incubator-trafodion git commit: Merge [TRAFODION-2523] PR 1006
Fix drop schema cascade memory corruption
Posted by db...@apache.org.
Merge [TRAFODION-2523] PR 1006 Fix drop schema cascade memory corruption
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/03fd0408
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/03fd0408
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/03fd0408
Branch: refs/heads/master
Commit: 03fd04081da9498505e538e5203580e6aac119ff
Parents: 2aac3f7 aff0f49
Author: Dave Birdsall <db...@apache.org>
Authored: Mon Mar 13 20:02:26 2017 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Mon Mar 13 20:02:26 2017 +0000
----------------------------------------------------------------------
core/sql/cli/Cli.cpp | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-trafodion git commit: fix review comments. (cherry
picked from commit 429f42604459874a1190d833fe9ec0e3666856d7)
Posted by db...@apache.org.
fix review comments.
(cherry picked from commit 429f42604459874a1190d833fe9ec0e3666856d7)
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/aff0f499
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/aff0f499
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/aff0f499
Branch: refs/heads/master
Commit: aff0f4991583e6cc663dc283ab58a0750c8b7c22
Parents: b281c92
Author: Prashant Vasudev <pr...@esgyn.com>
Authored: Sat Mar 4 12:45:36 2017 +0000
Committer: Prashant Vasudev <pr...@esgyn.com>
Committed: Mon Mar 13 07:17:17 2017 +0000
----------------------------------------------------------------------
core/sql/cli/Cli.cpp | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/aff0f499/core/sql/cli/Cli.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Cli.cpp b/core/sql/cli/Cli.cpp
index ce40fae..27e6b1e 100644
--- a/core/sql/cli/Cli.cpp
+++ b/core/sql/cli/Cli.cpp
@@ -9717,7 +9717,7 @@ Lng32 SQLCLI_LOBcliInterface
// set parserflags to allow ghost table
currContext.setSqlParserFlags(0x1);
- Int64 numChunks = 0;
+ Lng32 numChunks = 0;
Lng32 len;
cliRC = cliInterface->executeImmediate(query, (char*)&numChunks, &len, FALSE);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/aff0f499/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
index 51cbef3..a15b11c 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
@@ -7791,7 +7791,7 @@ void CmpSeabaseDDL::alterSeabaseTableAddPKeyConstraint(
// this new primary key.
// Do this optimization in mode_special_4 only.
Lng32 len = 0;
- Int64 rowCount = 0;
+ Lng32 rowCount = 0;
NABoolean ms4 = FALSE;
if (CmpCommon::getDefault(MODE_SPECIAL_4) == DF_ON)
{