You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/08/11 16:58:31 UTC
[2/4] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into setschema
Merge branch 'master' of github.com:apache/incubator-trafodion into setschema
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/4d73185c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/4d73185c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/4d73185c
Branch: refs/heads/master
Commit: 4d73185ca2f81ecd2727b25ead16d0b00e7f180b
Parents: a6b9b2d c855e1f
Author: mashengchen <ma...@gmail.com>
Authored: Mon Aug 1 03:27:10 2016 +0000
Committer: mashengchen <ma...@gmail.com>
Committed: Mon Aug 1 03:27:10 2016 +0000
----------------------------------------------------------------------
core/conn/Makefile | 9 +-
.../trafodion/jdbc/t4/T4DatabaseMetaData.java | 2 +-
core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 2 +-
.../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 39 +-
.../unixcli/DrvrManager/drvrmanager.cpp | 136 +++----
.../odbc/odbcclient/unixcli/cli/cdatasource.cpp | 6 +-
.../odbcclient/unixcli/cli/cdatasource_drvr.cpp | 4 +-
.../odbc/odbcclient/unixcli/cli/cdesc.cpp | 27 +-
.../odbc/odbcclient/unixcli/cli/cstmt.cpp | 9 +-
core/sqf/Makefile | 7 +-
.../export/include/common/evl_sqlog_eventnum.h | 1 +
core/sqf/sqenvcom.sh | 2 +
core/sqf/sql/scripts/sqcheck | 2 +-
core/sqf/sql/scripts/sqstart | 43 +++
.../hbase/client/transactional/RMInterface.java | 4 +-
.../transactional/TransactionManager.java | 29 +-
.../transactional/TrxTransactionState.java.tmpl | 4 +-
core/sqf/src/seatrans/tm/hbasetmlib2/Makefile | 2 +-
.../sqf/src/seatrans/tm/hbasetmlib2/hbasetm.cpp | 222 ++++-------
.../src/seatrans/tm/hbasetmlib2/hbasetmglob.h | 2 +-
.../seatrans/tm/hbasetmlib2/hbasetmlogging.h | 33 --
core/sqf/src/seatrans/tm/hbasetmlib2/idtm.cpp | 2 +
.../src/seatrans/tm/hbasetmlib2/idtmclicom.h | 138 ++++---
.../tm/hbasetmlib2/javaobjectinterfacetm.cpp | 124 ++++++-
.../tm/hbasetmlib2/javaobjectinterfacetm.h | 7 +
.../java/org/trafodion/dtm/HBaseTxClient.java | 9 +-
.../sqf/src/seatrans/tm/hbasetmlib2/testrun.cpp | 4 +-
core/sqf/src/seatrans/tm/macros.gmk | 2 +-
core/sqf/src/tm/Makefile | 11 +-
core/sqf/src/tm/javaobjectinterfacetm.cpp | 355 ------------------
core/sqf/src/tm/javaobjectinterfacetm.h | 154 --------
core/sqf/src/tm/tminfo.cpp | 1 -
core/sqf/src/tm/tmlib.cpp | 34 +-
core/sqf/src/tm/tmlogging.cpp | 108 ++++--
core/sqf/src/tm/tmlogging.h | 8 +-
core/sqf/src/tm/tmlogginglib.cpp | 55 ---
core/sqf/src/tm/tools/Makefile | 10 +-
core/sqf/src/tm/xarmlogging.cpp | 261 -------------
core/sql/bin/SqlciErrors.txt | 3 +-
core/sql/executor/ExExeUtilGet.cpp | 2 +-
core/sql/executor/ExExeUtilLoad.cpp | 2 +-
core/sql/executor/ExFastTransport.cpp | 2 -
core/sql/executor/ExHbaseAccess.cpp | 26 +-
core/sql/executor/ExHbaseAccess.h | 4 +-
core/sql/executor/ExHbaseIUD.cpp | 15 +-
core/sql/executor/ExHdfsScan.cpp | 17 +-
core/sql/executor/ExHdfsScan.h | 1 +
core/sql/executor/SequenceFileReader.cpp | 263 ++++++-------
core/sql/executor/ex_root.cpp | 6 +-
core/sql/executor/hiveHook.cpp | 4 +-
core/sql/exp/ExpErrorEnums.h | 1 +
core/sql/generator/GenExpGenerator.cpp | 34 +-
core/sql/optimizer/NATable.cpp | 81 +++-
core/sql/optimizer/NormRelExpr.cpp | 42 ++-
core/sql/regress/core/EXPECTEDRTS | 32 +-
core/sql/regress/hive/EXPECTED005 | 12 +-
core/sql/regress/hive/EXPECTED018 | 8 +
core/sql/regress/hive/FILTER018 | 2 +
core/sql/regress/hive/TEST005_a.hive.sql | 12 +-
core/sql/regress/hive/tbl_type.data | 2 +-
core/sql/sqlcomp/nadefaults.cpp | 2 +-
core/sql/ustat/hs_cli.cpp | 5 +
core/sql/ustat/hs_globals.cpp | 32 ++
core/sql/ustat/hs_update.cpp | 14 +
.../src/asciidoc/_chapters/introduction.adoc | 2 +-
docs/load_transform/src/asciidoc/index.adoc | 1 +
.../src/asciidoc/_chapters/introduction.adoc | 2 +-
docs/odb_user/src/asciidoc/_chapters/about.adoc | 2 +-
install/.gitignore | 1 +
install/installer/addNode_packages | 89 +++++
install/installer/addNode_reservePorts | 81 ++++
install/installer/addNode_step1 | 294 +++++++++++++++
install/installer/addNode_step2 | 372 +++++++++++++++++++
install/installer/dcs_installer | 4 +
install/installer/parseHBaseSite.py | 5 +
install/installer/rest_installer | 4 +
install/installer/tools/ambari_setup | 2 +-
install/installer/traf_apache_mods | 2 +-
install/installer/traf_cloudera_mods | 2 +-
install/installer/traf_config | 11 +
install/installer/traf_config_check | 19 +
install/installer/traf_config_setup | 33 +-
install/installer/traf_hortonworks_mods | 55 ++-
install/installer/traf_sqconfig | 8 +
install/installer/traf_start | 30 +-
install/installer/trafodion_config_default | 7 +
win-odbc64/odbcclient/drvr35/cdesc.cpp | 51 ++-
win-odbc64/odbcclient/drvr35/cstmt.cpp | 119 +++---
88 files changed, 2050 insertions(+), 1638 deletions(-)
----------------------------------------------------------------------