Skip to content

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

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
dataroaring merged 1 commit into from
Aug 12, 2025
Merged

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

dataroaring merged 1 commit into from
Aug 12, 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)
64aa8c2 
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 dataroaring as a code owner July 30, 2025 08:25
@Thearas
Copy link
Contributor

Thearas 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
@Thearas
Copy link
Contributor

Thearas commented Jul 30, 2025

run buildall

@doris-robot
Copy link

doris-robot commented Jul 30, 2025

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

------ Round 1 ----------------------------------
q1	17589	6959	6587	6587
q2	2094	167	165	165
q3	10687	1121	1147	1121
q4	10443	689	800	689
q5	7739	2801	2760	2760
q6	218	135	129	129
q7	958	606	609	606
q8	9336	1935	2001	1935
q9	6615	6365	6388	6365
q10	7000	2277	2292	2277
q11	470	255	257	255
q12	395	207	206	206
q13	17794	2980	3014	2980
q14	230	205	211	205
q15	502	475	469	469
q16	488	399	372	372
q17	976	562	575	562
q18	7166	6540	6529	6529
q19	1387	1057	1004	1004
q20	480	199	205	199
q21	3879	3113	3115	3113
q22	1121	984	989	984
Total cold run time: 107567 ms
Total hot run time: 39512 ms

----- Round 2, with runtime_filter_mode=off -----
q1	6686	6593	6593	6593
q2	327	226	227	226
q3	2889	2983	3015	2983
q4	2142	1848	1860	1848
q5	5783	5808	5808	5808
q6	215	130	129	129
q7	2256	1767	1792	1767
q8	3337	3515	3574	3515
q9	8668	8871	8846	8846
q10	3550	3524	3511	3511
q11	602	494	497	494
q12	820	600	596	596
q13	11982	3173	3148	3148
q14	291	259	270	259
q15	522	452	454	452
q16	486	436	423	423
q17	1838	1620	1615	1615
q18	8203	7726	7802	7726
q19	1703	1643	1569	1569
q20	2053	1832	1825	1825
q21	5142	4908	4987	4908
q22	1150	1045	1031	1031
Total cold run time: 70645 ms
Total hot run time: 59272 ms

@doris-robot
Copy link

doris-robot commented Jul 30, 2025

TPC-DS: Total hot run time: 197029 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 64aa8c2a49eca75800e6b43b57a786545451e805, data reload: false

query1	1280	919	905	905
query2	6391	1878	1841	1841
query3	10946	4559	4561	4559
query4	33045	23548	23625	23548
query5	3496	442	446	442
query6	261	165	194	165
query7	3985	307	316	307
query8	280	237	229	229
query9	9537	2558	2560	2558
query10	452	263	252	252
query11	17721	15619	15259	15259
query12	163	101	102	101
query13	1550	449	429	429
query14	9216	7429	7121	7121
query15	255	182	194	182
query16	8011	515	512	512
query17	1631	602	617	602
query18	2190	318	327	318
query19	236	174	169	169
query20	128	116	110	110
query21	218	104	107	104
query22	4733	4478	4521	4478
query23	35670	34106	34277	34106
query24	11153	2948	2850	2850
query25	656	424	420	420
query26	1217	177	174	174
query27	2544	363	361	361
query28	7104	2140	2132	2132
query29	864	464	455	455
query30	261	168	162	162
query31	1058	820	848	820
query32	102	60	59	59
query33	776	306	314	306
query34	951	523	514	514
query35	865	760	749	749
query36	1107	938	921	921
query37	133	62	67	62
query38	4112	3940	3957	3940
query39	1495	1478	1460	1460
query40	207	103	104	103
query41	51	49	47	47
query42	114	100	100	100
query43	527	470	463	463
query44	1245	800	794	794
query45	185	169	171	169
query46	1171	736	746	736
query47	2008	1957	1915	1915
query48	472	371	376	371
query49	948	390	399	390
query50	831	415	425	415
query51	7449	7183	7191	7183
query52	103	86	90	86
query53	262	189	180	180
query54	1200	479	477	477
query55	89	83	79	79
query56	278	254	243	243
query57	1290	1201	1203	1201
query58	226	207	206	206
query59	3081	3052	2946	2946
query60	284	256	259	256
query61	110	110	106	106
query62	840	694	712	694
query63	223	199	190	190
query64	4176	669	636	636
query65	3302	3296	3313	3296
query66	689	302	323	302
query67	16560	15562	15645	15562
query68	4384	591	568	568
query69	423	252	256	252
query70	1169	1099	1117	1099
query71	369	251	256	251
query72	6316	4045	3793	3793
query73	743	340	367	340
query74	10099	8988	9309	8988
query75	3367	2639	2655	2639
query76	2715	1137	1173	1137
query77	406	273	277	273
query78	10656	9519	9598	9519
query79	1255	609	618	609
query80	863	424	419	419
query81	528	212	216	212
query82	1319	87	83	83
query83	215	150	145	145
query84	239	82	77	77
query85	1143	317	283	283
query86	353	301	302	301
query87	4400	4244	4242	4242
query88	3602	2365	2361	2361
query89	420	292	293	292
query90	1815	184	185	184
query91	182	146	150	146
query92	63	49	51	49
query93	1205	552	555	552
query94	679	292	301	292
query95	350	253	249	249
query96	610	278	276	276
query97	3334	3085	3164	3085
query98	210	197	198	197
query99	1539	1288	1306	1288
Total cold run time: 298685 ms
Total hot run time: 197029 ms

@doris-robot
Copy link

doris-robot commented Jul 30, 2025

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

query1	0.03	0.03	0.03
query2	0.07	0.03	0.03
query3	0.24	0.07	0.07
query4	1.63	0.11	0.09
query5	0.52	0.51	0.52
query6	1.14	0.72	0.73
query7	0.02	0.01	0.01
query8	0.04	0.03	0.03
query9	0.56	0.50	0.51
query10	0.55	0.56	0.56
query11	0.14	0.11	0.10
query12	0.14	0.11	0.12
query13	0.61	0.61	0.60
query14	0.77	0.80	0.79
query15	0.84	0.82	0.82
query16	0.39	0.39	0.39
query17	1.04	1.08	1.03
query18	0.23	0.20	0.21
query19	1.92	1.79	1.90
query20	0.01	0.01	0.00
query21	15.38	0.59	0.57
query22	2.36	1.75	1.59
query23	17.07	0.94	0.88
query24	3.20	1.41	2.02
query25	0.34	0.10	0.15
query26	0.44	0.14	0.14
query27	0.05	0.04	0.05
query28	9.01	0.53	0.47
query29	12.61	3.20	3.19
query30	0.25	0.06	0.06
query31	2.86	0.38	0.39
query32	3.26	0.46	0.46
query33	2.98	3.01	3.03
query34	16.89	4.49	4.49
query35	4.59	4.57	4.55
query36	0.68	0.50	0.49
query37	0.08	0.06	0.06
query38	0.05	0.03	0.03
query39	0.04	0.02	0.03
query40	0.16	0.12	0.12
query41	0.08	0.02	0.02
query42	0.04	0.02	0.03
query43	0.04	0.03	0.03
Total cold run time: 103.35 s
Total hot run time: 30.51 s

@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

dataroaring
dataroaring approved these changes Aug 12, 2025
View reviewed changes
Copy link
Contributor

@dataroaring dataroaring left a comment

Choose a reason for hiding this comment

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

LGTM

@dataroaring dataroaring merged commit 6b40ab0 into branch-3.0 Aug 12, 2025
25 of 26 checks passed
@github-actions github-actions bot deleted the auto-pick-53559-branch-3.0 branch August 12, 2025 02:37
@gavinchou gavinchou mentioned this pull request Sep 1, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dataroaring dataroaring dataroaring 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

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