Skip to content

[fix](ip) fix ip nullable param without check (#44700)#46250

Merged
HappenLee merged 3 commits intoapache:branch-3.0from
amorynan:pick_44700_to_doris_branch-3.0
Jan 3, 2025
Merged

[fix](ip) fix ip nullable param without check (#44700)#46250
HappenLee merged 3 commits intoapache:branch-3.0from
amorynan:pick_44700_to_doris_branch-3.0

Conversation

@amorynan
Copy link
Copy Markdown
Contributor

@amorynan amorynan commented Jan 2, 2025 •
edited by HappenLee
Loading

if we use ipv6_cidr_to_range function with nullable func which with invalid ipv6 will make be core

mysql> select id, ipv6_cidr_to_range(nullable(''), 32) from fn_test_ip_nullable order by id;

What problem does this PR solve?

Related PR: #44700

Release note

None

Check List (For Author)

  • Test

    • Regression test
    • Unit Test
    • Manual test (add detailed scripts or steps below)
    • No need to test or manual test. Explain why:
      • This is a refactor/code format and no logic has been changed.
      • Previous test can cover this change.
      • No code files have been changed.
      • Other reason

  • Behavior changed:

    • No.
    • Yes.

  • Does this need documentation?

    • No.
    • Yes.

Check List (For Reviewer who merge this PR)

  • Confirm the release note
  • Confirm test cases
  • Confirm document
  • Add branch pick label

[fix](ip) fix ip nullable param without check (apache#44700)
1540c49 
if we use ipv6_cidr_to_range function with nullable func which with
invalid ipv6 will make be core
```
mysql> select id, ipv6_cidr_to_range(nullable(''), 32) from fn_test_ip_nullable order by id;
```
@hello-stephen
Copy link
Copy Markdown
Contributor

hello-stephen commented Jan 2, 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?

@amorynan
Copy link
Copy Markdown
Contributor Author

amorynan commented Jan 2, 2025

run buildall

@amorynan
Copy link
Copy Markdown
Contributor Author

amorynan commented Jan 2, 2025

run buildall

@amorynan
Copy link
Copy Markdown
Contributor Author

amorynan commented Jan 2, 2025

run buildall

@doris-robot
Copy link
Copy Markdown

doris-robot commented Jan 2, 2025

TPC-H: Total hot run time: 40550 ms 
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/tpch-tools
Tpch sf100 test result on commit 03b744c6d011581cd66ad4da81acdaee40085db9, data reload: false

------ Round 1 ----------------------------------
q1	17577	7378	7197	7197
q2	2067	171	166	166
q3	10653	1075	1224	1075
q4	10568	730	757	730
q5	7705	2832	2838	2832
q6	237	150	147	147
q7	982	603	601	601
q8	9392	1965	2002	1965
q9	6582	6396	6415	6396
q10	7107	2409	2284	2284
q11	583	271	270	270
q12	404	218	216	216
q13	17801	2948	3006	2948
q14	242	214	212	212
q15	565	514	527	514
q16	688	615	602	602
q17	960	592	548	548
q18	7202	6780	6484	6484
q19	1400	1082	1020	1020
q20	467	208	199	199
q21	3993	3279	3149	3149
q22	1101	1015	995	995
Total cold run time: 108276 ms
Total hot run time: 40550 ms

----- Round 2, with runtime_filter_mode=off -----
q1	7221	7179	7193	7179
q2	329	236	247	236
q3	2915	2918	2880	2880
q4	2054	1811	1835	1811
q5	5685	5723	5678	5678
q6	216	142	147	142
q7	2291	1856	1822	1822
q8	3344	3614	3453	3453
q9	8743	8881	8789	8789
q10	3585	3545	3532	3532
q11	597	509	489	489
q12	808	615	622	615
q13	8492	3093	3151	3093
q14	298	267	273	267
q15	568	523	516	516
q16	717	670	670	670
q17	1838	1626	1618	1618
q18	8198	7831	7577	7577
q19	1640	1581	1592	1581
q20	2100	1851	1861	1851
q21	5562	5417	5474	5417
q22	1122	1055	1058	1055
Total cold run time: 68323 ms
Total hot run time: 60271 ms

@doris-robot
Copy link
Copy Markdown

doris-robot commented Jan 2, 2025

TPC-DS: Total hot run time: 196848 ms 
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/tpcds-tools
TPC-DS sf100 test result on commit 03b744c6d011581cd66ad4da81acdaee40085db9, data reload: false

query1	1260	926	929	926
query2	6223	1996	2052	1996
query3	10836	4058	4390	4058
query4	66175	29074	23384	23384
query5	4926	442	442	442
query6	399	168	168	168
query7	5558	307	306	306
query8	320	228	229	228
query9	8889	2695	2681	2681
query10	453	274	261	261
query11	17332	15182	15755	15182
query12	167	103	100	100
query13	1482	441	424	424
query14	10428	6808	7649	6808
query15	205	179	174	174
query16	7140	474	474	474
query17	1063	600	615	600
query18	2092	321	319	319
query19	225	170	160	160
query20	121	112	113	112
query21	61	44	52	44
query22	4854	4573	4440	4440
query23	35302	34404	34795	34404
query24	6497	2918	2925	2918
query25	517	445	433	433
query26	661	166	168	166
query27	1876	303	305	303
query28	4636	2477	2479	2477
query29	715	483	452	452
query30	247	158	159	158
query31	1015	820	841	820
query32	66	57	59	57
query33	454	285	278	278
query34	916	520	514	514
query35	855	738	726	726
query36	1078	959	994	959
query37	124	73	73	73
query38	4099	4021	4100	4021
query39	1502	1489	1471	1471
query40	140	82	77	77
query41	51	48	49	48
query42	110	101	98	98
query43	525	494	488	488
query44	1213	832	846	832
query45	183	167	165	165
query46	1104	726	712	712
query47	2015	1928	1884	1884
query48	474	384	389	384
query49	729	382	377	377
query50	831	434	430	430
query51	7348	7231	7261	7231
query52	98	83	86	83
query53	250	183	182	182
query54	548	447	445	445
query55	78	81	80	80
query56	267	232	233	232
query57	1212	1076	1078	1076
query58	201	199	211	199
query59	3238	3114	3221	3114
query60	271	241	244	241
query61	106	113	109	109
query62	760	666	679	666
query63	213	194	200	194
query64	1388	654	620	620
query65	3251	3200	3174	3174
query66	613	303	297	297
query67	15834	15727	15559	15559
query68	4063	574	578	574
query69	408	277	258	258
query70	1167	1079	1108	1079
query71	326	258	263	258
query72	6217	3986	4059	3986
query73	746	341	355	341
query74	9949	9047	8875	8875
query75	3328	2612	2707	2612
query76	1775	1112	1047	1047
query77	498	268	266	266
query78	10494	9648	9551	9551
query79	1700	592	598	592
query80	856	423	449	423
query81	521	246	237	237
query82	1260	113	108	108
query83	164	149	149	149
query84	283	76	78	76
query85	881	293	284	284
query86	324	299	309	299
query87	4383	4330	4305	4305
query88	4005	2371	2343	2343
query89	408	281	280	280
query90	1879	187	187	187
query91	184	148	148	148
query92	65	48	49	48
query93	1952	542	539	539
query94	730	297	284	284
query95	350	251	249	249
query96	611	279	279	279
query97	3367	3190	3158	3158
query98	227	205	198	198
query99	1573	1301	1320	1301
Total cold run time: 318514 ms
Total hot run time: 196848 ms

@doris-robot
Copy link
Copy Markdown

doris-robot commented Jan 2, 2025

ClickBench: Total hot run time: 33.31 s 
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/clickbench-tools
ClickBench test result on commit 03b744c6d011581cd66ad4da81acdaee40085db9, data reload: false

query1	0.03	0.03	0.04
query2	0.06	0.03	0.03
query3	0.23	0.06	0.06
query4	1.63	0.10	0.11
query5	0.53	0.51	0.52
query6	1.14	0.72	0.72
query7	0.02	0.02	0.02
query8	0.04	0.03	0.03
query9	0.58	0.50	0.50
query10	0.55	0.54	0.56
query11	0.13	0.10	0.10
query12	0.14	0.11	0.12
query13	0.61	0.58	0.59
query14	2.91	3.00	2.98
query15	0.89	0.83	0.82
query16	0.40	0.38	0.38
query17	0.98	0.96	0.99
query18	0.24	0.22	0.22
query19	1.91	1.88	2.01
query20	0.01	0.01	0.01
query21	15.36	0.57	0.58
query22	2.42	2.52	2.09
query23	16.87	1.01	0.97
query24	3.06	1.24	1.07
query25	0.20	0.20	0.04
query26	0.48	0.14	0.13
query27	0.03	0.06	0.05
query28	10.52	1.10	1.05
query29	12.55	3.22	3.23
query30	0.25	0.06	0.07
query31	2.88	0.38	0.39
query32	3.26	0.45	0.45
query33	2.93	3.02	3.02
query34	16.93	4.41	4.46
query35	4.57	4.45	4.51
query36	0.68	0.49	0.47
query37	0.10	0.05	0.06
query38	0.04	0.03	0.04
query39	0.03	0.02	0.02
query40	0.15	0.13	0.13
query41	0.08	0.03	0.02
query42	0.03	0.02	0.02
query43	0.04	0.03	0.03
Total cold run time: 106.49 s
Total hot run time: 33.31 s

HappenLee
HappenLee approved these changes Jan 2, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@HappenLee HappenLee left a comment

Choose a reason for hiding this comment

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

LGTM

@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Jan 2, 2025
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Jan 2, 2025

PR approved by at least one committer and no changes requested.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Jan 2, 2025

PR approved by anyone and no changes requested.

@HappenLee HappenLee merged commit 4506457 into apache:branch-3.0 Jan 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@HappenLee HappenLee HappenLee approved these changes

Assignees

No one assigned

Labels

approved Indicates a PR has been approved by one committer. reviewed

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@amorynan @hello-stephen @doris-robot @HappenLee