Skip to content

branch-3.1: [fix](nereids)alter sql block rule lost sql pattern info #53559 #54095

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
morrySnow merged 1 commit into from
Jul 31, 2025
Merged

branch-3.1: [fix](nereids)alter sql block rule lost sql pattern info #53559 #54095

morrySnow merged 1 commit into from
Jul 31, 2025

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Jul 30, 2025

Cherry-picked from #53559

@starocean999
[fix](nereids)alter sql block rule lost sql pattern info (#53559)
85eb737 
CREATE SQL_BLOCK_RULE rule_drop
        PROPERTIES(
        "sql"="select \\* from order_analysis",
        "global"="true",
        "enable"="true");

ALTER SQL_BLOCK_RULE rule_drop PROPERTIES("global"="true");

when ALTER SQL_BLOCK_RULE, we use new properties in the command and keep
other properties unchanged, but we need call setSqlPattern to fill the
new sql pattern or it will be 'NULL' which is a wrong pattern
@github-actions github-actions bot requested a review from morrySnow as a code owner July 30, 2025 08:26
@hello-stephen
Copy link
Contributor

hello-stephen commented Jul 30, 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 Jul 30, 2025
@hello-stephen
Copy link
Contributor

hello-stephen commented Jul 30, 2025

run buildall

@hello-stephen
Copy link
Contributor

hello-stephen commented Jul 30, 2025

FE UT Coverage Report

Increment line coverage 100.00% (1/1) 🎉
Increment coverage report
Complete coverage report

@doris-robot
Copy link

doris-robot commented Jul 30, 2025

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

------ Round 1 ----------------------------------
q1	17648	5459	5347	5347
q2	2065	272	162	162
q3	10593	1252	759	759
q4	10265	875	470	470
q5	8778	2358	2151	2151
q6	190	168	134	134
q7	905	738	630	630
q8	9345	1437	1216	1216
q9	5250	4963	4884	4884
q10	6781	2277	1798	1798
q11	467	278	262	262
q12	339	355	213	213
q13	17828	3598	3001	3001
q14	231	225	225	225
q15	519	473	473	473
q16	432	429	381	381
q17	609	867	373	373
q18	7018	6424	6426	6424
q19	1372	963	537	537
q20	331	336	203	203
q21	2994	2202	2018	2018
q22	1079	1030	998	998
Total cold run time: 105039 ms
Total hot run time: 32659 ms

----- Round 2, with runtime_filter_mode=off -----
q1	5565	5485	5526	5485
q2	231	327	231	231
q3	2269	2598	2347	2347
q4	1367	1825	1365	1365
q5	4466	4868	4970	4868
q6	168	163	130	130
q7	2042	1956	1846	1846
q8	2595	2820	2678	2678
q9	7321	7247	7253	7247
q10	3022	3342	2786	2786
q11	557	511	488	488
q12	621	743	605	605
q13	3411	3784	3165	3165
q14	280	318	275	275
q15	522	490	468	468
q16	439	485	458	458
q17	1239	1713	1244	1244
q18	7669	7440	7476	7440
q19	825	1135	1100	1100
q20	2013	2067	1903	1903
q21	5307	4795	4625	4625
q22	1078	1091	1016	1016
Total cold run time: 53007 ms
Total hot run time: 51770 ms

@doris-robot
Copy link

doris-robot commented Jul 30, 2025

TPC-DS: Total hot run time: 198169 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 85eb737b74b61c7ee0a902c90d111f800f47e238, data reload: false

query1	1300	973	890	890
query2	6248	2066	1942	1942
query3	10924	4596	4588	4588
query4	33191	23722	23586	23586
query5	3789	605	459	459
query6	269	201	179	179
query7	3983	502	324	324
query8	322	252	249	249
query9	9287	2604	2605	2604
query10	445	332	261	261
query11	17981	15842	15224	15224
query12	175	111	109	109
query13	1566	551	423	423
query14	9441	7322	6811	6811
query15	220	211	193	193
query16	7838	682	482	482
query17	1550	776	581	581
query18	2065	426	313	313
query19	208	186	161	161
query20	130	121	118	118
query21	198	128	108	108
query22	4551	4613	4431	4431
query23	35753	34615	34314	34314
query24	7475	2749	2777	2749
query25	469	455	401	401
query26	919	267	177	177
query27	2377	485	362	362
query28	5247	2272	2229	2229
query29	614	573	478	478
query30	248	195	171	171
query31	989	926	856	856
query32	80	63	62	62
query33	505	382	327	327
query34	774	860	511	511
query35	797	803	723	723
query36	1012	1068	926	926
query37	106	96	74	74
query38	4049	4038	3980	3980
query39	1558	1466	1457	1457
query40	212	124	105	105
query41	51	50	52	50
query42	130	116	108	108
query43	525	538	496	496
query44	1367	839	838	838
query45	197	179	174	174
query46	899	1077	687	687
query47	1971	1983	1932	1932
query48	427	432	348	348
query49	748	506	429	429
query50	691	699	435	435
query51	7447	7295	7385	7295
query52	105	103	94	94
query53	233	259	191	191
query54	560	578	492	492
query55	83	82	78	78
query56	265	261	255	255
query57	1256	1259	1203	1203
query58	242	232	234	232
query59	3057	3192	3156	3156
query60	308	303	285	285
query61	152	144	144	144
query62	836	794	665	665
query63	241	194	199	194
query64	3834	1135	745	745
query65	3361	3315	3342	3315
query66	937	439	339	339
query67	16692	15697	15543	15543
query68	7690	841	568	568
query69	483	311	267	267
query70	1183	1093	1115	1093
query71	424	291	265	265
query72	5733	3771	3838	3771
query73	632	752	353	353
query74	10268	9089	9019	9019
query75	3591	3151	2689	2689
query76	3442	1189	773	773
query77	753	382	276	276
query78	10420	10395	9769	9769
query79	3485	856	594	594
query80	720	514	437	437
query81	502	254	234	234
query82	632	120	88	88
query83	178	161	141	141
query84	279	105	81	81
query85	793	360	308	308
query86	341	313	298	298
query87	4368	4402	4255	4255
query88	4214	2406	2378	2378
query89	426	332	291	291
query90	1817	190	196	190
query91	136	141	111	111
query92	66	56	53	53
query93	1423	884	567	567
query94	666	400	316	316
query95	349	285	278	278
query96	496	602	278	278
query97	3234	3323	3247	3247
query98	217	210	203	203
query99	1550	1431	1317	1317
Total cold run time: 295991 ms
Total hot run time: 198169 ms

@doris-robot
Copy link

doris-robot commented Jul 30, 2025

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

query1	0.04	0.04	0.03
query2	0.06	0.03	0.03
query3	0.24	0.07	0.07
query4	1.62	0.11	0.10
query5	0.54	0.54	0.50
query6	1.13	0.73	0.73
query7	0.02	0.01	0.01
query8	0.04	0.03	0.03
query9	0.58	0.52	0.50
query10	0.56	0.55	0.56
query11	0.14	0.10	0.10
query12	0.14	0.11	0.12
query13	0.60	0.58	0.59
query14	0.77	0.79	0.80
query15	0.84	0.84	0.83
query16	0.38	0.38	0.38
query17	1.09	1.01	1.01
query18	0.24	0.22	0.22
query19	1.95	1.82	1.86
query20	0.01	0.01	0.01
query21	15.42	0.92	0.58
query22	0.73	0.75	0.67
query23	15.07	1.37	0.51
query24	2.94	0.43	0.87
query25	0.31	0.12	0.06
query26	0.34	0.15	0.14
query27	0.07	0.05	0.05
query28	13.19	1.06	0.43
query29	12.58	3.98	3.28
query30	0.26	0.09	0.06
query31	2.83	0.59	0.38
query32	3.22	0.54	0.46
query33	2.98	3.07	3.03
query34	16.68	5.23	4.54
query35	4.60	4.55	4.60
query36	0.61	0.48	0.49
query37	0.08	0.06	0.06
query38	0.05	0.04	0.03
query39	0.03	0.03	0.02
query40	0.17	0.14	0.13
query41	0.08	0.02	0.03
query42	0.04	0.02	0.03
query43	0.04	0.03	0.03
Total cold run time: 103.31 s
Total hot run time: 28.36 s

@morrySnow morrySnow merged commit afab6ef into branch-3.1 Jul 31, 2025
23 checks passed
@github-actions github-actions bot deleted the auto-pick-53559-branch-3.1 branch July 31, 2025 06:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@morrySnow morrySnow morrySnow 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.

6 participants

@hello-stephen @doris-robot @morrySnow @dataroaring @starocean999