[Feature](func) Support the third argument for regexp_extract_all and regexp_extract_all_array #66050
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| // 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.literal.BigIntLiteral; | ||
| import org.apache.doris.nereids.trees.expressions.literal.VarcharLiteral; | ||
| import org.apache.doris.nereids.types.BigIntType; | ||
| import org.apache.doris.nereids.types.VarcharType; | ||
|
|
||
| import com.google.common.collect.ImmutableList; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| /** | ||
| * Unit tests for the optional group-index argument of regexp_extract_all | ||
| * and regexp_extract_all_array. | ||
| */ | ||
| public class RegexpExtractAllTest { | ||
|
|
||
| @Test | ||
| public void testTwoAndThreeArgumentForms() { | ||
| Expression str = new VarcharLiteral("abc"); | ||
| Expression pattern = new VarcharLiteral("(b)"); | ||
| Expression index = new BigIntLiteral(2); | ||
|
|
||
| RegexpExtractAll twoArg = new RegexpExtractAll(str, pattern); | ||
| Assertions.assertEquals("regexp_extract_all", twoArg.getName()); | ||
| Assertions.assertEquals(2, twoArg.arity()); | ||
|
|
||
| RegexpExtractAll threeArg = new RegexpExtractAll(str, pattern, index); | ||
| Assertions.assertEquals(3, threeArg.arity()); | ||
| Assertions.assertEquals(BigIntType.INSTANCE, threeArg.child(2).getDataType()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testSignatures() { | ||
| Expression str = new VarcharLiteral("abc"); | ||
| Expression pattern = new VarcharLiteral("(b)"); | ||
|
|
||
| List<FunctionSignature> signatures = new RegexpExtractAll(str, pattern).getSignatures(); | ||
| Assertions.assertEquals(4, signatures.size()); | ||
| // two-argument forms come first for backward compatibility | ||
| Assertions.assertEquals(2, signatures.get(0).argumentsTypes.size()); | ||
| Assertions.assertEquals(VarcharType.SYSTEM_DEFAULT, signatures.get(0).returnType); | ||
| Assertions.assertEquals(3, signatures.get(2).argumentsTypes.size()); | ||
| Assertions.assertEquals(BigIntType.INSTANCE, signatures.get(2).getArgType(2)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testWithChildren() { | ||
| Expression str = new VarcharLiteral("abc"); | ||
| Expression pattern = new VarcharLiteral("(b)"); | ||
| Expression index = new BigIntLiteral(2); | ||
|
|
||
| RegexpExtractAll func = new RegexpExtractAll(str, pattern); | ||
| RegexpExtractAll twoChildren = func.withChildren(ImmutableList.of(str, pattern)); | ||
| Assertions.assertNotSame(func, twoChildren); | ||
| Assertions.assertEquals(2, twoChildren.arity()); | ||
|
|
||
| RegexpExtractAll threeChildren = func.withChildren(ImmutableList.of(str, pattern, index)); | ||
| Assertions.assertEquals(3, threeChildren.arity()); | ||
|
|
||
| Assertions.assertThrows(IllegalArgumentException.class, | ||
| () -> func.withChildren(ImmutableList.of(str))); | ||
| } | ||
|
|
||
| @Test | ||
| public void testArrayVariant() { | ||
| Expression str = new VarcharLiteral("abc"); | ||
| Expression pattern = new VarcharLiteral("(b)"); | ||
| Expression index = new BigIntLiteral(0); | ||
|
|
||
| RegexpExtractAllArray func = new RegexpExtractAllArray(str, pattern); | ||
| Assertions.assertEquals("regexp_extract_all_array", func.getName()); | ||
| Assertions.assertEquals(2, func.arity()); | ||
| Assertions.assertEquals(4, func.getSignatures().size()); | ||
|
|
||
| RegexpExtractAllArray threeChildren = func.withChildren(ImmutableList.of(str, pattern, index)); | ||
| Assertions.assertEquals(3, threeChildren.arity()); | ||
| Assertions.assertThrows(IllegalArgumentException.class, | ||
| () -> func.withChildren(ImmutableList.of(str, pattern, index, index))); | ||
| } | ||
| } |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's better not to change the parameter limit from two to a hard limit of three. I think support variable parameters is better.
Doris's version upgrades are generally rolling upgrades, first upgrading the backend (be) and then the frontend (fe).An old FE sends two arguments to a new BE, while an old FE pads two-argument SQL calls to three arguments and therefore cannot execute them on an new BE.
Could we keep the original two-argument expression shape and make the new BE accept both 2 and 3 arguments? When only two arguments are provided, the BE can simply use group index 1 as the default. This would preserve existing two-argument queries during a rolling upgrade
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch, thanks! Reworked in d387667: the FE no longer pads, and the BE now registers both a 2-arg and a 3-arg variadic form (mirroring regexp_replace's ThreeParamTypes/FourParamTypes), so an old FE keeps working against a new BE during rolling upgrades.