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