You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2016/10/27 15:13:28 UTC

[4/9] incubator-trafodion git commit: Merge branch 'master' of github.com:apache/incubator-trafodion into wrkbrnch

Merge branch 'master' of github.com:apache/incubator-trafodion into wrkbrnch


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

Branch: refs/heads/master
Commit: d457ac0fb5b3d11e217959e0a6708f592b526881
Parents: 1605595 196e6f4
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Wed Oct 19 21:17:10 2016 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Wed Oct 19 21:17:10 2016 +0000

----------------------------------------------------------------------
 .../odbc/src/odbc/nsksrvrcore/srvrothers.cpp    |   39 +-
 core/sqf/monitor/linux/zclient.cxx              |   16 +-
 core/sqf/sql/scripts/rmscheck                   |    2 +-
 core/sqf/sql/scripts/traf_authentication_setup  |    2 +-
 .../SqlCompilerDebugger/ItemExpressionView.cpp  |    4 +-
 core/sql/arkcmp/CmpContext.cpp                  |    8 +-
 core/sql/arkcmp/CmpContext.h                    |    8 -
 core/sql/arkcmp/CmpStatement.cpp                |    7 +-
 core/sql/arkcmp/CmpStoredProc.cpp               |    2 +-
 core/sql/arkcmp/cmpargs.cpp                     |    2 +-
 core/sql/bin/SqlciErrors.txt                    |   10 +-
 core/sql/cli/Cli.cpp                            |  110 +-
 core/sql/cli/Cli.h                              |   16 -
 core/sql/cli/CliExtern.cpp                      |   73 +-
 core/sql/cli/Context.cpp                        |   21 +-
 core/sql/cli/ExSqlComp.cpp                      |    8 +-
 core/sql/cli/Globals.cpp                        |   17 +-
 core/sql/cli/Statement.cpp                      | 1893 +-------
 core/sql/cli/Statement.h                        |   50 +-
 core/sql/comexe/CmpMessage.cpp                  |   28 +-
 core/sql/comexe/CmpMessage.h                    |   30 +-
 core/sql/comexe/ComTdbRoot.cpp                  |    9 +-
 core/sql/comexe/ComTdbRoot.h                    |    9 +-
 core/sql/comexe/ComTdbSort.h                    |   10 +-
 core/sql/comexe/LateBindInfo.cpp                |  393 +-
 core/sql/comexe/LateBindInfo.h                  |  679 +--
 core/sql/common/BloomFilter.cpp                 |    2 +-
 core/sql/common/ColIndList.h                    |    4 +-
 core/sql/common/Collections.cpp                 |    1 -
 core/sql/common/Collections.h                   |   47 +-
 core/sql/common/ComDistribution.cpp             |    3 +-
 core/sql/common/ComExeTrace.cpp                 |    1 +
 core/sql/common/ComSecurityKey.cpp              |  156 +-
 core/sql/common/ComSecurityKey.h                |    9 +-
 core/sql/common/Ipc.h                           |    4 +-
 core/sql/common/NAMemory.cpp                    |    2 +-
 core/sql/common/NATestpoint.cpp                 |    3 +-
 core/sql/common/NATraceList.h                   |    2 +-
 core/sql/executor/ExExeUtilLoad.cpp             |    3 +-
 core/sql/executor/ExExeUtilMisc.cpp             |    5 +-
 core/sql/executor/ExFastTransport.cpp           |   13 +-
 core/sql/executor/ExFastTransport.h             |    4 +-
 core/sql/executor/ExHbaseAccess.cpp             |    1 +
 core/sql/executor/ExHbaseDDL.cpp                |    2 +-
 core/sql/executor/ExHdfsScan.cpp                |    5 +-
 core/sql/executor/Ex_esp_msg.h                  |   40 -
 core/sql/executor/dfs2fe.h                      |    4 +-
 core/sql/executor/ex_control.cpp                |    2 +-
 core/sql/executor/ex_ddl.cpp                    |    3 -
 core/sql/executor/ex_esp_frag_dir.cpp           |   11 -
 core/sql/executor/ex_esp_msg.cpp                |  243 -
 core/sql/executor/ex_frag_rt.cpp                |   33 -
 core/sql/executor/ex_globals.cpp                |    2 +
 core/sql/executor/ex_sort.cpp                   |   16 +-
 core/sql/exp/ExpLOB.h                           |    4 +-
 core/sql/exp/ExpLOBaccess.cpp                   |  119 +-
 core/sql/exp/ExpLOBaccess.h                     |   14 +-
 core/sql/exp/ExpLOBinterface.cpp                |   31 +-
 core/sql/exp/ExpLOBinterface.h                  |    9 +-
 core/sql/exp/ExpPCodeOptimizations.cpp          |    2 +-
 core/sql/exp/ExpPCodeOptsBulk.cpp               |    4 +-
 core/sql/exp/ExpPCodeOptsNativeExpr.cpp         |    2 +-
 core/sql/exp/exp_clause_derived.h               |    6 +
 core/sql/exp/exp_fixup.cpp                      |  110 +-
 core/sql/exp/exp_tuple_desc.cpp                 |   17 +-
 core/sql/export/ComDiags.cpp                    |    4 +-
 core/sql/generator/GenExplain.cpp               |    4 +-
 core/sql/generator/GenFastTransport.cpp         |   25 +-
 core/sql/generator/GenKey.cpp                   |    2 +-
 core/sql/generator/GenRelExeUtil.cpp            |    7 +-
 core/sql/generator/GenRelGrby.cpp               |    2 +-
 core/sql/generator/GenRelJoin.cpp               |    2 +-
 core/sql/generator/GenRelMisc.cpp               |  105 +-
 core/sql/generator/GenRelScan.cpp               |   47 +-
 core/sql/generator/GenRelUpdate.cpp             |   12 +-
 core/sql/generator/GenResources.cpp             |    2 +-
 core/sql/generator/Generator.cpp                |   32 +-
 core/sql/generator/Generator.h                  |   10 +
 core/sql/langman/LmRoutineJava.cpp              |    3 +-
 core/sql/langman/LmUtility.cpp                  |    2 +-
 core/sql/nskgmake/sort/Makefile                 |    3 +-
 core/sql/optimizer/Analyzer.cpp                 |   15 +-
 core/sql/optimizer/Analyzer.h                   |    5 +
 core/sql/optimizer/BindItemExpr.cpp             |    6 +-
 core/sql/optimizer/BindRI.cpp                   |    2 +-
 core/sql/optimizer/BindRelExpr.cpp              |  151 +-
 core/sql/optimizer/BindWA.cpp                   |    1 +
 core/sql/optimizer/BindWA.h                     |    2 +-
 core/sql/optimizer/CacheWA.cpp                  |    3 +
 core/sql/optimizer/ColStatDesc.cpp              |   20 +-
 core/sql/optimizer/ControlDB.cpp                |    8 +-
 core/sql/optimizer/EncodedValue.cpp             |    3 +-
 core/sql/optimizer/HDFSHook.cpp                 |    2 +-
 core/sql/optimizer/HbaseSearchSpec.h            |   52 +-
 core/sql/optimizer/ImplRule.cpp                 |    4 -
 core/sql/optimizer/Inlining.cpp                 |   19 -
 core/sql/optimizer/ItemFuncUDF.h                |   11 +-
 core/sql/optimizer/ItemOther.h                  |    2 +-
 core/sql/optimizer/LargeScopeRules.cpp          |    4 +-
 core/sql/optimizer/MJVIndexBuilder.cpp          |   12 +-
 core/sql/optimizer/MVCandidates.cpp             |   10 +-
 core/sql/optimizer/MVInfo.cpp                   |   13 +-
 core/sql/optimizer/MVJoinGraph.cpp              |    5 +-
 core/sql/optimizer/MjvBuilder.cpp               |    2 +-
 core/sql/optimizer/MultiJoin.cpp                |    2 +-
 core/sql/optimizer/MvRefreshBuilder.cpp         |    4 +-
 core/sql/optimizer/NAClusterInfo.cpp            |    2 +-
 core/sql/optimizer/NAFileSet.cpp                |    8 -
 core/sql/optimizer/NAFileSet.h                  |    4 -
 core/sql/optimizer/NARoutine.cpp                |   67 +-
 core/sql/optimizer/NATable.cpp                  | 4362 +++++++++---------
 core/sql/optimizer/NATable.h                    |    9 +-
 core/sql/optimizer/NodeMap.cpp                  |    2 +-
 core/sql/optimizer/NormRelExpr.cpp              |    8 +-
 core/sql/optimizer/NormWA.cpp                   |    4 +-
 core/sql/optimizer/NormWA.h                     |    8 +
 core/sql/optimizer/OptItemExpr.cpp              |    2 +-
 core/sql/optimizer/OptLogRelExpr.cpp            |    2 +-
 core/sql/optimizer/OptRange.cpp                 |    4 +-
 core/sql/optimizer/QRDescGenerator.cpp          |    2 +-
 core/sql/optimizer/QRDescGenerator.h            |    5 +-
 core/sql/optimizer/RETDesc.cpp                  |   10 +-
 core/sql/optimizer/Refresh.cpp                  |    2 +-
 core/sql/optimizer/RelExeUtil.h                 |    5 +-
 core/sql/optimizer/RelExpr.cpp                  |   34 +-
 core/sql/optimizer/RelMisc.h                    |    3 +-
 core/sql/optimizer/RelPackedRows.cpp            |    2 +-
 core/sql/optimizer/RelRoutine.cpp               |    2 +-
 core/sql/optimizer/RelScan.h                    |    7 +-
 core/sql/optimizer/Rule.cpp                     |    4 +-
 core/sql/optimizer/ScanOptimizer.cpp            |    4 +-
 core/sql/optimizer/SchemaDB.cpp                 |    2 +-
 core/sql/optimizer/SearchKey.cpp                |    6 +-
 core/sql/optimizer/Stats.cpp                    |    3 +-
 core/sql/optimizer/Stats.h                      |   12 +-
 core/sql/optimizer/TableNameMap.h               |    3 +-
 core/sql/optimizer/TransRule.cpp                |    2 +-
 core/sql/optimizer/VEGTable.cpp                 |    6 +-
 core/sql/optimizer/ValueDesc.cpp                |    2 +-
 core/sql/optimizer/memo.cpp                     |    2 +-
 core/sql/parser/ElemDDLHbaseOptions.h           |    3 +-
 core/sql/parser/SqlParserAux.cpp                |   27 +-
 core/sql/parser/SqlParserAux.h                  |    4 -
 core/sql/parser/StmtDDLCreate.cpp               |    6 +-
 core/sql/parser/sqlparser.y                     |  137 +-
 core/sql/qmscommon/QRLogger.cpp                 |    6 +
 core/sql/qmscommon/Range.cpp                    |    3 +-
 core/sql/qmscommon/Range.h                      |    3 +-
 core/sql/regress/compGeneral/DIFF042.KNOWN      |   36 +-
 core/sql/regress/compGeneral/EXPECTED001.SB     |    2 +-
 core/sql/regress/privs1/EXPECTED120             | 1222 +++++
 core/sql/regress/privs1/EXPECTED137             |  216 +-
 core/sql/regress/privs1/TEST120                 |  379 ++
 core/sql/regress/privs1/TEST137                 |   53 +-
 core/sql/regress/seabase/EXPECTED022            |    2 +-
 core/sql/regress/tools/regress-filter-linux     |    2 +-
 core/sql/runtimestats/ssmpipc.cpp               |    5 +-
 core/sql/sort/Qsort.h                           |    5 +-
 core/sql/sort/Record.cpp                        |   14 +-
 core/sql/sort/Record.h                          |    8 +
 core/sql/sort/SortTopN.cpp                      |  318 ++
 core/sql/sort/SortTopN.h                        |   89 +
 core/sql/sort/SortUtil.cpp                      |   78 +-
 core/sql/sort/SortUtil.h                        |    2 +-
 core/sql/sort/SortUtilCfg.cpp                   |   43 +-
 core/sql/sort/SortUtilCfg.h                     |   11 +-
 core/sql/sqlcomp/CmpDescribe.cpp                |    4 +-
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp        |   31 +-
 core/sql/sqlcomp/CmpSeabaseDDLindex.cpp         |    8 +-
 core/sql/sqlcomp/CmpSeabaseDDLrepos.cpp         |    4 +-
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp         |   63 +-
 core/sql/sqlcomp/CmpSeabaseDDLview.cpp          |    4 +-
 core/sql/sqlcomp/DefaultConstants.h             |    7 +-
 core/sql/sqlcomp/PrivMgrCommands.cpp            |  194 +-
 core/sql/sqlcomp/PrivMgrCommands.h              |   22 +-
 core/sql/sqlcomp/PrivMgrComponentPrivileges.cpp |   76 +-
 core/sql/sqlcomp/PrivMgrDesc.h                  |   90 +-
 core/sql/sqlcomp/PrivMgrPrivileges.cpp          |  602 +--
 core/sql/sqlcomp/PrivMgrPrivileges.h            |   38 +-
 core/sql/sqlcomp/PrivMgrRoles.cpp               |   22 +-
 core/sql/sqlcomp/QCache.cpp                     |   21 +-
 core/sql/sqlcomp/QCache.h                       |    1 +
 core/sql/sqlcomp/nadefaults.cpp                 |   18 +-
 core/sql/sqlcomp/parser.cpp                     |    5 +-
 core/sql/sqlmsg/GetErrorMessage.cpp             |    2 +-
 core/sql/sqlmxevents/logmxevent_traf.cpp        |    2 +-
 .../java/org/trafodion/sql/HBaseClient.java     |   13 +-
 core/sql/udrserv/spinfo.cpp                     |    3 +-
 core/sql/ustat/hs_cli.cpp                       |  105 +-
 core/sql/ustat/hs_cli.h                         |    4 +
 core/sql/ustat/hs_globals.cpp                   |   28 +-
 core/sql/ustat/hs_globals.h                     |   14 +
 core/sql/ustat/hs_la.cpp                        |    3 +
 core/sql/ustat/hs_log.h                         |    2 +
 core/sql/ustat/hs_parser.cpp                    |   11 +-
 core/sql/ustat/hs_update.cpp                    |    6 +
 .../org/trafodion/jdbc_test/TestForeignKey.java |  224 +
 .../src/asciidoc/_chapters/binder_msgs.adoc     |  102 +-
 .../src/asciidoc/_chapters/ddl_msgs.adoc        |  143 +
 docs/messages_guide/src/asciidoc/index.adoc     |    1 +
 .../src/asciidoc/_chapters/sql_statements.adoc  |   10 +-
 install/installer/traf_config_setup             |    5 -
 install/installer/traf_secure_setup             |   25 +-
 install/installer/traf_sqconfig                 |    5 +-
 install/installer/trafodion_install             |   13 +
 .../Install/win64_installer/installer.iss       |   53 +-
 win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc    |    8 +-
 .../odbcclient/TranslationDll/TranslationDll.rc |    8 +-
 win-odbc64/odbcclient/build_os.bat              |   10 +-
 win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.RC |    8 +-
 win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.RC |    8 +-
 win-odbc64/odbcclient/drvr35/cdatasource.cpp    |    2 +-
 win-odbc64/odbcclient/drvr35/drvr35.rc          |    8 +-
 win-odbc64/odbcclient/drvr35adm/drvr35adm.h     |    2 +-
 win-odbc64/odbcclient/drvr35adm/drvr35adm.rc    |    8 +-
 215 files changed, 7202 insertions(+), 7123 deletions(-)
----------------------------------------------------------------------