HIVE-8043: update qfile to enable merging for spark