Update the benchmark data generation and queries so now we have an interesting self-join scenario in addition to the simpler single-scan scenario