database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[cherry-pick](branch-2.1) Pick "[feature](function) support ip functions named ipv4_to_ipv6 and cut_ipv6" (#39058)

Browse Source 
## Proposed changes

Issue Number: close #xxx

<!--Describe your changes.-->
pick https://github.com/apache/doris/pull/36883 and
https://github.com/apache/doris/pull/35239
This commit is contained in:
yangshijie
2024-08-10 18:37:11 +08:00
committed by GitHub
parent 0db158386a
commit 5f77f909d9
14 changed files with 555 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
fe/fe-core/src/main/java/org/apache/doris/catalog/BuiltinScalarFunctions.java
View File

@ -131,6 +131,7 @@ import org.apache.doris.nereids.trees.expressions.functions.scalar.CurrentCatalo
import org.apache.doris.nereids.trees.expressions.functions.scalar.CurrentDate;
import org.apache.doris.nereids.trees.expressions.functions.scalar.CurrentTime;
import org.apache.doris.nereids.trees.expressions.functions.scalar.CurrentUser;
import org.apache.doris.nereids.trees.expressions.functions.scalar.CutIpv6;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Database;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Date;
import org.apache.doris.nereids.trees.expressions.functions.scalar.DateDiff;
@ -207,6 +208,7 @@ import org.apache.doris.nereids.trees.expressions.functions.scalar.Ipv4NumToStri
import org.apache.doris.nereids.trees.expressions.functions.scalar.Ipv4StringToNum;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Ipv4StringToNumOrDefault;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Ipv4StringToNumOrNull;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Ipv4ToIpv6;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Ipv6CIDRToRange;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Ipv6NumToString;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Ipv6StringToNum;
@ -571,6 +573,7 @@ public class BuiltinScalarFunctions implements FunctionHelper {
scalar(CurrentDate.class, "curdate", "current_date"),
scalar(CurrentTime.class, "curtime", "current_time"),
scalar(CurrentUser.class, "current_user"),
scalar(CutIpv6.class, "cut_ipv6"),
scalar(Database.class, "database", "schema"),
scalar(Date.class, "date"),
scalar(DateDiff.class, "datediff"),
@ -643,6 +646,7 @@ public class BuiltinScalarFunctions implements FunctionHelper {
scalar(Ipv4StringToNum.class, "ipv4_string_to_num"),
scalar(Ipv4StringToNumOrDefault.class, "ipv4_string_to_num_or_default"),
scalar(Ipv4StringToNumOrNull.class, "ipv4_string_to_num_or_null", "inet_aton"),
scalar(Ipv4ToIpv6.class, "ipv4_to_ipv6"),
scalar(Ipv6NumToString.class, "ipv6_num_to_string", "inet6_ntoa"),
scalar(Ipv6StringToNum.class, "ipv6_string_to_num"),
scalar(Ipv6StringToNumOrDefault.class, "ipv6_string_to_num_or_default"),
@ -654,12 +658,6 @@ public class BuiltinScalarFunctions implements FunctionHelper {
scalar(IsIpAddressInRange.class, "is_ip_address_in_range"),
scalar(Ipv4CIDRToRange.class, "ipv4_cidr_to_range"),
scalar(Ipv6CIDRToRange.class, "ipv6_cidr_to_range"),
scalar(ToIpv4.class, "to_ipv4"),
scalar(ToIpv4OrDefault.class, "to_ipv4_or_default"),
scalar(ToIpv4OrNull.class, "to_ipv4_or_null"),
scalar(ToIpv6.class, "to_ipv6"),
scalar(ToIpv6OrDefault.class, "to_ipv6_or_default"),
scalar(ToIpv6OrNull.class, "to_ipv6_or_null"),
scalar(JsonArray.class, "json_array"),
scalar(JsonObject.class, "json_object"),
scalar(JsonQuote.class, "json_quote"),
@ -874,6 +872,12 @@ public class BuiltinScalarFunctions implements FunctionHelper {
scalar(ToDate.class, "to_date"),
scalar(ToDateV2.class, "to_datev2"),
scalar(ToDays.class, "to_days"),
scalar(ToIpv4.class, "to_ipv4"),
scalar(ToIpv4OrDefault.class, "to_ipv4_or_default"),
scalar(ToIpv4OrNull.class, "to_ipv4_or_null"),
scalar(ToIpv6.class, "to_ipv6"),
scalar(ToIpv6OrDefault.class, "to_ipv6_or_default"),
scalar(ToIpv6OrNull.class, "to_ipv6_or_null"),
scalar(Tokenize.class, "tokenize"),
scalar(ToMonday.class, "to_monday"),
scalar(ToQuantileState.class, "to_quantile_state"),

67
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/CutIpv6.java Normal file
View File

@ -0,0 +1,67 @@
// 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.doris.nereids.trees.expressions.functions.scalar;
import org.apache.doris.catalog.FunctionSignature;
import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.expressions.functions.ExplicitlyCastableSignature;
import org.apache.doris.nereids.trees.expressions.functions.PropagateNullable;
import org.apache.doris.nereids.trees.expressions.shape.TernaryExpression;
import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
import org.apache.doris.nereids.types.IPv6Type;
import org.apache.doris.nereids.types.TinyIntType;
import org.apache.doris.nereids.types.VarcharType;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import java.util.List;
/**
* scalar function cut_ipv6
*/
public class CutIpv6 extends ScalarFunction
implements TernaryExpression, ExplicitlyCastableSignature, PropagateNullable {
public static final List<FunctionSignature> SIGNATURES = ImmutableList.of(
FunctionSignature.ret(VarcharType.SYSTEM_DEFAULT)
.args(IPv6Type.INSTANCE, TinyIntType.INSTANCE, TinyIntType.INSTANCE));
public CutIpv6(Expression arg0, Expression arg1, Expression arg2) {
super("cut_ipv6", arg0, arg1, arg2);
}
@Override
public CutIpv6 withChildren(List<Expression> children) {
Preconditions.checkArgument(children.size() == 3,
"cut_ipv6 accept 3 args, but got %s (%s)",
children.size(),
children);
return new CutIpv6(children.get(0), children.get(1), children.get(2));
}
@Override
public List<FunctionSignature> getSignatures() {
return SIGNATURES;
}
@Override
public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
return visitor.visitCutIpv6(this, context);
}
}

65
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Ipv4ToIpv6.java Normal file
View File

@ -0,0 +1,65 @@
// 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.doris.nereids.trees.expressions.functions.scalar;
import org.apache.doris.catalog.FunctionSignature;
import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.expressions.functions.ExplicitlyCastableSignature;
import org.apache.doris.nereids.trees.expressions.functions.PropagateNullable;
import org.apache.doris.nereids.trees.expressions.shape.UnaryExpression;
import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
import org.apache.doris.nereids.types.IPv4Type;
import org.apache.doris.nereids.types.IPv6Type;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import java.util.List;
/**
* scalar function ipv4_to_ipv6
*/
public class Ipv4ToIpv6 extends ScalarFunction
implements UnaryExpression, ExplicitlyCastableSignature, PropagateNullable {
public static final List<FunctionSignature> SIGNATURES = ImmutableList.of(
FunctionSignature.ret(IPv6Type.INSTANCE).args(IPv4Type.INSTANCE));
public Ipv4ToIpv6(Expression arg0) {
super("ipv4_to_ipv6", arg0);
}
@Override
public Ipv4ToIpv6 withChildren(List<Expression> children) {
Preconditions.checkArgument(children.size() == 1,
"ipv4_to_ipv6 accept 1 args, but got %s (%s)",
children.size(),
children);
return new Ipv4ToIpv6(children.get(0));
}
@Override
public List<FunctionSignature> getSignatures() {
return SIGNATURES;
}
@Override
public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
return visitor.visitIpv4ToIpv6(this, context);
}
}

58
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/visitor/ScalarFunctionVisitor.java
View File

@ -138,6 +138,7 @@ import org.apache.doris.nereids.trees.expressions.functions.scalar.CurrentCatalo
import org.apache.doris.nereids.trees.expressions.functions.scalar.CurrentDate;
import org.apache.doris.nereids.trees.expressions.functions.scalar.CurrentTime;
import org.apache.doris.nereids.trees.expressions.functions.scalar.CurrentUser;
import org.apache.doris.nereids.trees.expressions.functions.scalar.CutIpv6;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Database;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Date;
import org.apache.doris.nereids.trees.expressions.functions.scalar.DateDiff;
@ -210,6 +211,7 @@ import org.apache.doris.nereids.trees.expressions.functions.scalar.Ipv4NumToStri
import org.apache.doris.nereids.trees.expressions.functions.scalar.Ipv4StringToNum;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Ipv4StringToNumOrDefault;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Ipv4StringToNumOrNull;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Ipv4ToIpv6;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Ipv6CIDRToRange;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Ipv6NumToString;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Ipv6StringToNum;
@ -907,6 +909,10 @@ public interface ScalarFunctionVisitor<R, C> {
return visitScalarFunction(currentUser, context);
}
default R visitCutIpv6(CutIpv6 cutIpv6, C context) {
return visitScalarFunction(cutIpv6, context);
}
default R visitDatabase(Database database, C context) {
return visitScalarFunction(database, context);
}
@ -1235,6 +1241,10 @@ public interface ScalarFunctionVisitor<R, C> {
return visitScalarFunction(ipv4StringToNumOrNull, context);
}
default R visitIpv4ToIpv6(Ipv4ToIpv6 ipv4ToIpv6, C context) {
return visitScalarFunction(ipv4ToIpv6, context);
}
default R visitIpv6NumToString(Ipv6NumToString ipv6NumToString, C context) {
return visitScalarFunction(ipv6NumToString, context);
}
@ -1279,30 +1289,6 @@ public interface ScalarFunctionVisitor<R, C> {
return visitScalarFunction(ipv6CIDRToRange, context);
}
default R visitToIpv4(ToIpv4 toIpv4, C context) {
return visitScalarFunction(toIpv4, context);
}
default R visitToIpv4OrDefault(ToIpv4OrDefault toIpv4OrDefault, C context) {
return visitScalarFunction(toIpv4OrDefault, context);
}
default R visitToIpv4OrNull(ToIpv4OrNull toIpv4OrNull, C context) {
return visitScalarFunction(toIpv4OrNull, context);
}
default R visitToIpv6(ToIpv6 toIpv6, C context) {
return visitScalarFunction(toIpv6, context);
}
default R visitToIpv6OrDefault(ToIpv6OrDefault toIpv6OrDefault, C context) {
return visitScalarFunction(toIpv6OrDefault, context);
}
default R visitToIpv6OrNull(ToIpv6OrNull toIpv6OrNull, C context) {
return visitScalarFunction(toIpv6OrNull, context);
}
default R visitJsonArray(JsonArray jsonArray, C context) {
return visitScalarFunction(jsonArray, context);
}
@ -1983,6 +1969,30 @@ public interface ScalarFunctionVisitor<R, C> {
return visitScalarFunction(toDays, context);
}
default R visitToIpv4(ToIpv4 toIpv4, C context) {
return visitScalarFunction(toIpv4, context);
}
default R visitToIpv4OrDefault(ToIpv4OrDefault toIpv4OrDefault, C context) {
return visitScalarFunction(toIpv4OrDefault, context);
}
default R visitToIpv4OrNull(ToIpv4OrNull toIpv4OrNull, C context) {
return visitScalarFunction(toIpv4OrNull, context);
}
default R visitToIpv6(ToIpv6 toIpv6, C context) {
return visitScalarFunction(toIpv6, context);
}
default R visitToIpv6OrDefault(ToIpv6OrDefault toIpv6OrDefault, C context) {
return visitScalarFunction(toIpv6OrDefault, context);
}
default R visitToIpv6OrNull(ToIpv6OrNull toIpv6OrNull, C context) {
return visitScalarFunction(toIpv6OrNull, context);
}
default R visitToMonday(ToMonday toMonday, C context) {
return visitScalarFunction(toMonday, context);
}