You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sa...@apache.org on 2017/02/24 18:24:14 UTC
[4/5] incubator-trafodion git commit: review comment #2
review comment #2
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/2aeb4d1d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/2aeb4d1d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/2aeb4d1d
Branch: refs/heads/master
Commit: 2aeb4d1d8cb805f609dc89d7a316955e436a5442
Parents: 8c2ccd7
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Fri Feb 24 07:31:30 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Fri Feb 24 07:31:30 2017 +0000
----------------------------------------------------------------------
core/sql/cli/Cli.cpp | 1 +
core/sql/optimizer/NATable.cpp | 4 ++--
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 11 +++++++----
3 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2aeb4d1d/core/sql/cli/Cli.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Cli.cpp b/core/sql/cli/Cli.cpp
index 27c869e..bcefedf 100644
--- a/core/sql/cli/Cli.cpp
+++ b/core/sql/cli/Cli.cpp
@@ -10607,6 +10607,7 @@ Lng32 SQLCLI_LOBddlInterface
lobDebugInfo(logBuf,0,__LINE__,lobTrace);
char * query = new(currContext.exHeap()) char[4096];
char *hdfsServer = new(currContext.exHeap()) char[256];
+ strcpy(hdfsServer,lobHdfsServer);
switch (qType)
{
case LOB_CLI_CREATE:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2aeb4d1d/core/sql/optimizer/NATable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NATable.cpp b/core/sql/optimizer/NATable.cpp
index 35b9c84..496736a 100644
--- a/core/sql/optimizer/NATable.cpp
+++ b/core/sql/optimizer/NATable.cpp
@@ -5490,7 +5490,7 @@ NABoolean createNAFileSets(TrafDesc * table_desc /*IN*/,
tableConstructionHadWarnings_=TRUE;
char lobHdfsServer[256] ; // max length determined by dfs.namenode.fs-limits.max-component-length(255)
memset(lobHdfsServer,0,256);
- strncpy(lobHdfsServer,CmpCommon::getDefaultString(LOB_HDFS_SERVER), sizeof(lobHdfsServer));
+ strncpy(lobHdfsServer,CmpCommon::getDefaultString(LOB_HDFS_SERVER), sizeof(lobHdfsServer)-1);// leave a NULL terminator at the end.
Int32 lobHdfsPort = (Lng32)CmpCommon::getDefaultNumeric(LOB_HDFS_PORT);
if (hasLobColumn())
@@ -5535,7 +5535,7 @@ NABoolean createNAFileSets(TrafDesc * table_desc /*IN*/,
LOB_CLI_SELECT_CURSOR,
lobNumList,
lobTypList,
- lobLocList,lobColNameList,(char *)lobHdfsServer,lobHdfsPort,0,FALSE);
+ lobLocList,lobColNameList,lobHdfsServer,lobHdfsPort,0,FALSE);
if (cliRC == 0)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2aeb4d1d/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
index ba07e3b..a15b11c 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
@@ -2803,7 +2803,10 @@ short CmpSeabaseDDL::createSeabaseTable2(
}
- const char *lobHdfsServer = CmpCommon::getDefaultString(LOB_HDFS_SERVER);
+
+ char lobHdfsServer[256] ; // max length determined by dfs.namenode.fs-limits.max-component-length(255)
+ memset(lobHdfsServer,0,256);
+ strncpy(lobHdfsServer,CmpCommon::getDefaultString(LOB_HDFS_SERVER),sizeof(lobHdfsServer)-1);
Int32 lobHdfsPort = (Lng32)CmpCommon::getDefaultNumeric(LOB_HDFS_PORT);
if (j > 0)
@@ -2842,7 +2845,7 @@ short CmpSeabaseDDL::createSeabaseTable2(
lobTypList,
lobLocList,
lobColNameList,
- (char *)lobHdfsServer,
+ lobHdfsServer,
lobHdfsPort,
lobMaxSize,
lobTrace);
@@ -4278,7 +4281,7 @@ short CmpSeabaseDDL::dropSeabaseTable2(
char lobHdfsServer[256] ; // max length determined by dfs.namenode.fs-limits.max-component-length(255)
memset(lobHdfsServer,0,256);
- strncpy(lobHdfsServer,CmpCommon::getDefaultString(LOB_HDFS_SERVER),sizeof(lobHdfsServer));
+ strncpy(lobHdfsServer,CmpCommon::getDefaultString(LOB_HDFS_SERVER),sizeof(lobHdfsServer)-1);
Int32 lobHdfsPort = (Lng32)CmpCommon::getDefaultNumeric(LOB_HDFS_PORT);
Lng32 j = 0;
for (Int32 i = 0; i < nacolArr.entries(); i++)
@@ -4331,7 +4334,7 @@ short CmpSeabaseDDL::dropSeabaseTable2(
LOB_CLI_DROP,
lobNumList,
lobTypList,
- lobLocList,NULL,(char *)lobHdfsServer, lobHdfsPort,0,lobTrace);
+ lobLocList,NULL,lobHdfsServer, lobHdfsPort,0,lobTrace);
if (rc < 0)
{
*CmpCommon::diags() << DgSqlCode(-CAT_UNABLE_TO_DROP_OBJECT)