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