This is to address the comment from @Jackie-Jiang mentioned in https://github.com/apache/pinot/pull/7718#pullrequestreview-800656895