pick https://github.com/apache/doris/pull/41130 https://github.com/apache/doris/pull/41372 --------- Co-authored-by: zhaochangle <zhaochangle@selectdb.com>
pick https://github.com/apache/doris/pull/41130 https://github.com/apache/doris/pull/41372 --------- Co-authored-by: zhaochangle <zhaochangle@selectdb.com>