Skip to content

Commit 15c7003

Browse files
committed
rename functions
1 parent b69e91a commit 15c7003

1 file changed

Lines changed: 7 additions & 6 deletions

File tree

  • sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/package.scala

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,11 @@ package object expressions {
153153
}
154154

155155
/** Returns true if all qualifiers in `attrs` have 2 or less parts. */
156-
@transient private val has2OrLessPartQualifiers: Boolean = attrs.forall(_.qualifier.length <= 2)
156+
@transient private val hasTwoOrLessPartQualifiers: Boolean =
157+
attrs.forall(_.qualifier.length <= 2)
157158

158159
/** Match attributes for the case where all qualifiers in `attrs` have 2 or less parts. */
159-
private def matchWith2OrLessPartQualifiers(
160+
private def matchWithTwoOrLessPartQualifiers(
160161
nameParts: Seq[String],
161162
resolver: Resolver): (Seq[Attribute], Seq[String]) = {
162163
// Collect matching attributes given a name and a lookup.
@@ -220,7 +221,7 @@ package object expressions {
220221
/**
221222
* Match attributes for the case where at least one qualifier in `attrs` has more than 2 parts.
222223
*/
223-
private def matchWith3OrMorePartQualifiers(
224+
private def matchWithThreeOrMorePartQualifiers(
224225
nameParts: Seq[String],
225226
resolver: Resolver): (Seq[Attribute], Seq[String]) = {
226227
// Returns true if the `short` qualifier is a subset of the last elements of
@@ -282,10 +283,10 @@ package object expressions {
282283

283284
/** Perform attribute resolution given a name and a resolver. */
284285
def resolve(nameParts: Seq[String], resolver: Resolver): Option[NamedExpression] = {
285-
val (candidates, nestedFields) = if (has2OrLessPartQualifiers) {
286-
matchWith2OrLessPartQualifiers(nameParts, resolver)
286+
val (candidates, nestedFields) = if (hasTwoOrLessPartQualifiers) {
287+
matchWithTwoOrLessPartQualifiers(nameParts, resolver)
287288
} else {
288-
matchWith3OrMorePartQualifiers(nameParts, resolver)
289+
matchWithThreeOrMorePartQualifiers(nameParts, resolver)
289290
}
290291

291292
def name = UnresolvedAttribute(nameParts).name

0 commit comments

Comments
 (0)