Query cancellation & timeout

is this logic required for all storage adapters going forward? If so, how can we guarantee we won't forget about that