Skip to content

[fix](be) return correct canceled status from scanner #36392

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 18, 2024
Merged

[fix](be) return correct canceled status from scanner #36392

morrySnow merged 1 commit into from
Jun 18, 2024

Conversation

@mrhhsg
Copy link
Member

@mrhhsg mrhhsg commented Jun 17, 2024

Proposed changes

Issue Number: close #xxx

@doris-robot
Copy link

doris-robot commented Jun 17, 2024

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See How to process your PR

Since 2024-03-18, the Document has been moved to doris-website.
See Doris Document.

@mrhhsg
Copy link
Member Author

mrhhsg commented Jun 17, 2024

run buildall

@github-actions
Copy link
Contributor

github-actions bot commented Jun 17, 2024

clang-tidy review says "All clean, LGTM! 👍"

@doris-robot
Copy link

doris-robot commented Jun 17, 2024

TeamCity be ut coverage result:
Function Coverage: 36.48% (9003/24680)
Line Coverage: 28.01% (73743/263244)
Region Coverage: 27.49% (38306/139361)
Branch Coverage: 24.18% (19528/80746)
Coverage Report: http://coverage.selectdb-in.cc/coverage/47715ad9171566fabc1e0f7cb5b221acc210a40a_47715ad9171566fabc1e0f7cb5b221acc210a40a/report/index.html

@doris-robot
Copy link

doris-robot commented Jun 17, 2024

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

------ Round 1 ----------------------------------
q1	17616	4374	4230	4230
q2	2021	188	197	188
q3	10445	1135	1078	1078
q4	10183	793	764	764
q5	7471	2658	2597	2597
q6	223	139	136	136
q7	963	616	595	595
q8	9214	2052	2077	2052
q9	8735	6463	6471	6463
q10	8984	3757	3745	3745
q11	475	241	243	241
q12	443	235	229	229
q13	17774	2979	3004	2979
q14	266	214	229	214
q15	505	461	474	461
q16	523	370	388	370
q17	947	679	708	679
q18	7989	7430	7488	7430
q19	5736	1510	1519	1510
q20	653	311	344	311
q21	4883	3257	3860	3257
q22	390	346	340	340
Total cold run time: 116439 ms
Total hot run time: 39869 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4402	4266	4241	4241
q2	375	278	266	266
q3	2999	2939	2901	2901
q4	1984	1711	1722	1711
q5	5569	5516	5441	5441
q6	223	130	134	130
q7	2207	1905	1863	1863
q8	3253	3416	3437	3416
q9	8716	8727	8803	8727
q10	4054	3907	3740	3740
q11	616	521	510	510
q12	825	634	647	634
q13	17072	3153	3184	3153
q14	306	268	278	268
q15	541	482	483	482
q16	501	429	442	429
q17	1800	1536	1510	1510
q18	8218	7971	7868	7868
q19	1815	1577	1646	1577
q20	3039	1913	1862	1862
q21	6337	4991	4660	4660
q22	617	584	554	554
Total cold run time: 75469 ms
Total hot run time: 55943 ms

@doris-robot
Copy link

doris-robot commented Jun 17, 2024

TPC-DS: Total hot run time: 173839 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 47715ad9171566fabc1e0f7cb5b221acc210a40a, data reload: false

query1	923	383	376	376
query2	6451	2528	2290	2290
query3	6636	204	208	204
query4	19683	17148	17463	17148
query5	3649	471	455	455
query6	236	152	170	152
query7	4580	304	293	293
query8	303	297	286	286
query9	8721	2399	2394	2394
query10	573	299	280	280
query11	10610	10034	9865	9865
query12	129	94	85	85
query13	1658	369	374	369
query14	9966	7133	7883	7133
query15	237	193	204	193
query16	7710	270	275	270
query17	1879	573	527	527
query18	1947	280	283	280
query19	202	164	160	160
query20	93	87	86	86
query21	224	135	132	132
query22	4205	4073	3990	3990
query23	33805	33704	33593	33593
query24	11083	2826	2965	2826
query25	606	378	372	372
query26	722	156	158	156
query27	2262	326	328	326
query28	5900	2149	2141	2141
query29	918	621	638	621
query30	260	165	160	160
query31	958	797	750	750
query32	98	51	52	51
query33	734	285	289	285
query34	1037	482	475	475
query35	785	646	671	646
query36	1150	962	969	962
query37	147	80	73	73
query38	3017	2837	2822	2822
query39	911	831	821	821
query40	213	132	131	131
query41	54	51	51	51
query42	112	96	97	96
query43	568	539	534	534
query44	1212	716	735	716
query45	196	161	161	161
query46	1068	723	698	698
query47	1824	1780	1752	1752
query48	365	310	290	290
query49	842	406	407	406
query50	764	394	393	393
query51	6789	6620	6664	6620
query52	98	94	90	90
query53	364	295	299	295
query54	890	443	438	438
query55	73	72	71	71
query56	282	267	303	267
query57	1114	1015	1072	1015
query58	241	250	253	250
query59	3535	3230	3194	3194
query60	292	279	285	279
query61	93	88	89	88
query62	612	455	431	431
query63	316	287	296	287
query64	8827	2268	1718	1718
query65	3221	3128	3193	3128
query66	747	325	325	325
query67	15224	15061	15058	15058
query68	4501	523	531	523
query69	593	481	399	399
query70	1148	1132	1127	1127
query71	443	277	285	277
query72	7116	5421	5705	5421
query73	746	325	329	325
query74	5958	5592	5518	5518
query75	3359	2630	2710	2630
query76	2469	944	928	928
query77	619	307	302	302
query78	11356	10144	9925	9925
query79	3693	516	520	516
query80	1758	519	466	466
query81	570	217	221	217
query82	677	97	103	97
query83	234	172	168	168
query84	275	90	90	90
query85	755	292	272	272
query86	474	319	313	313
query87	3338	3057	3055	3055
query88	4830	2383	2367	2367
query89	522	377	391	377
query90	1827	191	189	189
query91	133	103	100	100
query92	66	51	53	51
query93	4529	512	502	502
query94	1075	191	194	191
query95	418	330	318	318
query96	617	262	263	262
query97	3219	3064	3151	3064
query98	233	194	187	187
query99	1274	832	854	832
Total cold run time: 273769 ms
Total hot run time: 173839 ms

@doris-robot
Copy link

doris-robot commented Jun 17, 2024

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

query1	0.04	0.04	0.03
query2	0.08	0.04	0.04
query3	0.22	0.05	0.06
query4	1.68	0.07	0.08
query5	0.50	0.49	0.49
query6	1.12	0.73	0.72
query7	0.02	0.01	0.02
query8	0.05	0.04	0.04
query9	0.54	0.47	0.49
query10	0.55	0.54	0.54
query11	0.15	0.11	0.11
query12	0.15	0.12	0.12
query13	0.59	0.58	0.60
query14	0.78	0.78	0.78
query15	0.87	0.84	0.80
query16	0.36	0.36	0.37
query17	0.96	0.96	0.97
query18	0.21	0.28	0.21
query19	1.81	1.79	1.82
query20	0.01	0.02	0.01
query21	15.44	0.66	0.67
query22	3.74	6.51	2.20
query23	18.28	1.42	1.40
query24	2.09	0.24	0.21
query25	0.15	0.08	0.08
query26	0.25	0.18	0.18
query27	0.09	0.09	0.08
query28	13.23	1.01	1.00
query29	12.62	3.33	3.32
query30	0.26	0.07	0.06
query31	2.85	0.39	0.38
query32	3.29	0.49	0.47
query33	2.88	2.89	2.87
query34	17.01	4.43	4.43
query35	4.46	4.46	4.44
query36	0.65	0.46	0.46
query37	0.18	0.16	0.15
query38	0.16	0.13	0.14
query39	0.05	0.03	0.03
query40	0.18	0.14	0.15
query41	0.11	0.04	0.04
query42	0.06	0.04	0.05
query43	0.05	0.04	0.04
Total cold run time: 108.77 s
Total hot run time: 30.99 s

@mrhhsg
Copy link
Member Author

mrhhsg commented Jun 17, 2024

run buildall

@github-actions
Copy link
Contributor

github-actions bot commented Jun 17, 2024

clang-tidy review says "All clean, LGTM! 👍"

@doris-robot
Copy link

doris-robot commented Jun 17, 2024

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

------ Round 1 ----------------------------------
q1	18001	5498	4392	4392
q2	2568	202	204	202
q3	11200	1100	1097	1097
q4	10490	843	728	728
q5	7588	2738	2602	2602
q6	229	144	147	144
q7	963	628	626	626
q8	9312	2082	2115	2082
q9	9014	6500	6445	6445
q10	8919	3704	3764	3704
q11	444	235	238	235
q12	468	236	246	236
q13	18705	3006	2982	2982
q14	254	228	217	217
q15	531	486	468	468
q16	535	391	388	388
q17	961	709	705	705
q18	7991	7459	7415	7415
q19	7904	1520	1446	1446
q20	645	308	336	308
q21	5015	3124	3314	3124
q22	383	330	330	330
Total cold run time: 122120 ms
Total hot run time: 39876 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4396	4275	4219	4219
q2	370	260	260	260
q3	2973	2784	2736	2736
q4	1854	1644	1617	1617
q5	5269	5281	5225	5225
q6	213	127	132	127
q7	2127	1782	1762	1762
q8	3204	3336	3343	3336
q9	8264	8291	8342	8291
q10	3911	3642	3613	3613
q11	587	493	485	485
q12	780	582	599	582
q13	16495	3022	3018	3018
q14	290	263	263	263
q15	524	481	470	470
q16	464	419	419	419
q17	1771	1477	1463	1463
q18	7608	7548	7332	7332
q19	3211	1570	1575	1570
q20	2009	1793	1769	1769
q21	4834	4672	4728	4672
q22	623	559	556	556
Total cold run time: 71777 ms
Total hot run time: 53785 ms

@doris-robot
Copy link

doris-robot commented Jun 17, 2024

TeamCity be ut coverage result:
Function Coverage: 36.48% (9004/24679)
Line Coverage: 28.02% (73749/263200)
Region Coverage: 27.49% (38303/139339)
Branch Coverage: 24.18% (19524/80734)
Coverage Report: http://coverage.selectdb-in.cc/coverage/bc200ab993dc63d85a69999ccebb1d092c5e67ff_bc200ab993dc63d85a69999ccebb1d092c5e67ff/report/index.html

@doris-robot
Copy link

doris-robot commented Jun 17, 2024

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

query1	944	375	380	375
query2	6456	2477	2284	2284
query3	6656	205	203	203
query4	19607	17198	17270	17198
query5	4394	483	460	460
query6	257	163	183	163
query7	4600	313	296	296
query8	312	278	283	278
query9	8577	2397	2369	2369
query10	605	309	286	286
query11	10529	10066	10101	10066
query12	130	87	84	84
query13	1630	369	367	367
query14	9959	7076	7833	7076
query15	230	191	191	191
query16	7811	266	259	259
query17	1911	547	532	532
query18	1952	278	276	276
query19	195	160	155	155
query20	92	86	83	83
query21	214	139	139	139
query22	4394	3947	4014	3947
query23	33473	33322	33087	33087
query24	12047	2821	2755	2755
query25	660	358	365	358
query26	1818	158	162	158
query27	2970	321	323	321
query28	7476	2033	2058	2033
query29	1137	630	621	621
query30	270	151	153	151
query31	945	738	755	738
query32	93	54	55	54
query33	774	293	281	281
query34	965	489	481	481
query35	752	621	617	617
query36	1075	971	950	950
query37	309	72	70	70
query38	2901	2743	2841	2743
query39	854	805	787	787
query40	296	130	132	130
query41	55	54	54	54
query42	116	96	103	96
query43	588	539	546	539
query44	1242	724	735	724
query45	199	168	174	168
query46	1082	715	733	715
query47	1862	1760	1776	1760
query48	366	304	302	302
query49	1222	448	424	424
query50	769	397	396	396
query51	6749	6717	6698	6698
query52	103	94	100	94
query53	372	306	299	299
query54	984	460	455	455
query55	77	75	77	75
query56	335	292	264	264
query57	1190	1071	1055	1055
query58	263	241	261	241
query59	3305	2998	2951	2951
query60	296	276	285	276
query61	95	115	94	94
query62	662	444	441	441
query63	316	298	302	298
query64	9795	2273	1751	1751
query65	3183	3137	3143	3137
query66	1363	337	341	337
query67	15440	14979	14799	14799
query68	5271	558	549	549
query69	601	436	366	366
query70	1126	1122	1160	1122
query71	454	269	273	269
query72	7746	5031	5336	5031
query73	781	322	334	322
query74	5902	5504	5495	5495
query75	3701	2685	2661	2661
query76	3520	948	973	948
query77	631	312	317	312
query78	10372	9877	9821	9821
query79	2650	519	533	519
query80	1015	482	482	482
query81	567	221	221	221
query82	1341	110	104	104
query83	270	178	174	174
query84	239	86	91	86
query85	1596	287	273	273
query86	479	319	312	312
query87	3277	3081	3050	3050
query88	4142	2341	2344	2341
query89	496	398	404	398
query90	1790	190	187	187
query91	128	97	99	97
query92	65	53	50	50
query93	2293	511	506	506
query94	1274	192	186	186
query95	412	312	314	312
query96	603	286	280	280
query97	3253	2991	3066	2991
query98	216	197	202	197
query99	1178	843	849	843
Total cold run time: 279688 ms
Total hot run time: 172370 ms

@doris-robot
Copy link

doris-robot commented Jun 17, 2024

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

query1	0.04	0.04	0.04
query2	0.09	0.04	0.05
query3	0.22	0.05	0.05
query4	1.67	0.07	0.07
query5	0.50	0.50	0.50
query6	1.13	0.74	0.74
query7	0.02	0.02	0.01
query8	0.05	0.05	0.05
query9	0.54	0.48	0.49
query10	0.55	0.55	0.54
query11	0.16	0.11	0.11
query12	0.14	0.11	0.12
query13	0.61	0.59	0.59
query14	0.78	0.78	0.78
query15	0.86	0.82	0.83
query16	0.37	0.37	0.36
query17	1.05	0.97	1.06
query18	0.22	0.25	0.23
query19	1.88	1.76	1.80
query20	0.01	0.01	0.01
query21	15.43	0.66	0.65
query22	4.14	7.52	2.22
query23	18.24	1.40	1.27
query24	2.13	0.21	0.21
query25	0.15	0.08	0.08
query26	0.26	0.17	0.18
query27	0.07	0.07	0.08
query28	13.33	1.02	1.00
query29	12.60	3.25	3.23
query30	0.26	0.07	0.06
query31	2.85	0.39	0.39
query32	3.26	0.47	0.48
query33	2.85	2.91	2.94
query34	17.10	4.43	4.42
query35	4.58	4.53	4.53
query36	0.66	0.50	0.46
query37	0.19	0.15	0.16
query38	0.15	0.15	0.15
query39	0.05	0.04	0.04
query40	0.17	0.15	0.16
query41	0.10	0.05	0.05
query42	0.05	0.05	0.05
query43	0.04	0.04	0.04
Total cold run time: 109.55 s
Total hot run time: 31.03 s

HappenLee
HappenLee approved these changes Jun 18, 2024
View reviewed changes
Copy link
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
Copy link
Contributor

github-actions bot commented Jun 18, 2024

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

@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Jun 18, 2024
@github-actions
Copy link
Contributor

github-actions bot commented Jun 18, 2024

PR approved by anyone and no changes requested.

@morrySnow morrySnow merged commit 3aa8b68 into apache:master Jun 18, 2024
@mrhhsg mrhhsg deleted the fix_status branch June 18, 2024 14:38
dataroaring pushed a commit that referenced this pull request Jun 21, 2024
@mrhhsg @dataroaring
[fix](be) return correct canceled status from scanner (#36392)
ce2633d
mrhhsg added a commit to mrhhsg/doris that referenced this pull request Aug 8, 2024
@mrhhsg
[fix](be) return correct canceled status from scanner (apache#36392)
7c4f134
@mrhhsg mrhhsg mentioned this pull request Aug 8, 2024
Merged
mrhhsg added a commit to mrhhsg/doris that referenced this pull request Aug 8, 2024
@mrhhsg
[fix](be) return correct canceled status from scanner (apache#36392)
d06409b
yiguolei pushed a commit that referenced this pull request Aug 8, 2024
@mrhhsg
[fix](be) return correct canceled status from scanner (#36392) (#39111)
e15b6cf 
## Proposed changes

pick #36392
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

@morrySnow morrySnow morrySnow approved these changes

Assignees

No one assigned

Labels

approved Indicates a PR has been approved by one committer. dev/2.1.6-merged dev/3.0.0-merged reviewed

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@mrhhsg @doris-robot @HappenLee @morrySnow @yiguolei @dataroaring