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/02/14 07:44:17 UTC
[04/10] incubator-trafodion git commit: Merge remote branch
'origin/master' into vsbb_upsert
Merge remote branch 'origin/master' into vsbb_upsert
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/6b5799b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/6b5799b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/6b5799b1
Branch: refs/heads/master
Commit: 6b5799b1f232f61060b226ff8477469e8799c28f
Parents: 7760c9f ee8b16d
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Fri Feb 3 01:32:35 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Fri Feb 3 01:32:35 2017 +0000
----------------------------------------------------------------------
core/sqf/export/include/dtm/tm.h | 2 +-
core/sqf/monitor/linux/process.cxx | 19 +-
.../transactional/TrxTransactionState.java.tmpl | 13 +-
core/sqf/src/tm/tmlib.cpp | 23 +
core/sqf/src/tm/tmlib.h | 1 +
core/sqf/src/tm/tools/dtmci.cpp | 1 +
core/sql/arkcmp/CmpStatement.cpp | 46 +-
core/sql/arkcmp/CmpStatement.h | 7 +-
core/sql/arkcmp/CompException.cpp | 82 +-
core/sql/arkcmp/CompException.h | 25 +-
core/sql/bin/SqlciErrors.txt | 3 +-
core/sql/comexe/ComTdbExeUtil.h | 1 +
core/sql/comexe/ComTdbHdfsScan.h | 2 +-
core/sql/comexe/ComTdbSort.h | 2 +-
core/sql/executor/ExExeUtil.h | 15 +-
core/sql/executor/ExExeUtilGet.cpp | 892 ++++++-------
core/sql/executor/ExHdfsScan.cpp | 110 +-
core/sql/executor/ExHdfsScan.h | 11 +-
core/sql/executor/HBaseClient_JNI.cpp | 24 +-
core/sql/executor/HBaseClient_JNI.h | 3 +-
core/sql/executor/ex_control.cpp | 8 +-
core/sql/exp/ExpHbaseInterface.cpp | 9 +-
core/sql/exp/ExpHbaseInterface.h | 8 +-
core/sql/exp/ExpLOBinterface.h | 3 +
core/sql/export/ExceptionCallBack.h | 6 +-
core/sql/export/NAAbort.cpp | 14 +-
core/sql/generator/GenPreCode.cpp | 5 +
core/sql/generator/GenRelExeUtil.cpp | 2 +
core/sql/generator/GenRelMisc.cpp | 14 +-
core/sql/nskgmake/Makerules.linux | 4 +-
core/sql/optimizer/BindRelExpr.cpp | 18 +-
core/sql/optimizer/ColStatDesc.cpp | 96 ++
core/sql/optimizer/ColStatDesc.h | 25 +-
core/sql/optimizer/ImplRule.cpp | 9 +-
core/sql/optimizer/NATable.cpp | 100 +-
core/sql/optimizer/NATable.h | 2 +-
core/sql/optimizer/NormRelExpr.cpp | 518 +++++---
core/sql/optimizer/OptLogRelExpr.cpp | 77 +-
core/sql/optimizer/RelExeUtil.cpp | 47 +-
core/sql/optimizer/RelExeUtil.h | 3 +
core/sql/optimizer/RelExpr.cpp | 421 ++++++-
core/sql/optimizer/RelExpr.h | 16 +-
core/sql/optimizer/RelGrby.h | 5 +-
core/sql/optimizer/RelJoin.h | 5 +-
core/sql/optimizer/RelMisc.h | 188 ++-
core/sql/optimizer/RelScan.h | 5 +-
core/sql/optimizer/RelSet.h | 5 +-
core/sql/optimizer/VEGTable.cpp | 29 +-
core/sql/optimizer/ValueDesc.cpp | 2 +-
core/sql/optimizer/ValueDesc.h | 2 +-
core/sql/parser/SqlParserAux.cpp | 7 +-
core/sql/parser/sqlparser.y | 4 +-
core/sql/pom.xml | 7 +
core/sql/regress/compGeneral/EXPECTED042 | 785 +++++-------
core/sql/regress/compGeneral/EXPECTED045 | 61 +-
core/sql/regress/compGeneral/FILTER042 | 6 +-
core/sql/regress/compGeneral/TEST042 | 92 +-
core/sql/regress/compGeneral/TEST045 | 11 +
core/sql/regress/executor/EXPECTED107 | 52 +
core/sql/regress/executor/TEST107 | 27 +
core/sql/regress/hive/EXPECTED009 | 58 +-
core/sql/regress/hive/FILTER005 | 34 +
core/sql/regress/hive/TEST009 | 4 +-
core/sql/regress/privs1/EXPECTED123 | 1187 ++++++++++++++++++
core/sql/regress/privs1/TEST123 | 178 +++
core/sql/regress/tools/runregr_compGeneral.ksh | 39 +-
core/sql/sqlcomp/CmpMain.cpp | 15 +
core/sql/sqlcomp/DefaultConstants.h | 7 +-
core/sql/sqlcomp/nadefaults.cpp | 11 +-
core/sql/sqlmxevents/logmxevent_traf.cpp | 150 ++-
core/sql/sqlmxevents/logmxevent_traf.h | 7 +-
core/sql/sqludr/sqludr.cpp | 14 +-
.../java/org/trafodion/sql/HBaseClient.java | 54 +-
.../java/org/trafodion/sql/udr/ColumnInfo.java | 22 +-
.../sql/udr/ComparisonPredicateInfo.java | 15 +-
.../org/trafodion/sql/udr/ConstraintInfo.java | 13 +-
.../java/org/trafodion/sql/udr/OrderInfo.java | 4 +
.../trafodion/sql/udr/ParameterListInfo.java | 14 +-
.../org/trafodion/sql/udr/PartitionInfo.java | 6 +-
.../org/trafodion/sql/udr/PredicateInfo.java | 17 +-
.../sql/udr/TMUDRSerializableObject.java | 72 +-
.../java/org/trafodion/sql/udr/TableInfo.java | 14 +-
.../java/org/trafodion/sql/udr/TupleInfo.java | 21 +-
.../java/org/trafodion/sql/udr/TypeInfo.java | 25 +-
.../main/java/org/trafodion/sql/udr/UDR.java | 83 +-
.../trafodion/sql/udr/UDRInvocationInfo.java | 26 +-
.../java/org/trafodion/sql/udr/UDRPlanInfo.java | 38 +-
core/sql/ustat/hs_cli.cpp | 27 +-
core/sql/ustat/hs_cli.h | 3 +
core/sql/ustat/hs_const.h | 1 +
core/sql/ustat/hs_globals.cpp | 44 +-
core/sql/ustat/hs_la.cpp | 29 +-
core/sql/ustat/hs_la.h | 27 +-
core/sql/ustat/hs_log.cpp | 7 +-
core/sql/ustat/hs_parser.cpp | 13 +
core/sql/ustat/hs_util.cpp | 4 +-
install/.gitignore | 3 +-
install/ambari-installer/Makefile | 26 +-
install/ambari-installer/meta.template | 34 +
.../mpack-install/am_install.sh | 17 +-
install/ambari-installer/mpack.json | 46 +
install/ambari-installer/repo.template | 2 +-
.../2.1/package/scripts/trafodiondcs.py | 2 +-
.../2.1/package/scripts/trafodionnode.py | 8 +-
.../custom-services/TRAFODION/2.1/metainfo.xml | 34 -
install/ambari-installer/traf-mpack/mpack.json | 46 -
install/ambari-installer/traf_ambari.spec | 14 +-
install/python-installer/db_uninstall.py | 114 ++
install/python-installer/scripts/hadoop_mods.py | 4 +
109 files changed, 4844 insertions(+), 1769 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6b5799b1/core/sql/generator/GenPreCode.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6b5799b1/core/sql/optimizer/BindRelExpr.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6b5799b1/core/sql/optimizer/RelExpr.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6b5799b1/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------