You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sa...@apache.org on 2017/05/12 07:52:14 UTC
[47/50] [abbrv] incubator-trafodion git commit: Merge remote branch
'origin/master' into merge2.1
Merge remote branch 'origin/master' into merge2.1
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/42bd3181
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/42bd3181
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/42bd3181
Branch: refs/heads/master
Commit: 42bd31813b79f84b591fc454812a0c3bda6175b8
Parents: 7223268 ef4a294
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Wed May 10 17:47:01 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Wed May 10 17:47:01 2017 +0000
----------------------------------------------------------------------
.../run_full_trafodion_backup.sh | 2 +-
.../sql/scripts/install_hadoop_regr_test_env | 109 +--
core/sqf/sql/scripts/install_local_hadoop | 15 +-
core/sql/executor/ex_sort.cpp | 304 +++++---
core/sql/executor/ex_sort.h | 35 +-
core/sql/optimizer/OptimizerSimulator.cpp | 2 +-
core/sql/regress/executor/DIFF140.KNOWN | 4 +
core/sql/regress/executor/EXPECTED130 | 220 +++---
core/sql/regress/executor/TEST130 | 90 +--
core/sql/regress/hive/EXPECTED003 | 6 +-
core/sql/regress/hive/EXPECTED005 | 104 +--
core/sql/regress/hive/EXPECTED009 | 22 +-
core/sql/regress/hive/EXPECTED018 | 717 ++++++++++---------
core/sql/regress/hive/FILTER005 | 4 +-
core/sql/regress/hive/TEST003 | 52 +-
.../hive/TEST003_create_hive_tables.hive | 24 +-
core/sql/regress/hive/TEST005 | 48 +-
core/sql/regress/hive/TEST005_a.hive.sql | 16 +-
core/sql/regress/hive/TEST009 | 6 +-
core/sql/regress/hive/TEST009_a.hive.sql | 4 +-
core/sql/regress/hive/TEST009_b.hive.sql | 2 +-
core/sql/regress/hive/TEST018 | 148 ++--
.../hive/TEST018_create_hive_tables.hive | 14 +-
core/sql/sort/SortUtil.cpp | 98 ++-
core/sql/sort/SortUtil.h | 6 +-
core/sql/sqlcomp/nadefaults.cpp | 14 +-
26 files changed, 1105 insertions(+), 961 deletions(-)
----------------------------------------------------------------------