HAWQ-1823. avoid of reallocating resource in udf

apache · Dec 27, 2021 · bd88dbd · bd88dbd
1 parent d01b19b
commit bd88dbd
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
@@ -147,7 +147,15 @@ bool CDBCreateIndex(IndexStmt *stmt, Oid relationOid, Oid indexOid)
 
 	elog(DEBUG1, "CDBCreateIndex virtual segment number is: %d\n", target_segment_num);
 
-	QueryResource *resource = AllocateResource(QRL_ONCE, 1, 1, target_segment_num, target_segment_num, NULL, 0);
+	QueryResource *resource = NULL;
+	QueryResource *savedResource = NULL;
+	savedResource = GetActiveQueryResource();
+	if (!savedResource) {
+	  resource = AllocateResource(QRL_ONCE, 1, 1, target_segment_num, target_segment_num, NULL, 0);
+	} else {
+	  resource = AllocateResource(QRL_INHERIT, 0, 0, 0, 0, NULL, 0);
+	}
+	SetActiveQueryResource(resource);
 
 	/* 4.bind SegNO to Vseg */
 	int total_segfiles = 0;

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
@@ -7219,8 +7219,12 @@ ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap)
       }
 		}
 
-	  resource = AllocateResource(QRL_ONCE, 1, 1, target_segment_num, target_segment_num,NULL,0);
-	  savedResource = GetActiveQueryResource();
+		savedResource = GetActiveQueryResource();
+		if (!savedResource) {
+		  resource = AllocateResource(QRL_ONCE, 1, 1, target_segment_num, target_segment_num,NULL,0);
+		} else {
+		  resource = AllocateResource(QRL_INHERIT, 0, 0, 0, 0, NULL, 0);
+		}
 	  SetActiveQueryResource(resource);
 
 	  segment_segnos = SetSegnoForWrite(NIL, 0, target_segment_num, true, true, false);
@@ -17578,8 +17582,12 @@ ATPExecPartSplit(Relation rel,
 
     }
 
-    resource = AllocateResource(QRL_ONCE, 1, 1, target_segment_num, target_segment_num, NULL, 0);
     savedResource = GetActiveQueryResource();
+    if (!savedResource) {
+      resource = AllocateResource(QRL_ONCE, 1, 1, target_segment_num, target_segment_num, NULL, 0);
+    } else {
+      resource = AllocateResource(QRL_INHERIT, 0, 0, 0, 0, NULL, 0);
+    }
     SetActiveQueryResource(resource);
     segment_segnos = SetSegnoForWrite(NIL, 0, target_segment_num, true, true, false);
     scantable_splits = NIL;

diff --git a/src/backend/resourcemanager/resqueuemanager.c b/src/backend/resourcemanager/resqueuemanager.c
@@ -4385,8 +4385,8 @@ void buildAcquireResourceResponseMessage(ConnectionTrack conn)
 	conn->MessageID    = RESPONSE_QD_ACQUIRE_RESOURCE;
 	conn->ResAllocTime = gettime_microsec();
 
-	elog(LOG, "latency of getting resource allocated is "UINT64_FORMAT "us",
-			  conn->ResAllocTime - conn->ResRequestTime);
+	elog(LOG, "ConnID %d latency of getting resource allocated is "UINT64_FORMAT "us",
+			  conn->ConnID, conn->ResAllocTime - conn->ResRequestTime);
 
 	MEMORY_CONTEXT_SWITCH_TO(PCONTEXT)
 	PCONTRACK->ConnToSend = lappend(PCONTRACK->ConnToSend, conn);