HPCC-12012 Revise based on code review

Signed-off-by: wangkx <kevin.wang@lexisnexis.com>