Merge remote branch 'origin/master' into ansharma_tsnano_br
Conflicts:
core/sql/regress/hive/EXPECTED005
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/50c2a891
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/50c2a891
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/50c2a891
Branch: refs/heads/master
Commit: 50c2a891c4b6044283b01c37796785ad92a96ed9
Parents: 319abf8 2ca9a03
Author: Anoop Sharma <[email protected]>
Authored: Mon Jun 11 18:19:39 2018 +0000
Committer: Anoop Sharma <[email protected]>
Committed: Mon Jun 11 18:19:39 2018 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/install_local_hadoop | 22 +-
core/sqf/src/seatrans/hbase-trx/pom.xml.hdp | 1 +
core/sqf/src/seatrans/hbase-trx/pom.xml.hdp2_1 | 1 +
core/sqf/src/seatrans/hbase-trx/pom.xml.mapr | 334 ------
core/sql/bin/SqlciErrors.txt | 11 +-
core/sql/cli/Cli.cpp | 15 +
core/sql/cli/Cli.h | 8 +-
core/sql/cli/CliExtern.cpp | 122 ++
core/sql/cli/Context.cpp | 86 ++
core/sql/cli/Context.h | 6 +-
core/sql/cli/SessionDefaults.cpp | 4 +-
core/sql/comexe/ComTdbExeUtil.cpp | 15 -
core/sql/comexe/ComTdbExeUtil.h | 23 +-
core/sql/common/ComObjectName.cpp | 7 +-
core/sql/common/NAString.cpp | 27 +-
core/sql/common/NAType.cpp | 10 +-
core/sql/common/OperTypeEnum.h | 4 +
core/sql/executor/ExComTdb.cpp | 1 -
core/sql/executor/ExExeUtil.h | 55 +-
core/sql/executor/ExExeUtilLoad.cpp | 70 +-
core/sql/executor/ExExeUtilMisc.cpp | 39 -
core/sql/executor/HiveClient_JNI.cpp | 3 +-
core/sql/executor/JavaObjectInterface.cpp | 43 +-
core/sql/executor/JavaObjectInterface.h | 8 +-
core/sql/executor/hiveHook.cpp | 14 +-
core/sql/exp/ExpErrorEnums.h | 1 +
core/sql/exp/ExpLOB.cpp | 131 ++-
core/sql/exp/ExpLOB.h | 15 +-
core/sql/exp/ExpLOBenums.h | 2 +-
core/sql/exp/ExpLOBexternal.h | 4 +-
core/sql/exp/ExpPCodeClauseGen.cpp | 4 +
core/sql/exp/exp_clause.cpp | 3 +
core/sql/exp/exp_clause_derived.h | 14 +-
core/sql/export/ComDiags.cpp | 1 +
core/sql/generator/GenExpGenerator.cpp | 2 +
core/sql/generator/GenExpGenerator.h | 9 +-
core/sql/generator/GenExplain.cpp | 25 +-
core/sql/generator/GenFastTransport.cpp | 6 +
core/sql/generator/GenItemExpr.cpp | 2 +
core/sql/generator/GenItemFunc.cpp | 10 +-
core/sql/generator/GenPreCode.cpp | 7 +-
core/sql/generator/GenRelExeUtil.cpp | 26 +-
core/sql/generator/GenRelScan.cpp | 4 +
core/sql/generator/Generator.h | 2 +-
core/sql/optimizer/BindItemExpr.cpp | 5 -
core/sql/optimizer/BindRelExpr.cpp | 5 +-
core/sql/optimizer/ItemExpr.cpp | 18 +-
core/sql/optimizer/NATable.cpp | 26 +-
core/sql/optimizer/NATable.h | 41 +-
core/sql/optimizer/NormRelExpr.cpp | 18 +-
core/sql/optimizer/RelExeUtil.cpp | 92 +-
core/sql/optimizer/RelExeUtil.h | 11 +-
core/sql/optimizer/RelExpr.cpp | 4 +-
core/sql/optimizer/RelMisc.h | 2 +
core/sql/optimizer/hiveHook.h | 16 +
core/sql/parser/AllStmtDDL.h | 2 +
core/sql/parser/ElemDDLLikeOptions.cpp | 30 +
core/sql/parser/ElemDDLLikeOptions.h | 33 +
core/sql/parser/ElemDDLNode.cpp | 6 +
core/sql/parser/ElemDDLNode.h | 6 +-
core/sql/parser/ParDDLLikeOpts.cpp | 15 +
core/sql/parser/ParDDLLikeOptsCreateTable.h | 14 +
core/sql/parser/SqlParserAux.cpp | 75 +-
core/sql/parser/SqlParserAux.h | 14 +-
core/sql/parser/StmtDDLCleanupObjects.h | 4 +-
core/sql/parser/StmtDDLCreate.cpp | 7 +-
core/sql/parser/StmtDDLCreateTable.h | 14 +
core/sql/parser/StmtDDLCreateView.h | 7 +
core/sql/parser/StmtDDLDrop.cpp | 3 +-
core/sql/parser/StmtDDLDropView.h | 6 +
core/sql/parser/StmtDDLMisc.cpp | 2 -
core/sql/parser/StmtDDLRegOrUnregHive.cpp | 4 +-
core/sql/parser/StmtDDLRegOrUnregHive.h | 6 +-
core/sql/parser/StmtDDLonHiveObjects.h | 191 +++
core/sql/parser/sqlparser.y | 765 ++++++++----
core/sql/parser/ulexer.cpp | 25 +-
core/sql/regress/compGeneral/EXPECTEDTOK | 4 +-
core/sql/regress/compGeneral/EXPECTEDTOK2 | 4 +-
core/sql/regress/core/EXPECTED002.LINUX | 15 +
core/sql/regress/core/TEST002 | 5 +
core/sql/regress/executor/EXPECTED020 | 4 +
core/sql/regress/executor/EXPECTED063 | 24 +-
core/sql/regress/executor/TEST063 | 2 +-
core/sql/regress/hive/DIFF003.KNOWN | 10 +-
core/sql/regress/hive/DIFF008.KNOWN | 7 +
core/sql/regress/hive/DIFF009.KNOWN | 3 +
core/sql/regress/hive/EXPECTED003 | 2 +-
core/sql/regress/hive/EXPECTED005 | 189 ++-
core/sql/regress/hive/EXPECTED007 | 314 ++++-
core/sql/regress/hive/EXPECTED008 | 1108 ++++++++++++++++++
core/sql/regress/hive/EXPECTED009 | 96 +-
core/sql/regress/hive/EXPECTED018 | 840 +++++++------
core/sql/regress/hive/FILTER005 | 1 +
core/sql/regress/hive/FILTER008 | 35 +
core/sql/regress/hive/TEST003 | 2 +-
core/sql/regress/hive/TEST005 | 57 +-
core/sql/regress/hive/TEST005_a.hive.sql | 2 +
core/sql/regress/hive/TEST007 | 53 +-
core/sql/regress/hive/TEST008 | 309 +++++
core/sql/regress/hive/TEST009 | 4 +-
core/sql/regress/hive/TEST009_a.hive.sql | 8 +-
core/sql/regress/hive/TEST009_b.hive.sql | 30 +-
core/sql/regress/hive/TEST018 | 160 ++-
.../hive/TEST018_create_hive_tables.hive | 20 +-
core/sql/regress/privs2/EXPECTED129 | 36 +-
core/sql/regress/seabase/EXPECTED003 | 6 +-
core/sql/regress/seabase/EXPECTED031 | 45 +-
core/sql/regress/seabase/TEST026 | 1 +
core/sql/regress/seabase/TEST031 | 10 +-
core/sql/runtimestats/SqlStats.cpp | 22 +-
core/sql/runtimestats/SqlStats.h | 3 +
core/sql/runtimestats/rts_msg.cpp | 39 +
core/sql/runtimestats/rts_msg.h | 40 +-
core/sql/runtimestats/sscpipc.cpp | 53 +
core/sql/runtimestats/sscpipc.h | 1 +
core/sql/runtimestats/ssmpipc.cpp | 85 ++
core/sql/runtimestats/ssmpipc.h | 5 +-
core/sql/sqlcomp/CmpDescribe.cpp | 213 +++-
core/sql/sqlcomp/CmpDescribe.h | 67 +-
core/sql/sqlcomp/CmpSeabaseDDL.h | 28 +
core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp | 185 +--
core/sql/sqlcomp/CmpSeabaseDDLcleanup.h | 5 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 15 +-
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 5 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 947 +++++++++++++--
core/sql/sqlcomp/CmpSeabaseDDLview.cpp | 20 +
core/sql/sqlcomp/DefaultConstants.h | 4 +
core/sql/sqlcomp/nadefaults.cpp | 9 +-
core/sql/sqlcomp/parser.cpp | 131 ++-
core/sql/sqlcomp/parser.h | 100 ++
.../main/java/org/trafodion/sql/HiveClient.java | 6 +-
core/sql/ustat/hs_la.cpp | 6 +-
.../src/asciidoc/_chapters/sql_statements.adoc | 2 +-
133 files changed, 6251 insertions(+), 1810 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/50c2a891/core/sql/bin/SqlciErrors.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/50c2a891/core/sql/common/NAType.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/50c2a891/core/sql/exp/ExpErrorEnums.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/50c2a891/core/sql/parser/StmtDDLMisc.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/50c2a891/core/sql/regress/hive/EXPECTED005
----------------------------------------------------------------------
