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