SPARK-2699 Improve compatibility with parquet file/table