Merge branch 'master' of github.com:apache/trafodion into sean_traf

Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/c559d5dc
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/c559d5dc
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/c559d5dc

Branch: refs/heads/master
Commit: c559d5dc3436f3a85585925a9e2966665ae9b88f
Parents: 968f9cf 2b96f4c
Author: Sean Broeder <sbroeder@edev06.esgyn.local>
Authored: Wed Aug 1 19:09:00 2018 +0000
Committer: Sean Broeder <sbroeder@edev06.esgyn.local>
Committed: Wed Aug 1 19:09:00 2018 +0000

----------------------------------------------------------------------
 .../jdbcT4/src/main/java/T4Messages.properties  |   14 +-
 .../jdbcT4/src/main/samples/t4jdbc.properties   |    2 +-
 .../odbc/src/odbc/nsksrvrcore/srvrothers.cpp    |  138 +
 .../odbc/odbcclient/unixcli/cli/cconnect.cpp    |    1 +
 .../odbc/odbcclient/unixcli/cli/ctosqlconv.cpp  |    9 +-
 .../export/include/common/evl_sqlog_eventnum.h  |   49 +-
 core/sqf/monitor/linux/cluster.cxx              |  221 +-
 core/sqf/monitor/linux/cluster.h                |    7 +
 core/sqf/monitor/linux/commaccept.cxx           |    8 +-
 core/sqf/monitor/linux/config.cxx               |    8 +-
 core/sqf/monitor/linux/healthcheck.cxx          |    3 +-
 core/sqf/monitor/linux/internal.h               |    5 +
 core/sqf/monitor/linux/lnode.cxx                |   12 +-
 core/sqf/monitor/linux/makefile                 |    1 +
 core/sqf/monitor/linux/monitor.cxx              |   18 +-
 core/sqf/monitor/linux/msgdef.h                 |    2 +-
 core/sqf/monitor/linux/nameserver.cxx           |  470 +-
 core/sqf/monitor/linux/nameserver.h             |   18 +-
 core/sqf/monitor/linux/nscommacceptmon.cxx      |   92 +-
 core/sqf/monitor/linux/nscommacceptmon.h        |    5 +-
 core/sqf/monitor/linux/nsreqnodedown.cxx        |  100 +
 core/sqf/monitor/linux/nsreqprocinfons.cxx      |   13 +-
 core/sqf/monitor/linux/nsreqshutdown.cxx        |    6 +-
 core/sqf/monitor/linux/nsreqstop.cxx            |    2 +-
 core/sqf/monitor/linux/pnode.cxx                |   90 +-
 core/sqf/monitor/linux/process.cxx              |  217 +-
 core/sqf/monitor/linux/process.h                |    9 +-
 core/sqf/monitor/linux/pstartd.cxx              |    2 +-
 core/sqf/monitor/linux/ptpclient.cxx            |  934 ++-
 core/sqf/monitor/linux/ptpclient.h              |   66 +-
 core/sqf/monitor/linux/ptpcommaccept.cxx        |  328 +-
 core/sqf/monitor/linux/ptpcommaccept.h          |   12 +-
 core/sqf/monitor/linux/redirector.cxx           |   53 +-
 core/sqf/monitor/linux/reqdump.cxx              |   16 +-
 core/sqf/monitor/linux/reqevent.cxx             |   16 +-
 core/sqf/monitor/linux/reqkill.cxx              |   26 +-
 core/sqf/monitor/linux/reqnotify.cxx            |   18 +-
 core/sqf/monitor/linux/reqopen.cxx              |   20 +-
 core/sqf/monitor/linux/reqprocinfo.cxx          |   15 +-
 core/sqf/monitor/linux/reqqueue.cxx             |   43 +-
 core/sqf/monitor/linux/reqqueue.h               |   19 +
 core/sqf/monitor/linux/shell.cxx                |   67 +-
 core/sqf/monitor/linux/tmsync.cxx               |    4 +-
 core/sqf/monitor/linux/zclient.cxx              |    2 +-
 core/sqf/sqenvcom.sh                            |   16 +-
 core/sqf/sql/scripts/gomon.cold                 |   13 +-
 core/sql/bin/SqlciErrors.txt                    |    4 +-
 core/sql/cli/sqlcli.h                           |    5 +-
 core/sql/comexe/ComTdbControl.h                 |   14 +-
 core/sql/common/ComResWords.cpp                 |  186 +-
 core/sql/common/ComResWords.h                   |   23 +-
 core/sql/common/DTICommonType.cpp               |   16 +
 core/sql/common/NAString.cpp                    |    8 +-
 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/ExExeUtil.h                   |   15 +
 core/sql/executor/ExExeUtilGet.cpp              |   24 +
 core/sql/executor/ExExeUtilGetStats.cpp         |    5 +-
 core/sql/executor/ExExeUtilLoad.cpp             |   94 +-
 core/sql/executor/ExFastTransport.cpp           |   21 +-
 core/sql/executor/ExFastTransport.h             |    9 +
 core/sql/executor/ExHbaseAccess.h               |    1 -
 core/sql/executor/ExHbaseIUD.cpp                |   12 +-
 core/sql/executor/ExHdfsScan.cpp                |   28 +-
 core/sql/executor/ExHdfsScan.h                  |    1 -
 core/sql/executor/ExStats.cpp                   |  740 +-
 core/sql/executor/ExStats.h                     |  160 +-
 core/sql/executor/HBaseClient_JNI.h             |    6 +-
 core/sql/executor/HdfsClient_JNI.cpp            |    5 +
 core/sql/executor/OrcFileReader.h               |    1 +
 core/sql/executor/ex_control.cpp                |   48 +
 core/sql/executor/log4cpp.hdfs.config           |   37 -
 core/sql/executor/log4j.hdfs.config             |   50 -
 core/sql/exp/ExpErrorEnums.h                    |    5 +
 core/sql/exp/ExpHbaseInterface.h                |    1 -
 core/sql/exp/ExpLOB.cpp                         |    8 +
 core/sql/exp/ExpLOBaccess.cpp                   |   42 +-
 core/sql/exp/ExpLOBaccess.h                     |   17 +-
 core/sql/exp/ExpLOBenums.h                      |    2 -
 core/sql/exp/ExpLOBinterface.cpp                |   70 +-
 core/sql/exp/ExpLOBinterface.h                  |   19 +-
 core/sql/exp/ExpLOBprocess.cpp                  |    6 +-
 core/sql/exp/ExpPCodeClauseGen.cpp              |    1 +
 core/sql/exp/ExpPackDefs.cpp                    |    5 +
 core/sql/exp/exp_clause.cpp                     |    8 +
 core/sql/exp/exp_clause.h                       |   18 +-
 core/sql/exp/exp_datetime.cpp                   |  237 +
 core/sql/exp/exp_datetime.h                     |   43 +-
 core/sql/exp/exp_fixup.cpp                      |    2 +-
 core/sql/exp/exp_function.cpp                   |  277 +
 core/sql/exp/exp_function.h                     |   23 +-
 core/sql/generator/GenExplain.cpp               |   32 +-
 core/sql/generator/GenItemFunc.cpp              |    8 +
 core/sql/generator/GenPreCode.cpp               |   36 +
 core/sql/generator/GenRelDCL.cpp                |   39 +-
 core/sql/optimizer/BindItemExpr.cpp             |    7 +-
 core/sql/optimizer/BindRelExpr.cpp              |   29 +-
 core/sql/optimizer/EncodedValue.cpp             |   91 +-
 core/sql/optimizer/EncodedValue.h               |   11 +-
 core/sql/optimizer/ItemExpr.cpp                 |   18 +
 core/sql/optimizer/ItemFunc.h                   |   19 +
 core/sql/optimizer/SynthType.cpp                |  131 +-
 core/sql/parser/ParKeyWords.cpp                 |  230 +-
 core/sql/parser/ParKeyWords.h                   |   22 +-
 core/sql/parser/SqlParserAux.h                  |    7 -
 core/sql/parser/StmtDDLonHiveObjects.h          |   20 +-
 core/sql/parser/sqlparser.y                     |  131 +-
 core/sql/pom.xml                                |   10 +
 core/sql/pom.xml.apache                         |    6 +
 core/sql/pom.xml.hdp                            |    6 +
 core/sql/regress/compGeneral/EXPECTED023        |   42 +
 core/sql/regress/core/EXPECTED002.LINUX         |   57 +
 core/sql/regress/core/EXPECTED037.SB            |  883 +-
 core/sql/regress/core/EXPECTED038.LINUX         |  134 +
 core/sql/regress/core/EXPECTED116               |   12 +
 core/sql/regress/core/FILTERRTS                 |    1 +
 core/sql/regress/core/TEST002                   |   25 +
 core/sql/regress/core/TEST037                   |   24 +-
 core/sql/regress/core/TEST038                   |   22 +
 core/sql/regress/executor/EXPECTED002.SB        |    8 +
 core/sql/regress/executor/EXPECTED130           |    3 +
 core/sql/regress/executor/FILTER002             |    1 -
 core/sql/regress/executor/TEST002               |    1 +
 core/sql/regress/hive/DIFF008.KNOWN             |    2 +-
 core/sql/regress/hive/DIFF009.KNOWN             |    2 +-
 core/sql/regress/hive/EXPECTED007               |   60 +
 core/sql/regress/hive/EXPECTED008               |   79 +-
 core/sql/regress/hive/EXPECTED009               |    3 +
 core/sql/regress/hive/TEST008                   |   25 +-
 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             |   81 +
 core/sql/regress/privs2/EXPECTED146             |   36 +
 core/sql/regress/seabase/EXPECTED011            |    3 +
 core/sql/regress/seabase/EXPECTED012            |   27 +
 core/sql/regress/seabase/EXPECTED022            |   12 +
 core/sql/regress/seabase/EXPECTED024            |    3 +
 core/sql/regress/seabase/EXPECTED027            |   12 +
 core/sql/regress/seabase/EXPECTED030            |  232 +
 core/sql/regress/seabase/EXPECTED031            |    3 +
 core/sql/regress/seabase/TEST030                |   29 +
 core/sql/regress/udr/EXPECTED001                |    6 +
 core/sql/regress/udr/EXPECTED102                |   30 +
 core/sql/regress/udr/EXPECTED103                |    6 +
 core/sql/regress/udr/EXPECTED107.SB             |    3 +
 core/sql/sqlci/sqlci_lex.ll                     |    1 +
 core/sql/sqlci/sqlci_yacc.y                     |    2 +
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp        |   25 +-
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp         |   69 +-
 core/sql/sqlcomp/DefaultConstants.h             |    1 +
 core/sql/sqlcomp/nadefaults.cpp                 |    2 +
 .../main/java/org/trafodion/sql/HDFSClient.java |   47 +-
 .../main/java/org/trafodion/sql/HiveClient.java |   38 +-
 core/sql/ustat/hs_globals.cpp                   |   87 +-
 core/sql/ustat/hs_globals.h                     |    3 +
 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          | 7666 +++++++++++-------
 .../_chapters/sql_language_elements.adoc        |   63 +-
 .../src/asciidoc/_chapters/sql_statements.adoc  |  246 +-
 .../src/asciidoc/_chapters/sql_utilities.adoc   |    4 +-
 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     |   21 +-
 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 +
 201 files changed, 13162 insertions(+), 5938 deletions(-)
----------------------------------------------------------------------


Reply via email to