From 4f60e3a149fb83204278f50df9315828cffa8a28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20Dub=C3=A9?= Date: Tue, 24 Sep 2019 16:56:20 +0000 Subject: [PATCH] Feedback --- src/backend/distributed/commands/call.c | 7 +++++-- src/test/regress/expected/multi_mx_call.out | 7 ------- src/test/regress/expected/multi_mx_call_0.out | 7 ------- src/test/regress/sql/multi_mx_call.sql | 8 -------- 4 files changed, 5 insertions(+), 24 deletions(-) diff --git a/src/backend/distributed/commands/call.c b/src/backend/distributed/commands/call.c index 1f3cf58b4..431a6b72c 100644 --- a/src/backend/distributed/commands/call.c +++ b/src/backend/distributed/commands/call.c @@ -1,7 +1,9 @@ /*------------------------------------------------------------------------- * * call.c - * Commands for call remote stored procedures. + * Commands for distributing CALL for distributed procedures. + * + * Procedures can be distributed with create_distributed_function. * * Copyright (c) 2019, Citus Data, Inc. * @@ -169,6 +171,7 @@ CallFuncExprRemotely(CallStmt *callStmt, DistObjectCacheEntry *procedure, TupleDesc tupleDesc = CallStmtResultDesc(callStmt); TupleTableSlot *slot = MakeSingleTupleTableSlotCompat(tupleDesc, &TTSOpsMinimalTuple); + bool hasReturning = true; Task *task = CitusMakeNode(Task); task->jobId = INVALID_JOB_ID; @@ -182,7 +185,7 @@ CallFuncExprRemotely(CallStmt *callStmt, DistObjectCacheEntry *procedure, task->taskPlacementList = placementList; ExecuteTaskListExtended(ROW_MODIFY_NONE, list_make1(task), - tupleDesc, tupleStore, true, + tupleDesc, tupleStore, hasReturning, MaxAdaptiveExecutorPoolSize); while (tuplestore_gettupleslot(tupleStore, true, false, slot)) diff --git a/src/test/regress/expected/multi_mx_call.out b/src/test/regress/expected/multi_mx_call.out index 027ba702a..36209baf4 100644 --- a/src/test/regress/expected/multi_mx_call.out +++ b/src/test/regress/expected/multi_mx_call.out @@ -390,14 +390,7 @@ PL/pgSQL function mx_call_proc(integer,integer) line 8 at assignment 27 (1 row) --- --- clean-up --- reset client_min_messages; -reset citus.shard_replication_factor; -reset citus.replication_model; -reset search_path; \set VERBOSITY terse drop schema multi_mx_call cascade; NOTICE: drop cascades to 10 other objects -\set VERBOSITY default diff --git a/src/test/regress/expected/multi_mx_call_0.out b/src/test/regress/expected/multi_mx_call_0.out index 84f53a2c3..a5dac9c72 100644 --- a/src/test/regress/expected/multi_mx_call_0.out +++ b/src/test/regress/expected/multi_mx_call_0.out @@ -311,14 +311,7 @@ call multi_mx_call.mx_call_proc(floor(random())::int, 2); ERROR: syntax error at or near "call" LINE 1: call multi_mx_call.mx_call_proc(floor(random())::int, 2); ^ --- --- clean-up --- reset client_min_messages; -reset citus.shard_replication_factor; -reset citus.replication_model; -reset search_path; \set VERBOSITY terse drop schema multi_mx_call cascade; NOTICE: drop cascades to 5 other objects -\set VERBOSITY default diff --git a/src/test/regress/sql/multi_mx_call.sql b/src/test/regress/sql/multi_mx_call.sql index c826d42d8..c6caf7698 100644 --- a/src/test/regress/sql/multi_mx_call.sql +++ b/src/test/regress/sql/multi_mx_call.sql @@ -180,15 +180,7 @@ call multi_mx_call.mx_call_proc(multi_mx_call.mx_call_add(3, 4), 2); -- volatile parameter cannot be pushed down call multi_mx_call.mx_call_proc(floor(random())::int, 2); --- --- clean-up --- reset client_min_messages; -reset citus.shard_replication_factor; -reset citus.replication_model; -reset search_path; - \set VERBOSITY terse drop schema multi_mx_call cascade; -\set VERBOSITY default