You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by se...@apache.org on 2017/05/10 22:49:43 UTC
[5/7] incubator-trafodion git commit: Merge branch 'master' of
git://git.apache.org/incubator-trafodion into trafodion-2420_4
Merge branch 'master' of git://git.apache.org/incubator-trafodion into trafodion-2420_4
Conflicts:
core/sql/executor/ex_sort.cpp
core/sql/executor/ex_sort.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/1449032c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/1449032c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/1449032c
Branch: refs/heads/master
Commit: 1449032c2a016ada311e415a7013a662c21d6358
Parents: e771901 bf3e8d0
Author: selvaganesang <se...@esgyn.com>
Authored: Tue May 9 04:17:15 2017 +0000
Committer: selvaganesang <se...@esgyn.com>
Committed: Tue May 9 04:17:15 2017 +0000
----------------------------------------------------------------------
.../run_full_trafodion_backup.sh | 2 +-
.../sql/scripts/install_hadoop_regr_test_env | 102 +--
core/sqf/sql/scripts/install_local_hadoop | 15 +-
core/sql/executor/ex_sort.cpp | 304 +++++---
core/sql/executor/ex_sort.h | 34 +-
core/sql/optimizer/OptimizerSimulator.cpp | 2 +-
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 +-
25 files changed, 1095 insertions(+), 959 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1449032c/core/sql/executor/ex_sort.cpp
----------------------------------------------------------------------
diff --cc core/sql/executor/ex_sort.cpp
index 1482bb9,f631b45..c92a38e
--- a/core/sql/executor/ex_sort.cpp
+++ b/core/sql/executor/ex_sort.cpp
@@@ -857,9 -941,22 +952,24 @@@ short ExSortTcb::workUp(
if (qparent_.up->isFull()){
return workStatus(WORK_OK); // parent queue is full. Just return
}
+ if (bmoStats_)
+ bmoStats_->setBmoPhase(SORT_PHASE_END-SORT_RECV_PHASE);
-
+
+ //First time reaching here and before calling
+ //sortReceive, release the buffers used during
+ //sortSend phase ONLY if sort overflowed( by this
+ //time, all sort records are in scratch files).
+ //Overflow does not happen in TopNSort. Partial sort
+ //has a separate receive pool.
+ if((sortSendPool_ != NULL) && //not yet released
+ (!pstate.noOverflow_) && //overflow happened
+ (!sortTdb().partialSort())) //not partial sort
+ {
+
+ deleteAndReallocateSortPool();
+ }
+
+
ex_queue_entry * pentry = qparent_.up->getTailEntry();
rc = sortReceive(pentry_down, request, pentry, FALSE,
pentry_down->downState.parentIndex,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1449032c/core/sql/executor/ex_sort.h
----------------------------------------------------------------------
diff --cc core/sql/executor/ex_sort.h
index 4822aea,0e435f3..aa09b8f
--- a/core/sql/executor/ex_sort.h
+++ b/core/sql/executor/ex_sort.h
@@@ -136,17 -137,8 +137,19 @@@ public
SORT_CANCEL_CHILD,
SORT_DONE_WITH_QND
};
+
+ // Change ExSortTcb::SortPhaseStr[] when a new value is added to this enum
+ // Add new value before SORT_PHASE_END
+ enum SortPhase {
+ SORT_PREP_PHASE,
+ SORT_SEND_PHASE,
+ SORT_RECV_PHASE,
+ SORT_MERGE_PHASE,
+ SORT_PHASE_END
+ };
+ static const char *SortPhaseStr[];
+ private:
- void deleteAndReallocateSortPool();
++ void deleteAndReallocateSortPool();
protected:
friend class ExSortTdb;
friend class ExSortPrivateState;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1449032c/core/sql/sort/SortUtil.cpp
----------------------------------------------------------------------