Skip to content

branch-2.1: [feat](function) SUBSTRING_INDEX function delimiter supports dynamic #50149 #50303

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.

Sign up for GitHub

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

Jump to bottom
Merged
yiguolei merged 1 commit into from
Apr 23, 2025
Merged

branch-2.1: [feat](function) SUBSTRING_INDEX function delimiter supports dynamic #50149 #50303

yiguolei merged 1 commit into from
Apr 23, 2025

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Apr 22, 2025

Cherry-picked from #50149

@felixwluo
[feat](function) SUBSTRING_INDEX function delimiter supports dynamic (#…
d658584 
…50149)

### What problem does this PR solve?

Problem Summary:

sql
```
SELECT t1.no
      ,t1.sub_str
      ,t1.str
      ,substring_index(t1.str, t1.sub_str, -1)
      ,t2.rst2
FROM (
       SELECT 1 AS no, 'BBB' AS sub_str, 'AAA_01|BBB_02|CCC_03|DDD_04|EEE_05|FFF_06' AS str UNION ALL
       SELECT 2 AS no, 'ccc' AS sub_str, 'zyz_01|zyz_02|CCC_03|qwe_04|qwe_05|qwe_06' AS str UNION ALL
       SELECT 3 AS no, 'DDD' AS sub_str, 'AAA_01|BBB_02|CCC_03|DDD_04|EEE_05|FFF_06' AS str UNION ALL
       SELECT 4 AS no, 'DDD' AS sub_str, 'sgr_01|wsc_02|CCC_03|DDD_04|rfv_05|rgb_06' AS str UNION ALL
       SELECT 5 AS no, 'eee' AS sub_str, 'cdr_01|vfr_02|dfc_03|DDD_04|EEE_05|FFF_06' AS str UNION ALL
       SELECT 6 AS no, 'A_01' AS sub_str, 'AAA_01|dsd_02|ert_03|bgt_04|fgh_05|hyb_06' AS str 
     ) t1
LEFT JOIN (
       SELECT 1 AS no, 'BBB' AS sub_str,  substring_index('AAA_01|BBB_02|CCC_03|DDD_04|EEE_05|FFF_06', 'BBB', -1) AS rst2 UNION ALL
       SELECT 2 AS no, 'ccc' AS sub_str,  substring_index('zyz_01|zyz_02|CCC_03|qwe_04|qwe_05|qwe_06', 'ccc', -1) AS rst2 UNION ALL
       SELECT 3 AS no, 'DDD' AS sub_str,  substring_index('AAA_01|BBB_02|CCC_03|DDD_04|EEE_05|FFF_06', 'DDD', -1) AS rst2 UNION ALL
       SELECT 4 AS no, 'DDD' AS sub_str,  substring_index('sgr_01|wsc_02|CCC_03|DDD_04|rfv_05|rgb_06', 'DDD', -1) AS rst2 UNION ALL
       SELECT 5 AS no, 'eee' AS sub_str,  substring_index('cdr_01|vfr_02|dfc_03|DDD_04|EEE_05|FFF_06', 'eee', -1) AS rst2 UNION ALL
       SELECT 6 AS no, 'A_01' AS sub_str, substring_index('AAA_01|dsd_02|ert_03|bgt_04|fgh_05|hyb_06', 'A_01', -1) AS rst2 
     ) t2
     ON t1.no = t2.no AND t1.sub_str = t2.sub_str
ORDER BY t1.no;
```
previous results for doris:
```
-- master
function except for the first argument, other parameter must be a constant

-- 2.1
+------+---------+-------------------------------------------+-------------------------------------------------+-------------------------------------------+
| no   | sub_str | str                                       | substring_index(`t1`.`str`, `t1`.`sub_str`, -1) | rst2                                      |
+------+---------+-------------------------------------------+-------------------------------------------------+-------------------------------------------+
|    1 | BBB     | AAA_01|BBB_02|CCC_03|DDD_04|EEE_05|FFF_06 | _02|CCC_03|DDD_04|EEE_05|FFF_06                 | _02|CCC_03|DDD_04|EEE_05|FFF_06           |
|    2 | ccc     | zyz_01|zyz_02|CCC_03|qwe_04|qwe_05|qwe_06 | zyz_01|zyz_02|CCC_03|qwe_04|qwe_05|qwe_06       | zyz_01|zyz_02|CCC_03|qwe_04|qwe_05|qwe_06 |
|    3 | DDD     | AAA_01|BBB_02|CCC_03|DDD_04|EEE_05|FFF_06 | _02|CCC_03|DDD_04|EEE_05|FFF_06                 | _04|EEE_05|FFF_06                         |
|    4 | DDD     | sgr_01|wsc_02|CCC_03|DDD_04|rfv_05|rgb_06 | sgr_01|wsc_02|CCC_03|DDD_04|rfv_05|rgb_06       | _04|rfv_05|rgb_06                         |
|    5 | eee     | cdr_01|vfr_02|dfc_03|DDD_04|EEE_05|FFF_06 | cdr_01|vfr_02|dfc_03|DDD_04|EEE_05|FFF_06       | cdr_01|vfr_02|dfc_03|DDD_04|EEE_05|FFF_06 |
|    6 | A_01    | AAA_01|dsd_02|ert_03|bgt_04|fgh_05|hyb_06 | AAA_01|dsd_02|ert_03|bgt_04|fgh_05|hyb_06       | |dsd_02|ert_03|bgt_04|fgh_05|hyb_06       |
+------+---------+-------------------------------------------+-------------------------------------------------+-------------------------------------------+
```

mysql result:
```
+----+---------+-------------------------------------------+-------------------------------------------+-------------------------------------------+
| no | sub_str | str                                       | substring_index(t1.str, t1.sub_str, -1)   | rst2                                      |
+----+---------+-------------------------------------------+-------------------------------------------+-------------------------------------------+
|  1 | BBB     | AAA_01|BBB_02|CCC_03|DDD_04|EEE_05|FFF_06 | _02|CCC_03|DDD_04|EEE_05|FFF_06           | _02|CCC_03|DDD_04|EEE_05|FFF_06           |
|  2 | ccc     | zyz_01|zyz_02|CCC_03|qwe_04|qwe_05|qwe_06 | zyz_01|zyz_02|CCC_03|qwe_04|qwe_05|qwe_06 | zyz_01|zyz_02|CCC_03|qwe_04|qwe_05|qwe_06 |
|  3 | DDD     | AAA_01|BBB_02|CCC_03|DDD_04|EEE_05|FFF_06 | _04|EEE_05|FFF_06                         | _04|EEE_05|FFF_06                         |
|  4 | DDD     | sgr_01|wsc_02|CCC_03|DDD_04|rfv_05|rgb_06 | _04|rfv_05|rgb_06                         | _04|rfv_05|rgb_06                         |
|  5 | eee     | cdr_01|vfr_02|dfc_03|DDD_04|EEE_05|FFF_06 | cdr_01|vfr_02|dfc_03|DDD_04|EEE_05|FFF_06 | cdr_01|vfr_02|dfc_03|DDD_04|EEE_05|FFF_06 |
|  6 | A_01    | AAA_01|dsd_02|ert_03|bgt_04|fgh_05|hyb_06 | |dsd_02|ert_03|bgt_04|fgh_05|hyb_06       | |dsd_02|ert_03|bgt_04|fgh_05|hyb_06       |
+----+---------+-------------------------------------------+-------------------------------------------+-------------------------------------------+
```

current doris results:
```
+------+---------+-------------------------------------------+-------------------------------------------+-------------------------------------------+
| no   | sub_str | str                                       | substring_index(t1.str, t1.sub_str, -1)   | rst2                                      |
+------+---------+-------------------------------------------+-------------------------------------------+-------------------------------------------+
|    1 | BBB     | AAA_01|BBB_02|CCC_03|DDD_04|EEE_05|FFF_06 | _02|CCC_03|DDD_04|EEE_05|FFF_06           | _02|CCC_03|DDD_04|EEE_05|FFF_06           |
|    2 | ccc     | zyz_01|zyz_02|CCC_03|qwe_04|qwe_05|qwe_06 | zyz_01|zyz_02|CCC_03|qwe_04|qwe_05|qwe_06 | zyz_01|zyz_02|CCC_03|qwe_04|qwe_05|qwe_06 |
|    3 | DDD     | AAA_01|BBB_02|CCC_03|DDD_04|EEE_05|FFF_06 | _04|EEE_05|FFF_06                         | _04|EEE_05|FFF_06                         |
|    4 | DDD     | sgr_01|wsc_02|CCC_03|DDD_04|rfv_05|rgb_06 | _04|rfv_05|rgb_06                         | _04|rfv_05|rgb_06                         |
|    5 | eee     | cdr_01|vfr_02|dfc_03|DDD_04|EEE_05|FFF_06 | cdr_01|vfr_02|dfc_03|DDD_04|EEE_05|FFF_06 | cdr_01|vfr_02|dfc_03|DDD_04|EEE_05|FFF_06 |
|    6 | A_01    | AAA_01|dsd_02|ert_03|bgt_04|fgh_05|hyb_06 | |dsd_02|ert_03|bgt_04|fgh_05|hyb_06       | |dsd_02|ert_03|bgt_04|fgh_05|hyb_06       |
+------+---------+-------------------------------------------+-------------------------------------------+-------------------------------------------+
```

now consistent with mysql behavior.
@github-actions github-actions bot requested a review from yiguolei as a code owner April 22, 2025 11:07
@hello-stephen
Copy link
Contributor

hello-stephen commented Apr 22, 2025

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See How to process your PR.

Please clearly describe your PR:

  1. What problem was fixed (it's best to include specific error reporting information). How it was fixed.
  2. Which behaviors were modified. What was the previous behavior, what is it now, why was it modified, and what possible impacts might there be.
  3. What features were added. Why was this function added?
  4. Which code was refactored and why was this part of the code refactored?
  5. Which functions were optimized and what is the difference before and after the optimization?

@dataroaring dataroaring reopened this Apr 22, 2025
@hello-stephen
Copy link
Contributor

hello-stephen commented Apr 22, 2025

run buildall

@hello-stephen
Copy link
Contributor

hello-stephen commented Apr 22, 2025

BE UT Coverage Report

Increment line coverage 0.00% (0/44) 🎉

Increment coverage report
Complete coverage report

Category Coverage
Function Coverage 38.80% (10252/26422)
Line Coverage 29.86% (85114/285087)
Region Coverage 28.51% (43867/153874)
Branch Coverage 25.23% (22424/88872)

@hello-stephen
Copy link
Contributor

hello-stephen commented Apr 22, 2025

BE Regression P0 && UT Coverage Report

Increment line coverage 0.00% (0/44) 🎉

Increment coverage report
Complete coverage report

Category Coverage
Function Coverage
Line Coverage
Region Coverage
Branch Coverage

@felixwluo
Copy link
Contributor

felixwluo commented Apr 22, 2025

run feut

@hello-stephen
Copy link
Contributor

hello-stephen commented Apr 23, 2025

BE Regression P0 && UT Coverage Report

Increment line coverage 0.00% (0/44) 🎉

Increment coverage report
Complete coverage report

Category Coverage
Function Coverage
Line Coverage
Region Coverage
Branch Coverage

@yiguolei yiguolei merged commit 98f5d95 into branch-2.1 Apr 23, 2025
19 of 20 checks passed
@github-actions github-actions bot deleted the auto-pick-50149-branch-2.1 branch April 23, 2025 07:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yiguolei yiguolei yiguolei approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@hello-stephen @felixwluo @yiguolei @dataroaring