Changes according to hive-exec.jar refactory (HIVE-7423)