Merge branch 'master' into TRAFODION-2884 Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/87210a56 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/87210a56 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/87210a56
Branch: refs/heads/master Commit: 87210a56c0b209253f54ba1957c826afda3b9f7c Parents: 46bba63 5b5ab32 Author: Zalo Correa <[email protected]> Authored: Fri Jun 15 17:15:45 2018 -0600 Committer: GitHub <[email protected]> Committed: Fri Jun 15 17:15:45 2018 -0600 ---------------------------------------------------------------------- .../jdbc/t4/CONNECTION_CONTEXT_def.java | 1 + .../jdbc/t4/InitializeDialogueMessage.java | 3 +- .../trafodion/jdbc/t4/InterfaceConnection.java | 7 +- .../trafodion/jdbc/t4/InterfaceResultSet.java | 103 +- .../org/trafodion/jdbc/t4/T4DSProperties.java | 3 + .../org/trafodion/jdbc/t4/T4Properties.java | 32 +- .../java/org/trafodion/jdbc/t4/TRANSPORT.java | 1 + .../org/trafodion/jdbc/t4/TrafT4Statement.java | 4 +- core/conn/odbc/src/odbc/Common/Global.h | 3 + .../odbc/Krypton/generated_incs/odbcCommon.h | 1 + .../src/odbc/nsksrvr/Interface/odbcs_srvr.cpp | 1 + core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 1 + .../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 137 +- core/conn/trafci/install/Installer.java-tmpl | 8 + core/sqf/export/include/seabed/int/thread.inl | 3 + core/sqf/sql/scripts/install_local_hadoop | 22 +- core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54 | 1 + core/sqf/src/seatrans/hbase-trx/pom.xml.cdh55 | 1 + core/sqf/src/seatrans/hbase-trx/pom.xml.cdh57 | 1 + 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/sqf/src/trafconf/Makefile | 3 + core/sqf/src/trafconf/tctrace.h | 2 +- core/sql/bin/SqlciErrors.txt | 13 +- 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 | 27 +- core/sql/common/ComAnsiNamePart.cpp | 24 + core/sql/common/ComAnsiNamePart.h | 2 + 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/ExExeUtilGet.cpp | 244 ++- 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_bignum.cpp | 14 + 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 | 8 +- core/sql/generator/GenRelExeUtil.cpp | 40 +- core/sql/generator/GenRelScan.cpp | 4 + core/sql/generator/Generator.h | 2 +- core/sql/optimizer/BindItemExpr.cpp | 157 +- core/sql/optimizer/BindRelExpr.cpp | 5 +- core/sql/optimizer/ItemFunc.h | 3 + core/sql/optimizer/NATable.cpp | 31 +- core/sql/optimizer/NATable.h | 42 +- 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/ValueDesc.cpp | 27 +- core/sql/optimizer/hiveHook.h | 16 + core/sql/parser/AllStmtDDL.h | 2 + core/sql/parser/ElemDDLConstraintPK.h | 23 +- 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/ParKeyWords.cpp | 2 - core/sql/parser/SqlParserAux.cpp | 75 +- core/sql/parser/SqlParserAux.h | 14 +- core/sql/parser/StmtDDLCleanupObjects.h | 4 +- core/sql/parser/StmtDDLCreate.cpp | 35 +- 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 | 1163 +++++++------ core/sql/parser/ulexer.cpp | 25 +- .../sql/regress/compGeneral/DIFF006.KNOWN.SB.OS | 12 - core/sql/regress/compGeneral/EXPECTED006.SB | 53 +- core/sql/regress/compGeneral/EXPECTEDTOK | 7 +- core/sql/regress/compGeneral/EXPECTEDTOK2 | 7 +- core/sql/regress/compGeneral/TEST006 | 1 + core/sql/regress/core/EXPECTED002.LINUX | 15 + core/sql/regress/core/EXPECTED037.SB | 39 +- core/sql/regress/core/EXPECTED056.SB | 6 + core/sql/regress/core/EXPECTED116 | 197 ++- core/sql/regress/core/TEST002 | 5 + core/sql/regress/core/TEST037 | 20 + core/sql/regress/core/TEST056 | 2 + core/sql/regress/executor/EXPECTED016.SB | 20 +- core/sql/regress/executor/EXPECTED020 | 4 + core/sql/regress/executor/EXPECTED063 | 24 +- core/sql/regress/executor/EXPECTED122 | 27 +- core/sql/regress/executor/TEST016 | 7 +- core/sql/regress/executor/TEST063 | 2 +- core/sql/regress/executor/TEST122 | 5 +- 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/privs1/EXPECTED125 | 729 ++++++++ core/sql/regress/privs1/TEST125 | 51 + core/sql/regress/privs2/EXPECTED129 | 36 +- core/sql/regress/privs2/EXPECTED144 | 301 +++- core/sql/regress/privs2/EXPECTED146 | 125 +- core/sql/regress/privs2/TEST138 | 1 + core/sql/regress/privs2/TEST144 | 39 +- core/sql/regress/privs2/TEST146 | 7 + core/sql/regress/seabase/EXPECTED003 | 6 +- core/sql/regress/seabase/EXPECTED020 | 58 +- core/sql/regress/seabase/EXPECTED031 | 59 +- core/sql/regress/seabase/EXPECTED032 | 248 ++- core/sql/regress/seabase/TEST020 | 4 +- core/sql/regress/seabase/TEST026 | 1 + core/sql/regress/seabase/TEST031 | 10 +- core/sql/regress/seabase/TEST032 | 56 + 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/sqlci/sqlci_lex.ll | 2 - core/sql/sqlci/sqlci_yacc.y | 11 - core/sql/sqlcomp/CmpDescribe.cpp | 277 ++- core/sql/sqlcomp/CmpDescribe.h | 68 +- core/sql/sqlcomp/CmpSeabaseDDL.h | 36 +- core/sql/sqlcomp/CmpSeabaseDDLauth.cpp | 69 +- core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp | 185 +- core/sql/sqlcomp/CmpSeabaseDDLcleanup.h | 5 +- core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 28 +- core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 5 +- core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 1585 ++++++++++++++---- core/sql/sqlcomp/CmpSeabaseDDLview.cpp | 20 + core/sql/sqlcomp/DefaultConstants.h | 20 + core/sql/sqlcomp/nadefaults.cpp | 17 +- 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 +- .../org/trafodion/dcs/server/ServerManager.java | 14 +- .../src/asciidoc/_chapters/binder_msgs.adoc | 17 + .../src/asciidoc/_chapters/sql_statements.adoc | 106 +- .../src/asciidoc/_chapters/sql_utilities.adoc | 2 +- install/python-installer/configs/version.json | 4 +- 190 files changed, 9579 insertions(+), 2723 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/87210a56/core/sqf/src/trafconf/Makefile ---------------------------------------------------------------------- diff --cc core/sqf/src/trafconf/Makefile index 42e81bc,507e296..f48a281 --- a/core/sqf/src/trafconf/Makefile +++ b/core/sqf/src/trafconf/Makefile @@@ -44,11 -44,14 +44,14 @@@ LIBS = $(LIBTRAFCONFIG LIBSX += -lrt # need -lsqlite3 for SQLite -LIBSX += -lsqlite3 +LIBSX += -lsqlite3 -lpthread + # need -lpthread starting on CentOS7 + LIBSX += -lpthread + PROGS = $(TRAFCONF) -OBJTRAFCONFIG = $(OUTDIR)/trafconfig.o \ +OBJTRAFCONFIG = $(OUTDIR)/trafconfig.o \ $(OUTDIR)/tcdb.o \ $(OUTDIR)/tcdbstore.o \ $(OUTDIR)/tclog.o \ http://git-wip-us.apache.org/repos/asf/trafodion/blob/87210a56/core/sqf/src/trafconf/tctrace.h ----------------------------------------------------------------------
