HIVE-7540: change SortByShuffler accordingly