Skip to content

Conversation

@zddr
Copy link
Contributor

@zddr zddr commented Jul 25, 2024

fix

Note: Cases will be added uniformly in other PRs

@doris-robot
Copy link

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.

@zddr
Copy link
Contributor Author

zddr commented Jul 25, 2024

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	5333	4472	4303	4303
q2	1745	202	195	195
q3	7295	1119	1095	1095
q4	10412	805	935	805
q5	7580	2747	2693	2693
q6	222	141	142	141
q7	961	605	611	605
q8	9236	1895	1936	1895
q9	8686	6528	6531	6528
q10	8730	3824	3815	3815
q11	441	245	246	245
q12	398	229	222	222
q13	17756	3030	3020	3020
q14	278	243	241	241
q15	531	479	472	472
q16	459	392	383	383
q17	980	689	671	671
q18	8203	7782	7459	7459
q19	3577	1011	1149	1011
q20	646	328	342	328
q21	4884	3142	3203	3142
q22	345	289	285	285
Total cold run time: 98698 ms
Total hot run time: 39554 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4439	4263	4258	4258
q2	384	287	275	275
q3	2995	2776	2795	2776
q4	1860	1639	1640	1639
q5	5307	5329	5314	5314
q6	218	130	135	130
q7	2130	1763	1763	1763
q8	3208	3356	3348	3348
q9	8436	8403	8436	8403
q10	3913	3660	3691	3660
q11	571	491	507	491
q12	775	616	589	589
q13	16327	3043	3014	3014
q14	303	287	279	279
q15	527	472	477	472
q16	481	445	429	429
q17	1800	1489	1507	1489
q18	7722	7588	7355	7355
q19	1659	1480	1344	1344
q20	2028	1791	1809	1791
q21	4805	4561	4700	4561
q22	542	520	504	504
Total cold run time: 70430 ms
Total hot run time: 53884 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 171941 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 381b0a5f8d8b10b1e6d151c5127349b666d2bbba, data reload: false

query1	909	380	370	370
query2	6457	1831	1798	1798
query3	6671	206	214	206
query4	25820	17674	17385	17385
query5	4222	470	487	470
query6	272	169	162	162
query7	4602	279	280	279
query8	251	196	207	196
query9	8540	2399	2370	2370
query10	447	283	277	277
query11	10635	10058	10078	10058
query12	139	89	86	86
query13	1633	391	364	364
query14	10480	7022	7610	7022
query15	235	166	167	166
query16	7768	473	475	473
query17	1360	562	541	541
query18	1973	294	293	293
query19	197	148	151	148
query20	91	87	85	85
query21	216	98	100	98
query22	4444	4005	3899	3899
query23	33978	33396	33199	33199
query24	12322	2848	2934	2848
query25	698	388	393	388
query26	1808	158	163	158
query27	2943	278	278	278
query28	7535	2021	2001	2001
query29	1184	429	429	429
query30	290	155	152	152
query31	986	750	750	750
query32	100	55	58	55
query33	789	346	337	337
query34	901	467	471	467
query35	910	744	742	742
query36	1108	924	950	924
query37	278	78	79	78
query38	2911	2797	2716	2716
query39	882	806	814	806
query40	278	114	117	114
query41	49	50	47	47
query42	115	99	101	99
query43	515	471	471	471
query44	1144	723	720	720
query45	211	179	177	177
query46	1090	748	758	748
query47	1894	1763	1873	1763
query48	364	295	280	280
query49	1190	411	430	411
query50	803	398	402	398
query51	6792	6720	6708	6708
query52	102	89	85	85
query53	256	183	178	178
query54	1008	434	435	434
query55	78	73	70	70
query56	284	274	286	274
query57	1167	1069	1044	1044
query58	257	265	266	265
query59	2805	2629	2525	2525
query60	312	277	275	275
query61	96	99	95	95
query62	834	642	662	642
query63	218	178	196	178
query64	10459	2233	1790	1790
query65	3163	3096	3087	3087
query66	1378	327	352	327
query67	15802	15441	14869	14869
query68	7143	556	558	556
query69	729	416	340	340
query70	1217	1168	1144	1144
query71	534	263	269	263
query72	8393	5610	5523	5523
query73	829	324	326	324
query74	6211	5684	5662	5662
query75	5090	2655	2663	2655
query76	4952	927	908	908
query77	780	327	301	301
query78	9715	9005	9612	9005
query79	8175	523	530	523
query80	2150	490	482	482
query81	589	229	220	220
query82	525	133	130	130
query83	289	175	170	170
query84	270	77	80	77
query85	1091	304	307	304
query86	369	285	315	285
query87	3247	3118	3114	3114
query88	4240	2387	2386	2386
query89	512	283	286	283
query90	2126	194	190	190
query91	127	100	100	100
query92	61	47	49	47
query93	6061	537	533	533
query94	1013	283	287	283
query95	341	252	254	252
query96	605	268	267	267
query97	3172	3010	3049	3010
query98	226	208	203	203
query99	1522	1253	1287	1253
Total cold run time: 301953 ms
Total hot run time: 171941 ms

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.

Please add a regression test.

@doris-robot
Copy link

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

query1	0.04	0.03	0.03
query2	0.08	0.05	0.04
query3	0.22	0.04	0.05
query4	1.68	0.08	0.08
query5	0.51	0.49	0.49
query6	1.13	0.73	0.73
query7	0.02	0.02	0.02
query8	0.06	0.04	0.04
query9	0.56	0.49	0.50
query10	0.54	0.54	0.54
query11	0.16	0.11	0.11
query12	0.15	0.12	0.12
query13	0.59	0.59	0.59
query14	0.76	0.78	0.79
query15	0.85	0.81	0.81
query16	0.36	0.36	0.36
query17	1.05	0.97	0.97
query18	0.22	0.21	0.22
query19	1.88	1.81	1.73
query20	0.01	0.01	0.01
query21	15.40	0.82	0.67
query22	4.38	7.85	1.84
query23	18.31	1.37	1.28
query24	2.13	0.24	0.22
query25	0.15	0.09	0.09
query26	0.30	0.22	0.20
query27	0.46	0.23	0.24
query28	13.29	1.02	1.00
query29	12.67	3.28	3.26
query30	0.26	0.06	0.06
query31	2.86	0.39	0.38
query32	3.28	0.48	0.48
query33	2.85	2.88	2.88
query34	17.13	4.34	4.32
query35	4.41	4.40	4.45
query36	0.66	0.50	0.46
query37	0.19	0.15	0.16
query38	0.16	0.16	0.16
query39	0.04	0.04	0.03
query40	0.16	0.12	0.12
query41	0.10	0.05	0.05
query42	0.06	0.05	0.04
query43	0.04	0.04	0.05
Total cold run time: 110.16 s
Total hot run time: 30.55 s

@zddr
Copy link
Contributor Author

zddr commented Jul 25, 2024

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17635	4443	4295	4295
q2	2024	200	191	191
q3	10477	1137	1135	1135
q4	10141	775	686	686
q5	7544	2705	2708	2705
q6	228	139	138	138
q7	959	603	602	602
q8	9410	1921	1945	1921
q9	8760	6534	6517	6517
q10	8803	3782	3763	3763
q11	459	244	250	244
q12	390	227	226	226
q13	18843	2984	2971	2971
q14	283	239	244	239
q15	524	482	488	482
q16	501	402	374	374
q17	956	658	726	658
q18	8224	7513	7421	7421
q19	5259	1077	999	999
q20	698	321	343	321
q21	5057	3227	3326	3227
q22	352	288	289	288
Total cold run time: 117527 ms
Total hot run time: 39403 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4452	4257	4212	4212
q2	371	273	274	273
q3	2988	2759	2771	2759
q4	1918	1642	1696	1642
q5	5301	5300	5299	5299
q6	220	128	132	128
q7	2122	1731	1737	1731
q8	3188	3345	3291	3291
q9	8412	8389	8401	8389
q10	3892	3691	3717	3691
q11	592	500	499	499
q12	768	607	610	607
q13	16522	2945	3000	2945
q14	318	274	276	274
q15	525	483	493	483
q16	466	414	425	414
q17	1749	1477	1454	1454
q18	7748	7819	7387	7387
q19	1667	1483	1528	1483
q20	1998	1779	1780	1779
q21	8395	4705	4716	4705
q22	587	513	529	513
Total cold run time: 74199 ms
Total hot run time: 53958 ms

@doris-robot
Copy link

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

query1	922	389	366	366
query2	6450	1807	1802	1802
query3	6648	206	212	206
query4	28497	17618	17316	17316
query5	4162	524	511	511
query6	254	172	162	162
query7	4521	286	299	286
query8	242	195	190	190
query9	8332	2453	2450	2450
query10	424	276	294	276
query11	12605	9990	10017	9990
query12	143	89	90	89
query13	1539	372	375	372
query14	9742	7992	7790	7790
query15	228	171	169	169
query16	7752	515	472	472
query17	1629	572	550	550
query18	1977	300	300	300
query19	197	148	154	148
query20	97	89	91	89
query21	209	102	103	102
query22	4375	4092	3976	3976
query23	33918	33289	33474	33289
query24	12154	2852	2843	2843
query25	689	396	394	394
query26	1844	157	157	157
query27	2897	279	281	279
query28	7658	2023	2019	2019
query29	1182	433	430	430
query30	294	158	160	158
query31	999	747	750	747
query32	100	58	57	57
query33	775	346	351	346
query34	891	473	491	473
query35	857	769	719	719
query36	1128	938	956	938
query37	285	82	82	82
query38	2853	2742	2773	2742
query39	874	813	804	804
query40	300	117	124	117
query41	51	47	47	47
query42	126	103	99	99
query43	499	465	463	463
query44	1219	737	735	735
query45	211	178	179	178
query46	1131	734	743	734
query47	1877	1771	1793	1771
query48	372	303	298	298
query49	1207	452	444	444
query50	815	424	413	413
query51	6744	6716	6673	6673
query52	97	93	93	93
query53	256	191	182	182
query54	836	450	456	450
query55	79	76	76	76
query56	312	285	308	285
query57	1181	1051	1033	1033
query58	293	276	274	274
query59	2918	2586	2701	2586
query60	313	285	288	285
query61	95	96	96	96
query62	797	639	682	639
query63	210	192	181	181
query64	10538	2260	1713	1713
query65	3184	3124	3127	3124
query66	1301	341	333	333
query67	15625	14997	15051	14997
query68	6982	571	579	571
query69	705	428	333	333
query70	1222	1106	1072	1072
query71	535	275	299	275
query72	8868	6271	5343	5343
query73	868	328	330	328
query74	6204	5792	5742	5742
query75	5293	2684	2692	2684
query76	5173	963	926	926
query77	799	314	318	314
query78	9808	9036	8846	8846
query79	10791	538	543	538
query80	1211	498	505	498
query81	585	226	223	223
query82	769	135	132	132
query83	347	174	177	174
query84	330	77	79	77
query85	1422	314	294	294
query86	419	319	321	319
query87	3321	3118	3059	3059
query88	4573	2430	2417	2417
query89	530	288	290	288
query90	2090	203	199	199
query91	128	99	98	98
query92	62	50	51	50
query93	7112	558	591	558
query94	1041	285	288	285
query95	364	269	271	269
query96	635	278	275	275
query97	3237	2985	3077	2985
query98	213	207	200	200
query99	1593	1259	1256	1256
Total cold run time: 310160 ms
Total hot run time: 173036 ms

@doris-robot
Copy link

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

query1	0.04	0.03	0.04
query2	0.09	0.04	0.04
query3	0.22	0.05	0.06
query4	1.68	0.06	0.07
query5	0.52	0.49	0.49
query6	1.14	0.73	0.72
query7	0.02	0.01	0.01
query8	0.05	0.04	0.04
query9	0.56	0.50	0.49
query10	0.55	0.55	0.56
query11	0.15	0.12	0.11
query12	0.15	0.12	0.12
query13	0.61	0.58	0.58
query14	0.77	0.77	0.78
query15	0.85	0.80	0.82
query16	0.36	0.36	0.36
query17	0.95	1.04	0.95
query18	0.22	0.22	0.22
query19	1.76	1.75	1.84
query20	0.01	0.01	0.02
query21	15.41	0.78	0.67
query22	4.24	6.80	2.15
query23	18.28	1.42	1.31
query24	2.10	0.24	0.23
query25	0.17	0.09	0.08
query26	0.30	0.21	0.21
query27	0.46	0.24	0.23
query28	13.21	1.02	1.00
query29	12.66	3.33	3.36
query30	0.26	0.06	0.06
query31	2.86	0.41	0.39
query32	3.25	0.48	0.48
query33	2.86	2.89	2.92
query34	16.92	4.40	4.42
query35	4.45	4.46	4.43
query36	0.66	0.48	0.48
query37	0.18	0.16	0.16
query38	0.16	0.15	0.15
query39	0.04	0.03	0.03
query40	0.15	0.12	0.12
query41	0.09	0.05	0.05
query42	0.06	0.05	0.05
query43	0.04	0.05	0.04
Total cold run time: 109.51 s
Total hot run time: 31.09 s

dataroaring
dataroaring previously approved these changes Jul 26, 2024
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 Jul 26, 2024
@github-actions
Copy link
Contributor

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

@github-actions
Copy link
Contributor

PR approved by anyone and no changes requested.

morrySnow
morrySnow previously approved these changes Jul 26, 2024
@zddr zddr dismissed stale reviews from morrySnow and dataroaring via d3f839d July 26, 2024 12:15
@zddr
Copy link
Contributor Author

zddr commented Jul 26, 2024

run buildall

@github-actions github-actions bot removed the approved Indicates a PR has been approved by one committer. label Jul 26, 2024
@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17640	4360	4277	4277
q2	2012	202	192	192
q3	10440	1155	1162	1155
q4	10142	806	691	691
q5	7528	2818	2666	2666
q6	218	139	141	139
q7	935	594	596	594
q8	9223	1897	1898	1897
q9	8853	6499	6530	6499
q10	8697	3758	3754	3754
q11	504	245	246	245
q12	428	223	225	223
q13	18634	2984	2999	2984
q14	273	227	228	227
q15	534	479	489	479
q16	518	390	377	377
q17	967	699	746	699
q18	8002	7396	7352	7352
q19	7067	1012	1041	1012
q20	688	333	336	333
q21	4915	3322	3270	3270
q22	355	286	286	286
Total cold run time: 118573 ms
Total hot run time: 39351 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4527	4224	4201	4201
q2	368	269	276	269
q3	2984	2840	3035	2840
q4	2044	1722	1710	1710
q5	5663	5522	5464	5464
q6	221	139	133	133
q7	2173	1895	1857	1857
q8	3270	3410	3418	3410
q9	8762	8706	8875	8706
q10	4073	3877	3700	3700
q11	596	505	497	497
q12	823	644	640	640
q13	15983	3234	3172	3172
q14	315	296	298	296
q15	547	507	468	468
q16	465	430	447	430
q17	1821	1552	1514	1514
q18	8035	7919	7814	7814
q19	3270	1667	1596	1596
q20	2240	1868	1870	1868
q21	5125	4902	4767	4767
q22	594	525	542	525
Total cold run time: 73899 ms
Total hot run time: 55877 ms

@doris-robot
Copy link

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

query1	906	372	368	368
query2	6443	1978	1844	1844
query3	6630	205	214	205
query4	28247	17393	17500	17393
query5	3606	477	488	477
query6	281	177	179	177
query7	4587	291	293	291
query8	246	203	190	190
query9	8631	2462	2432	2432
query10	466	292	257	257
query11	11553	10049	10051	10049
query12	115	90	83	83
query13	1614	356	362	356
query14	10305	7877	6359	6359
query15	214	165	171	165
query16	7499	477	478	477
query17	1154	543	530	530
query18	1764	279	291	279
query19	189	138	138	138
query20	91	81	83	81
query21	200	118	97	97
query22	4216	4049	4027	4027
query23	34181	33852	33497	33497
query24	11226	3016	2894	2894
query25	644	394	406	394
query26	729	153	150	150
query27	2303	273	274	273
query28	5938	2074	2074	2074
query29	787	442	418	418
query30	256	153	154	153
query31	996	790	755	755
query32	106	57	54	54
query33	674	354	325	325
query34	909	481	484	481
query35	868	773	742	742
query36	1116	932	955	932
query37	151	92	87	87
query38	3024	2828	2923	2828
query39	897	865	834	834
query40	205	121	118	118
query41	47	44	44	44
query42	104	99	103	99
query43	539	493	487	487
query44	1076	717	715	715
query45	211	180	182	180
query46	1084	749	722	722
query47	1839	1765	1736	1736
query48	370	292	288	288
query49	823	411	438	411
query50	795	432	400	400
query51	6696	6762	6592	6592
query52	104	85	88	85
query53	255	178	178	178
query54	890	447	433	433
query55	77	72	74	72
query56	289	268	266	266
query57	1129	1043	1040	1040
query58	271	259	260	259
query59	2902	2797	2726	2726
query60	318	282	282	282
query61	96	95	94	94
query62	796	642	662	642
query63	219	178	175	175
query64	9244	2336	1780	1780
query65	3150	3081	3089	3081
query66	779	344	346	344
query67	15466	14802	14833	14802
query68	4619	543	539	539
query69	584	310	306	306
query70	1174	1144	1068	1068
query71	412	277	274	274
query72	9118	5334	6145	5334
query73	751	333	332	332
query74	6205	5654	5636	5636
query75	4319	2671	2697	2671
query76	2890	930	930	930
query77	665	319	314	314
query78	9734	8959	8876	8876
query79	8687	514	519	514
query80	1891	500	501	500
query81	596	226	221	221
query82	1597	142	140	140
query83	361	185	179	179
query84	272	85	83	83
query85	1792	348	352	348
query86	458	301	291	291
query87	3246	3070	3147	3070
query88	5038	2464	2477	2464
query89	430	279	277	277
query90	1945	198	194	194
query91	126	100	100	100
query92	61	47	49	47
query93	6390	530	524	524
query94	1010	287	291	287
query95	363	266	264	264
query96	623	277	274	274
query97	3160	3044	3027	3027
query98	217	208	194	194
query99	1542	1252	1237	1237
Total cold run time: 293812 ms
Total hot run time: 171732 ms

@doris-robot
Copy link

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

query1	0.04	0.03	0.04
query2	0.07	0.04	0.04
query3	0.22	0.05	0.05
query4	1.68	0.06	0.06
query5	0.49	0.47	0.48
query6	1.13	0.72	0.73
query7	0.02	0.01	0.01
query8	0.05	0.04	0.05
query9	0.56	0.49	0.50
query10	0.55	0.54	0.54
query11	0.15	0.12	0.11
query12	0.15	0.12	0.12
query13	0.58	0.58	0.59
query14	0.76	0.78	0.83
query15	0.84	0.82	0.81
query16	0.36	0.35	0.35
query17	1.02	0.95	0.97
query18	0.24	0.21	0.21
query19	1.85	1.73	1.72
query20	0.01	0.01	0.01
query21	15.39	0.76	0.66
query22	3.96	7.48	1.75
query23	18.28	1.34	1.18
query24	2.13	0.23	0.22
query25	0.15	0.09	0.08
query26	0.30	0.21	0.21
query27	0.46	0.23	0.23
query28	13.28	1.03	1.00
query29	12.62	3.29	3.28
query30	0.25	0.06	0.05
query31	2.89	0.40	0.40
query32	3.25	0.48	0.48
query33	2.86	2.91	2.91
query34	17.09	4.34	4.36
query35	4.39	4.37	4.52
query36	0.65	0.45	0.46
query37	0.18	0.16	0.15
query38	0.16	0.15	0.15
query39	0.04	0.04	0.03
query40	0.15	0.12	0.13
query41	0.10	0.04	0.05
query42	0.06	0.04	0.04
query43	0.04	0.05	0.04
Total cold run time: 109.45 s
Total hot run time: 30.27 s

@morrySnow morrySnow merged commit 45f03ca into apache:master Jul 30, 2024
yiguolei pushed a commit that referenced this pull request Jul 31, 2024
feiniaofeiafei pushed a commit to feiniaofeiafei/doris that referenced this pull request Aug 9, 2024
fix 

- when label contains dbName, will loss
intro by apache#27861

- show routine load for xxx.yyy can export authentication error
intro by apache#33347

Note: Cases will be added uniformly in other PRs
dataroaring pushed a commit that referenced this pull request Aug 11, 2024
fix 

- when label contains dbName, will loss
intro by #27861

- show routine load for xxx.yyy can export authentication error
intro by #33347

Note: Cases will be added uniformly in other PRs
dataroaring pushed a commit that referenced this pull request Aug 16, 2024
fix 

- when label contains dbName, will loss
intro by #27861

- show routine load for xxx.yyy can export authentication error
intro by #33347

Note: Cases will be added uniformly in other PRs
@yiguolei yiguolei mentioned this pull request Sep 5, 2024
3 tasks
@gavinchou gavinchou mentioned this pull request Oct 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants