Merge pull request #1 from dp-bigdata/master

get changes from dp-bigdata
set result file location in the result
Merge pull request #9 from yixzhang/master

changes in query engine