update the plans for the DISTINCT queries

It's a change for DISTINCT queries: from DISTINCT plan node to inline Aggregate plan node.
No terminating newline here either.