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 2015/10/02 18:29:44 UTC
[2/3] incubator-trafodion git commit: Merge remote branch
'github/master' into hivePartFunc
Merge remote branch 'github/master' into hivePartFunc
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/f27bc255
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/f27bc255
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/f27bc255
Branch: refs/heads/master
Commit: f27bc255357b1913d40d4b06303e5dd14ca10d7b
Parents: 276da69 469408f
Author: Qifan Chen <qf...@dev02.trafodion.org>
Authored: Fri Oct 2 13:41:51 2015 +0000
Committer: Qifan Chen <qf...@dev02.trafodion.org>
Committed: Fri Oct 2 13:41:51 2015 +0000
----------------------------------------------------------------------
.gitignore | 1 +
Makefile | 25 +
core/Makefile | 45 +-
core/conn/Makefile | 6 +-
.../unixcli/package/trafodbclnx_install.sh | 5 -
core/macros.gmk | 1 +
core/rest/Makefile | 6 +-
core/rest/genvers | 22 +-
core/rest/src/saveVersion.sh | 11 +-
core/sqf/Makefile | 21 +-
core/sqf/sqenvcom.sh | 1 +
core/sqf/sql/scripts/dcscheck | 108 +-
core/sqf/sql/scripts/install_local_hadoop | 273 +---
core/sqf/sql/scripts/install_traf_components | 401 ++++++
core/sqf/sql/scripts/sqcheck | 2 +-
core/sqf/sql/scripts/sqconfig | 24 -
core/sql/cli/Cli.cpp | 5 +-
core/sql/cli/Cli.h | 3 +-
core/sql/cli/CliExtern.cpp | 5 +-
core/sql/comexe/ComTdbExeUtil.h | 8 +-
core/sql/executor/ExExeUtil.h | 4 +-
core/sql/executor/ExExeUtilLoad.cpp | 134 +-
core/sql/exp/ExpLOB.cpp | 42 +-
core/sql/exp/ExpLOB.h | 13 +-
core/sql/exp/ExpLOBaccess.cpp | 1235 ++++++++++--------
core/sql/exp/ExpLOBaccess.h | 51 +-
core/sql/exp/ExpLOBenums.h | 9 +
core/sql/exp/ExpLOBexternal.h | 3 +-
core/sql/exp/ExpLOBinterface.cpp | 42 +-
core/sql/exp/ExpLOBinterface.h | 25 +-
core/sql/generator/GenItemFunc.cpp | 2 +
core/sql/generator/GenRelExeUtil.cpp | 6 +-
core/sql/optimizer/ItemFunc.h | 11 +-
core/sql/optimizer/NATable.cpp | 2 +-
core/sql/optimizer/RelExeUtil.h | 4 +-
core/sql/parser/sqlparser.y | 41 +-
core/sql/regress/compGeneral/EXPECTED042 | 100 +-
core/sql/regress/executor/EXPECTED130 | 435 +++++-
core/sql/regress/executor/TEST130 | 307 ++++-
core/sql/regress/executor/anoush.jpg | Bin 0 -> 230150 bytes
core/sql/regress/executor/deep.jpg | Bin 0 -> 159018 bytes
core/sql/regress/executor/lob_input_a1.txt | 1 +
core/sql/regress/executor/lob_input_b1.txt | 1 +
core/sql/regress/executor/lob_input_c1.txt | 1 +
core/sql/regress/executor/lob_input_d1.txt | 4 +
core/sql/regress/executor/lob_input_e1.txt | 4 +
core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 12 +-
core/sql/sqlcomp/DefaultConstants.h | 3 +-
core/sql/sqlcomp/nadefaults.cpp | 14 +-
dcs/.gitignore | 1 +
dcs/Makefile | 52 +
dcs/genvers | 24 +
dcs/src/saveVersion.sh | 15 +-
env.sh | 24 +
wms/src/saveVersion.sh | 7 +-
56 files changed, 2473 insertions(+), 1131 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f27bc255/core/sql/optimizer/NATable.cpp
----------------------------------------------------------------------