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