Do not use FQS for queries with FOR UPDATE/SHARE clause

diff --git a/src/backend/optimizer/util/pgxcship.c b/src/backend/optimizer/util/pgxcship.c
index db0a38a957767d02b8387ac6c7b74e7c5a90499e..e4631603264dd53d8fc2b0d0a03fcc1150361b33 100644 (file)
--- a/src/backend/optimizer/util/pgxcship.c
+++ b/src/backend/optimizer/util/pgxcship.c
@@ -871,6 +871,11 @@ pgxc_shippability_walker(Node *node, Shippability_context *sc_context)
 
                        if (query->hasRecursive)
                                pgxc_set_shippability_reason(sc_context, SS_UNSUPPORTED_EXPR);
+
+                       /* Queries with FOR UPDATE/SHARE can't be shipped */
+                       if (query->hasForUpdate || query->rowMarks)
+                               pgxc_set_shippability_reason(sc_context, SS_UNSUPPORTED_EXPR);
+
                        /*
                         * If the query needs Coordinator for evaluation or the query can be
                         * completed on Coordinator itself, we don't ship it to the Datanode