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