Skip to content

Commit 6bda94b

Browse files
committed
Renames analysisRequire to checkConversionRequirement
1 parent 66419b7 commit 6bda94b

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

sql/core/src/main/scala/org/apache/spark/sql/parquet/ParquetSchemaConverter.scala

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ private[parquet] class ParquetSchemaConverter(
134134
val precision = field.getDecimalMetadata.getPrecision
135135
val scale = field.getDecimalMetadata.getScale
136136

137-
ParquetSchemaConverter.analysisRequire(
137+
ParquetSchemaConverter.checkConversionRequirement(
138138
maxPrecision == -1 || 1 <= precision && precision <= maxPrecision,
139139
s"Invalid decimal precision: $typeName cannot store $precision digits (max $maxPrecision)")
140140

@@ -168,7 +168,7 @@ private[parquet] class ParquetSchemaConverter(
168168
}
169169

170170
case INT96 =>
171-
ParquetSchemaConverter.analysisRequire(
171+
ParquetSchemaConverter.checkConversionRequirement(
172172
assumeInt96IsTimestamp,
173173
"INT96 is not supported unless it's interpreted as timestamp. " +
174174
s"Please try to set ${SQLConf.PARQUET_INT96_AS_TIMESTAMP.key} to true.")
@@ -210,11 +210,11 @@ private[parquet] class ParquetSchemaConverter(
210210
//
211211
// See: https://github.com/apache/parquet-format/blob/master/LogicalTypes.md#lists
212212
case LIST =>
213-
ParquetSchemaConverter.analysisRequire(
213+
ParquetSchemaConverter.checkConversionRequirement(
214214
field.getFieldCount == 1, s"Invalid list type $field")
215215

216216
val repeatedType = field.getType(0)
217-
ParquetSchemaConverter.analysisRequire(
217+
ParquetSchemaConverter.checkConversionRequirement(
218218
repeatedType.isRepetition(REPEATED), s"Invalid list type $field")
219219

220220
if (isElementType(repeatedType, field.getName)) {
@@ -230,17 +230,17 @@ private[parquet] class ParquetSchemaConverter(
230230
// See: https://github.com/apache/parquet-format/blob/master/LogicalTypes.md#backward-compatibility-rules-1
231231
// scalastyle:on
232232
case MAP | MAP_KEY_VALUE =>
233-
ParquetSchemaConverter.analysisRequire(
233+
ParquetSchemaConverter.checkConversionRequirement(
234234
field.getFieldCount == 1 && !field.getType(0).isPrimitive,
235235
s"Invalid map type: $field")
236236

237237
val keyValueType = field.getType(0).asGroupType()
238-
ParquetSchemaConverter.analysisRequire(
238+
ParquetSchemaConverter.checkConversionRequirement(
239239
keyValueType.isRepetition(REPEATED) && keyValueType.getFieldCount == 2,
240240
s"Invalid map type: $field")
241241

242242
val keyType = keyValueType.getType(0)
243-
ParquetSchemaConverter.analysisRequire(
243+
ParquetSchemaConverter.checkConversionRequirement(
244244
keyType.isPrimitive,
245245
s"Map key type is expected to be a primitive type, but found: $keyType")
246246

@@ -546,7 +546,7 @@ private[parquet] object ParquetSchemaConverter {
546546

547547
def checkFieldName(name: String): Unit = {
548548
// ,;{}()\n\t= and space are special characters in Parquet schema
549-
analysisRequire(
549+
checkConversionRequirement(
550550
!name.matches(".*[ ,;{}()\n\t=].*"),
551551
s"""Attribute name "$name" contains invalid character(s) among " ,;{}()\\n\\t=".
552552
|Please use alias to rename it.
@@ -558,7 +558,7 @@ private[parquet] object ParquetSchemaConverter {
558558
schema
559559
}
560560

561-
def analysisRequire(f: => Boolean, message: String): Unit = {
561+
def checkConversionRequirement(f: => Boolean, message: String): Unit = {
562562
if (!f) {
563563
throw new AnalysisException(message)
564564
}

0 commit comments

Comments
 (0)