Use guard for GetNextTuple

duckdb · Dec 20, 2024 · 899d84d · 899d84d
1 parent 621f5c5
commit 899d84d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/include/pgduckdb/scan/postgres_table_reader.hpp b/include/pgduckdb/scan/postgres_table_reader.hpp
@@ -16,6 +16,7 @@ class PostgresTableReader {
 private:
 	MinimalTuple GetNextWorkerTuple();
 	void PostgresTableReaderCleanupUnsafe();
+	TupleTableSlot * GetNextTupleUnsafe();
 	int ParallelWorkerNumber(Cardinality cardinality);
 	const char * ExplainScanPlan(QueryDesc *query_desc);
 	bool CanTableScanRunInParallel(Plan *plan);

diff --git a/src/scan/postgres_table_reader.cpp b/src/scan/postgres_table_reader.cpp
@@ -243,24 +243,29 @@ PostgresTableReader::MarkPlanParallelAware(Plan *plan) {
 
 TupleTableSlot *
 PostgresTableReader::GetNextTuple() {
+	return PostgresMemberGuard(PostgresTableReader::GetNextTupleUnsafe);
+}
+
+TupleTableSlot *
+PostgresTableReader::GetNextTupleUnsafe() {
 	if (nreaders > 0) {
 		MinimalTuple worker_minmal_tuple = GetNextWorkerTuple();
 		if (HeapTupleIsValid(worker_minmal_tuple)) {
-			PostgresFunctionGuard(ExecStoreMinimalTuple, worker_minmal_tuple, slot, false);
+			ExecStoreMinimalTuple(worker_minmal_tuple, slot, false);
 			return slot;
 		}
 	} else {
 		std::lock_guard<std::mutex> lock(GlobalProcessLock::GetLock());
 		PostgresScopedStackReset scoped_stack_reset;
 		table_scan_query_desc->estate->es_query_dsa = parallel_executor_info ? parallel_executor_info->area : NULL;
-		TupleTableSlot *thread_scan_slot = PostgresFunctionGuard(ExecProcNode, table_scan_planstate);
+		TupleTableSlot *thread_scan_slot = ExecProcNode(table_scan_planstate);
 		table_scan_query_desc->estate->es_query_dsa = NULL;
 		if (!TupIsNull(thread_scan_slot)) {
 			return thread_scan_slot;
 		}
 	}
 
-	return PostgresFunctionGuard(ExecClearTuple, slot);
+	return ExecClearTuple(slot);
 }
 
 MinimalTuple