Query cancellation & timeout

no, QueryWatcher is just something that query runners register with, QueryRunners don't need to know about this method.