Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 624bafbd0 -> 901cebd7d


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


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

Branch: refs/heads/master
Commit: 8a8c67a76cd63513c834b5aa2e362ba5472fe18f
Parents: 986dba8 43b005f
Author: Amanda Moran <ama...@apache.com>
Authored: Wed Oct 12 17:07:53 2016 +0000
Committer: Amanda Moran <ama...@apache.com>
Committed: Wed Oct 12 17:07:53 2016 +0000

----------------------------------------------------------------------
 .../SqlCompilerDebugger/ItemExpressionView.cpp  |   4 +-
 core/sql/arkcmp/CmpContext.cpp                  |   7 +-
 core/sql/arkcmp/CmpStatement.cpp                |   2 +
 core/sql/arkcmp/CmpStoredProc.cpp               |   2 +-
 core/sql/arkcmp/cmpargs.cpp                     |   2 +-
 core/sql/bin/SqlciErrors.txt                    |   2 +-
 core/sql/cli/Context.cpp                        |  21 +-
 core/sql/cli/Globals.cpp                        |  17 +-
 core/sql/comexe/ComTdbSort.h                    |  10 +-
 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.h                           |   4 +-
 core/sql/common/NAMemory.cpp                    |   2 +-
 core/sql/common/NATestpoint.cpp                 |   3 +-
 core/sql/common/NATraceList.h                   |   2 +-
 core/sql/executor/ExHbaseAccess.cpp             |   1 +
 core/sql/executor/ExHbaseDDL.cpp                |   2 +-
 core/sql/executor/ex_sort.cpp                   |  16 +-
 core/sql/exp/ExpLOB.h                           |   4 +-
 core/sql/exp/ExpPCodeOptimizations.cpp          |   2 +-
 core/sql/exp/ExpPCodeOptsBulk.cpp               |   4 +-
 core/sql/exp/ExpPCodeOptsNativeExpr.cpp         |   2 +-
 core/sql/exp/exp_tuple_desc.cpp                 |  17 +-
 core/sql/export/ComDiags.cpp                    |   4 +-
 core/sql/generator/GenExplain.cpp               |   2 +-
 core/sql/generator/GenKey.cpp                   |   2 +-
 core/sql/generator/GenRelGrby.cpp               |   2 +-
 core/sql/generator/GenRelJoin.cpp               |   2 +-
 core/sql/generator/GenRelMisc.cpp               |   3 +-
 core/sql/generator/GenRelScan.cpp               |   2 +-
 core/sql/generator/GenRelUpdate.cpp             |  12 +-
 core/sql/generator/GenResources.cpp             |   2 +-
 core/sql/generator/Generator.cpp                |  16 +-
 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              |  11 +-
 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/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/NATable.cpp                  |   8 +-
 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                 |   3 +-
 core/sql/optimizer/RelExpr.cpp                  |  29 +-
 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                |   6 +-
 core/sql/parser/StmtDDLCreate.cpp               |   6 +-
 core/sql/parser/sqlparser.y                     |  36 +--
 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/runtimestats/ssmpipc.cpp               |   2 +-
 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        |  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             |   1 +
 core/sql/sqlcomp/PrivMgrDesc.h                  |   8 +-
 core/sql/sqlcomp/PrivMgrPrivileges.cpp          |   8 +-
 core/sql/sqlcomp/QCache.cpp                     |   2 +-
 core/sql/sqlcomp/QCache.h                       |   1 +
 core/sql/sqlcomp/nadefaults.cpp                 |   2 +
 core/sql/sqlcomp/parser.cpp                     |   5 +-
 core/sql/sqlmsg/GetErrorMessage.cpp             |   2 +-
 .../java/org/trafodion/sql/HBaseClient.java     |  13 +-
 core/sql/udrserv/spinfo.cpp                     |   3 +-
 core/sql/ustat/hs_cli.cpp                       |   2 +-
 core/sql/ustat/hs_parser.cpp                    |   4 +-
 .../src/asciidoc/_chapters/binder_msgs.adoc     | 102 +++---
 docs/messages_guide/src/asciidoc/index.adoc     |   1 +
 130 files changed, 1009 insertions(+), 464 deletions(-)
----------------------------------------------------------------------


Reply via email to