add partition-by and concat