wip: finalized query api that we need to convert current repositories.
wip: finalized query api that we need to convert current repositories.

dwhjames/aws-wrap,dwhjames/aws-wrap,liruqi/aws-wrap,liruqi/aws-wrap