Merge "update Db provider to support query number"