You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sa...@apache.org on 2017/03/28 15:19:04 UTC
[4/6] incubator-trafodion git commit: Merge remote branch
'origin/master' into 2.2_work
Merge remote branch 'origin/master' into 2.2_work
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/22ef1e28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/22ef1e28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/22ef1e28
Branch: refs/heads/master
Commit: 22ef1e28ef2a264bbe9d937efb783c65e64ec408
Parents: d3d707a 0c6089d
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Thu Mar 23 22:33:43 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Thu Mar 23 22:33:43 2017 +0000
----------------------------------------------------------------------
core/conn/trafci/install/Installer.java-tmpl | 36 +-
.../java/org/trafodion/ci/QueryWrapper.java | 6 +-
core/sqf/sql/scripts/analyzeMessageGuide.py | 3 +
core/sqf/sql/scripts/install_local_hadoop | 4 +
core/sqf/src/seabed/src/threadl.cpp | 38 +-
.../hbase/client/transactional/TmDDL.java | 33 +-
.../transactional/SplitBalanceHelper.java | 11 +-
.../transactional/TrxRegionObserver.java.tmpl | 2 +-
.../java/org/trafodion/dtm/HBaseTxClient.java | 487 +-
core/sql/bin/SqlciErrors.txt | 40 +-
core/sql/cli/Cli.cpp | 2 +-
core/sql/comexe/ComTdb.h | 1 +
core/sql/comexe/ComTdbExeUtil.cpp | 74 +
core/sql/comexe/ComTdbExeUtil.h | 49 +-
core/sql/common/CharType.cpp | 41 +-
core/sql/common/CharType.h | 7 +-
core/sql/common/ComSecurityKey.cpp | 118 +-
core/sql/common/ComSecurityKey.h | 18 +-
core/sql/common/ComSmallDefs.h | 4 +
core/sql/common/ComUser.cpp | 11 +
core/sql/common/ComUser.h | 1 +
core/sql/common/NAType.cpp | 11 +
core/sql/common/NAType.h | 3 +
core/sql/common/conversionLocale.cpp | 4 +-
core/sql/executor/ExComTdb.cpp | 8 +
core/sql/executor/ExExeUtil.h | 96 +
core/sql/executor/ExExeUtilGet.cpp | 54 +-
core/sql/executor/ExExeUtilMisc.cpp | 125 +
core/sql/executor/ExHbaseAccess.cpp | 18 +-
core/sql/executor/ExHbaseIUD.cpp | 30 +-
core/sql/executor/ExUdr.cpp | 2 +-
core/sql/exp/ExpHbaseDefs.h | 2 +
core/sql/exp/exp_function.cpp | 10 +-
core/sql/exp/exp_function.h | 20 +-
core/sql/generator/GenExplain.cpp | 27 +-
core/sql/generator/GenItemFunc.cpp | 14 +-
core/sql/generator/GenRelExeUtil.cpp | 68 +-
core/sql/generator/GenRelGrby.cpp | 10 +-
core/sql/generator/GenRelMisc.cpp | 10 +-
core/sql/generator/Generator.cpp | 8 +
core/sql/optimizer/BindRelExpr.cpp | 78 +-
core/sql/optimizer/ItemExpr.h | 1 -
core/sql/optimizer/ItemFunc.h | 6 +-
core/sql/optimizer/NATable.cpp | 2 +
core/sql/optimizer/ObjectNames.cpp | 37 +-
core/sql/optimizer/ObjectNames.h | 4 +
core/sql/optimizer/RelExeUtil.cpp | 56 +
core/sql/optimizer/RelExeUtil.h | 44 +-
core/sql/optimizer/SynthType.cpp | 16 +-
core/sql/parser/ParKeyWords.cpp | 1 +
core/sql/parser/sqlparser.y | 39 +-
core/sql/regress/charsets/EXPECTED004 | 6 +-
core/sql/regress/charsets/EXPECTED314 | 68 +
core/sql/regress/charsets/TEST314 | 12 +
core/sql/regress/hive/EXPECTED005 | 132 +-
core/sql/regress/hive/EXPECTED007 | 86 +-
core/sql/regress/hive/EXPECTED009 | 23 +-
core/sql/regress/hive/EXPECTED017 | 18 +-
core/sql/regress/hive/TEST005 | 20 +-
core/sql/regress/hive/TEST007 | 80 +-
core/sql/regress/hive/TEST009 | 3 +-
core/sql/regress/privs1/EXPECTED120 | 129 +-
core/sql/regress/privs1/TEST120 | 33 +-
core/sql/regress/seabase/EXPECTED002 | 185 +-
core/sql/regress/seabase/EXPECTED003 | 114 +-
core/sql/regress/seabase/EXPECTED010 | 378 +-
core/sql/regress/seabase/EXPECTED011 | 18 +-
core/sql/regress/seabase/EXPECTED020 | 4 +-
core/sql/regress/seabase/EXPECTED031 | 239 +-
core/sql/regress/seabase/EXPECTED033 | 21 +-
core/sql/regress/seabase/TEST002 | 30 +
core/sql/regress/seabase/TEST003 | 16 +-
core/sql/regress/seabase/TEST011 | 2 +
core/sql/regress/seabase/TEST031 | 74 +
core/sql/regress/seabase/TEST033 | 13 +-
core/sql/regress/tools/runregr_privs1.ksh | 49 +-
core/sql/regress/tools/runregr_privs2.ksh | 49 +-
core/sql/regress/udr/EXPECTED001 | 14 +-
core/sql/regress/udr/EXPECTED107.SB | 10 +-
core/sql/regress/udr/TEST001 | 14 +-
core/sql/regress/udr/TEST107 | 10 +-
core/sql/sqlci/sqlci_lex.ll | 1 +
core/sql/sqlci/sqlci_yacc.y | 2 +
core/sql/sqlcomp/CmpDDLCatErrorCodes.h | 30 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 174 +-
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 6 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 3 +
core/sql/sqlcomp/DefaultConstants.h | 10 +-
core/sql/sqlcomp/PrivMgrCommands.cpp | 8 +-
core/sql/sqlcomp/PrivMgrPrivileges.cpp | 33 +-
core/sql/sqlcomp/PrivMgrPrivileges.h | 1 -
core/sql/sqlcomp/nadefaults.cpp | 44 +-
core/sql/sqlcomp/parser.cpp | 2 +-
.../java/org/trafodion/sql/HBaseClient.java | 17 +
.../java/org/trafodion/sql/HBulkLoadClient.java | 2 +-
core/sql/ustat/hs_cli.cpp | 2 +
.../src/asciidoc/_chapters/query_execution.adoc | 71 +-
.../src/asciidoc/_chapters/ddl_msgs.adoc | 111 +-
.../src/asciidoc/_chapters/olap_functions.adoc | 129 +-
.../sql_functions_and_expressions.adoc | 16663 ++++++++---------
.../_chapters/sql_language_elements.adoc | 6 +-
.../src/asciidoc/_chapters/sql_statements.adoc | 114 +-
.../TRAFODION/2.1/service_advisor.py | 3 +-
install/installer/traf_hortonworks_mods | 6 +
install/python-installer/configs/mod_cfgs.json | 1 +
105 files changed, 11552 insertions(+), 9527 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/22ef1e28/core/sql/optimizer/SynthType.cpp
----------------------------------------------------------------------