In catalog shard POC, some generic Shard based queries with retry are replaced with RSLocalClient().queryOnce() without retry. Using ShardingCatalogClientHelper that can be used for retry loops is problematic in some cases because it has high level dependencies and creates a dependency loop, preventing the build.

Most likely, we don't need to do anything, but this requires discussion.