Second step for refactor distributed query #55

Job	Run time
build_and_test (tls, linux, amd64)	1m 35s
build_and_test (tls, linux, arm64)	1m 11s
build_and_test (tls, darwin, amd64)	1m 36s
build_and_test (tls, darwin, arm64)	1m 42s
build_and_test (tls, windows, amd64)	3s
build_and_test (tls, windows, arm64)	3s
build_and_test (admin, linux, amd64)	1m 32s
build_and_test (admin, linux, arm64)	1m 14s
build_and_test (admin, darwin, amd64)	1m 33s
build_and_test (admin, darwin, arm64)	1m 30s
build_and_test (admin, windows, amd64)	9s
build_and_test (admin, windows, arm64)	4s
build_and_test (api, linux, amd64)	1m 41s
build_and_test (api, linux, arm64)	1m 8s
build_and_test (api, darwin, amd64)	1m 31s
build_and_test (api, darwin, arm64)	1m 36s
build_and_test (api, windows, amd64)	2s
build_and_test (api, windows, arm64)	2s
build_and_test (cli, linux, amd64)	1m 4s
build_and_test (cli, linux, arm64)	30s
build_and_test (cli, darwin, amd64)	42s
build_and_test (cli, darwin, arm64)	51s
build_and_test (cli, windows, amd64)	52s
build_and_test (cli, windows, arm64)	50s
	23m 1s

Provide feedback