In the greedy query planner, compute only O(n²) trees instead of O(n³)

In the greedy query planner, compute only O(n²) trees instead of O(n³) #4033