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 2018/04/07 00:42:02 UTC
[1/4] trafodion git commit: Merge remote branch 'origin/master' into
ansharma_trafixes_deliver2_br
Repository: trafodion
Updated Branches:
refs/heads/master 995e8a090 -> 6ca1d0f14
Merge remote branch 'origin/master' into ansharma_trafixes_deliver2_br
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/2167123e
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/2167123e
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/2167123e
Branch: refs/heads/master
Commit: 2167123e6aebdca754bcf49a2523a958b7823c73
Parents: 43984c4 3edf1f6
Author: Anoop Sharma <an...@esgyn.com>
Authored: Thu Apr 5 20:30:40 2018 +0000
Committer: Anoop Sharma <an...@esgyn.com>
Committed: Thu Apr 5 20:30:40 2018 +0000
----------------------------------------------------------------------
core/sql/common/ComResWords.cpp | 2 --
core/sql/parser/sqlparser.y | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/2167123e/core/sql/parser/sqlparser.y
----------------------------------------------------------------------
[2/4] trafodion git commit: review changes from PR 1502,
plus jenkins compGeneral crash fix
Posted by an...@apache.org.
review changes from PR 1502, plus jenkins compGeneral crash fix
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/bad90592
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/bad90592
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/bad90592
Branch: refs/heads/master
Commit: bad905922f8e4817b3dff0f1fd06f0e9f115de6f
Parents: 2167123
Author: Anoop Sharma <an...@esgyn.com>
Authored: Fri Apr 6 17:42:24 2018 +0000
Committer: Anoop Sharma <an...@esgyn.com>
Committed: Fri Apr 6 17:42:24 2018 +0000
----------------------------------------------------------------------
core/sql/comexe/ComTdbExeUtil.h | 14 +++++++++-----
core/sql/common/NAType.h | 4 ++--
core/sql/executor/ExExeUtilGet.cpp | 30 ++++++++++++++++--------------
core/sql/optimizer/BindItemExpr.cpp | 4 ++++
core/sql/optimizer/ValueDesc.cpp | 2 +-
5 files changed, 32 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/bad90592/core/sql/comexe/ComTdbExeUtil.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbExeUtil.h b/core/sql/comexe/ComTdbExeUtil.h
index 9024afe..7275a15 100644
--- a/core/sql/comexe/ComTdbExeUtil.h
+++ b/core/sql/comexe/ComTdbExeUtil.h
@@ -3179,18 +3179,22 @@ struct HiveMDTablesColInfoStruct
char hiveTableType[128];
};
+#define HIVEMD_DATA_TYPE_LEN 32
+#define HIVEMD_DISPLAY_DATA_TYPE_LEN 96
+#define HIVEMD_CHARSET_LEN 40
+#define HIVEMD_DT_QUALIFIER_LEN 28
static const ComTdbVirtTableColumnInfo hiveMDColumnsColInfo[] =
{
{ "CATALOG_NAME", 0, COM_USER_COLUMN, REC_BYTE_F_ASCII, 256, FALSE, SQLCHARSETCODE_UTF8, 0, 0, 0, 0, 0, 0, 0, COM_NO_DEFAULT, "" ,NULL,NULL,COM_UNKNOWN_DIRECTION_LIT, 0},
{ "SCHEMA_NAME", 1, COM_USER_COLUMN, REC_BYTE_F_ASCII, 256, FALSE, SQLCHARSETCODE_UTF8, 0, 0, 0, 0, 0, 0, 0, COM_NO_DEFAULT, "" ,NULL,NULL,COM_UNKNOWN_DIRECTION_LIT, 0},
{ "TABLE_NAME", 2, COM_USER_COLUMN, REC_BYTE_F_ASCII, 256, FALSE, SQLCHARSETCODE_UTF8, 0, 0, 0, 0, 0, 0, 0, COM_NO_DEFAULT, "" ,NULL,NULL,COM_UNKNOWN_DIRECTION_LIT, 0},
{ "COLUMN_NAME", 3, COM_USER_COLUMN, REC_BYTE_F_ASCII, 256, FALSE, SQLCHARSETCODE_UTF8, 0, 0, 0, 0, 0, 0, 0, COM_NO_DEFAULT, "" ,NULL,NULL,COM_UNKNOWN_DIRECTION_LIT, 0},
- { "SQL_DATA_TYPE", 4, COM_USER_COLUMN, REC_BYTE_F_ASCII, 32, FALSE, SQLCHARSETCODE_ISO88591, 0, 0, 0, 0, 0, 0, 0, COM_NO_DEFAULT, "" ,NULL,NULL,COM_UNKNOWN_DIRECTION_LIT, 0},
+ { "SQL_DATA_TYPE", 4, COM_USER_COLUMN, REC_BYTE_F_ASCII, HIVEMD_DATA_TYPE_LEN, FALSE, SQLCHARSETCODE_ISO88591, 0, 0, 0, 0, 0, 0, 0, COM_NO_DEFAULT, "" ,NULL,NULL,COM_UNKNOWN_DIRECTION_LIT, 0},
{ "FS_DATA_TYPE", 5, COM_USER_COLUMN, REC_BIN32_SIGNED, 4, FALSE, SQLCHARSETCODE_UNKNOWN, 0, 0, 0, 0, 0, 0, 0, COM_NO_DEFAULT, "" ,NULL,NULL,COM_UNKNOWN_DIRECTION_LIT, 0},
- { "DISPLAY_DATA_TYPE", 6, COM_USER_COLUMN, REC_BYTE_F_ASCII, 96, FALSE, SQLCHARSETCODE_ISO88591, 0, 0, 0, 0, 0, 0, 0, COM_NO_DEFAULT, "" ,NULL,NULL,COM_UNKNOWN_DIRECTION_LIT, 0},
- { "HIVE_DATA_TYPE", 7, COM_USER_COLUMN, REC_BYTE_F_ASCII, 32, FALSE, SQLCHARSETCODE_ISO88591, 0, 0, 0, 0, 0, 0, 0, COM_NO_DEFAULT, "" ,NULL,NULL,COM_UNKNOWN_DIRECTION_LIT, 0},
+ { "DISPLAY_DATA_TYPE", 6, COM_USER_COLUMN, REC_BYTE_F_ASCII, HIVEMD_DISPLAY_DATA_TYPE_LEN, FALSE, SQLCHARSETCODE_ISO88591, 0, 0, 0, 0, 0, 0, 0, COM_NO_DEFAULT, "" ,NULL,NULL,COM_UNKNOWN_DIRECTION_LIT, 0},
+ { "HIVE_DATA_TYPE", 7, COM_USER_COLUMN, REC_BYTE_F_ASCII, HIVEMD_DATA_TYPE_LEN, FALSE, SQLCHARSETCODE_ISO88591, 0, 0, 0, 0, 0, 0, 0, COM_NO_DEFAULT, "" ,NULL,NULL,COM_UNKNOWN_DIRECTION_LIT, 0},
{ "COLUMN_SIZE", 8, COM_USER_COLUMN, REC_BIN32_SIGNED, 4, FALSE, SQLCHARSETCODE_UNKNOWN, 0, 0, 0, 0, 0, 0, 0, COM_NO_DEFAULT, "" ,NULL,NULL,COM_UNKNOWN_DIRECTION_LIT, 0},
- { "CHARACTER_SET", 9, COM_USER_COLUMN, REC_BYTE_F_ASCII, 40, FALSE, SQLCHARSETCODE_ISO88591, 0, 0, 0, 0, 0, 0, 0, COM_NO_DEFAULT, "" ,NULL,NULL,COM_UNKNOWN_DIRECTION_LIT, 0},
+ { "CHARACTER_SET", 9, COM_USER_COLUMN, REC_BYTE_F_ASCII, HIVEMD_CHARSET_LEN, FALSE, SQLCHARSETCODE_ISO88591, 0, 0, 0, 0, 0, 0, 0, COM_NO_DEFAULT, "" ,NULL,NULL,COM_UNKNOWN_DIRECTION_LIT, 0},
{ "COLUMN_PRECISION", 10, COM_USER_COLUMN, REC_BIN32_SIGNED, 4, FALSE, SQLCHARSETCODE_UNKNOWN, 0, 0, 0, 0, 0, 0, 0, COM_NO_DEFAULT, "" ,NULL,NULL,COM_UNKNOWN_DIRECTION_LIT, 0},
{ "COLUMN_SCALE", 11, COM_USER_COLUMN, REC_BIN32_SIGNED, 4, FALSE, SQLCHARSETCODE_UNKNOWN, 0, 0, 0, 0, 0, 0, 0, COM_NO_DEFAULT, "" ,NULL,NULL,COM_UNKNOWN_DIRECTION_LIT, 0},
{ "DT_CODE", 12, COM_USER_COLUMN, REC_BIN32_SIGNED, 4, FALSE, SQLCHARSETCODE_UNKNOWN, 0, 0, 0, 0, 0, 0, 0, COM_NO_DEFAULT, "" ,NULL,NULL,COM_UNKNOWN_DIRECTION_LIT, 0},
@@ -3199,7 +3203,7 @@ static const ComTdbVirtTableColumnInfo hiveMDColumnsColInfo[] =
{ "PART_COL_NUMBER", 15, COM_USER_COLUMN, REC_BIN32_SIGNED, 4, FALSE, SQLCHARSETCODE_UNKNOWN, 0, 0, 0, 0, 0, 0, 0, COM_NO_DEFAULT, "" ,NULL,NULL,COM_UNKNOWN_DIRECTION_LIT, 0},
{ "BUCKET_COL_NUMBER", 16, COM_USER_COLUMN, REC_BIN32_SIGNED, 4, FALSE, SQLCHARSETCODE_UNKNOWN, 0, 0, 0, 0, 0, 0, 0, COM_NO_DEFAULT, "" ,NULL,NULL,COM_UNKNOWN_DIRECTION_LIT, 0},
{ "SORT_COL_NUMBER", 17, COM_USER_COLUMN, REC_BIN32_SIGNED, 4, FALSE, SQLCHARSETCODE_UNKNOWN, 0, 0, 0, 0, 0, 0, 0, COM_NO_DEFAULT, "" ,NULL,NULL,COM_UNKNOWN_DIRECTION_LIT, 0},
- { "DATETIME_QUALIFIER", 18, COM_USER_COLUMN, REC_BYTE_F_ASCII, 28, FALSE, SQLCHARSETCODE_ISO88591, 0, 0, 0, 0, 0, 0, 0, COM_NO_DEFAULT, "" ,NULL,NULL,COM_UNKNOWN_DIRECTION_LIT, 0},
+ { "DATETIME_QUALIFIER", 18, COM_USER_COLUMN, REC_BYTE_F_ASCII, HIVEMD_DT_QUALIFIER_LEN, FALSE, SQLCHARSETCODE_ISO88591, 0, 0, 0, 0, 0, 0, 0, COM_NO_DEFAULT, "" ,NULL,NULL,COM_UNKNOWN_DIRECTION_LIT, 0},
{ "DATETIME_START_FIELD", 19, COM_USER_COLUMN, REC_BIN32_SIGNED, 4, FALSE, SQLCHARSETCODE_UNKNOWN, 0, 0, 0, 0, 0, 0, 0, COM_NO_DEFAULT, "" ,NULL,NULL,COM_UNKNOWN_DIRECTION_LIT, 0},
{ "DATETIME_END_FIELD", 20, COM_USER_COLUMN, REC_BIN32_SIGNED, 4, FALSE, SQLCHARSETCODE_UNKNOWN, 0, 0, 0, 0, 0, 0, 0, COM_NO_DEFAULT, "" ,NULL,NULL,COM_UNKNOWN_DIRECTION_LIT, 0},
{ "DEFAULT_VALUE", 21, COM_USER_COLUMN, REC_BYTE_F_ASCII, 240, FALSE, SQLCHARSETCODE_UTF8, 0, 0, 0, 0, 0, 0, 0, COM_NO_DEFAULT, "" ,NULL,NULL,COM_UNKNOWN_DIRECTION_LIT, 0},
http://git-wip-us.apache.org/repos/asf/trafodion/blob/bad90592/core/sql/common/NAType.h
----------------------------------------------------------------------
diff --git a/core/sql/common/NAType.h b/core/sql/common/NAType.h
index 7b719a9..3fafd94 100644
--- a/core/sql/common/NAType.h
+++ b/core/sql/common/NAType.h
@@ -561,9 +561,9 @@ public:
const char * displaydatatype,
short displayCaseSpecific = 0);
- short getMyTypeAsText(NAString * outputStr,
+ short getMyTypeAsText(NAString * outputStr, // output
NABoolean addNullability = TRUE,
- NABoolean addCollation = TRUE) const; // output
+ NABoolean addCollation = TRUE) const;
short getMyTypeAsHiveText(NAString * outputStr) const; // output
http://git-wip-us.apache.org/repos/asf/trafodion/blob/bad90592/core/sql/executor/ExExeUtilGet.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExExeUtilGet.cpp b/core/sql/executor/ExExeUtilGet.cpp
index 4428998..1dc3109 100644
--- a/core/sql/executor/ExExeUtilGet.cpp
+++ b/core/sql/executor/ExExeUtilGet.cpp
@@ -5837,9 +5837,11 @@ short ExExeUtilHiveMDaccessTcb::work()
Lng32 length = -1;
Lng32 precision = -1;
Lng32 scale = -1;
- char sqlType[50];
- char displayType[100];
- char charset[50];
+
+ // HIVEMD defines used below are defined in ComTdbExeUtil.h
+ char sqlType[HIVEMD_DATA_TYPE_LEN+1];
+ char displayType[HIVEMD_DISPLAY_DATA_TYPE_LEN+1];
+ char charset[HIVEMD_CHARSET_LEN+1];
retcode =
getTypeAttrsFromHiveColType(hcd ? hcd->type_ : hpd->type_,
htd->getSDs()->isOrcFile(),
@@ -5849,11 +5851,11 @@ short ExExeUtilHiveMDaccessTcb::work()
if (retcode < 0)
{
// add a warning and continue.
- char strP[300];
- sprintf(strP, "Datatype %s for column '%s' in table %s.%s.%s is not supported. This table will be ignored.",
- (hcd ? hcd->type_ : hpd->type_),
- (hcd ? hcd->name_ : hpd->name_),
- hiveCat_, hiveSch_, htd->tblName_);
+ char strP[1001];
+ snprintf(strP, 1000, "Datatype %s for column '%s' in table %s.%s.%s is not supported. This table will be ignored.",
+ (hcd ? hcd->type_ : hpd->type_),
+ (hcd ? hcd->name_ : hpd->name_),
+ hiveCat_, hiveSch_, htd->tblName_);
*diags << DgSqlCode(CLI_GET_METADATA_INFO_ERROR)
<< DgString0(strP);
@@ -5863,20 +5865,20 @@ short ExExeUtilHiveMDaccessTcb::work()
infoCol->fsDatatype = fstype;
- str_cpy(infoCol->sqlDatatype, sqlType, 32, ' ');
+ str_cpy(infoCol->sqlDatatype, sqlType, HIVEMD_DATA_TYPE_LEN, ' ');
- str_cpy(infoCol->displayDatatype, displayType, 96, ' ');
+ str_cpy(infoCol->displayDatatype, displayType, HIVEMD_DISPLAY_DATA_TYPE_LEN, ' ');
str_cpy(infoCol->hiveDatatype, (hcd ? hcd->type_ : hpd->type_),
- 32, ' ');
+ HIVEMD_DATA_TYPE_LEN, ' ');
infoCol->colSize = length;
infoCol->colPrecision = precision;
infoCol->colScale = scale;
- str_pad(infoCol->charSet, 40, ' ');
+ str_pad(infoCol->charSet, HIVEMD_CHARSET_LEN, ' ');
if (strlen(charset) > 0)
- str_cpy(infoCol->charSet, charset, 40, ' ');
+ str_cpy(infoCol->charSet, charset, HIVEMD_CHARSET_LEN, ' ');
infoCol->nullable = 1;
@@ -5898,7 +5900,7 @@ short ExExeUtilHiveMDaccessTcb::work()
{
infoCol->dtCode = SQLDTCODE_DATE;
infoCol->colScale = 0;
- str_pad(infoCol->dtQualifier, 28, ' ');
+ str_pad(infoCol->dtQualifier, HIVEMD_DT_QUALIFIER_LEN, ' ');
infoCol->dtStartField = 1;
infoCol->dtEndField = 3;
}
http://git-wip-us.apache.org/repos/asf/trafodion/blob/bad90592/core/sql/optimizer/BindItemExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/BindItemExpr.cpp b/core/sql/optimizer/BindItemExpr.cpp
index cc25f93..cf57706 100644
--- a/core/sql/optimizer/BindItemExpr.cpp
+++ b/core/sql/optimizer/BindItemExpr.cpp
@@ -8894,12 +8894,14 @@ ItemExpr *PositionFunc::bindNode(BindWA *bindWA)
if (type3.getTypeQualifier() != NA_NUMERIC_TYPE) {
// 4053 The third operand of a POSITION function must be numeric.
*CmpCommon::diags() << DgSqlCode(-4053) << DgString0(getTextUpper());
+ bindWA->setErrStatus();
return NULL;
}
if (((NumericType&)type3).getScale() != 0) {
// 4047 The third operand of a POSITION function must have a scale of 0.
*CmpCommon::diags() << DgSqlCode(-4047) << DgString0(getTextUpper());
+ bindWA->setErrStatus();
return NULL;
}
@@ -8927,12 +8929,14 @@ ItemExpr *PositionFunc::bindNode(BindWA *bindWA)
if (type4.getTypeQualifier() != NA_NUMERIC_TYPE) {
// 4053 The third operand of a POSITION function must be numeric.
*CmpCommon::diags() << DgSqlCode(-4053) << DgString0(getTextUpper());
+ bindWA->setErrStatus();
return NULL;
}
if (((NumericType&)type4).getScale() != 0) {
// 4047 The third operand of a POSITION function must have a scale of 0.
*CmpCommon::diags() << DgSqlCode(-4047) << DgString0(getTextUpper());
+ bindWA->setErrStatus();
return NULL;
}
http://git-wip-us.apache.org/repos/asf/trafodion/blob/bad90592/core/sql/optimizer/ValueDesc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ValueDesc.cpp b/core/sql/optimizer/ValueDesc.cpp
index a39040f..a1ed3ff 100644
--- a/core/sql/optimizer/ValueDesc.cpp
+++ b/core/sql/optimizer/ValueDesc.cpp
@@ -6394,7 +6394,7 @@ void ValueIdList::convertToTextKey(const ValueIdList& keyList, NAString& result)
constType->getScale(),
0);
- char strval[100];
+ char strval[t+1];
memset( strval, ' ', t );
// Get the ASCII representation
[4/4] trafodion git commit: PR-1507 Changes after PR 1502 review,
plus jenkins compGeneral crash fix
Posted by an...@apache.org.
PR-1507 Changes after PR 1502 review, plus jenkins compGeneral crash fix
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/6ca1d0f1
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/6ca1d0f1
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/6ca1d0f1
Branch: refs/heads/master
Commit: 6ca1d0f148140aebdde045ad1b37287f0ee72a54
Parents: 995e8a0 f94a381
Author: Anoop Sharma <an...@esgyn.com>
Authored: Sat Apr 7 00:41:45 2018 +0000
Committer: Anoop Sharma <an...@esgyn.com>
Committed: Sat Apr 7 00:41:45 2018 +0000
----------------------------------------------------------------------
core/sql/comexe/ComTdbExeUtil.h | 14 +++++++++-----
core/sql/common/NAType.h | 4 ++--
core/sql/executor/ExExeUtilGet.cpp | 24 +++++++++++++-----------
core/sql/optimizer/BindItemExpr.cpp | 4 ++++
core/sql/optimizer/ValueDesc.cpp | 2 +-
5 files changed, 29 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6ca1d0f1/core/sql/optimizer/BindItemExpr.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6ca1d0f1/core/sql/optimizer/ValueDesc.cpp
----------------------------------------------------------------------
[3/4] trafodion git commit: Merge remote branch 'origin/master' into
ansharma_trafixes_deliver2_br
Posted by an...@apache.org.
Merge remote branch 'origin/master' into ansharma_trafixes_deliver2_br
Conflicts:
core/sql/executor/ExExeUtilGet.cpp
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/f94a381f
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/f94a381f
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/f94a381f
Branch: refs/heads/master
Commit: f94a381fe15b0e01c13c65efd761e43e26d6b503
Parents: bad9059 ee2cff9
Author: Anoop Sharma <an...@esgyn.com>
Authored: Fri Apr 6 19:53:18 2018 +0000
Committer: Anoop Sharma <an...@esgyn.com>
Committed: Fri Apr 6 19:53:18 2018 +0000
----------------------------------------------------------------------
core/sql/arkcmp/CmpContext.cpp | 52 --
core/sql/arkcmp/CmpContext.h | 3 -
core/sql/bin/SqlciErrors.txt | 2 +-
core/sql/cli/Cli.cpp | 3 +-
core/sql/cli/Context.cpp | 11 +-
core/sql/cli/Globals.cpp | 2 +-
core/sql/common/CharType.cpp | 2 +-
core/sql/common/CharType.h | 27 +-
core/sql/executor/ExExeUtil.h | 8 +-
core/sql/executor/ExExeUtilCli.cpp | 165 ++++---
core/sql/executor/ExExeUtilCli.h | 19 +-
core/sql/executor/ExExeUtilCommon.cpp | 47 +-
core/sql/executor/ExExeUtilExplain.cpp | 38 +-
core/sql/executor/ExExeUtilGet.cpp | 160 +++----
core/sql/executor/ExExeUtilGetStats.cpp | 9 +-
core/sql/executor/ExExeUtilLoad.cpp | 181 ++++---
core/sql/executor/ExExeUtilMisc.cpp | 144 +++---
core/sql/executor/ExExeUtilVolTab.cpp | 29 +-
core/sql/executor/ExHdfsScan.cpp | 17 +-
core/sql/executor/ExHdfsScan.h | 1 +
core/sql/executor/HBaseClient_JNI.cpp | 472 ------------------
core/sql/executor/HBaseClient_JNI.h | 91 +---
core/sql/executor/HdfsClient_JNI.cpp | 2 +-
core/sql/executor/HiveClient_JNI.cpp | 473 +++++++++++++++++++
core/sql/executor/HiveClient_JNI.h | 106 +++++
core/sql/executor/JavaObjectInterface.cpp | 2 +-
core/sql/executor/ex_root.cpp | 20 -
core/sql/executor/hiveHook.cpp | 60 +--
core/sql/exp/ExpError.cpp | 14 +
core/sql/exp/ExpError.h | 9 +
core/sql/exp/ExpHbaseInterface.h | 1 +
core/sql/exp/ExpLOBaccess.cpp | 27 +-
core/sql/exp/ExpLOBinterface.cpp | 5 +-
core/sql/exp/exp_attrs.cpp | 12 +-
core/sql/exp/exp_attrs.h | 6 +-
core/sql/exp/exp_function.cpp | 8 +-
core/sql/generator/GenExpGenerator.cpp | 7 +-
core/sql/generator/GenRelExeUtil.cpp | 5 +-
core/sql/generator/GenRelJoin.cpp | 8 +-
core/sql/generator/GenRelPackedRows.cpp | 7 +-
core/sql/generator/Generator.h | 1 +
core/sql/nskgmake/executor/Makefile | 1 +
core/sql/optimizer/BindItemExpr.cpp | 12 +-
core/sql/optimizer/ItemFunc.h | 34 +-
core/sql/optimizer/NATable.cpp | 2 +-
core/sql/optimizer/NormRelExpr.cpp | 5 +-
core/sql/optimizer/ObjectNames.cpp | 2 +-
core/sql/optimizer/OptimizerSimulator.cpp | 47 +-
core/sql/optimizer/SynthType.cpp | 8 +-
core/sql/optimizer/hiveHook.h | 11 -
core/sql/parser/sqlparser.y | 4 +-
core/sql/qmscommon/QRLogger.cpp | 2 +-
core/sql/sqlcomp/CmpDescribe.cpp | 4 +-
core/sql/sqlcomp/CmpMain.cpp | 8 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 3 +-
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 12 +-
core/sql/sqlcomp/PrivMgrComponentPrivileges.cpp | 5 +-
core/sql/sqlcomp/PrivMgrMDTable.cpp | 4 +-
core/sql/sqlcomp/nadefaults.cpp | 68 +--
.../main/java/org/trafodion/sql/HiveClient.java | 95 ++--
60 files changed, 1225 insertions(+), 1358 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f94a381f/core/sql/executor/ExExeUtilGet.cpp
----------------------------------------------------------------------
diff --cc core/sql/executor/ExExeUtilGet.cpp
index 1dc3109,97815ef..bf938c3
--- a/core/sql/executor/ExExeUtilGet.cpp
+++ b/core/sql/executor/ExExeUtilGet.cpp
@@@ -5851,14 -5836,14 +5838,14 @@@ short ExExeUtilHiveMDaccessTcb::work(
if (retcode < 0)
{
// add a warning and continue.
- char strP[300];
- sprintf(strP, "Datatype %s for column '%s' in table %s.%s.%s is not supported. This table will be ignored.",
+ char strP[1001];
+ snprintf(strP, 1000, "Datatype %s for column '%s' in table %s.%s.%s is not supported. This table will be ignored.",
- (hcd ? hcd->type_ : hpd->type_),
- (hcd ? hcd->name_ : hpd->name_),
- hiveCat_, hiveSch_, htd->tblName_);
- *diags << DgSqlCode(CLI_GET_METADATA_INFO_ERROR)
- << DgString0(strP);
-
+ (hcd ? hcd->type_ : hpd->type_),
+ (hcd ? hcd->name_ : hpd->name_),
+ hiveCat_, hiveSch_, htd->tblName_);
+ ExRaiseSqlError(getHeap(), &diagsArea_, CLI_GET_METADATA_INFO_ERROR,
+ NULL, NULL, NULL,
+ strP);
step_ = ADVANCE_ROW_;
break;
}
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f94a381f/core/sql/optimizer/BindItemExpr.cpp
----------------------------------------------------------------------