Repository: incubator-hawq
Updated Branches:
  refs/heads/master 07f25fd19 -> 174673d0d


HAWQ-1170. Crash at cleanup_allocation_algorithm() when enable 
'--enable-cassert' option


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/174673d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/174673d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/174673d0

Branch: refs/heads/master
Commit: 174673d0d5fccd06a0baf86912dab5015f171f42
Parents: 07f25fd
Author: stanlyxiang <[email protected]>
Authored: Wed Nov 23 16:36:49 2016 +0800
Committer: ivan <[email protected]>
Committed: Tue Dec 6 10:38:36 2016 +0800

----------------------------------------------------------------------
 src/backend/cdb/cdbdatalocality.c | 3 ---
 1 file changed, 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/174673d0/src/backend/cdb/cdbdatalocality.c
----------------------------------------------------------------------
diff --git a/src/backend/cdb/cdbdatalocality.c 
b/src/backend/cdb/cdbdatalocality.c
index c475624..6e7ab2f 100644
--- a/src/backend/cdb/cdbdatalocality.c
+++ b/src/backend/cdb/cdbdatalocality.c
@@ -4241,7 +4241,6 @@ calculate_planner_segment_num(Query *query, 
QueryResourceLife resourceLife,
                                if ((context.resultRelationHashSegNum < 
context.externTableForceSegNum
                                                && 
context.externTableForceSegNum != 0)
                                                || 
(context.resultRelationHashSegNum < context.externTableLocationSegNum)) {
-                                       cleanup_allocation_algorithm(&context);
                                        elog(ERROR, "Could not allocate enough 
memory! "
                                                        "bucket number of 
result hash table and external table should match each other");
                                }
@@ -4251,7 +4250,6 @@ calculate_planner_segment_num(Query *query, 
QueryResourceLife resourceLife,
                        else if(context.externTableForceSegNum > 0){
                                /* bucket number of external table must be the 
same with the number of virtual segments*/
                                if(context.externTableForceSegNum < 
context.externTableLocationSegNum){
-                                       cleanup_allocation_algorithm(&context);
                                        elog(ERROR, "external table bucket 
number should match each other");
                                }
                                maxTargetSegmentNumber = 
context.externTableForceSegNum;
@@ -4411,7 +4409,6 @@ calculate_planner_segment_num(Query *query, 
QueryResourceLife resourceLife,
 
                /* for normal query if containerCount equals to 0, then stop 
the query.*/
                if (resourceLife != QRL_NONE && VirtualSegmentNumber == 0) {
-                       cleanup_allocation_algorithm(&context);
                        elog(ERROR, "Could not allocate enough resource!");
                }
 

Reply via email to