Merge remote branch 'origin/master' into TRAFODION-2235

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

Branch: refs/heads/master
Commit: 41c384ed5413c91c80b368bf0dfb74daef7ca1ab
Parents: 6dc469d 54abce6
Author: Zalo Correa <zalo.cor...@esgyn.com>
Authored: Tue Oct 11 10:31:37 2016 -0700
Committer: Zalo Correa <zalo.cor...@esgyn.com>
Committed: Tue Oct 11 10:31:37 2016 -0700

----------------------------------------------------------------------
 core/conn/jdbc_type2/native/SQLMXDriver.cpp     |   13 -
 core/sqf/commonLogger/CommonLogger.cpp          |    5 +-
 core/sqf/commonLogger/CommonLogger.h            |    2 +
 core/sqf/sql/scripts/sqcheck                    |   27 +-
 .../transactional/TransactionManager.java       |   11 +-
 .../client/transactional/TransactionState.java  |   41 +-
 .../transactional/SsccRegionEndpoint.java.tmpl  |    9 +-
 .../transactional/TrxRegionEndpoint.java.tmpl   |   14 +-
 .../transactional/TrxRegionObserver.java.tmpl   |    2 +-
 .../java/org/trafodion/dtm/HBaseTxClient.java   |   49 +-
 .../java/org/trafodion/dtm/TmAuditTlog.java     |   11 +-
 .../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                    |    7 +-
 core/sql/cli/Cli.cpp                            |  110 +-
 core/sql/cli/Cli.h                              |   16 -
 core/sql/cli/CliExtern.cpp                      |   66 +-
 core/sql/cli/Context.cpp                        |   21 +-
 core/sql/cli/ExSqlComp.cpp                      |   10 +-
 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/ComTdbSortGrby.cpp              |    3 +-
 core/sql/comexe/ComTdbSortGrby.h                |   23 +-
 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/ComExeTrace.cpp                 |    1 +
 core/sql/common/Ipc.cpp                         |   22 +-
 core/sql/common/Ipc.h                           |    6 +-
 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/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                |   63 +-
 core/sql/executor/ex_globals.cpp                |    2 +
 core/sql/executor/ex_globals.h                  |   14 +
 core/sql/executor/ex_sort_grby.cpp              | 1041 ++++++++--
 core/sql/executor/ex_sort_grby.h                |  120 +-
 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/ExpPCodeClauseGen.cpp              |    8 +
 core/sql/exp/ExpPCodeOptimizations.cpp          |    2 +-
 core/sql/exp/ExpPCodeOptsBulk.cpp               |    4 +-
 core/sql/exp/ExpPCodeOptsNativeExpr.cpp         |    2 +-
 core/sql/exp/exp_clause.cpp                     |   21 +-
 core/sql/exp/exp_clause_derived.h               |    8 +-
 core/sql/exp/exp_comp.cpp                       |  108 +-
 core/sql/exp/exp_conv.cpp                       |    2 +-
 core/sql/exp/exp_tuple_desc.cpp                 |   17 +-
 core/sql/export/ComDiags.cpp                    |    4 +-
 core/sql/generator/GenExpGenerator.cpp          |    1 -
 core/sql/generator/GenExplain.cpp               |   18 +-
 core/sql/generator/GenFastTransport.cpp         |   25 +-
 core/sql/generator/GenItemExpr.cpp              |    4 +
 core/sql/generator/GenItemFunc.cpp              |    2 +
 core/sql/generator/GenKey.cpp                   |    2 +-
 core/sql/generator/GenPreCode.cpp               |   10 +-
 core/sql/generator/GenRelExeUtil.cpp            |    7 +-
 core/sql/generator/GenRelGrby.cpp               |   87 +-
 core/sql/generator/GenRelJoin.cpp               |    2 +-
 core/sql/generator/GenRelMisc.cpp               |  102 +-
 core/sql/generator/GenRelScan.cpp               |   47 +-
 core/sql/generator/GenRelUpdate.cpp             |  162 +-
 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/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              |  105 +-
 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                 |    8 +
 core/sql/optimizer/ItemExpr.cpp                 |   17 +-
 core/sql/optimizer/ItemExpr.h                   |   10 +-
 core/sql/optimizer/ItemFunc.h                   |   11 +-
 core/sql/optimizer/ItemFuncUDF.h                |   11 +-
 core/sql/optimizer/ItemLog.h                    |   22 +-
 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/NATable.cpp                  |    8 +-
 core/sql/optimizer/NATable.h                    |    9 +-
 core/sql/optimizer/NodeMap.cpp                  |    2 +-
 core/sql/optimizer/NormItemExpr.cpp             |    8 +-
 core/sql/optimizer/NormRelExpr.cpp              |   65 +-
 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/OptPhysRelExpr.cpp           |   16 +-
 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/RelCache.cpp                 |   12 +
 core/sql/optimizer/RelExeUtil.h                 |    5 +-
 core/sql/optimizer/RelExpr.cpp                  |   47 +-
 core/sql/optimizer/RelGrby.h                    |   39 +-
 core/sql/optimizer/RelJoin.h                    |    2 +-
 core/sql/optimizer/RelMisc.h                    |    4 +-
 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/SynthType.cpp                |   14 +-
 core/sql/optimizer/TableNameMap.h               |    3 +-
 core/sql/optimizer/TransRule.cpp                |   14 +-
 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/HvRoles.h                       |    2 +-
 core/sql/parser/SqlParserAux.cpp                |   38 +-
 core/sql/parser/SqlParserAux.h                  |    4 -
 core/sql/parser/StmtDDLCreate.cpp               |    6 +-
 core/sql/parser/sqlparser.y                     |  139 +-
 core/sql/qmscommon/QRLogger.cpp                 |    8 +-
 core/sql/qmscommon/Range.cpp                    |    3 +-
 core/sql/qmscommon/Range.h                      |    3 +-
 core/sql/regress/compGeneral/EXPECTED011.SB     |   22 +-
 core/sql/regress/compGeneral/EXPECTED023        |    2 +-
 core/sql/regress/executor/TEST106               |    4 +
 core/sql/regress/hive/EXPECTED018               |  183 +-
 core/sql/regress/privs1/EXPECTED132             |  100 +-
 core/sql/regress/privs1/EXPECTED136             |    2 +
 core/sql/regress/privs2/EXPECTED129             |   23 +-
 core/sql/regress/privs2/EXPECTED135             |   17 +-
 core/sql/regress/privs2/EXPECTED138             |   22 +
 core/sql/regress/privs2/EXPECTED139             |   10 +
 core/sql/regress/privs2/EXPECTED140             |    4 +-
 core/sql/regress/privs2/EXPECTED142             |    6 +
 core/sql/regress/seabase/EXPECTED020            |   23 +
 core/sql/regress/seabase/EXPECTED033            |  617 ++++++
 core/sql/regress/seabase/TEST020                |   10 +
 core/sql/regress/seabase/TEST033                |  162 ++
 core/sql/regress/tools/regress-filter-linux     |    2 +-
 core/sql/runtimestats/ssmpipc.cpp               |    2 +-
 core/sql/sqlcomp/CmpDescribe.cpp                |    4 +-
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp        |   10 +-
 core/sql/sqlcomp/CmpSeabaseDDLindex.cpp         |    8 +-
 core/sql/sqlcomp/CmpSeabaseDDLrepos.cpp         |    4 +-
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp         |   36 +-
 core/sql/sqlcomp/CmpSeabaseDDLview.cpp          |    4 +-
 core/sql/sqlcomp/DefaultConstants.h             |    6 +-
 core/sql/sqlcomp/PrivMgrDesc.cpp                |   36 +-
 core/sql/sqlcomp/PrivMgrDesc.h                  |   30 +-
 core/sql/sqlcomp/PrivMgrPrivileges.cpp          | 1349 ++++++-------
 core/sql/sqlcomp/PrivMgrPrivileges.h            |   78 +-
 core/sql/sqlcomp/QCache.cpp                     |    3 +-
 core/sql/sqlcomp/QCache.h                       |    1 +
 core/sql/sqlcomp/nadefaults.cpp                 |   19 +-
 core/sql/sqlcomp/parser.cpp                     |    7 +-
 core/sql/sqlmsg/GetErrorMessage.cpp             |    2 +-
 core/sql/sqlmxevents/logmxevent_traf.cpp        |    8 +-
 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                   |   30 +-
 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/dcs/server/ServerManager.java |  115 +-
 .../src/asciidoc/_chapters/binder_msgs.adoc     |  102 +-
 docs/messages_guide/src/asciidoc/index.adoc     |    1 +
 docs/src/site/markdown/index.md                 |   21 +-
 .../site/resources/images/carousel/meetup.png   |  Bin 81640 -> 0 bytes
 docs/src/site/site.xml                          |    2 +-
 install/installer/traf_cloudera_mods            |   11 +-
 .../phoenix/end2end/MultiCfQueryExecTest.java   |    5 +-
 .../end2end/SaltedTableUpsertSelectTest.java    |   13 +-
 221 files changed, 4758 insertions(+), 5522 deletions(-)
----------------------------------------------------------------------


Reply via email to