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