Btw, here is a contribution (long back, never merged) on https on the broker: https://github.com/apache/incubator-pinot/pull/3675