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](compile) be compile failed in mac due to std::max #37238

Merged
merged 1 commit into from
Jul 5, 2024

Conversation

feiniaofeiafei
Copy link
Contributor

Proposed changes

Issue Number: close #xxx

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

@feiniaofeiafei
Copy link
Contributor Author

run buildall

@morrySnow morrySnow changed the title [Fix]fix be compile in mac [fix](compile )fix compile failed in mac due to std::max Jul 3, 2024
Copy link
Contributor

github-actions bot commented Jul 3, 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 Jul 3, 2024
Copy link
Contributor

github-actions bot commented Jul 3, 2024

PR approved by anyone and no changes requested.

@morrySnow morrySnow changed the title [fix](compile )fix compile failed in mac due to std::max [fix](compile) be compile failed in mac due to std::max Jul 3, 2024
Copy link
Contributor

github-actions bot commented Jul 3, 2024

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

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17626	4360	4300	4300
q2	2022	192	182	182
q3	10495	1175	1118	1118
q4	10180	822	911	822
q5	7504	2673	2586	2586
q6	226	141	138	138
q7	964	588	605	588
q8	9219	2080	2054	2054
q9	9109	6505	6462	6462
q10	9010	3743	3727	3727
q11	467	233	241	233
q12	392	234	233	233
q13	17770	2956	3006	2956
q14	263	239	216	216
q15	535	479	473	473
q16	484	381	371	371
q17	951	717	697	697
q18	7980	7538	7421	7421
q19	5273	1539	1493	1493
q20	653	323	336	323
q21	4860	3243	3875	3243
q22	400	338	343	338
Total cold run time: 116383 ms
Total hot run time: 39974 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4469	4236	4278	4236
q2	371	268	261	261
q3	2988	2821	2847	2821
q4	2007	1670	1753	1670
q5	5659	5517	5438	5438
q6	220	135	132	132
q7	2220	1880	1889	1880
q8	3295	3417	3420	3417
q9	8707	8684	8798	8684
q10	4155	3898	3766	3766
q11	612	502	516	502
q12	836	643	630	630
q13	16191	3202	3218	3202
q14	293	292	289	289
q15	531	494	480	480
q16	497	432	418	418
q17	1819	1560	1513	1513
q18	8143	8014	7806	7806
q19	1755	1646	1676	1646
q20	2167	1871	1837	1837
q21	5194	4991	4831	4831
q22	652	591	545	545
Total cold run time: 72781 ms
Total hot run time: 56004 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 172867 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 427c7e930623cf8fc4bc48b5914b3845a059657b, data reload: false

query1	911	370	377	370
query2	6456	2457	2374	2374
query3	6635	207	218	207
query4	20643	17576	17274	17274
query5	3656	481	480	480
query6	257	165	181	165
query7	4594	300	310	300
query8	331	306	290	290
query9	8533	2365	2363	2363
query10	581	303	285	285
query11	10591	10101	10141	10101
query12	119	92	84	84
query13	1644	359	363	359
query14	10107	6890	6935	6890
query15	240	190	198	190
query16	7723	330	320	320
query17	1570	550	532	532
query18	1931	277	280	277
query19	204	154	154	154
query20	93	82	86	82
query21	210	134	136	134
query22	4440	4039	3997	3997
query23	33711	33619	33617	33617
query24	11030	2969	2865	2865
query25	641	406	399	399
query26	870	164	162	162
query27	2342	325	328	325
query28	5785	2105	2089	2089
query29	914	670	645	645
query30	265	159	156	156
query31	1005	769	763	763
query32	97	60	56	56
query33	804	309	304	304
query34	1025	479	483	479
query35	768	649	640	640
query36	1107	989	963	963
query37	149	88	80	80
query38	2999	2839	2865	2839
query39	896	854	848	848
query40	219	128	131	128
query41	64	54	59	54
query42	110	101	108	101
query43	627	582	545	545
query44	1202	711	727	711
query45	203	165	170	165
query46	1081	725	715	715
query47	1847	1744	1767	1744
query48	378	303	297	297
query49	938	411	432	411
query50	767	378	382	378
query51	6792	6799	6755	6755
query52	108	91	90	90
query53	357	299	289	289
query54	899	462	433	433
query55	75	74	74	74
query56	282	254	270	254
query57	1152	1062	1077	1062
query58	250	251	261	251
query59	3384	3276	3270	3270
query60	305	274	293	274
query61	98	91	91	91
query62	621	439	449	439
query63	332	288	292	288
query64	8658	2308	1751	1751
query65	3151	3101	3135	3101
query66	750	358	343	343
query67	15678	14979	14966	14966
query68	8298	541	541	541
query69	738	463	354	354
query70	1134	1103	1123	1103
query71	528	281	273	273
query72	8991	5601	4978	4978
query73	1367	323	326	323
query74	5977	5455	5565	5455
query75	5303	2633	2638	2633
query76	5146	955	934	934
query77	822	300	289	289
query78	9635	8975	8931	8931
query79	8863	513	509	509
query80	1042	480	477	477
query81	526	233	224	224
query82	720	109	106	106
query83	328	173	169	169
query84	269	84	88	84
query85	1272	329	272	272
query86	405	301	327	301
query87	3339	3110	3172	3110
query88	4491	2355	2340	2340
query89	524	380	385	380
query90	2003	187	197	187
query91	133	98	100	98
query92	63	50	52	50
query93	6686	497	497	497
query94	1210	215	207	207
query95	403	316	315	315
query96	623	265	268	265
query97	3154	2997	3018	2997
query98	226	197	200	197
query99	1178	845	830	830
Total cold run time: 291602 ms
Total hot run time: 172867 ms

@doris-robot
Copy link

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

query1	0.04	0.04	0.03
query2	0.08	0.04	0.04
query3	0.23	0.04	0.05
query4	1.67	0.07	0.07
query5	0.49	0.48	0.48
query6	1.13	0.73	0.72
query7	0.01	0.01	0.01
query8	0.04	0.04	0.04
query9	0.54	0.49	0.48
query10	0.52	0.54	0.53
query11	0.15	0.12	0.11
query12	0.15	0.13	0.12
query13	0.60	0.58	0.58
query14	0.79	0.79	0.78
query15	0.86	0.83	0.82
query16	0.37	0.38	0.37
query17	0.98	0.98	0.99
query18	0.22	0.26	0.25
query19	1.82	1.75	1.72
query20	0.01	0.00	0.01
query21	15.44	0.77	0.66
query22	4.00	7.20	1.75
query23	18.32	1.32	1.27
query24	2.07	0.25	0.22
query25	0.15	0.08	0.08
query26	0.26	0.17	0.17
query27	0.08	0.08	0.08
query28	13.29	1.03	0.99
query29	12.65	3.29	3.31
query30	0.25	0.08	0.05
query31	2.85	0.40	0.38
query32	3.28	0.47	0.48
query33	2.91	2.94	2.92
query34	17.17	4.41	4.49
query35	4.51	4.53	4.51
query36	0.65	0.47	0.47
query37	0.18	0.15	0.15
query38	0.16	0.15	0.15
query39	0.04	0.04	0.04
query40	0.17	0.14	0.13
query41	0.09	0.05	0.04
query42	0.05	0.06	0.05
query43	0.04	0.04	0.04
Total cold run time: 109.31 s
Total hot run time: 30.49 s

@feiniaofeiafei
Copy link
Contributor Author

run p0

@zy-kkk zy-kkk merged commit 76fa580 into apache:master Jul 5, 2024
28 of 32 checks passed
feiniaofeiafei added a commit to feiniaofeiafei/doris that referenced this pull request Aug 5, 2024
yiguolei pushed a commit that referenced this pull request Aug 5, 2024
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/2.1.6-merged dev/3.0.1-merged reviewed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants