HIVE-8017: clean up
Merge branch 'HIVE-8017' of https://github.com/lirui-intel/hive into HIVE-8017