use hiveserver2
minor refactor