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:15 UTC
[02/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/22a46a38
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/22a46a38
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/22a46a38
Branch: refs/heads/master
Commit: 22a46a385b501f0688502af49834af7ec24803c2
Parents: d92de57 6016992
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Thu Jan 26 22:01:56 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Thu Jan 26 22:01:56 2017 +0000
----------------------------------------------------------------------
.rat-excludes | 10 +-
RAT_README | 9 +
.../native/ResStatisticsStatement.cpp | 123 +-
.../odbc/nsksrvrcore/ResStatisticsStatement.cpp | 125 +-
core/sqf/export/include/dtm/tm.h | 8 +
core/sqf/export/include/dtm/tmtransaction.h | 2 +-
.../sqf/export/limited-support-tools/LSO/README | 42 +-
.../export/limited-support-tools/LSO/offender | 11 +-
.../limited-support-tools/LSO/se_blocked.sql | 35 +
core/sqf/inc/cextdecs/cextdecs.h | 14 +
core/sqf/sql/scripts/install_apache_hadoop | 4 -
core/sqf/sql/scripts/install_local_hadoop | 4 -
core/sqf/sql/scripts/update_hbase | 3 -
.../transactional/TransactionManager.java | 14 +-
.../client/transactional/TransactionState.java | 24 +
.../transactional/CommitConflictException.java | 61 +
.../transactional/TrxRegionEndpoint.java.tmpl | 90 +-
.../transactional/TrxTransactionState.java.tmpl | 72 +-
.../sqf/src/seatrans/tm/hbasetmlib2/hbasetm.cpp | 24 +-
core/sqf/src/seatrans/tm/hbasetmlib2/hbasetm.h | 2 +-
.../tm/hbasetmlib2/javaobjectinterfacetm.cpp | 53 +-
.../tm/hbasetmlib2/javaobjectinterfacetm.h | 5 +-
.../java/org/trafodion/dtm/HBaseTxClient.java | 61 +-
.../dtm/TransactionManagerException.java | 70 +
.../sqf/src/seatrans/tm/hbasetmlib2/testrun.cpp | 6 +-
core/sqf/src/tm/tmlib.cpp | 33 +-
core/sqf/src/tm/tmlibmsg.h | 2 +
core/sqf/src/tm/tmrm.h | 2 +-
core/sqf/src/tm/tmrmhbase.cpp | 9 +-
core/sqf/src/tm/tmrmhbase.h | 2 +-
core/sqf/src/tm/tmrmtse.cpp | 2 +-
core/sqf/src/tm/tmrmtse.h | 2 +-
core/sqf/src/tm/tmtransaction.cpp | 9 +-
core/sqf/src/tm/tmtx.cpp | 2 +-
core/sqf/src/tm/tmtxbranches.cpp | 7 +-
core/sqf/src/tm/tmtxbranches.h | 2 +-
core/sqf/src/tm/tmxatxn.cpp | 2 +-
core/sqf/sysinstall/etc/sudoers.d/trafodion | 3 +
core/sql/bin/SqlciErrors.txt | 24 +-
core/sql/cli/Cli.cpp | 85 +-
core/sql/cli/Context.cpp | 9 -
core/sql/cli/Globals.cpp | 73 -
core/sql/cli/Globals.h | 4 -
core/sql/cli/Statement.cpp | 123 -
core/sql/cli/Statement.h | 5 -
core/sql/cli/sqlcli.h | 20 +-
core/sql/comexe/ComTdbHbaseAccess.cpp | 5 +-
core/sql/comexe/ComTdbHbaseAccess.h | 2 +
core/sql/common/ComMisc.cpp | 20 +-
core/sql/executor/ExExeUtil.h | 2 +
core/sql/executor/ExExeUtilCli.cpp | 10 +-
core/sql/executor/ExExeUtilCli.h | 3 +-
core/sql/executor/ExExeUtilCommon.cpp | 3 +-
core/sql/executor/ExExeUtilGet.cpp | 37 +-
core/sql/executor/ExExeUtilGetStats.cpp | 306 +-
core/sql/executor/ExExeUtilLoad.cpp | 131 +-
core/sql/executor/ExHbaseAccess.cpp | 20 +-
core/sql/executor/ExHbaseAccess.h | 3 +
core/sql/executor/ExHbaseIUD.cpp | 69 +-
core/sql/executor/ExHdfsScan.cpp | 51 +-
core/sql/executor/ExStats.cpp | 3097 ++++++------------
core/sql/executor/ExStats.h | 623 +---
core/sql/executor/ex_exe_stmt_globals.h | 3 -
core/sql/executor/ex_frag_rt.cpp | 16 +-
core/sql/executor/ex_root.cpp | 38 -
core/sql/executor/ex_sort.cpp | 6 +
core/sql/executor/ex_transaction.cpp | 15 +-
core/sql/exp/ExpError.h | 4 +-
core/sql/exp/ExpErrorEnums.h | 1 +
core/sql/exp/ExpHbaseDefs.h | 2 +
core/sql/exp/ExpHbaseInterface.cpp | 7 +-
core/sql/exp/ExpLOB.cpp | 10 +
core/sql/exp/ExpLOBaccess.cpp | 305 +-
core/sql/exp/ExpLOBaccess.h | 42 +-
core/sql/exp/ExpLOBprocess.cpp | 2 +-
core/sql/export/ComDiags.cpp | 6 +-
core/sql/export/ComDiags.h | 2 +-
core/sql/generator/GenExpGenerator.cpp | 2 +-
core/sql/generator/GenPreCode.cpp | 4 +-
core/sql/generator/GenRelExeUtil.cpp | 25 +-
core/sql/generator/GenRelScan.cpp | 2 +
core/sql/generator/GenRelUpdate.cpp | 49 +-
core/sql/optimizer/BindItemExpr.cpp | 21 +-
core/sql/optimizer/BindRelExpr.cpp | 137 +-
core/sql/optimizer/ImplRule.cpp | 4 +-
core/sql/optimizer/Inlining.cpp | 54 +-
core/sql/optimizer/NormRelExpr.cpp | 11 +
core/sql/optimizer/RETDesc.cpp | 44 +-
core/sql/optimizer/RelExeUtil.cpp | 5 +-
core/sql/optimizer/RelExpr.cpp | 6 +-
core/sql/optimizer/RelJoin.h | 2 +
core/sql/optimizer/RelUpdate.h | 74 +-
core/sql/optimizer/costmethod.cpp | 4 +
core/sql/regress/compGeneral/EXPECTED005 | 54 +-
core/sql/regress/compGeneral/EXPECTED013.SB | 21 +-
core/sql/regress/compGeneral/EXPECTED045 | 30 +-
core/sql/regress/core/EXPECTED116 | 47 +-
core/sql/regress/core/EXPECTEDRTS | 1713 +++++-----
core/sql/regress/core/FILTERRTS | 15 +-
core/sql/regress/executor/DIFF015.KNOWN | 24 +
core/sql/regress/executor/EXPECTED015.SB | 39 +
core/sql/regress/executor/EXPECTED130 | 97 +-
core/sql/regress/executor/EXPECTED140 | 2 +
core/sql/regress/executor/TEST015 | 7 +
core/sql/regress/executor/TEST130 | 6 +
core/sql/regress/hive/EXPECTED005 | 149 +-
core/sql/regress/hive/EXPECTED007 | 373 +++
core/sql/regress/hive/EXPECTED015 | 24 +
core/sql/regress/hive/EXPECTED018 | 10 +
core/sql/regress/hive/TEST005 | 13 +
core/sql/regress/hive/TEST007 | 160 +
core/sql/regress/hive/TEST009 | 2 +-
core/sql/regress/privs2/EXPECTED129 | 36 +-
core/sql/regress/seabase/EXPECTED012 | 22 +-
core/sql/regress/seabase/EXPECTED020 | 24 +-
core/sql/regress/seabase/EXPECTED030 | 59 +-
core/sql/regress/seabase/EXPECTED032 | 17 +-
core/sql/regress/seabase/TEST022 | 2 -
core/sql/regress/seabase/TEST030 | 14 +-
core/sql/regress/seabase/TEST032 | 4 +-
core/sql/regress/tools/regress-filter-linux | 4 +
core/sql/regress/tools/runregr_compGeneral.ksh | 2 +-
core/sql/runtimestats/sscpipc.cpp | 12 +
core/sql/runtimestats/ssmpipc.cpp | 1 -
core/sql/sort/CommonStructs.h | 1 -
core/sql/sqlci/SqlCmd.cpp | 4 +
core/sql/sqlci/sqlci_yacc.y | 8 +-
core/sql/sqlcomp/CmpDDLCatErrorCodes.h | 17 +-
core/sql/sqlcomp/CmpSeabaseDDL.h | 4 +
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 56 +-
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 14 -
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 18 +
core/sql/sqlcomp/CmpSeabaseDDLview.cpp | 173 +-
core/sql/sqlcomp/DefaultConstants.h | 8 +
core/sql/sqlcomp/nadefaults.cpp | 2 +
.../main/java/org/trafodion/sql/HiveClient.java | 3 +-
.../org/trafodion/dcs/util/RetryCounter.java | 2 +-
.../src/asciidoc/_chapters/ddl_msgs.adoc | 48 +-
.../src/asciidoc/_chapters/executor_msgs.adoc | 15 +
.../src/asciidoc/_chapters/prepare.adoc | 1 -
.../src/asciidoc/_chapters/quickstart.adoc | 5 -
.../src/asciidoc/_chapters/script_install.adoc | 2 -
install/.gitignore | 4 +
install/Makefile | 39 +-
install/README.md | 81 +
install/ambari-installer/Makefile | 79 +
.../mpack-install/am_install.sh | 47 +
install/ambari-installer/repo.template | 24 +
.../TRAFODION/2.1/configuration/dcs-env.xml | 150 +
.../TRAFODION/2.1/configuration/dcs-log4j.xml | 107 +
.../TRAFODION/2.1/configuration/dcs-site.xml | 271 ++
.../TRAFODION/2.1/configuration/rest-site.xml | 157 +
.../2.1/configuration/traf-cluster-env.xml | 41 +
.../2.1/configuration/trafodion-env.xml | 252 ++
.../common-services/TRAFODION/2.1/metainfo.xml | 165 +
.../TRAFODION/2.1/package/scripts/params.py | 95 +
.../2.1/package/scripts/status_params.py | 23 +
.../2.1/package/scripts/trafodiondcs.py | 60 +
.../2.1/package/scripts/trafodionmaster.py | 186 ++
.../2.1/package/scripts/trafodionnode.py | 223 ++
.../TRAFODION/2.1/role_command_order.json | 21 +
.../TRAFODION/2.1/service_advisor.py | 255 ++
.../TRAFODION/2.1/themes/theme.json | 192 ++
.../custom-services/TRAFODION/2.1/metainfo.xml | 34 +
install/ambari-installer/traf-mpack/mpack.json | 46 +
install/ambari-installer/traf_ambari.spec | 64 +
install/installer/traf_cloudera_mods | 2 +-
install/installer/traf_hortonworks_mods | 10 -
.../configs/db_config_default.ini | 5 +-
install/python-installer/configs/mod_cfgs.json | 3 +-
install/python-installer/db_install.py | 47 +-
install/python-installer/prettytable.py | 1475 +++++++++
install/python-installer/scripts/common.py | 6 +-
install/python-installer/scripts/hadoop_mods.py | 49 +-
install/python-installer/scripts/hdfs_cmds.py | 4 +-
.../scripts/httplib2/__init__.py | 1714 ++++++++++
.../scripts/httplib2/iri2uri.py | 132 +
.../python-installer/scripts/httplib2/socks.py | 438 +++
.../python-installer/scripts/traf_discover.py | 21 +-
.../python-installer/scripts/traf_kerberos.py | 4 +-
install/python-installer/scripts/traf_ldap.py | 17 +-
install/python-installer/scripts/traf_setup.py | 12 +-
install/python-installer/scripts/traf_user.py | 58 +-
install/python-installer/scripts/wrapper.py | 8 +-
.../python-installer/templates/bashrc.template | 81 -
.../templates/traf_authentication_conf.template | 71 -
licenses/Makefile | 7 +-
licenses/lic-pyinstall-src | 63 +
188 files changed, 11474 insertions(+), 5310 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/22a46a38/core/sql/executor/ExHbaseIUD.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/22a46a38/core/sql/generator/GenPreCode.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/22a46a38/core/sql/generator/GenRelUpdate.cpp
----------------------------------------------------------------------