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