From 74802cd2fbf4272c6e8db2742b97108911a7c1c8 Mon Sep 17 00:00:00 2001 From: Cheng Lian Date: Sat, 22 Aug 2015 21:29:00 +0800 Subject: [PATCH] Minor refactoring for readability --- .../execution/datasources/parquet/CatalystRowConverter.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/CatalystRowConverter.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/CatalystRowConverter.scala index 74517b42ae0b9..cbf0704c4a9a4 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/CatalystRowConverter.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/CatalystRowConverter.scala @@ -459,7 +459,8 @@ private[parquet] class CatalystRowConverter( (parquetRepeatedType, catalystElementType) match { case (t: PrimitiveType, _) => true case (t: GroupType, _) if t.getFieldCount > 1 => true - case (t, _) if t.getName == "array" || t.getName == s"${parentName}_tuple" => true + case (t: GroupType, _) if t.getFieldCount == 1 && t.getName == "array" => true + case (t: GroupType, _) if t.getFieldCount == 1 && t.getName == parentName + "_tuple" => true case (t: GroupType, StructType(Array(f))) if f.name == t.getFieldName(0) => true case _ => false }