Removed map of subquery to subquery index in favor of storing index as part of DISI wrapper to improve hybrid query latencies by 20%

Removed map of subquery to subquery index in favor of storing index as part of DISI wrapper to improve hybrid query latencies by 20% #2678