external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test fix

test-fix-valgrind
Ahmet Gedemenli 2023-01-26 14:32:30 +03:00
parent d2d507eb85
commit 042e6ad9dc
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/backend/distributed/operations/shard_cleaner.c
View File

@ -728,11 +728,6 @@ TryDropSubscriptionOutsideTransaction(char *subscriptionName,
} }
} }
PQclear(result);
ForgetResults(connection);
RemoteTransactionCommit(connection);
ResetRemoteTransaction(connection);
StringInfo alterQuery = makeStringInfo(); StringInfo alterQuery = makeStringInfo();
appendStringInfo(alterQuery, appendStringInfo(alterQuery,
"ALTER SUBSCRIPTION %s SET (slot_name = NONE)", "ALTER SUBSCRIPTION %s SET (slot_name = NONE)",
@ -745,9 +740,31 @@ TryDropSubscriptionOutsideTransaction(char *subscriptionName,
List *dropCommandList = list_make3("SET LOCAL lock_timeout TO '1s'", List *dropCommandList = list_make3("SET LOCAL lock_timeout TO '1s'",
alterQuery->data, dropQuery->data); alterQuery->data, dropQuery->data);
bool success = SendOptionalCommandListToWorkerOutsideTransactionWithConnection(
connection, bool success = true;
dropCommandList); const char *commandString = NULL;
foreach_ptr(commandString, dropCommandList)
{
if (ExecuteOptionalRemoteCommand(connection, commandString, NULL) != 0)
{
success = false;
break;
}
}
PQclear(result);
ForgetResults(connection);
if (success)
{
RemoteTransactionCommit(connection);
}
else
{
RemoteTransactionAbort(connection);
}
ResetRemoteTransaction(connection);
return success; return success;
} }