HIVE-7528: refine the shuffle code