The existing function requires a canonical query to be passed in, but after join-opt we actually have several ones. There are also many checks in this function that don't apply (or can't apply without more context). We really should either refactor this function or create a new one with a narrower scope that join/executor.cpp can call into.