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:04 UTC
[3/4] trafodion git commit: Merge remote branch 'origin/master' into
ansharma_trafixes_deliver2_br
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
----------------------------------------------------------------------