[SPARK-30612][SQL] Resolve qualified column name with v2 tables #27391
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.spark.sql.catalyst.expressions | ||
|
|
||
| import org.apache.spark.SparkFunSuite | ||
| import org.apache.spark.sql.AnalysisException | ||
| import org.apache.spark.sql.catalyst.analysis.{caseInsensitiveResolution, caseSensitiveResolution} | ||
| import org.apache.spark.sql.types.{IntegerType, StructField, StructType} | ||
|
|
||
| class AttributeResolutionSuite extends SparkFunSuite { | ||
| val resolver = caseInsensitiveResolution | ||
|
|
||
| test("basic attribute resolution with namespaces") { | ||
|
Contributor
There was a problem hiding this comment. Can you add a test please where the table name and the column name is the same and make sure resolution works. Something like: val attrs = Seq(AttributeReference("t", IntegerType)(qualifier = Seq("ns1", "ns2", "t")))
attrs.resolve(Seq("ns1", "ns2", "t"), resolver) match {
case Some(attr) => fail()
case _ => fail()
} |
||
| val attrs = Seq( | ||
| AttributeReference("a", IntegerType)(qualifier = Seq("ns1", "ns2", "t1")), | ||
| AttributeReference("a", IntegerType)(qualifier = Seq("ns1", "ns2", "ns3", "t2"))) | ||
|
|
||
| // Try to match attribute reference with name "a" with qualifier "ns1.ns2.t1". | ||
| Seq(Seq("t1", "a"), Seq("ns2", "t1", "a"), Seq("ns1", "ns2", "t1", "a")).foreach { nameParts => | ||
| attrs.resolve(nameParts, resolver) match { | ||
| case Some(attr) => assert(attr.semanticEquals(attrs(0))) | ||
| case _ => fail() | ||
| } | ||
| } | ||
|
|
||
| // Non-matching cases | ||
| Seq(Seq("ns1", "ns2", "t1"), Seq("ns2", "a")).foreach { nameParts => | ||
| assert(attrs.resolve(nameParts, resolver).isEmpty) | ||
| } | ||
| } | ||
|
|
||
| test("attribute resolution where table and attribute names are the same") { | ||
| val attrs = Seq(AttributeReference("t", IntegerType)(qualifier = Seq("ns1", "ns2", "t"))) | ||
| // Matching cases | ||
| Seq( | ||
| Seq("t"), Seq("t", "t"), Seq("ns2", "t", "t"), Seq("ns1", "ns2", "t", "t") | ||
| ).foreach { nameParts => | ||
| attrs.resolve(nameParts, resolver) match { | ||
| case Some(attr) => assert(attr.semanticEquals(attrs(0))) | ||
| case _ => fail() | ||
| } | ||
| } | ||
|
|
||
| // Non-matching case | ||
| assert(attrs.resolve(Seq("ns1", "ns2", "t"), resolver).isEmpty) | ||
| } | ||
|
|
||
| test("attribute resolution ambiguity at the attribute name level") { | ||
| val attrs = Seq( | ||
| AttributeReference("a", IntegerType)(qualifier = Seq("ns1", "t1")), | ||
| AttributeReference("a", IntegerType)(qualifier = Seq("ns1", "ns2", "t2"))) | ||
|
|
||
| val ex = intercept[AnalysisException] { | ||
| attrs.resolve(Seq("a"), resolver) | ||
| } | ||
| assert(ex.getMessage.contains( | ||
| "Reference 'a' is ambiguous, could be: ns1.t1.a, ns1.ns2.t2.a.")) | ||
| } | ||
|
|
||
| test("attribute resolution ambiguity at the qualifier level") { | ||
| val attrs = Seq( | ||
| AttributeReference("a", IntegerType)(qualifier = Seq("ns1", "t")), | ||
| AttributeReference("a", IntegerType)(qualifier = Seq("ns2", "ns1", "t"))) | ||
|
|
||
| val ex = intercept[AnalysisException] { | ||
| attrs.resolve(Seq("ns1", "t", "a"), resolver) | ||
| } | ||
| assert(ex.getMessage.contains( | ||
| "Reference 'ns1.t.a' is ambiguous, could be: ns1.t.a, ns2.ns1.t.a.")) | ||
| } | ||
|
|
||
| test("attribute resolution with nested fields") { | ||
| val attrType = StructType(Seq(StructField("aa", IntegerType), StructField("bb", IntegerType))) | ||
| val attrs = Seq(AttributeReference("a", attrType)(qualifier = Seq("ns1", "t"))) | ||
|
|
||
| val resolved = attrs.resolve(Seq("ns1", "t", "a", "aa"), resolver) | ||
| resolved match { | ||
| case Some(Alias(_, name)) => assert(name == "aa") | ||
| case _ => fail() | ||
| } | ||
|
|
||
| val ex = intercept[AnalysisException] { | ||
| attrs.resolve(Seq("ns1", "t", "a", "cc"), resolver) | ||
| } | ||
| assert(ex.getMessage.contains("No such struct field cc in aa, bb")) | ||
| } | ||
|
|
||
| test("attribute resolution with case insensitive resolver") { | ||
| val attrs = Seq(AttributeReference("a", IntegerType)(qualifier = Seq("ns1", "t"))) | ||
| attrs.resolve(Seq("Ns1", "T", "A"), caseInsensitiveResolution) match { | ||
| case Some(attr) => assert(attr.semanticEquals(attrs(0)) && attr.name == "A") | ||
| case _ => fail() | ||
| } | ||
| } | ||
|
|
||
| test("attribute resolution with case sensitive resolver") { | ||
| val attrs = Seq(AttributeReference("a", IntegerType)(qualifier = Seq("ns1", "t"))) | ||
| assert(attrs.resolve(Seq("Ns1", "T", "A"), caseSensitiveResolution).isEmpty) | ||
| assert(attrs.resolve(Seq("ns1", "t", "A"), caseSensitiveResolution).isEmpty) | ||
| attrs.resolve(Seq("ns1", "t", "a"), caseSensitiveResolution) match { | ||
| case Some(attr) => assert(attr.semanticEquals(attrs(0))) | ||
| case _ => fail() | ||
| } | ||
| } | ||
|
|
||
| test("attribute resolution should try to match the longest qualifier") { | ||
| // We have two attributes: | ||
| // 1) "a.b" where "a" is the name and "b" is the nested field. | ||
| // 2) "a.b.a" where "b" is the name, left-side "a" is the qualifier and the right-side "a" | ||
| // is the nested field. | ||
| // When "a.b" is resolved, "b" is tried first as the name, so it is resolved to #2 attribute. | ||
| val a1Type = StructType(Seq(StructField("b", IntegerType))) | ||
| val a2Type = StructType(Seq(StructField("a", IntegerType))) | ||
| val attrs = Seq( | ||
| AttributeReference("a", a1Type)(), | ||
| AttributeReference("b", a2Type)(qualifier = Seq("a"))) | ||
| attrs.resolve(Seq("a", "b"), resolver) match { | ||
| case Some(attr) => assert(attr.semanticEquals(attrs(1))) | ||
| case _ => fail() | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.