(cherry picked commit from <gitee.com//opengauss/openGauss-server/commit/effc9c0131e042bdbc15f855febeb56d7b1b0add>