You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by an...@apache.org on 2016/10/07 23:05:44 UTC
[7/8] incubator-trafodion git commit: changes based on review comments
changes based on review comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/72487258
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/72487258
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/72487258
Branch: refs/heads/master
Commit: 72487258a9cffea46b41499853bb028773d41b9e
Parents: a164c4b
Author: Anoop Sharma <an...@esgyn.com>
Authored: Fri Oct 7 19:54:07 2016 +0000
Committer: Anoop Sharma <an...@esgyn.com>
Committed: Fri Oct 7 19:54:07 2016 +0000
----------------------------------------------------------------------
core/sql/cli/Statement.cpp | 3 +--
core/sql/comexe/CmpMessage.h | 25 +++++++++++++------------
core/sql/comexe/LateBindInfo.cpp | 6 ++++--
3 files changed, 18 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/72487258/core/sql/cli/Statement.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Statement.cpp b/core/sql/cli/Statement.cpp
index 910a473..93a03cb 100644
--- a/core/sql/cli/Statement.cpp
+++ b/core/sql/cli/Statement.cpp
@@ -2108,7 +2108,7 @@ RETCODE Statement::doHiveTableSimCheck(TrafSimilarityTableInfo *si,
if (retcode == 1) // check failed
{
- char errStr[200];
+ char errStr[2000];
str_sprintf(errStr, "compiledModTS = %Ld, failedModTS = %Ld, failedLoc = %s",
si->modTS(), failedModTS,
(failedLocBufLen > 0 ? failedLocBuf : si->hdfsRootDir()));
@@ -3396,7 +3396,6 @@ RETCODE Statement::execute(CliGlobals * cliGlobals, Descriptor * input_desc,
case RE_EXECUTE_:
{
- // save lnil & stuff
// if input descriptor was passed in at execute time, recreate
// the input data
// Setting the boolean reExecute to true, will cause the
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/72487258/core/sql/comexe/CmpMessage.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/CmpMessage.h b/core/sql/comexe/CmpMessage.h
index 8b5037d..7822fce 100644
--- a/core/sql/comexe/CmpMessage.h
+++ b/core/sql/comexe/CmpMessage.h
@@ -413,18 +413,19 @@ protected:
HBASE_DDL = 0x0800
};
- char * sqltext_; // 00-03
- Lng32 sqlTextLen_; // 04-07
- Lng32 unused_; // 12-15
- char * schemaName_; // 16-19
- Lng32 schemaNameLen_; // 20-23
- ULng32 inputArrayMaxsize_; // 24-27
- ULng32 flags_; // 28-31
-
- char * recompControlInfo_; // 32-35
- Lng32 recompControlInfoLen_; // 36-39
- Lng32 sqlTextCharSet_; // 40-43
- char fillerBytes_[FILLERSIZE]; // 44-99
+ char * sqltext_; // 00-07
+ Lng32 sqlTextLen_; // 08-11
+ Lng32 unused_; // 12-15
+ char * schemaName_; // 16-23
+ Lng32 schemaNameLen_; // 24-27
+ Lng32 unused2_; // 28-31
+ ULng32 inputArrayMaxsize_; // 32-35
+ ULng32 flags_; // 36-39
+
+ char * recompControlInfo_; // 40-43
+ Lng32 recompControlInfoLen_; // 44-47
+ Lng32 sqlTextCharSet_; // 48-51
+ char fillerBytes_[FILLERSIZE]; // 52-107
};
#pragma warn(1506) // warning elimination
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/72487258/core/sql/comexe/LateBindInfo.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/LateBindInfo.cpp b/core/sql/comexe/LateBindInfo.cpp
index 8574ea1..e96d75f 100644
--- a/core/sql/comexe/LateBindInfo.cpp
+++ b/core/sql/comexe/LateBindInfo.cpp
@@ -1064,7 +1064,8 @@ TrafSimilarityTableInfo::TrafSimilarityTableInfo(char * tableName,
hdfsRootDir_(hdfsRootDir),
modTS_(modTS), numPartnLevels_(numPartnLevels),
hdfsDirsToCheck_(hdfsDirsToCheck),
- hdfsHostName_(hdfsHostName), hdfsPort_(hdfsPort)
+ hdfsHostName_(hdfsHostName), hdfsPort_(hdfsPort),
+ flags_(0)
{
if (isHive)
setIsHive(TRUE);
@@ -1076,7 +1077,8 @@ TrafSimilarityTableInfo::TrafSimilarityTableInfo()
hdfsRootDir_(NULL),
modTS_(-1), numPartnLevels_(-1),
hdfsDirsToCheck_(NULL),
- hdfsHostName_(NULL), hdfsPort_(NULL)
+ hdfsHostName_(NULL), hdfsPort_(NULL),
+ flags_(0)
{
}