You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by hz...@apache.org on 2016/10/31 22:55:16 UTC
[09/11] incubator-trafodion git commit: Merge remote branch
'origin/master' into cses_1026
Merge remote branch 'origin/master' into cses_1026
Conflicts:
core/sql/generator/Generator.h
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/51ba8ee9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/51ba8ee9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/51ba8ee9
Branch: refs/heads/master
Commit: 51ba8ee93e86cb0b22fc122b7ce5488e6c09bf4c
Parents: e17de2b 2d93f39
Author: Hans Zeller <hz...@apache.org>
Authored: Mon Oct 31 17:45:28 2016 +0000
Committer: Hans Zeller <hz...@apache.org>
Committed: Mon Oct 31 17:45:28 2016 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/install_local_hadoop | 2 +-
core/sql/cli/CliExpExchange.cpp | 4 +-
core/sql/executor/ExHbaseAccess.cpp | 70 +++++++-
core/sql/executor/ExHbaseAccess.h | 3 +
core/sql/exp/ExpPCodeExpGen.cpp | 6 +-
core/sql/exp/exp_attrs.cpp | 4 +-
core/sql/exp/exp_attrs.h | 16 +-
core/sql/exp/exp_conv.cpp | 2 +-
core/sql/exp/exp_eval.cpp | 3 +-
core/sql/exp/exp_expr.h | 3 +-
core/sql/exp/exp_tuple_desc.cpp | 21 ++-
core/sql/generator/GenExpGenerator.cpp | 39 ++---
core/sql/generator/GenExpGenerator.h | 17 +-
core/sql/generator/GenPreCode.cpp | 3 +-
core/sql/generator/GenRelScan.cpp | 10 +-
core/sql/generator/GenRelUpdate.cpp | 4 +-
core/sql/optimizer/BindRelExpr.cpp | 5 +
core/sql/optimizer/NATable.cpp | 3 +-
core/sql/regress/hive/EXPECTED018 | 6 +-
core/sql/regress/privs2/EXPECTED144 | Bin 59186 -> 59408 bytes
core/sql/regress/privs2/TEST144 | 7 +-
core/sql/regress/seabase/EXPECTED027 | 86 +++++-----
core/sql/regress/seabase/EXPECTED033 | 40 +++++
core/sql/regress/seabase/TEST027 | 4 +-
core/sql/regress/seabase/TEST033 | 7 +
core/sql/sqlcomp/CmpSeabaseDDL.h | 10 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 212 ++++++++++++++++++-------
27 files changed, 422 insertions(+), 165 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/51ba8ee9/core/sql/generator/GenPreCode.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/51ba8ee9/core/sql/generator/GenRelScan.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/51ba8ee9/core/sql/optimizer/BindRelExpr.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/51ba8ee9/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------