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