You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by li...@apache.org on 2018/07/30 12:36:26 UTC
[3/5] trafodion git commit: Merge branch 'master' of
https://github.com/apache/trafodion into TRAFODION-3147
Merge branch 'master' of https://github.com/apache/trafodion into TRAFODION-3147
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/508f4c43
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/508f4c43
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/508f4c43
Branch: refs/heads/master
Commit: 508f4c43ef4b0dd163ae2d28fa58ba190ff92194
Parents: a748fbb 60b3eb0
Author: Liu Ming <ov...@sina.com>
Authored: Sun Jul 22 21:34:57 2018 -0400
Committer: Liu Ming <ov...@sina.com>
Committed: Sun Jul 22 21:34:57 2018 -0400
----------------------------------------------------------------------
.../jdbcT4/src/main/java/T4Messages.properties | 14 +-
.../trafodion/jdbc/t4/InterfaceResultSet.java | 6 -
.../jdbcT4/src/main/samples/t4jdbc.properties | 2 +-
.../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 66 +-
.../odbc/odbcclient/unixcli/cli/cconnect.cpp | 1 +
core/sqf/conf/log4j.dtm.config | 5 +
core/sqf/conf/log4j.sql.config | 3 +
core/sqf/sql/scripts/genms | 8 +
.../transactional/TransactionManager.java | 110 +-
.../transactional/TrxRegionEndpoint.java.tmpl | 76 +
.../generated/SsccRegionProtos.java | 1 +
.../generated/TrxRegionProtos.java | 1525 ++++-
.../hbase-trx/src/main/protobuf/TrxRegion.proto | 13 +
core/sql/arkcmp/CmpContext.cpp | 11 +
core/sql/arkcmp/CmpStatement.cpp | 3 +-
core/sql/arkcmp/CmpStatement.h | 5 -
core/sql/bin/SqlciErrors.txt | 9 +-
core/sql/bin/ex_sscp_main.cpp | 2 +-
core/sql/cli/Cli.cpp | 49 +-
core/sql/cli/Descriptor.cpp | 4 +-
core/sql/cli/Globals.cpp | 13 +-
core/sql/cli/SessionDefaults.cpp | 8 +
core/sql/cli/SessionDefaults.h | 12 +
core/sql/cli/sqlcli.h | 6 +-
core/sql/comexe/CmpMessage.cpp | 3 +-
core/sql/comexe/CmpMessage.h | 37 +-
core/sql/comexe/ComTdb.cpp | 6 -
core/sql/comexe/ComTdb.h | 9 +-
core/sql/comexe/ComTdbControl.h | 14 +-
core/sql/comexe/ComTdbDDL.h | 13 +-
core/sql/comexe/ComTdbExeUtil.cpp | 149 +-
core/sql/comexe/ComTdbExeUtil.h | 156 +-
core/sql/common/ComMisc.cpp | 47 +
core/sql/common/ComMisc.h | 14 +
core/sql/common/ComResWords.cpp | 186 +-
core/sql/common/ComResWords.h | 23 +-
core/sql/common/ComRtUtils.cpp | 23 +
core/sql/common/ComRtUtils.h | 2 +
core/sql/common/DTICommonType.cpp | 16 +
core/sql/common/DateTimeType.cpp | 28 +-
core/sql/common/DatetimeType.h | 5 +-
core/sql/common/IntervalType.cpp | 14 +-
core/sql/common/IntervalType.h | 3 +-
core/sql/common/NAMemory.cpp | 19 +-
core/sql/common/NAMemory.h | 2 +
core/sql/common/NAString.cpp | 7 +-
core/sql/common/NAType.cpp | 2 +-
core/sql/common/NAWinNT.h | 1 +
core/sql/common/OperTypeEnum.h | 2 +-
core/sql/common/dfs2rec.h | 9 +-
core/sql/common/wstr.cpp | 33 +
core/sql/executor/ExComTdb.cpp | 6 -
core/sql/executor/ExExeUtil.h | 213 +-
core/sql/executor/ExExeUtilCli.cpp | 10 +
core/sql/executor/ExExeUtilCli.h | 2 +
core/sql/executor/ExExeUtilCommon.cpp | 13 +-
core/sql/executor/ExExeUtilGet.cpp | 70 +-
core/sql/executor/ExExeUtilGetStats.cpp | 10 +-
core/sql/executor/ExExeUtilLoad.cpp | 69 +-
core/sql/executor/ExExeUtilMisc.cpp | 1156 +---
core/sql/executor/ExHdfsScan.cpp | 8 +-
core/sql/executor/ExStats.cpp | 9 +-
core/sql/executor/ExStats.h | 2 +
core/sql/executor/HBaseClient_JNI.cpp | 2 +
core/sql/executor/HdfsClient_JNI.cpp | 209 +-
core/sql/executor/HdfsClient_JNI.h | 22 +-
core/sql/executor/ex_control.cpp | 55 +
core/sql/executor/ex_ddl.cpp | 36 +-
core/sql/executor/ex_ddl.h | 1 +
core/sql/executor/ex_esp_frag_dir.cpp | 14 +-
core/sql/executor/ex_globals.cpp | 10 +-
core/sql/executor/ex_globals.h | 3 +-
core/sql/executor/ex_root.cpp | 2 +-
core/sql/executor/ex_split_bottom.cpp | 4 +-
core/sql/executor/ex_transaction.cpp | 3 +-
core/sql/executor/hiveHook.cpp | 47 +-
core/sql/exp/ExpConvMxcs.cpp | 2 +-
core/sql/exp/ExpErrorEnums.h | 8 +-
core/sql/exp/ExpHbaseDefs.h | 1 +
core/sql/exp/ExpLOB.cpp | 35 +-
core/sql/exp/ExpLOB.h | 4 +-
core/sql/exp/ExpLOBaccess.cpp | 413 +-
core/sql/exp/ExpLOBaccess.h | 12 +
core/sql/exp/ExpLOBinterface.cpp | 18 +-
core/sql/exp/ExpPCodeClauseGen.cpp | 1 +
core/sql/exp/ExpPackDefs.cpp | 5 +
core/sql/exp/exp_arith.cpp | 444 +-
core/sql/exp/exp_bignum.h | 17 +-
core/sql/exp/exp_clause.cpp | 6 +
core/sql/exp/exp_clause.h | 3 +-
core/sql/exp/exp_conv.cpp | 6 +
core/sql/exp/exp_datetime.cpp | 486 +-
core/sql/exp/exp_datetime.h | 55 +-
core/sql/exp/exp_fixup.cpp | 6 +-
core/sql/exp/exp_function.cpp | 271 +
core/sql/exp/exp_function.h | 23 +-
core/sql/generator/GenExplain.cpp | 64 +-
core/sql/generator/GenItemFunc.cpp | 7 +
core/sql/generator/GenPreCode.cpp | 24 +-
core/sql/generator/GenRelDCL.cpp | 39 +-
core/sql/generator/GenRelEnforcer.cpp | 6 +-
core/sql/generator/GenRelExeUtil.cpp | 256 +-
core/sql/generator/GenRelMisc.cpp | 10 +-
core/sql/generator/GenRelScan.cpp | 2 +-
core/sql/langman/LmLangManagerJava.cpp | 4 +-
core/sql/nskgmake/sqlcomp/Makefile | 1 +
core/sql/optimizer/BindItemExpr.cpp | 7 +-
core/sql/optimizer/BindRelExpr.cpp | 43 +-
core/sql/optimizer/EncodedValue.cpp | 6 +-
core/sql/optimizer/ImplRule.h | 64 -
core/sql/optimizer/ItemExpr.cpp | 16 +
core/sql/optimizer/ItemFunc.h | 18 +
core/sql/optimizer/QRDescGenerator.cpp | 15 +-
core/sql/optimizer/RelCache.cpp | 4 -
core/sql/optimizer/RelExeUtil.cpp | 259 +-
core/sql/optimizer/RelExeUtil.h | 184 +-
core/sql/optimizer/RelExpr.cpp | 36 +-
core/sql/optimizer/RelFastTransport.cpp | 75 +-
core/sql/optimizer/RelUpdate.h | 15 -
core/sql/optimizer/SynthType.cpp | 126 +-
core/sql/parser/ElemDDLLikeOptions.cpp | 31 -
core/sql/parser/ElemDDLLikeOptions.h | 33 -
core/sql/parser/ElemDDLNode.h | 3 -
core/sql/parser/ParDDLLikeOpts.cpp | 14 -
core/sql/parser/ParDDLLikeOptsCreateTable.h | 1 -
core/sql/parser/ParKeyWords.cpp | 229 +-
core/sql/parser/ParKeyWords.h | 22 +-
core/sql/parser/SqlParserAux.cpp | 8 -
core/sql/parser/SqlParserAux.h | 15 -
core/sql/parser/StmtDDLCreate.cpp | 4 +-
core/sql/parser/StmtDDLCreateTable.h | 20 +-
core/sql/parser/StmtDDLonHiveObjects.h | 22 +-
core/sql/parser/sqlparser.y | 487 +-
core/sql/pom.xml | 6 +
core/sql/pom.xml.apache | 6 +
core/sql/pom.xml.hdp | 6 +
core/sql/regress/compGeneral/EXPECTED023 | 42 +
core/sql/regress/compGeneral/EXPECTED071 | 4 +-
core/sql/regress/core/EXPECTED002.LINUX | 57 +
core/sql/regress/core/EXPECTED037.SB | 876 ++-
core/sql/regress/core/EXPECTED038.LINUX | 129 +
core/sql/regress/core/EXPECTED116 | 12 +
core/sql/regress/core/EXPECTED162 | 762 +--
core/sql/regress/core/EXPECTEDRTS | 1 +
core/sql/regress/core/FILTERRTS | 1 +
core/sql/regress/core/TEST002 | 25 +
core/sql/regress/core/TEST037 | 20 -
core/sql/regress/core/TEST038 | 23 +-
core/sql/regress/executor/EXPECTED022.SB | 6043 ++----------------
core/sql/regress/executor/EXPECTED130 | 8 +-
core/sql/regress/executor/TEST022 | 1088 ++--
core/sql/regress/hive/DIFF008.KNOWN | 2 +-
core/sql/regress/hive/DIFF009.KNOWN | 2 +-
core/sql/regress/hive/EXPECTED001 | 762 +--
core/sql/regress/hive/EXPECTED004 | 28 +-
core/sql/regress/hive/EXPECTED005 | 157 +-
core/sql/regress/hive/EXPECTED007 | 60 +
core/sql/regress/hive/EXPECTED008 | 374 +-
core/sql/regress/hive/EXPECTED009 | 3 +
core/sql/regress/hive/FILTER008 | 1 +
core/sql/regress/hive/TEST008 | 108 +-
core/sql/regress/privs1/EXPECTED123 | 318 +
core/sql/regress/privs1/EXPECTED125 | 390 ++
core/sql/regress/privs1/EXPECTED132 | 48 +
core/sql/regress/privs1/EXPECTED136 | 3 +
core/sql/regress/privs1/EXPECTED141 | 30 +
core/sql/regress/privs2/EXPECTED135 | 18 +
core/sql/regress/privs2/EXPECTED138 | 105 +
core/sql/regress/privs2/EXPECTED140 | 3 +
core/sql/regress/privs2/EXPECTED143 | 12 +
core/sql/regress/privs2/EXPECTED144 | 45 +
core/sql/regress/privs2/EXPECTED146 | 36 +
core/sql/regress/seabase/EXPECTED002 | 252 +-
core/sql/regress/seabase/EXPECTED011 | 3 +
core/sql/regress/seabase/EXPECTED012 | 52 +
core/sql/regress/seabase/EXPECTED022 | 12 +
core/sql/regress/seabase/EXPECTED030 | 232 +
core/sql/regress/seabase/EXPECTED031 | 3 +
core/sql/regress/seabase/TEST002 | 1 +
core/sql/regress/seabase/TEST030 | 29 +
core/sql/regress/udr/EXPECTED001 | 6 +
core/sql/regress/udr/EXPECTED100.SB | 26 +-
core/sql/regress/udr/EXPECTED102 | 30 +
core/sql/regress/udr/EXPECTED103 | 6 +
core/sql/regress/udr/EXPECTED107.SB | 3 +
core/sql/regress/udr/TEST100 | 13 +-
core/sql/regress/udr/t100.java | 4 +
core/sql/runtimestats/SqlStats.cpp | 79 +-
core/sql/runtimestats/SqlStats.h | 14 +-
core/sql/sqlci/SqlCmd.cpp | 19 +-
core/sql/sqlci/sqlci_lex.ll | 1 +
core/sql/sqlci/sqlci_yacc.y | 2 +
core/sql/sqlcomp/CmpDDLCatErrorCodes.h | 4 +
core/sql/sqlcomp/CmpDescribe.cpp | 92 -
core/sql/sqlcomp/CmpDescribe.h | 8 -
core/sql/sqlcomp/CmpSeabaseDDL.h | 9 +-
core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp | 5 +-
core/sql/sqlcomp/CmpSeabaseDDLcommentOn.cpp | 9 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 471 +-
core/sql/sqlcomp/CmpSeabaseDDLinitraf.cpp | 844 +++
core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 4 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 380 +-
core/sql/sqlcomp/CmpSeabaseDDLupgrade.cpp | 6 +-
core/sql/sqlcomp/CmpSeabaseDDLview.cpp | 1 -
core/sql/sqlcomp/DefaultConstants.h | 18 +-
core/sql/sqlcomp/nadefaults.cpp | 9 +-
core/sql/sqlcomp/parser.cpp | 18 +-
core/sql/sqlcomp/parser.h | 5 +
.../java/org/trafodion/sql/HBaseClient.java | 56 +-
.../main/java/org/trafodion/sql/HDFSClient.java | 165 +-
.../main/java/org/trafodion/sql/HiveClient.java | 38 +-
.../java/org/trafodion/sql/udr/TypeInfo.java | 18 +-
core/sql/ustat/hs_globals.cpp | 11 +-
core/sql/ustat/hs_la.cpp | 5 +-
core/sql/ustat/hs_read.cpp | 268 +-
core/sql/ustat/hs_update.cpp | 29 -
.../src/asciidoc/_chapters/binder_msgs.adoc | 14 +
.../src/asciidoc/_chapters/executor_msgs.adoc | 13 +
.../src/asciidoc/_chapters/introduction.adoc | 106 +-
.../sql_functions_and_expressions.adoc | 12 +-
.../_chapters/sql_language_elements.adoc | 63 +-
.../src/asciidoc/_chapters/sql_statements.adoc | 508 +-
.../src/asciidoc/_chapters/sql_utilities.adoc | 18 +-
docs/src/site/markdown/index.md | 15 +-
docs/src/site/site.xml | 2 +-
pom.xml | 2 +-
win-odbc64/Common/TransportBase.h | 2 +
win-odbc64/Common/marshalingdrvr_drvr.cpp | 123 +
win-odbc64/Common/marshalingdrvr_drvr.h | 27 +
.../Install/win64_installer/installer.iss | 64 +-
win-odbc64/Krypton/generated_incs/odbc_cl.h | 52 +
.../odbcclient/drvr35/Interface/odbcs_drvr.cpp | 227 +
.../odbcclient/drvr35/Interface/odbcs_drvr.h | 24 +
win-odbc64/odbcclient/drvr35/cconnect.cpp | 4 +
win-odbc64/odbcclient/drvr35/cconnect.h | 4 +
win-odbc64/odbcclient/drvr35/cdesc.cpp | 24 +-
win-odbc64/odbcclient/drvr35/cstmt.cpp | 309 +
win-odbc64/odbcclient/drvr35/cstmt.h | 27 +
win-odbc64/odbcclient/drvr35/ctosqlconv.cpp | 12 +
win-odbc64/odbcclient/drvr35/drvr35_os.vcxproj | 4 +-
.../odbcclient/drvr35/drvr35_os.vcxproj.filters | 6 +
win-odbc64/odbcclient/drvr35/drvrglobal.cpp | 5 +-
win-odbc64/odbcclient/drvr35/drvrnet.cpp | 12 +
win-odbc64/odbcclient/drvr35/drvrnet.h | 21 +
win-odbc64/odbcclient/drvr35/lob.cpp | 88 +
win-odbc64/odbcclient/drvr35/lob.h | 38 +
win-odbc64/odbcclient/drvr35/netstmt.cpp | 95 +
win-odbc64/odbcclient/drvr35/sqltocconv.cpp | 28 +-
win-odbc64/odbcclient/drvr35/sqltocconv.h | 4 +-
win-odbc64/sql/cli/sqlcli.h | 4 +
250 files changed, 13717 insertions(+), 11851 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/508f4c43/core/sql/common/OperTypeEnum.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/508f4c43/core/sql/exp/exp_clause.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/508f4c43/core/sql/exp/exp_function.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/508f4c43/core/sql/generator/GenItemFunc.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/508f4c43/core/sql/optimizer/ItemExpr.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/508f4c43/core/sql/optimizer/SynthType.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/508f4c43/core/sql/parser/ParKeyWords.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/508f4c43/core/sql/parser/sqlparser.y
----------------------------------------------------------------------