refactor some stuffs
Merge pull request #1684 from VoltDB/ENG-6922-agg-plan

refactor some stuffs