diff --git a/src/backend/columnar/columnar_debug.c b/src/backend/columnar/columnar_debug.c index 5525bb032..83af86ee5 100644 --- a/src/backend/columnar/columnar_debug.c +++ b/src/backend/columnar/columnar_debug.c @@ -70,8 +70,6 @@ columnar_store_memory_stats(PG_FUNCTION_ARGS) Tuplestorestate *tupleStore = SetupTuplestore(fcinfo, &tupleDescriptor); tuplestore_putvalues(tupleStore, tupleDescriptor, values, nulls); - tuplestore_donestoring(tupleStore); - PG_RETURN_DATUM(0); } diff --git a/src/backend/distributed/connection/locally_reserved_shared_connections.c b/src/backend/distributed/connection/locally_reserved_shared_connections.c index 44e1340c2..a26983104 100644 --- a/src/backend/distributed/connection/locally_reserved_shared_connections.c +++ b/src/backend/distributed/connection/locally_reserved_shared_connections.c @@ -118,9 +118,6 @@ citus_reserved_connection_stats(PG_FUNCTION_ARGS) StoreAllReservedConnections(tupleStore, tupleDescriptor); - /* clean up and return the tuplestore */ - tuplestore_donestoring(tupleStore); - PG_RETURN_VOID(); } diff --git a/src/backend/distributed/connection/shared_connection_stats.c b/src/backend/distributed/connection/shared_connection_stats.c index 89fb1cd19..7592a6feb 100644 --- a/src/backend/distributed/connection/shared_connection_stats.c +++ b/src/backend/distributed/connection/shared_connection_stats.c @@ -143,9 +143,6 @@ citus_remote_connection_stats(PG_FUNCTION_ARGS) StoreAllRemoteConnectionStats(tupleStore, tupleDescriptor); - /* clean up and return the tuplestore */ - tuplestore_donestoring(tupleStore); - PG_RETURN_VOID(); } diff --git a/src/backend/distributed/executor/intermediate_results.c b/src/backend/distributed/executor/intermediate_results.c index c1b8f86dc..3442e23a3 100644 --- a/src/backend/distributed/executor/intermediate_results.c +++ b/src/backend/distributed/executor/intermediate_results.c @@ -861,8 +861,6 @@ ReadIntermediateResultsIntoFuncOutput(FunctionCallInfo fcinfo, char *copyFormat, tupleStore); } } - - tuplestore_donestoring(tupleStore); } diff --git a/src/backend/distributed/executor/partitioned_intermediate_results.c b/src/backend/distributed/executor/partitioned_intermediate_results.c index 21949feed..8feb31a95 100644 --- a/src/backend/distributed/executor/partitioned_intermediate_results.c +++ b/src/backend/distributed/executor/partitioned_intermediate_results.c @@ -262,8 +262,6 @@ worker_partition_query_result(PG_FUNCTION_ARGS) tuplestore_putvalues(tupleStore, returnTupleDesc, values, nulls); } - - tuplestore_donestoring(tupleStore); PortalDrop(portal, false); FreeExecutorState(estate); diff --git a/src/backend/distributed/metadata/metadata_utility.c b/src/backend/distributed/metadata/metadata_utility.c index c19917ebc..4568c29ad 100644 --- a/src/backend/distributed/metadata/metadata_utility.c +++ b/src/backend/distributed/metadata/metadata_utility.c @@ -245,9 +245,6 @@ citus_shard_sizes(PG_FUNCTION_ARGS) ReceiveShardNameAndSizeResults(connectionList, tupleStore, tupleDescriptor); - /* clean up and return the tuplestore */ - tuplestore_donestoring(tupleStore); - PG_RETURN_VOID(); } diff --git a/src/backend/distributed/operations/citus_tools.c b/src/backend/distributed/operations/citus_tools.c index 77f5190e3..19d198c0c 100644 --- a/src/backend/distributed/operations/citus_tools.c +++ b/src/backend/distributed/operations/citus_tools.c @@ -592,8 +592,5 @@ CreateTupleStore(TupleDesc tupleDescriptor, pfree(nodeNameText); pfree(resultText); } - - tuplestore_donestoring(tupleStore); - return tupleStore; } diff --git a/src/backend/distributed/operations/shard_rebalancer.c b/src/backend/distributed/operations/shard_rebalancer.c index 773c9e8b6..166423cf0 100644 --- a/src/backend/distributed/operations/shard_rebalancer.c +++ b/src/backend/distributed/operations/shard_rebalancer.c @@ -1058,8 +1058,6 @@ get_rebalance_table_shards_plan(PG_FUNCTION_ARGS) tuplestore_putvalues(tupstore, tupdesc, values, nulls); } - tuplestore_donestoring(tupstore); - return (Datum) 0; } @@ -1132,8 +1130,6 @@ get_rebalance_progress(PG_FUNCTION_ARGS) } } - tuplestore_donestoring(tupstore); - DetachFromDSMSegments(segmentList); return (Datum) 0; diff --git a/src/backend/distributed/planner/multi_explain.c b/src/backend/distributed/planner/multi_explain.c index f4c38a3bd..bca9bbaa1 100644 --- a/src/backend/distributed/planner/multi_explain.c +++ b/src/backend/distributed/planner/multi_explain.c @@ -1000,8 +1000,6 @@ worker_last_saved_explain_analyze(PG_FUNCTION_ARGS) tuplestore_putvalues(tupleStore, tupleDescriptor, columnValues, columnNulls); } - - tuplestore_donestoring(tupleStore); PG_RETURN_DATUM(0); } @@ -1087,8 +1085,6 @@ worker_save_query_explain_analyze(PG_FUNCTION_ARGS) ExplainEndOutput(es); - tuplestore_donestoring(tupleStore); - /* save EXPLAIN ANALYZE result to be fetched later */ MemoryContext oldContext = MemoryContextSwitchTo(TopTransactionContext); FreeSavedExplainPlan(); diff --git a/src/backend/distributed/test/distributed_deadlock_detection.c b/src/backend/distributed/test/distributed_deadlock_detection.c index 84739cb49..448228158 100644 --- a/src/backend/distributed/test/distributed_deadlock_detection.c +++ b/src/backend/distributed/test/distributed_deadlock_detection.c @@ -67,8 +67,5 @@ get_adjacency_list_wait_graph(PG_FUNCTION_ARGS) tuplestore_putvalues(tupleStore, tupleDescriptor, values, isNulls); } - /* clean up and return the tuplestore */ - tuplestore_donestoring(tupleStore); - PG_RETURN_VOID(); } diff --git a/src/backend/distributed/test/distributed_intermediate_results.c b/src/backend/distributed/test/distributed_intermediate_results.c index 5c450d88b..d99e11474 100644 --- a/src/backend/distributed/test/distributed_intermediate_results.c +++ b/src/backend/distributed/test/distributed_intermediate_results.c @@ -101,9 +101,6 @@ partition_task_list_results(PG_FUNCTION_ARGS) tuplestore_putvalues(tupleStore, tupleDescriptor, columnValues, columnNulls); } - - tuplestore_donestoring(tupleStore); - PG_RETURN_DATUM(0); } @@ -186,8 +183,5 @@ redistribute_task_list_results(PG_FUNCTION_ARGS) tuplestore_putvalues(tupleStore, tupleDescriptor, columnValues, columnNulls); } - - tuplestore_donestoring(tupleStore); - PG_RETURN_DATUM(0); } diff --git a/src/backend/distributed/test/foreign_key_relationship_query.c b/src/backend/distributed/test/foreign_key_relationship_query.c index bae2e77e0..f6266d709 100644 --- a/src/backend/distributed/test/foreign_key_relationship_query.c +++ b/src/backend/distributed/test/foreign_key_relationship_query.c @@ -215,8 +215,5 @@ get_foreign_key_connected_relations(PG_FUNCTION_ARGS) tuplestore_putvalues(tupleStore, tupleDescriptor, values, nulls); } - - tuplestore_donestoring(tupleStore); - PG_RETURN_VOID(); } diff --git a/src/backend/distributed/test/progress_utils.c b/src/backend/distributed/test/progress_utils.c index c50e2dd5e..42b065dae 100644 --- a/src/backend/distributed/test/progress_utils.c +++ b/src/backend/distributed/test/progress_utils.c @@ -114,8 +114,6 @@ show_progress(PG_FUNCTION_ARGS) } } - tuplestore_donestoring(tupstore); - DetachFromDSMSegments(attachedDSMSegments); return (Datum) 0; diff --git a/src/backend/distributed/transaction/backend_data.c b/src/backend/distributed/transaction/backend_data.c index 26d853507..c76a80460 100644 --- a/src/backend/distributed/transaction/backend_data.c +++ b/src/backend/distributed/transaction/backend_data.c @@ -323,9 +323,6 @@ get_global_active_transactions(PG_FUNCTION_ARGS) ForgetResults(connection); } - /* clean up and return the tuplestore */ - tuplestore_donestoring(tupleStore); - PG_RETURN_VOID(); } @@ -344,9 +341,6 @@ get_all_active_transactions(PG_FUNCTION_ARGS) StoreAllActiveTransactions(tupleStore, tupleDescriptor); - /* clean up and return the tuplestore */ - tuplestore_donestoring(tupleStore); - PG_RETURN_VOID(); } diff --git a/src/backend/distributed/transaction/citus_dist_stat_activity.c b/src/backend/distributed/transaction/citus_dist_stat_activity.c index ec631204d..d1aa9a034 100644 --- a/src/backend/distributed/transaction/citus_dist_stat_activity.c +++ b/src/backend/distributed/transaction/citus_dist_stat_activity.c @@ -1100,7 +1100,4 @@ ReturnCitusDistStats(List *citusStatsList, FunctionCallInfo fcinfo) tuplestore_putvalues(tupleStore, tupleDesc, values, nulls); } - - /* clean up and return the tuplestore */ - tuplestore_donestoring(tupleStore); } diff --git a/src/backend/distributed/transaction/lock_graph.c b/src/backend/distributed/transaction/lock_graph.c index 30dec5d80..aa37e4371 100644 --- a/src/backend/distributed/transaction/lock_graph.c +++ b/src/backend/distributed/transaction/lock_graph.c @@ -322,9 +322,6 @@ ReturnWaitGraph(WaitGraph *waitGraph, FunctionCallInfo fcinfo) tuplestore_putvalues(tupleStore, tupleDesc, values, nulls); } - - /* clean up and return the tuplestore */ - tuplestore_donestoring(tupleStore); }