refactor the querygenerator
Merge branch 'master' of https://github.com/firzhan/SiddhiHive