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.

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

[Not-Pick-2.1](upgrade) Remove compatibility code to prepare for next major version #35312

Merged
merged 1 commit into from
May 28, 2024
Merged

[Not-Pick-2.1](upgrade) Remove compatibility code to prepare for next major version #35312

merged 1 commit into from
May 28, 2024

Conversation

zclllyybb
Copy link
Contributor

Proposed changes

Issue Number: close #xxx

Further comments

If this is a relatively large or complex change, kick off the discussion at dev@doris.apache.org by explaining why you chose the solution you did and what alternatives you considered, etc...

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

@zclllyybb
Copy link
Contributor Author

run buildall

@github-actions GitHub Actions
Copy link
Contributor

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

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17672	4548	4230	4230
q2	2024	190	190	190
q3	10544	1246	1223	1223
q4	10520	907	724	724
q5	7798	2694	2695	2694
q6	225	133	136	133
q7	959	600	601	600
q8	9408	2098	2119	2098
q9	9016	6631	6652	6631
q10	9562	3761	3688	3688
q11	466	242	241	241
q12	438	226	221	221
q13	18697	2985	2972	2972
q14	259	224	225	224
q15	521	461	482	461
q16	535	375	382	375
q17	992	621	680	621
q18	8257	7526	7544	7526
q19	3829	1535	1501	1501
q20	652	316	307	307
q21	4924	3854	3200	3200
q22	341	278	280	278
Total cold run time: 117639 ms
Total hot run time: 40138 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4338	4171	4205	4171
q2	361	267	274	267
q3	2976	2793	2713	2713
q4	1896	1667	1684	1667
q5	5253	5335	5317	5317
q6	215	125	127	125
q7	2108	1755	1784	1755
q8	3218	3326	3316	3316
q9	8406	8352	8436	8352
q10	3894	3714	3657	3657
q11	612	509	491	491
q12	768	594	569	569
q13	16549	2975	3012	2975
q14	300	268	275	268
q15	520	482	472	472
q16	475	429	417	417
q17	1782	1485	1475	1475
q18	7670	7714	7406	7406
q19	1658	1508	1579	1508
q20	1978	1801	1777	1777
q21	4804	4730	4644	4644
q22	572	502	492	492
Total cold run time: 70353 ms
Total hot run time: 53834 ms

@doris-robot
Copy link

TeamCity be ut coverage result:
Function Coverage: 35.67% (9005/25244)
Line Coverage: 27.35% (74503/272384)
Region Coverage: 26.59% (38568/145066)
Branch Coverage: 23.46% (19684/83920)
Coverage Report: http://coverage.selectdb-in.cc/coverage/4e43660a96262664f0f58c6905c8709ea65acea1_4e43660a96262664f0f58c6905c8709ea65acea1/report/index.html

@doris-robot
Copy link

TPC-DS: Total hot run time: 170887 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 4e43660a96262664f0f58c6905c8709ea65acea1, data reload: false

query1	908	378	360	360
query2	6459	2608	2250	2250
query3	6654	208	207	207
query4	19224	17500	17390	17390
query5	4179	449	422	422
query6	245	157	150	150
query7	4579	290	293	290
query8	257	190	177	177
query9	8456	2361	2348	2348
query10	449	279	259	259
query11	10764	10143	10258	10143
query12	142	90	88	88
query13	1655	361	357	357
query14	9790	6834	5952	5952
query15	218	169	173	169
query16	7829	278	257	257
query17	1849	521	512	512
query18	1966	275	268	268
query19	207	156	151	151
query20	94	85	83	83
query21	193	127	132	127
query22	4297	3978	3915	3915
query23	33931	32968	32893	32893
query24	12119	2811	2825	2811
query25	675	357	365	357
query26	1823	153	154	153
query27	3033	326	339	326
query28	7690	2023	2029	2023
query29	1168	605	591	591
query30	319	172	172	172
query31	965	755	757	755
query32	98	56	57	56
query33	772	270	276	270
query34	1061	474	504	474
query35	722	579	584	579
query36	1118	932	912	912
query37	276	70	70	70
query38	2908	2781	2777	2777
query39	880	794	784	784
query40	273	123	124	123
query41	48	44	45	44
query42	99	94	95	94
query43	587	554	560	554
query44	1255	720	731	720
query45	182	167	162	162
query46	1075	744	715	715
query47	1839	1769	1753	1753
query48	368	298	297	297
query49	1179	404	384	384
query50	759	378	373	373
query51	6955	6843	6837	6837
query52	105	89	95	89
query53	344	286	289	286
query54	967	437	424	424
query55	77	74	72	72
query56	259	243	241	241
query57	1149	1030	1043	1030
query58	232	214	223	214
query59	3443	3120	3075	3075
query60	267	255	267	255
query61	93	86	99	86
query62	653	446	466	446
query63	312	288	284	284
query64	9803	2235	1730	1730
query65	3179	3076	3141	3076
query66	1382	328	331	328
query67	15135	14960	14671	14671
query68	4624	535	546	535
query69	481	264	325	264
query70	1168	1083	1134	1083
query71	447	264	261	261
query72	7377	5442	5375	5375
query73	732	320	322	320
query74	6079	5720	5590	5590
query75	3808	2591	2627	2591
query76	3564	1050	1051	1050
query77	655	274	267	267
query78	10431	9772	9744	9744
query79	2466	513	507	507
query80	961	458	441	441
query81	524	246	246	246
query82	1312	99	96	96
query83	274	174	176	174
query84	247	89	89	89
query85	1568	325	263	263
query86	476	319	309	309
query87	3300	3096	3127	3096
query88	3952	2313	2328	2313
query89	482	391	376	376
query90	1953	187	189	187
query91	125	98	100	98
query92	63	49	50	49
query93	2171	522	500	500
query94	1247	188	187	187
query95	396	324	312	312
query96	595	272	272	272
query97	3184	3026	2999	2999
query98	245	216	217	216
query99	1134	855	836	836
Total cold run time: 278032 ms
Total hot run time: 170887 ms

@doris-robot
Copy link

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

query1	0.04	0.04	0.03
query2	0.08	0.04	0.04
query3	0.23	0.06	0.06
query4	1.66	0.10	0.10
query5	0.50	0.50	0.50
query6	1.13	0.72	0.72
query7	0.02	0.01	0.02
query8	0.05	0.04	0.04
query9	0.54	0.48	0.49
query10	0.53	0.54	0.55
query11	0.15	0.11	0.11
query12	0.15	0.13	0.12
query13	0.58	0.59	0.60
query14	0.77	0.77	0.79
query15	0.83	0.81	0.83
query16	0.36	0.36	0.37
query17	0.96	0.94	0.97
query18	0.22	0.25	0.26
query19	1.91	1.79	1.71
query20	0.01	0.01	0.02
query21	15.77	0.65	0.64
query22	4.40	7.41	1.82
query23	18.32	1.43	1.40
query24	1.77	0.22	0.24
query25	0.15	0.08	0.08
query26	0.26	0.16	0.17
query27	0.08	0.08	0.07
query28	13.33	1.02	1.08
query29	12.73	3.26	3.25
query30	0.24	0.06	0.05
query31	2.86	0.38	0.38
query32	3.31	0.46	0.46
query33	2.88	2.91	2.98
query34	17.23	4.38	4.43
query35	4.55	4.49	4.52
query36	0.66	0.46	0.46
query37	0.18	0.16	0.15
query38	0.15	0.14	0.15
query39	0.05	0.04	0.03
query40	0.16	0.14	0.15
query41	0.08	0.04	0.04
query42	0.05	0.06	0.05
query43	0.04	0.04	0.04
Total cold run time: 109.97 s
Total hot run time: 30.57 s

@zclllyybb zclllyybb mentioned this pull request May 24, 2024
Merged
HappenLee
HappenLee previously approved these changes May 24, 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 github-actions bot added the approved Indicates a PR has been approved by one committer. label May 24, 2024
@github-actions GitHub Actions
Copy link
Contributor

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

@github-actions GitHub Actions
Copy link
Contributor

PR approved by anyone and no changes requested.

BiteTheDDDDt
BiteTheDDDDt previously approved these changes May 27, 2024
View reviewed changes
@zclllyybb zclllyybb dismissed stale reviews from BiteTheDDDDt and HappenLee via c3e352e May 27, 2024 11:06
@zclllyybb
Copy link
Contributor Author

run buildall

@github-actions github-actions bot removed the approved Indicates a PR has been approved by one committer. label May 27, 2024
@github-actions GitHub Actions
Copy link
Contributor

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

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17636	4403	4262	4262
q2	2029	193	194	193
q3	10750	1244	1221	1221
q4	10693	798	769	769
q5	7692	2824	2755	2755
q6	226	135	136	135
q7	965	612	602	602
q8	9816	2112	2116	2112
q9	9274	6662	6581	6581
q10	9075	3735	3699	3699
q11	441	248	240	240
q12	477	222	221	221
q13	17782	2997	3025	2997
q14	265	224	220	220
q15	529	472	469	469
q16	530	385	387	385
q17	960	720	754	720
q18	8148	7512	7393	7393
q19	3462	1574	1514	1514
q20	644	323	304	304
q21	4996	3246	4011	3246
q22	349	277	280	277
Total cold run time: 116739 ms
Total hot run time: 40315 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4321	4247	4227	4227
q2	363	260	275	260
q3	2976	2795	2706	2706
q4	1859	1649	1635	1635
q5	5258	5271	5313	5271
q6	210	125	126	125
q7	2156	1741	1701	1701
q8	3224	3314	3322	3314
q9	8391	8383	8424	8383
q10	3922	3750	3744	3744
q11	588	481	488	481
q12	755	595	620	595
q13	17383	2993	3005	2993
q14	299	277	253	253
q15	518	472	471	471
q16	471	425	415	415
q17	1794	1531	1465	1465
q18	7588	7687	7439	7439
q19	1677	1593	1561	1561
q20	1969	1775	1803	1775
q21	4892	4816	4730	4730
q22	590	511	508	508
Total cold run time: 71204 ms
Total hot run time: 54052 ms

@doris-robot
Copy link

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

query1	921	383	372	372
query2	6500	2459	2346	2346
query3	6650	206	203	203
query4	19495	17420	17242	17242
query5	4127	419	444	419
query6	247	162	171	162
query7	4582	334	305	305
query8	242	191	190	190
query9	8447	2402	2372	2372
query10	457	282	270	270
query11	10667	10054	10249	10054
query12	140	91	86	86
query13	1655	372	372	372
query14	9897	7749	7696	7696
query15	253	165	171	165
query16	8164	276	273	273
query17	1808	550	543	543
query18	2108	289	285	285
query19	214	162	155	155
query20	88	87	85	85
query21	201	131	131	131
query22	4146	3853	3856	3853
query23	33557	32971	32898	32898
query24	11972	2803	2860	2803
query25	640	355	357	355
query26	1740	154	153	153
query27	2999	313	315	313
query28	7565	2059	2065	2059
query29	1006	592	584	584
query30	287	149	152	149
query31	939	763	733	733
query32	95	53	55	53
query33	782	271	261	261
query34	1016	477	467	467
query35	733	590	572	572
query36	1080	913	944	913
query37	267	66	66	66
query38	2899	2804	2763	2763
query39	864	793	799	793
query40	275	128	123	123
query41	46	45	44	44
query42	103	100	94	94
query43	569	556	526	526
query44	1236	742	754	742
query45	180	162	165	162
query46	1080	707	736	707
query47	1852	1760	1790	1760
query48	402	311	297	297
query49	1204	386	392	386
query50	776	379	382	379
query51	6749	6642	6706	6642
query52	101	98	89	89
query53	352	279	282	279
query54	1024	432	427	427
query55	74	71	71	71
query56	254	243	249	243
query57	1143	1005	1049	1005
query58	238	214	207	207
query59	3385	3331	3369	3331
query60	281	257	258	257
query61	121	86	89	86
query62	636	497	458	458
query63	310	282	293	282
query64	9898	2216	1740	1740
query65	3208	3127	3113	3113
query66	1367	333	343	333
query67	15230	14977	15017	14977
query68	4651	543	538	538
query69	441	279	272	272
query70	1157	1055	1132	1055
query71	437	266	259	259
query72	7842	5581	5527	5527
query73	724	320	324	320
query74	6028	5621	5636	5621
query75	3457	2632	2637	2632
query76	2831	1022	1022	1022
query77	407	267	265	265
query78	10216	9905	9978	9905
query79	2018	506	511	506
query80	941	483	422	422
query81	517	222	218	218
query82	634	91	90	90
query83	246	171	181	171
query84	236	88	112	88
query85	1890	264	259	259
query86	518	311	296	296
query87	3312	3123	3090	3090
query88	4192	2427	2417	2417
query89	472	379	376	376
query90	2034	189	191	189
query91	124	99	95	95
query92	61	48	51	48
query93	2191	526	505	505
query94	1178	190	190	190
query95	414	311	313	311
query96	589	266	273	266
query97	3219	3026	3032	3026
query98	246	224	217	217
query99	1085	885	828	828
Total cold run time: 275852 ms
Total hot run time: 173298 ms

@doris-robot
Copy link

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

query1	0.03	0.03	0.04
query2	0.08	0.04	0.05
query3	0.24	0.05	0.05
query4	1.68	0.08	0.08
query5	0.50	0.50	0.56
query6	1.12	0.74	0.72
query7	0.01	0.01	0.02
query8	0.05	0.04	0.04
query9	0.53	0.48	0.49
query10	0.54	0.54	0.55
query11	0.15	0.11	0.11
query12	0.14	0.12	0.12
query13	0.59	0.58	0.60
query14	0.78	0.78	0.78
query15	0.83	0.80	0.81
query16	0.37	0.37	0.37
query17	1.01	1.00	1.00
query18	0.22	0.23	0.24
query19	1.89	1.69	1.66
query20	0.02	0.01	0.01
query21	15.47	0.67	0.64
query22	4.76	6.92	1.60
query23	18.27	1.46	1.32
query24	1.54	0.28	0.21
query25	0.15	0.08	0.08
query26	0.26	0.17	0.17
query27	0.08	0.08	0.07
query28	13.46	1.01	1.00
query29	13.10	3.33	3.30
query30	0.24	0.07	0.05
query31	2.84	0.38	0.39
query32	3.28	0.47	0.46
query33	2.87	2.92	2.91
query34	17.22	4.47	4.48
query35	4.53	4.49	4.52
query36	0.65	0.45	0.46
query37	0.18	0.16	0.16
query38	0.15	0.15	0.15
query39	0.04	0.04	0.03
query40	0.18	0.13	0.13
query41	0.10	0.05	0.05
query42	0.05	0.04	0.05
query43	0.04	0.04	0.04
Total cold run time: 110.24 s
Total hot run time: 30.35 s

@doris-robot
Copy link

TeamCity be ut coverage result:
Function Coverage: 35.79% (8997/25141)
Line Coverage: 27.42% (74519/271805)
Region Coverage: 26.63% (38551/144741)
Branch Coverage: 23.51% (19674/83672)
Coverage Report: http://coverage.selectdb-in.cc/coverage/c3e352ee956ba32c787d94664b15661c29f29afa_c3e352ee956ba32c787d94664b15661c29f29afa/report/index.html

@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label May 28, 2024
@github-actions GitHub Actions
Copy link
Contributor

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

@BiteTheDDDDt BiteTheDDDDt merged commit 2e2a4fc into apache:master May 28, 2024
29 of 30 checks passed
dataroaring pushed a commit that referenced this pull request May 28, 2024
@zclllyybb @dataroaring
[Not-Pick-2.1](upgrade) Remove compatibility code to prepare for next…
c46c543 
… major version (#35312)

Remove compatibility code to prepare for next major version
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mryange Mryange Mryange approved these changes

@BiteTheDDDDt BiteTheDDDDt BiteTheDDDDt approved these changes

@HappenLee HappenLee HappenLee left review comments

Assignees
No one assigned
Labels
approved Indicates a PR has been approved by one committer. dev/3.0.0-merged reviewed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@zclllyybb @doris-robot @BiteTheDDDDt @HappenLee @Mryange @dataroaring