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/02/02 17:57:41 UTC
[07/25] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion
Merge branch 'master' of github.com:apache/incubator-trafodion
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/62237083
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/62237083
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/62237083
Branch: refs/heads/master
Commit: 62237083f0db8230e257b6a8a12b5ca21c3831d8
Parents: 11f9686 141f354
Author: mashengchen <ma...@gmail.com>
Authored: Mon Jan 11 04:03:24 2016 +0000
Committer: mashengchen <ma...@gmail.com>
Committed: Mon Jan 11 04:03:24 2016 +0000
----------------------------------------------------------------------
core/conn/jdbc_type2/native/SrvrCommon.cpp | 163 ++++--
core/conn/jdbc_type4/.gitignore | 1 +
core/conn/jdbc_type4/build.xml | 9 +-
.../org/trafodion/rest/GetStatusResponse.java | 2 +-
.../java/org/trafodion/rest/RESTServlet.java | 7 +
.../rest/provider/JAXBContextResolver.java | 1 -
.../producer/PlainTextMessageBodyProducer.java | 3 -
.../java/org/trafodion/rest/util/ConfTool.java | 2 +-
.../org/trafodion/rest/zookeeper/ZkClient.java | 1 -
.../transactional/TransactionManager.java | 9 +-
.../TransactionRegionLocation.java | 22 +-
.../client/transactional/TransactionState.java | 13 +-
.../transactional/TrxRegionEndpoint.java | 26 +-
core/sql/bin/clitest.cpp | 267 +++++++++
core/sql/bin/vprocclitestdriver.cpp | 51 ++
core/sql/cli/Cli.cpp | 31 +-
core/sql/cli/sqlcli.h | 9 +-
core/sql/clitest/blobtest.cpp | 269 +++++++++
core/sql/clitest/blobtest.h | 76 +++
core/sql/clitest/vers_libclitest.cpp | 28 +
core/sql/comexe/ComTdbExeUtil.cpp | 22 +-
core/sql/comexe/ComTdbExeUtil.h | 27 +-
core/sql/comexe/ComTdbRoot.h | 14 +-
core/sql/common/BaseTypes.cpp | 27 +-
core/sql/executor/ExExeUtil.h | 2 +-
core/sql/executor/ExExeUtilCli.cpp | 8 +-
core/sql/executor/ExExeUtilCli.h | 2 +-
core/sql/executor/ExExeUtilLoad.cpp | 167 ++++--
core/sql/executor/ExHdfsScan.cpp | 8 +-
core/sql/executor/hiveHook.cpp | 2 +-
core/sql/exp/ExpLOB.cpp | 70 ++-
core/sql/exp/ExpLOB.h | 13 +-
core/sql/exp/ExpLOBaccess.cpp | 26 +-
core/sql/exp/ExpLOBenums.h | 1 +
core/sql/exp/ExpLOBinterface.cpp | 24 +-
core/sql/exp/ExpLOBinterface.h | 1 +
core/sql/generator/GenItemFunc.cpp | 7 +
core/sql/generator/GenRelExeUtil.cpp | 11 +-
core/sql/generator/GenRelMisc.cpp | 4 +
core/sql/nskgmake/Makerules.linux | 4 +-
core/sql/nskgmake/clitest/Makefile | 36 ++
core/sql/nskgmake/clitestdriver/Makefile | 35 ++
core/sql/optimizer/ItemExpr.cpp | 4 +-
core/sql/optimizer/ItemFunc.h | 17 +-
core/sql/optimizer/RelExeUtil.cpp | 4 +-
core/sql/optimizer/RelExeUtil.h | 12 +-
core/sql/optimizer/SynthType.cpp | 33 +-
core/sql/parser/sqlparser.y | 88 +--
core/sql/regress/executor/EXPECTED130 | 275 ++++++++-
core/sql/regress/executor/TEST130 | 8 +-
core/sql/regress/executor/TEST130_argfile | 3 +
core/sql/sqlcomp/DefaultConstants.h | 2 +
core/sql/sqlcomp/NADefaults.h | 2 +
core/sql/sqlcomp/nadefaults.cpp | 141 +++--
core/sql/ustat/hs_globals.cpp | 75 +++
dcs/bin/scripts/dcsbind.sh | 14 +-
dcs/pom.xml | 6 +
.../main/asciidoc/_chapters/architecture.adoc | 15 +-
.../main/asciidoc/_chapters/configuration.adoc | 78 ++-
.../main/asciidoc/_chapters/external_apis.adoc | 34 --
dcs/src/main/asciidoc/_chapters/ops_mgt.adoc | 30 +-
.../asciidoc/_chapters/troubleshooting.adoc | 4 +-
dcs/src/main/asciidoc/index.adoc | 1 -
dcs/src/main/resources/dcs-default.xml | 45 --
.../java/org/trafodion/jdbc_test/BatchTest.java | 582 +++++++++++++++++++
.../org/trafodion/jdbc_test/JdbcCommon.java | 224 +++++++
install/installer/cloud_cli_setup | 97 ++++
install/installer/dcs_installer | 39 +-
install/installer/traf_config_setup | 123 ++--
install/installer/trafodion_config_default | 15 +
install/installer/trafodion_install | 8 +-
.../org/trafodion/phoenix/end2end/BaseTest.java | 5 -
.../trafodion/phoenix/end2end/BatchTest.java | 250 --------
73 files changed, 2910 insertions(+), 825 deletions(-)
----------------------------------------------------------------------