Skip to content
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.

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

[fix](cloud) Fix cloud -230 retry not reset ctx state #47326

Merged
merged 4 commits into from
Jan 27, 2025

Conversation

deardeng
Copy link
Contributor

What problem does this PR solve?

Issue Number: close #xxx

Related PR: #xxx

Problem Summary:

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

@Thearas
Copy link
Contributor

Thearas commented Jan 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?

@deardeng
Copy link
Contributor Author

run buildall

@deardeng
Copy link
Contributor Author

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17591	5511	5395	5395
q2	2045	307	178	178
q3	10405	1262	713	713
q4	10229	974	510	510
q5	7539	2457	2178	2178
q6	187	171	136	136
q7	906	734	627	627
q8	9233	1348	1226	1226
q9	5208	4919	4925	4919
q10	6818	2342	1901	1901
q11	482	273	267	267
q12	334	363	216	216
q13	17771	3651	3077	3077
q14	229	227	205	205
q15	521	468	471	468
q16	604	602	574	574
q17	544	867	338	338
q18	7094	6443	6435	6435
q19	1210	961	531	531
q20	315	322	199	199
q21	2841	2161	1959	1959
q22	374	327	322	322
Total cold run time: 102480 ms
Total hot run time: 32374 ms

----- Round 2, with runtime_filter_mode=off -----
q1	5485	5499	5525	5499
q2	234	332	239	239
q3	2285	2679	2326	2326
q4	1454	1824	1386	1386
q5	4324	4775	4652	4652
q6	161	158	122	122
q7	2085	2026	1834	1834
q8	2670	2836	2691	2691
q9	7328	7248	7258	7248
q10	2996	3293	2785	2785
q11	583	519	500	500
q12	659	768	654	654
q13	3506	3845	3292	3292
q14	277	315	283	283
q15	516	470	470	470
q16	646	688	643	643
q17	1195	1737	1255	1255
q18	7706	7467	7297	7297
q19	792	867	1159	867
q20	2002	2059	1895	1895
q21	5677	5192	4929	4929
q22	622	573	576	573
Total cold run time: 53203 ms
Total hot run time: 51440 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 187813 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 1a0ebf948c0a29101415b4b284de8e50cf4dc677, data reload: false

query1	970	384	370	370
query2	6518	2133	2052	2052
query3	6788	213	210	210
query4	33975	23082	23342	23082
query5	4370	635	467	467
query6	293	191	194	191
query7	4604	478	306	306
query8	305	243	241	241
query9	9663	2670	2671	2670
query10	484	331	251	251
query11	17675	15104	14952	14952
query12	171	114	110	110
query13	1665	523	414	414
query14	10347	6828	7248	6828
query15	262	205	188	188
query16	8632	602	468	468
query17	1672	742	577	577
query18	2146	396	290	290
query19	222	182	150	150
query20	117	108	110	108
query21	211	137	102	102
query22	4499	4660	4245	4245
query23	33922	32918	33183	32918
query24	6473	2206	2215	2206
query25	496	448	379	379
query26	1175	269	149	149
query27	2014	467	331	331
query28	5248	2463	2428	2428
query29	740	555	434	434
query30	236	184	165	165
query31	953	918	809	809
query32	101	58	61	58
query33	507	374	293	293
query34	749	852	512	512
query35	812	800	752	752
query36	984	1023	940	940
query37	116	103	82	82
query38	4148	4163	4052	4052
query39	1462	1391	1397	1391
query40	209	114	101	101
query41	53	50	52	50
query42	125	101	102	101
query43	518	529	488	488
query44	1261	799	802	799
query45	178	170	165	165
query46	848	1026	637	637
query47	1861	1876	1783	1783
query48	365	393	332	332
query49	801	505	399	399
query50	620	663	380	380
query51	6913	6985	6784	6784
query52	101	102	97	97
query53	218	247	189	189
query54	482	485	420	420
query55	80	80	81	80
query56	256	279	253	253
query57	1167	1152	1107	1107
query58	249	237	260	237
query59	2981	3221	2909	2909
query60	286	285	254	254
query61	128	123	117	117
query62	780	708	625	625
query63	233	188	188	188
query64	4218	1010	660	660
query65	3253	3140	3144	3140
query66	1059	421	312	312
query67	15806	15697	15540	15540
query68	5780	813	540	540
query69	474	299	249	249
query70	1252	1089	1076	1076
query71	379	308	256	256
query72	5877	3797	3852	3797
query73	647	743	369	369
query74	10383	9225	9081	9081
query75	3170	3153	2672	2672
query76	3147	1165	762	762
query77	486	370	276	276
query78	10005	9926	9395	9395
query79	3111	786	593	593
query80	583	528	449	449
query81	503	278	245	245
query82	614	151	124	124
query83	176	182	154	154
query84	238	92	75	75
query85	783	376	295	295
query86	402	323	291	291
query87	4489	4518	4366	4366
query88	4747	2198	2164	2164
query89	430	336	298	298
query90	1885	189	190	189
query91	137	139	111	111
query92	67	56	51	51
query93	1794	844	536	536
query94	708	399	301	301
query95	335	268	254	254
query96	486	644	282	282
query97	2768	2919	2768	2768
query98	224	192	191	191
query99	1311	1376	1285	1285
Total cold run time: 288165 ms
Total hot run time: 187813 ms

@deardeng
Copy link
Contributor Author

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17578	5528	5416	5416
q2	2052	331	170	170
q3	10392	1253	723	723
q4	10212	970	526	526
q5	7555	2385	2116	2116
q6	191	168	136	136
q7	900	764	622	622
q8	9236	1355	1159	1159
q9	5217	4934	4878	4878
q10	6832	2315	1888	1888
q11	471	271	262	262
q12	347	356	229	229
q13	17792	3675	3069	3069
q14	225	229	213	213
q15	513	486	479	479
q16	621	635	600	600
q17	552	865	339	339
q18	7255	6560	6360	6360
q19	1233	977	553	553
q20	311	331	221	221
q21	2809	2287	1986	1986
q22	368	331	310	310
Total cold run time: 102662 ms
Total hot run time: 32255 ms

----- Round 2, with runtime_filter_mode=off -----
q1	5507	5474	5529	5474
q2	243	340	249	249
q3	2246	2693	2358	2358
q4	1430	1826	1367	1367
q5	4277	4735	4678	4678
q6	165	165	129	129
q7	1979	1834	1724	1724
q8	2516	2670	2629	2629
q9	6942	6951	6854	6854
q10	2889	3159	2666	2666
q11	568	517	489	489
q12	633	700	605	605
q13	3311	3666	3079	3079
q14	265	296	274	274
q15	513	462	462	462
q16	644	689	635	635
q17	1175	1671	1242	1242
q18	7341	7208	6951	6951
q19	749	1127	1049	1049
q20	1924	1958	1820	1820
q21	5463	5117	4883	4883
q22	612	610	572	572
Total cold run time: 51392 ms
Total hot run time: 50189 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 187755 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 38af6118fe69d262fc7da96598fc47515b3edc3b, data reload: false

query1	966	385	381	381
query2	6525	2123	2135	2123
query3	6792	214	209	209
query4	33216	23282	22754	22754
query5	4330	619	452	452
query6	296	189	190	189
query7	4615	489	305	305
query8	294	241	226	226
query9	9320	2685	2678	2678
query10	469	316	252	252
query11	17759	15014	14915	14915
query12	170	108	106	106
query13	1670	523	416	416
query14	10668	6830	6827	6827
query15	244	201	187	187
query16	8001	648	440	440
query17	1568	714	574	574
query18	2086	394	302	302
query19	204	179	151	151
query20	117	110	142	110
query21	208	128	99	99
query22	4356	4618	4430	4430
query23	34221	33130	33160	33130
query24	6382	2337	2340	2337
query25	497	449	384	384
query26	1202	274	154	154
query27	2016	459	332	332
query28	5354	2467	2460	2460
query29	729	540	408	408
query30	238	188	157	157
query31	961	902	818	818
query32	88	60	66	60
query33	561	358	296	296
query34	764	851	501	501
query35	806	830	738	738
query36	997	1034	934	934
query37	127	99	79	79
query38	4409	4169	4066	4066
query39	1441	1371	1407	1371
query40	207	113	104	104
query41	76	53	52	52
query42	123	105	108	105
query43	530	537	500	500
query44	1314	810	791	791
query45	187	174	165	165
query46	856	1028	632	632
query47	1867	1862	1768	1768
query48	385	406	330	330
query49	811	502	408	408
query50	620	659	389	389
query51	6958	6941	6857	6857
query52	106	103	91	91
query53	226	258	179	179
query54	483	481	420	420
query55	86	79	82	79
query56	255	262	250	250
query57	1198	1165	1080	1080
query58	244	239	250	239
query59	3160	3228	3062	3062
query60	281	268	290	268
query61	119	114	121	114
query62	833	710	677	677
query63	219	195	185	185
query64	4507	995	636	636
query65	3242	3152	3157	3152
query66	1064	399	296	296
query67	15835	15637	15471	15471
query68	4314	828	531	531
query69	470	293	262	262
query70	1197	1099	1116	1099
query71	381	281	316	281
query72	5803	3792	3799	3792
query73	654	767	358	358
query74	10056	9123	8594	8594
query75	3162	3170	2787	2787
query76	3200	1181	779	779
query77	476	369	278	278
query78	9991	9929	9254	9254
query79	3045	799	597	597
query80	669	608	452	452
query81	515	269	234	234
query82	228	154	117	117
query83	168	176	157	157
query84	244	99	70	70
query85	726	336	370	336
query86	388	317	299	299
query87	4521	4388	4447	4388
query88	4956	2223	2206	2206
query89	398	333	297	297
query90	1949	192	197	192
query91	136	135	106	106
query92	67	59	55	55
query93	2601	861	531	531
query94	661	402	305	305
query95	341	263	259	259
query96	496	612	283	283
query97	2808	2884	2770	2770
query98	228	204	200	200
query99	1321	1379	1235	1235
Total cold run time: 286629 ms
Total hot run time: 187755 ms

@doris-robot
Copy link

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

query1	0.03	0.03	0.03
query2	0.07	0.03	0.04
query3	0.24	0.08	0.06
query4	1.63	0.10	0.11
query5	0.42	0.44	0.41
query6	1.16	0.65	0.65
query7	0.03	0.02	0.01
query8	0.04	0.02	0.03
query9	0.58	0.50	0.52
query10	0.56	0.57	0.54
query11	0.14	0.10	0.10
query12	0.13	0.11	0.10
query13	0.59	0.61	0.60
query14	2.68	2.72	2.70
query15	0.91	0.82	0.83
query16	0.39	0.42	0.39
query17	1.04	1.05	1.06
query18	0.21	0.21	0.21
query19	1.95	1.90	2.01
query20	0.01	0.01	0.01
query21	15.36	0.95	0.60
query22	0.75	0.78	0.65
query23	15.32	1.40	0.57
query24	2.68	0.84	0.36
query25	0.14	0.12	0.16
query26	0.47	0.16	0.13
query27	0.06	0.07	0.04
query28	13.07	1.10	0.42
query29	12.61	4.03	3.30
query30	0.24	0.08	0.06
query31	2.83	0.60	0.39
query32	3.24	0.56	0.47
query33	2.97	3.06	3.02
query34	16.73	5.20	4.53
query35	4.54	4.51	4.48
query36	0.66	0.49	0.47
query37	0.09	0.06	0.06
query38	0.05	0.03	0.03
query39	0.03	0.02	0.02
query40	0.16	0.13	0.13
query41	0.08	0.03	0.03
query42	0.04	0.02	0.02
query43	0.04	0.03	0.03
Total cold run time: 104.97 s
Total hot run time: 30.16 s

@wm1581066 wm1581066 added usercase Important user case type label dev/3.0.x labels Jan 23, 2025
@gavinchou gavinchou added the p0_c label Jan 23, 2025
gavinchou
gavinchou previously approved these changes Jan 23, 2025
@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Jan 23, 2025
Copy link
Contributor

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

Copy link
Contributor

PR approved by anyone and no changes requested.

@deardeng
Copy link
Contributor Author

run buildall

@github-actions github-actions bot removed the approved Indicates a PR has been approved by one committer. label Jan 23, 2025
@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17607	5559	5343	5343
q2	2042	286	167	167
q3	10448	1192	740	740
q4	10259	936	519	519
q5	8155	2342	2120	2120
q6	189	162	131	131
q7	886	750	607	607
q8	9240	1354	1159	1159
q9	5194	4841	4795	4795
q10	6859	2324	1895	1895
q11	480	269	254	254
q12	337	369	214	214
q13	18285	3735	3150	3150
q14	217	229	205	205
q15	518	488	463	463
q16	635	596	594	594
q17	557	845	320	320
q18	6907	6481	6377	6377
q19	2782	951	528	528
q20	298	309	190	190
q21	2745	2164	1987	1987
q22	365	328	297	297
Total cold run time: 105005 ms
Total hot run time: 32055 ms

----- Round 2, with runtime_filter_mode=off -----
q1	5600	5450	5481	5450
q2	241	329	236	236
q3	2246	2638	2339	2339
q4	1402	1797	1353	1353
q5	4308	4712	4674	4674
q6	176	177	127	127
q7	2064	1964	1798	1798
q8	2607	2853	2681	2681
q9	7285	7188	7200	7188
q10	3058	3293	2785	2785
q11	577	536	494	494
q12	638	727	592	592
q13	3505	3996	3333	3333
q14	291	298	275	275
q15	518	483	471	471
q16	672	693	648	648
q17	1246	1730	1278	1278
q18	7723	7480	7322	7322
q19	804	1103	1072	1072
q20	1980	2020	1893	1893
q21	5641	5237	4930	4930
q22	600	570	594	570
Total cold run time: 53182 ms
Total hot run time: 51509 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 192207 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 9c79e139327a1b4a90157f659eeee0c8da92b114, data reload: false

query1	1310	945	935	935
query2	6225	2079	1938	1938
query3	10928	4571	4481	4481
query4	60615	29157	23029	23029
query5	5513	612	443	443
query6	412	194	200	194
query7	5535	508	301	301
query8	350	255	230	230
query9	8323	2598	2582	2582
query10	438	327	247	247
query11	17906	15448	15493	15448
query12	171	117	111	111
query13	1464	549	429	429
query14	11255	7179	7117	7117
query15	216	207	196	196
query16	7305	628	487	487
query17	1127	757	610	610
query18	1860	414	321	321
query19	209	190	162	162
query20	121	117	123	117
query21	216	126	108	108
query22	4472	4796	4528	4528
query23	34110	33377	33591	33377
query24	5523	2309	2348	2309
query25	453	466	401	401
query26	637	269	155	155
query27	1703	482	336	336
query28	3982	2443	2406	2406
query29	537	576	441	441
query30	218	191	163	163
query31	927	893	834	834
query32	72	64	57	57
query33	424	346	306	306
query34	769	882	520	520
query35	849	854	759	759
query36	1033	1028	963	963
query37	130	106	78	78
query38	4401	4238	4259	4238
query39	1588	1439	1461	1439
query40	215	125	109	109
query41	52	56	49	49
query42	121	109	99	99
query43	514	505	505	505
query44	1354	827	844	827
query45	188	182	173	173
query46	878	1051	650	650
query47	1890	1898	1824	1824
query48	393	405	326	326
query49	712	493	407	407
query50	679	684	420	420
query51	4279	4275	4323	4275
query52	106	106	96	96
query53	235	269	195	195
query54	493	497	424	424
query55	91	85	83	83
query56	270	253	250	250
query57	1221	1188	1158	1158
query58	242	230	241	230
query59	3138	3224	3115	3115
query60	278	269	257	257
query61	122	121	125	121
query62	747	737	668	668
query63	227	194	190	190
query64	1295	1032	643	643
query65	3247	3162	3168	3162
query66	712	390	294	294
query67	15774	15633	15541	15541
query68	3324	849	544	544
query69	484	311	255	255
query70	1201	1178	1143	1143
query71	410	283	268	268
query72	5939	3868	3853	3853
query73	661	757	358	358
query74	9847	8720	8698	8698
query75	3228	3147	2662	2662
query76	2971	1168	777	777
query77	516	374	287	287
query78	10173	10237	9370	9370
query79	2495	817	610	610
query80	1722	545	433	433
query81	553	273	236	236
query82	351	157	119	119
query83	269	171	156	156
query84	285	91	76	76
query85	765	370	367	367
query86	394	324	304	304
query87	4358	4482	4364	4364
query88	3474	2223	2167	2167
query89	406	321	293	293
query90	1565	194	194	194
query91	145	137	105	105
query92	68	58	55	55
query93	1694	863	534	534
query94	672	413	303	303
query95	333	270	258	258
query96	496	625	284	284
query97	2809	2812	2769	2769
query98	228	207	192	192
query99	1306	1361	1286	1286
Total cold run time: 305942 ms
Total hot run time: 192207 ms

@doris-robot
Copy link

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

query1	0.04	0.03	0.02
query2	0.07	0.03	0.04
query3	0.25	0.07	0.06
query4	1.62	0.11	0.10
query5	0.40	0.42	0.40
query6	1.17	0.67	0.66
query7	0.02	0.02	0.02
query8	0.04	0.03	0.03
query9	0.59	0.50	0.52
query10	0.55	0.56	0.53
query11	0.14	0.11	0.11
query12	0.14	0.11	0.11
query13	0.62	0.60	0.60
query14	2.72	2.74	2.83
query15	0.91	0.84	0.83
query16	0.40	0.39	0.38
query17	1.04	1.08	1.05
query18	0.23	0.21	0.20
query19	1.90	1.79	2.00
query20	0.02	0.01	0.01
query21	15.36	0.99	0.57
query22	0.75	0.75	0.62
query23	15.39	1.45	0.50
query24	2.91	1.00	0.73
query25	0.10	0.06	0.05
query26	0.40	0.17	0.13
query27	0.05	0.05	0.05
query28	13.42	1.05	0.44
query29	12.58	3.93	3.23
query30	0.24	0.08	0.08
query31	2.81	0.60	0.40
query32	3.22	0.55	0.47
query33	3.04	3.05	3.08
query34	16.69	5.17	4.51
query35	4.54	4.47	4.50
query36	0.68	0.53	0.48
query37	0.10	0.06	0.06
query38	0.04	0.04	0.03
query39	0.03	0.03	0.02
query40	0.16	0.13	0.12
query41	0.07	0.03	0.03
query42	0.03	0.02	0.02
query43	0.03	0.04	0.03
Total cold run time: 105.51 s
Total hot run time: 30.26 s

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

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

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

@dataroaring dataroaring merged commit 780024a into apache:master Jan 27, 2025
26 of 27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by one committer. dev/3.0.x p0_c reviewed usercase Important user case type label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants