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