You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2015/09/01 19:53:50 UTC

[3/4] 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/29389f43
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/29389f43
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/29389f43

Branch: refs/heads/master
Commit: 29389f431eadc3c0505ab34370e19fc9a7b4fbd2
Parents: 23e24b4 7610b1e
Author: Roberta Marton <ro...@esgyn.com>
Authored: Tue Sep 1 15:18:26 2015 +0000
Committer: Roberta Marton <ro...@esgyn.com>
Committed: Tue Sep 1 15:18:26 2015 +0000

----------------------------------------------------------------------
 core/sql/bin/SqlciErrors.txt               |   2 +-
 core/sql/executor/ExHdfsScan.cpp           | 115 ++++---
 core/sql/executor/ExHdfsScan.h             |  45 +++
 core/sql/generator/GenPreCode.cpp          |  18 +-
 core/sql/generator/GenRelScan.cpp          |   6 +-
 core/sql/optimizer/CostMethod.h            |  64 +---
 core/sql/optimizer/OptPhysRelExpr.cpp      |  11 +
 core/sql/optimizer/RelUpdate.h             |   3 +
 core/sql/optimizer/ScmCostMethod.cpp       |  72 +++++
 core/sql/optimizer/SearchKey.cpp           |  64 ++++
 core/sql/optimizer/SearchKey.h             |  20 +-
 core/sql/optimizer/SimpleScanOptimizer.cpp |  23 +-
 core/sql/optimizer/costmethod.cpp          | 181 ++++++++++-
 core/sql/optimizer/disjuncts.h             |   8 +-
 core/sql/optimizer/mdam.cpp                |  40 +--
 core/sql/optimizer/opt.cpp                 |  10 +-
 core/sql/regress/compGeneral/TEST071       |  20 ++
 core/sql/regress/seabase/EXPECTED010       | 379 ++++++++++++------------
 18 files changed, 739 insertions(+), 342 deletions(-)
----------------------------------------------------------------------