Address this todo https://github.com/datafusion-contrib/datafusion-distributed/pull/236/files#diff-9be3fccf02d9d99c9431fc94e1bf32e70c96676a11ca28e2ee6567701a842c77R292
