Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fix])(nereids)Support select catalog.db.table.column from xxx for nereids planner. #23221

Merged
merged 1 commit into from
Aug 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ public Expression visitUnboundStar(UnboundStar unboundStar, CascadesContext cont
return new BoundStar(slots);
case 1: // select table.*
case 2: // select db.table.*
case 3: // select catalog.db.table.*
return bindQualifiedStar(qualifier, slots);
default:
throw new AnalysisException("Not supported qualifier: "
Expand All @@ -167,6 +168,8 @@ private BoundStar bindQualifiedStar(List<String> qualifierStar, List<Slot> bound
return qualifierStar.get(0).equalsIgnoreCase(boundSlotQualifier.get(0));
case 2:// bound slot is `db`.`table`.`column`
return qualifierStar.get(0).equalsIgnoreCase(boundSlotQualifier.get(1));
case 3:// bound slot is `catalog`.`db`.`table`.`column`
return qualifierStar.get(0).equalsIgnoreCase(boundSlotQualifier.get(2));
default:
throw new AnalysisException("Not supported qualifier: "
+ StringUtils.join(qualifierStar, "."));
Expand All @@ -181,10 +184,29 @@ private BoundStar bindQualifiedStar(List<String> qualifierStar, List<Slot> bound
case 2:// bound slot is `db`.`table`.`column`
return compareDbNameIgnoreClusterName(qualifierStar.get(0), boundSlotQualifier.get(0))
&& qualifierStar.get(1).equalsIgnoreCase(boundSlotQualifier.get(1));
case 3:// bound slot is `catalog`.`db`.`table`.`column`
return compareDbNameIgnoreClusterName(qualifierStar.get(0), boundSlotQualifier.get(1))
&& qualifierStar.get(1).equalsIgnoreCase(boundSlotQualifier.get(2));
default:
throw new AnalysisException("Not supported qualifier: "
+ StringUtils.join(qualifierStar, ".") + ".*");
}
case 3: // catalog.db.table.*
boundSlotQualifier = boundSlot.getQualifier();
switch (boundSlotQualifier.size()) {
// bound slot is `column` and no qualified
case 0:
case 1: // bound slot is `table`.`column`
case 2: // bound slot is `db`.`table`.`column`
return false;
case 3:// bound slot is `catalog`.`db`.`table`.`column`
return qualifierStar.get(0).equalsIgnoreCase(boundSlotQualifier.get(0))
&& compareDbNameIgnoreClusterName(qualifierStar.get(1), boundSlotQualifier.get(1))
&& qualifierStar.get(2).equalsIgnoreCase(boundSlotQualifier.get(2));
default:
throw new AnalysisException("Not supported qualifier: "
+ StringUtils.join(qualifierStar, ".") + ".*");
}
default:
throw new AnalysisException("Not supported name: "
+ StringUtils.join(qualifierStar, ".") + ".*");
Expand Down Expand Up @@ -221,13 +243,24 @@ private List<Slot> bindSlot(UnboundSlot unboundSlot, List<Slot> boundSlots) {
String qualifierTableName = boundSlot.getQualifier().get(qualifierSize - 1);
return qualifierTableName.equalsIgnoreCase(nameParts.get(0))
&& boundSlot.getName().equalsIgnoreCase(nameParts.get(1));
} else if (nameParts.size() == 3) {
}
if (nameParts.size() == 3) {
String qualifierTableName = boundSlot.getQualifier().get(qualifierSize - 1);
String qualifierDbName = boundSlot.getQualifier().get(qualifierSize - 2);
return compareDbNameIgnoreClusterName(nameParts.get(0), qualifierDbName)
&& qualifierTableName.equalsIgnoreCase(nameParts.get(1))
&& boundSlot.getName().equalsIgnoreCase(nameParts.get(2));
}
// catalog.db.table.column
if (nameParts.size() == 4) {
String qualifierTableName = boundSlot.getQualifier().get(qualifierSize - 1);
String qualifierDbName = boundSlot.getQualifier().get(qualifierSize - 2);
String qualifierCatalogName = boundSlot.getQualifier().get(qualifierSize - 3);
return qualifierCatalogName.equalsIgnoreCase(nameParts.get(0))
&& compareDbNameIgnoreClusterName(nameParts.get(1), qualifierDbName)
&& qualifierTableName.equalsIgnoreCase(nameParts.get(2))
&& boundSlot.getName().equalsIgnoreCase(nameParts.get(3));
}
//TODO: handle name parts more than three.
throw new AnalysisException("Not supported name: "
+ StringUtils.join(nameParts, "."));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import org.apache.commons.lang3.StringUtils;

import java.util.List;
import java.util.Objects;
Expand Down Expand Up @@ -97,13 +98,19 @@ public List<String> getQualifier() {
* Full qualified name parts, i.e., concat qualifier and name into a list.
*/
public List<String> qualified() {
if (qualifier.size() == 3) {
return qualifier;
}
return Utils.qualifiedNameParts(qualifier, table.getName());
}

/**
* Full qualified table name, concat qualifier and name with `.` as separator.
*/
public String qualifiedName() {
if (qualifier.size() == 3) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why we use special branch?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

qualifier may only contain db name or contain full name (catalog.db.table),for the first case, need to concat the table name here, for the latter case, we don't need to.

return StringUtils.join(qualifier, ".");
}
return Utils.qualifiedName(qualifier, table.getName());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
-- This file is automatically generated. You should know what you did if you want to edit this
-- !test1 --
1 1
2 1
3 2
4 2
5 \N
6 \N

-- !test2 --
1 1
2 1
3 2
4 2
5 \N
6 \N

-- !test3 --
1 1
2 1
3 2
4 2
5 \N
6 \N

-- !test4 --
1 1
2 1
3 2
4 2
5 \N
6 \N

-- !test5 --
1 1
2 1
3 2
4 2
5 \N
6 \N

-- !test6 --
1 1
2 1
3 2
4 2
5 \N
6 \N

-- !test7 --
1 1
2 1
3 2
4 2
5 \N
6 \N

-- !test8 --
1 1
2 1
3 2
4 2
5 \N
6 \N

-- !test9 --
1 1
2 1
3 2
4 2
5 \N
6 \N

-- !test10 --
1 1
2 1
3 2
4 2
5 \N
6 \N

-- !test11 --
1 1
2 1
3 2
4 2
5 \N
6 \N

-- !test12 --
1 1
2 1
3 2
4 2
5 \N
6 \N

Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
// 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.

suite("test_hive_star_qualifier", "p2,external,hive,external_remote,external_remote_hive") {
String catalog_name = "test_hive_star_qualifier"

def test1 = """select * from ${catalog_name}.multi_catalog.one_partition order by id;"""
def test2 = """select * from multi_catalog.one_partition order by id;"""
def test3 = """select * from one_partition order by id;"""
def test4 = """select one_partition.* from ${catalog_name}.multi_catalog.one_partition order by id;"""
def test5 = """select one_partition.* from multi_catalog.one_partition order by id;"""
def test6 = """select one_partition.* from one_partition order by id;"""
def test7 = """select multi_catalog.one_partition.* from ${catalog_name}.multi_catalog.one_partition order by id;"""
def test8 = """select multi_catalog.one_partition.* from multi_catalog.one_partition order by id;"""
def test9 = """select multi_catalog.one_partition.* from one_partition order by id;"""
def test10 = """select ${catalog_name}.multi_catalog.one_partition.* from ${catalog_name}.multi_catalog.one_partition order by id;"""
def test11 = """select ${catalog_name}.multi_catalog.one_partition.* from multi_catalog.one_partition order by id;"""
def test12 = """select ${catalog_name}.multi_catalog.one_partition.* from one_partition order by id;"""

String enabled = context.config.otherConfigs.get("enableExternalHiveTest")
if (enabled != null && enabled.equalsIgnoreCase("true")) {
String extHiveHmsHost = context.config.otherConfigs.get("extHiveHmsHost")
String extHiveHmsPort = context.config.otherConfigs.get("extHiveHmsPort")
sql """drop catalog if exists ${catalog_name};"""
sql """
create catalog if not exists ${catalog_name} properties (
'type'='hms',
'hadoop.username' = 'hadoop',
'hive.metastore.uris' = 'thrift://${extHiveHmsHost}:${extHiveHmsPort}'
);
"""
sql """use ${catalog_name}.multi_catalog"""
qt_test1 test1
qt_test2 test2
qt_test3 test3
qt_test4 test4
qt_test5 test5
qt_test6 test6
qt_test7 test7
qt_test8 test8
qt_test9 test9
qt_test10 test10
qt_test11 test11
qt_test12 test12
sql """drop catalog if exists ${catalog_name};"""
}
}