Skip to content

branch-3.1: [fix](Prepared Statment) Fix exec prepared insert stmt in non master error (#48689) #52271

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
Jun 27, 2025
Merged

branch-3.1: [fix](Prepared Statment) Fix exec prepared insert stmt in non master error (#48689) #52271

morrySnow merged 1 commit into from
Jun 27, 2025

Conversation

@Jibing-Li
Copy link
Contributor

@Jibing-Li Jibing-Li commented Jun 25, 2025

backport: #48689

@Jibing-Li Jibing-Li marked this pull request as ready for review June 25, 2025 02:55
@Jibing-Li Jibing-Li requested a review from morrySnow as a code owner June 25, 2025 02:55
@Thearas
Copy link
Contributor

Thearas commented Jun 25, 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?

@Jibing-Li
Copy link
Contributor Author

Jibing-Li commented Jun 25, 2025

run buildall

@liutang123 @Jibing-Li
[fix](Prepared Statment) Fix exec prepared insert stmt in non master …
e5d7cc1 
…error (apache#48689)

When client send a prepare command to non master frontend like `INSERT
INTO xxxx VALUES(?)` and then execute it whith some params.
The non master frontend will forward the origin stmt to master and
analyze error will occur.
In this PR, we forward the origin sql and param to master. Master
prepare a logic plan with place holder and then use the param and logic
plan to generate physical plan.
@morrySnow
Copy link
Contributor

morrySnow commented Jun 25, 2025

run buildall

@doris-robot
Copy link

doris-robot commented Jun 25, 2025

Cloud UT Coverage Report

Increment line coverage 🎉

Increment coverage report
Complete coverage report

Category Coverage
Function Coverage 83.25% (1123/1349)
Line Coverage 66.76% (19335/28962)
Region Coverage 66.51% (9579/14402)
Branch Coverage 56.54% (5207/9210)

@doris-robot
Copy link

doris-robot commented Jun 25, 2025

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

------ Round 1 ----------------------------------
q1	17800	7029	6710	6710
q2	2051	192	168	168
q3	10748	1062	1160	1062
q4	10409	794	817	794
q5	7725	2865	2897	2865
q6	223	135	135	135
q7	1007	626	628	626
q8	9353	1989	2059	1989
q9	6705	6436	6452	6436
q10	7037	2295	2351	2295
q11	481	261	261	261
q12	396	212	206	206
q13	17777	2983	2982	2982
q14	229	209	203	203
q15	519	470	468	468
q16	485	380	368	368
q17	997	618	574	574
q18	7515	6493	6641	6493
q19	1310	1032	903	903
q20	469	204	198	198
q21	3954	3090	3125	3090
q22	1102	986	955	955
Total cold run time: 108292 ms
Total hot run time: 39781 ms

----- Round 2, with runtime_filter_mode=off -----
q1	6626	6607	6612	6607
q2	329	234	232	232
q3	2913	2757	2862	2757
q4	2030	1839	1776	1776
q5	5736	5702	5804	5702
q6	214	131	129	129
q7	2205	1793	1794	1793
q8	3405	3605	3542	3542
q9	9049	8721	8905	8721
q10	3612	3524	3553	3524
q11	591	491	484	484
q12	812	598	610	598
q13	10134	3110	3116	3110
q14	304	303	284	284
q15	526	458	449	449
q16	485	441	428	428
q17	1863	1640	1627	1627
q18	8313	7814	7680	7680
q19	1736	1536	1536	1536
q20	2115	1918	1820	1820
q21	5101	5115	5070	5070
q22	1145	1034	996	996
Total cold run time: 69244 ms
Total hot run time: 58865 ms

@doris-robot
Copy link

doris-robot commented Jun 25, 2025

TPC-DS: Total hot run time: 197247 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 e5d7cc162752e29dd08583e11978e98242658348, data reload: false

query1	1299	898	902	898
query2	6388	1942	1951	1942
query3	10828	4359	4198	4198
query4	61965	29164	24039	24039
query5	5186	497	462	462
query6	395	177	178	177
query7	5485	310	325	310
query8	315	229	235	229
query9	8724	2604	2594	2594
query10	497	298	259	259
query11	18122	15239	15917	15239
query12	163	103	104	103
query13	1483	457	429	429
query14	10050	7931	6815	6815
query15	200	195	175	175
query16	7259	465	520	465
query17	1146	609	593	593
query18	1857	312	321	312
query19	226	173	158	158
query20	121	117	112	112
query21	206	108	103	103
query22	4542	4514	4625	4514
query23	34392	34417	33918	33918
query24	6280	3010	2983	2983
query25	547	419	434	419
query26	663	169	173	169
query27	2001	368	363	363
query28	3764	2198	2161	2161
query29	710	494	415	415
query30	254	158	166	158
query31	984	797	826	797
query32	68	56	59	56
query33	446	306	309	306
query34	940	512	532	512
query35	854	699	719	699
query36	1090	992	948	948
query37	109	71	65	65
query38	4101	3997	3969	3969
query39	1518	1467	1471	1467
query40	200	108	96	96
query41	45	44	46	44
query42	112	101	104	101
query43	539	495	486	486
query44	1208	823	826	823
query45	185	171	170	170
query46	1144	737	750	737
query47	2010	1897	1888	1888
query48	440	357	343	343
query49	749	389	396	389
query50	841	428	436	428
query51	7414	7325	7234	7234
query52	106	90	96	90
query53	265	199	190	190
query54	566	462	470	462
query55	78	82	81	81
query56	273	268	262	262
query57	1306	1234	1200	1200
query58	220	207	222	207
query59	3296	3116	3027	3027
query60	282	260	259	259
query61	105	105	104	104
query62	765	670	718	670
query63	216	185	184	184
query64	1397	659	622	622
query65	3253	3197	3226	3197
query66	698	293	299	293
query67	15725	15507	15518	15507
query68	4189	573	578	573
query69	441	264	267	264
query70	1203	1084	1097	1084
query71	368	276	254	254
query72	6381	4068	3913	3913
query73	764	351	360	351
query74	10699	9235	9245	9235
query75	3345	2656	2693	2656
query76	1939	1095	1101	1095
query77	484	279	299	279
query78	10608	9624	9639	9624
query79	2065	605	600	600
query80	1408	422	416	416
query81	517	225	218	218
query82	1259	89	89	89
query83	270	144	144	144
query84	291	80	82	80
query85	1032	299	311	299
query86	393	307	296	296
query87	4383	4210	4272	4210
query88	3989	2377	2360	2360
query89	418	290	292	290
query90	1979	190	187	187
query91	145	106	109	106
query92	65	49	56	49
query93	2872	556	548	548
query94	786	293	297	293
query95	354	257	258	257
query96	621	279	276	276
query97	3314	3103	3131	3103
query98	209	197	193	193
query99	1572	1308	1280	1280
Total cold run time: 316979 ms
Total hot run time: 197247 ms

@doris-robot
Copy link

doris-robot commented Jun 25, 2025

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

query1	0.05	0.03	0.03
query2	0.09	0.05	0.05
query3	0.23	0.05	0.05
query4	1.64	0.08	0.08
query5	0.51	0.51	0.50
query6	1.13	0.76	0.74
query7	0.02	0.02	0.02
query8	0.06	0.05	0.04
query9	0.57	0.49	0.50
query10	0.57	0.57	0.57
query11	0.16	0.12	0.12
query12	0.16	0.13	0.13
query13	0.62	0.60	0.59
query14	0.79	0.79	0.82
query15	0.86	0.85	0.84
query16	0.39	0.35	0.37
query17	1.02	1.03	1.01
query18	0.19	0.19	0.18
query19	1.95	1.83	1.88
query20	0.02	0.02	0.02
query21	15.41	0.67	0.65
query22	4.45	5.67	2.31
query23	18.27	1.37	1.32
query24	2.19	0.24	0.23
query25	0.15	0.08	0.08
query26	0.27	0.18	0.18
query27	0.07	0.08	0.08
query28	13.27	0.60	0.56
query29	12.64	3.40	3.34
query30	0.25	0.06	0.05
query31	2.85	0.39	0.42
query32	3.23	0.49	0.49
query33	3.00	3.03	3.04
query34	16.88	4.54	4.53
query35	4.56	4.56	4.59
query36	0.67	0.49	0.46
query37	0.19	0.16	0.16
query38	0.16	0.15	0.15
query39	0.05	0.04	0.04
query40	0.17	0.13	0.12
query41	0.10	0.05	0.05
query42	0.06	0.05	0.05
query43	0.06	0.04	0.04
Total cold run time: 109.98 s
Total hot run time: 31.3 s

@morrySnow
Copy link
Contributor

morrySnow commented Jun 26, 2025

run buildall

@hello-stephen
Copy link
Contributor

hello-stephen commented Jun 26, 2025

Cloud UT Coverage Report

Increment line coverage 🎉

Increment coverage report
Complete coverage report

Category Coverage
Function Coverage 83.43% (1128/1352)
Line Coverage 67.27% (19648/29207)
Region Coverage 66.94% (9686/14470)
Branch Coverage 56.89% (5268/9260)

@hello-stephen
Copy link
Contributor

hello-stephen commented Jun 26, 2025

BE UT Coverage Report

Increment line coverage 🎉

Increment coverage report
Complete coverage report

Category Coverage
Function Coverage 42.38% (11534/27215)
Line Coverage 33.36% (100211/300363)
Region Coverage 32.66% (52188/159813)
Branch Coverage 29.72% (28026/94306)

@morrySnow morrySnow merged commit 1104d83 into apache:branch-3.1 Jun 27, 2025
20 of 23 checks passed
@morrySnow morrySnow deleted the obprepare3.1 branch June 27, 2025 05:34
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

@Jibing-Li @Thearas @morrySnow @doris-robot @hello-stephen @liutang123