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

branch-3.0: [fix](java) should use JAVA_OPTS_FOR_JDK_17 instead of JAVA_OPTS #48170 #48335 #48284

Merged
merged 3 commits into from
Feb 26, 2025

Conversation

morningman
Copy link
Contributor

@morningman morningman commented Feb 25, 2025

bp #48170 and #48335
and also pick part of #47299, only related to jni-util.cpp.
To pass the krb5.conf config to Jni env

@Thearas
Copy link
Contributor

Thearas commented Feb 25, 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?

@morningman
Copy link
Contributor Author

run buildall

@morningman
Copy link
Contributor Author

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17565	7326	7173	7173
q2	2064	168	176	168
q3	10723	1064	1150	1064
q4	10530	738	711	711
q5	7721	2831	2830	2830
q6	243	151	150	150
q7	953	611	605	605
q8	9349	1918	1972	1918
q9	6540	6391	6408	6391
q10	7008	2308	2293	2293
q11	466	273	264	264
q12	414	211	215	211
q13	17784	3000	3007	3000
q14	239	211	209	209
q15	588	511	526	511
q16	687	599	579	579
q17	971	586	493	493
q18	7311	6931	7029	6931
q19	1419	1179	1131	1131
q20	493	212	211	211
q21	4245	3125	3142	3125
q22	1103	1006	1027	1006
Total cold run time: 108416 ms
Total hot run time: 40974 ms

----- Round 2, with runtime_filter_mode=off -----
q1	7313	7255	7198	7198
q2	326	237	236	236
q3	2884	2950	2850	2850
q4	2009	1847	1785	1785
q5	5669	5709	5738	5709
q6	231	150	152	150
q7	2230	1788	1859	1788
q8	3321	3550	3495	3495
q9	8883	8931	8837	8837
q10	3583	3575	3539	3539
q11	590	505	524	505
q12	806	639	630	630
q13	9361	3148	3155	3148
q14	303	279	275	275
q15	573	538	534	534
q16	674	668	654	654
q17	1810	1620	1614	1614
q18	8116	7753	7721	7721
q19	1648	1557	1534	1534
q20	2097	1866	1845	1845
q21	5482	5295	5341	5295
q22	1188	1029	1009	1009
Total cold run time: 69097 ms
Total hot run time: 60351 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 197220 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 0d74072a51cf9316ce6f26344e8788929a3a97d6, data reload: false

query1	1313	942	930	930
query2	6240	2036	2080	2036
query3	10780	4410	4283	4283
query4	65651	28904	23397	23397
query5	5040	442	435	435
query6	401	174	168	168
query7	5584	307	309	307
query8	303	217	223	217
query9	8932	2685	2679	2679
query10	455	274	253	253
query11	17804	15228	15853	15228
query12	171	109	108	108
query13	1509	443	436	436
query14	10342	7055	6783	6783
query15	206	177	183	177
query16	7246	489	519	489
query17	1099	595	615	595
query18	2090	331	324	324
query19	218	169	167	167
query20	119	113	112	112
query21	206	108	107	107
query22	4630	4614	4722	4614
query23	34522	34168	34997	34168
query24	6134	2839	2913	2839
query25	515	397	393	393
query26	648	174	166	166
query27	1903	361	360	360
query28	4394	2442	2422	2422
query29	665	443	440	440
query30	247	156	173	156
query31	993	809	844	809
query32	66	51	57	51
query33	455	285	281	281
query34	920	511	528	511
query35	844	735	723	723
query36	1071	949	967	949
query37	113	67	65	65
query38	4144	4057	4013	4013
query39	1531	1567	1485	1485
query40	204	99	98	98
query41	47	50	45	45
query42	109	99	101	99
query43	535	509	483	483
query44	1224	821	829	821
query45	182	174	168	168
query46	1165	732	753	732
query47	2083	1949	1953	1949
query48	466	399	382	382
query49	727	391	406	391
query50	847	421	421	421
query51	7414	7233	7164	7164
query52	106	90	88	88
query53	251	183	181	181
query54	561	453	440	440
query55	82	77	79	77
query56	259	256	259	256
query57	1222	1143	1112	1112
query58	206	211	199	199
query59	3282	3039	2977	2977
query60	282	252	259	252
query61	110	108	133	108
query62	815	707	735	707
query63	214	188	185	185
query64	1361	671	660	660
query65	3256	3186	3187	3186
query66	705	301	299	299
query67	16052	15609	15683	15609
query68	3000	592	581	581
query69	434	281	276	276
query70	1197	1099	1115	1099
query71	357	261	255	255
query72	5935	4016	4014	4014
query73	751	341	341	341
query74	10084	8904	9234	8904
query75	3349	2636	2631	2631
query76	1901	1086	1052	1052
query77	496	263	272	263
query78	10448	9619	9567	9567
query79	1386	605	601	601
query80	899	424	417	417
query81	524	241	236	236
query82	1291	88	88	88
query83	253	153	143	143
query84	281	81	79	79
query85	884	296	283	283
query86	330	297	300	297
query87	4393	4216	4229	4216
query88	3745	2381	2352	2352
query89	425	288	286	286
query90	2014	186	187	186
query91	182	150	149	149
query92	67	48	50	48
query93	1896	545	550	545
query94	783	296	298	296
query95	350	256	254	254
query96	611	271	284	271
query97	3331	3172	3129	3129
query98	212	207	199	199
query99	1686	1406	1397	1397
Total cold run time: 316766 ms
Total hot run time: 197220 ms

@doris-robot
Copy link

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

query1	0.03	0.03	0.03
query2	0.07	0.03	0.04
query3	0.23	0.06	0.06
query4	1.62	0.10	0.11
query5	0.53	0.50	0.51
query6	1.13	0.72	0.72
query7	0.02	0.02	0.01
query8	0.06	0.04	0.03
query9	0.56	0.52	0.49
query10	0.54	0.56	0.56
query11	0.14	0.10	0.10
query12	0.14	0.11	0.11
query13	0.60	0.60	0.60
query14	2.88	2.85	2.89
query15	0.92	0.82	0.82
query16	0.36	0.37	0.41
query17	1.05	1.02	1.08
query18	0.23	0.21	0.21
query19	1.87	1.83	1.98
query20	0.01	0.01	0.02
query21	15.36	0.58	0.59
query22	2.16	2.14	1.76
query23	16.95	1.07	0.88
query24	3.53	0.95	1.19
query25	0.31	0.10	0.05
query26	0.46	0.13	0.13
query27	0.04	0.04	0.03
query28	10.30	1.09	1.06
query29	12.58	3.26	3.24
query30	0.25	0.06	0.06
query31	2.86	0.38	0.39
query32	3.24	0.45	0.45
query33	2.97	2.98	2.99
query34	17.02	4.50	4.44
query35	4.44	4.48	4.53
query36	0.67	0.48	0.47
query37	0.10	0.07	0.06
query38	0.04	0.03	0.03
query39	0.03	0.02	0.03
query40	0.16	0.13	0.13
query41	0.08	0.02	0.03
query42	0.04	0.02	0.02
query43	0.03	0.03	0.03
Total cold run time: 106.61 s
Total hot run time: 32.7 s

@morningman morningman changed the title branch-3.0: [fix](java) should use JAVA_OPTS_FOR_JDK_17 instead of JAVA_OPTS #48170 branch-3.0: [fix](java) should use JAVA_OPTS_FOR_JDK_17 instead of JAVA_OPTS #48170 #48335 Feb 25, 2025
@morningman
Copy link
Contributor Author

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17565	6754	6618	6618
q2	2052	168	162	162
q3	10654	1067	1201	1067
q4	10555	791	732	732
q5	7739	2786	2816	2786
q6	227	140	137	137
q7	997	623	614	614
q8	9367	1945	2021	1945
q9	6612	6367	6411	6367
q10	6969	2274	2278	2274
q11	463	269	266	266
q12	405	211	213	211
q13	17789	3002	3004	3002
q14	244	211	214	211
q15	517	470	472	470
q16	651	577	570	570
q17	967	632	546	546
q18	7222	6735	6776	6735
q19	1506	1103	1084	1084
q20	479	212	210	210
q21	4032	3316	3261	3261
q22	1097	991	995	991
Total cold run time: 108109 ms
Total hot run time: 40259 ms

----- Round 2, with runtime_filter_mode=off -----
q1	6609	6574	6568	6568
q2	338	236	227	227
q3	2906	2779	2984	2779
q4	2096	1824	1794	1794
q5	5814	5754	5707	5707
q6	208	131	129	129
q7	2251	1831	1775	1775
q8	3364	3610	3519	3519
q9	8854	9044	8946	8946
q10	3591	3524	3517	3517
q11	598	512	501	501
q12	818	622	597	597
q13	7821	3207	3155	3155
q14	298	281	282	281
q15	519	467	473	467
q16	687	669	665	665
q17	1843	1654	1596	1596
q18	8309	7885	7959	7885
q19	1663	1392	1495	1392
q20	2073	1909	1855	1855
q21	5609	5261	5333	5261
q22	1116	1082	1059	1059
Total cold run time: 67385 ms
Total hot run time: 59675 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 196732 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 6ae08b05957e4e4092edd57696c4e366e1706cb0, data reload: false

query1	1319	897	899	897
query2	6216	1972	2010	1972
query3	10901	4439	4309	4309
query4	60653	31999	23252	23252
query5	4830	450	435	435
query6	403	180	184	180
query7	5477	306	305	305
query8	308	231	227	227
query9	8783	2581	2589	2581
query10	453	280	269	269
query11	16680	15214	15775	15214
query12	162	106	112	106
query13	1422	440	423	423
query14	10713	7419	7558	7419
query15	210	186	180	180
query16	7098	505	453	453
query17	1122	594	614	594
query18	1804	327	308	308
query19	206	166	168	166
query20	125	114	118	114
query21	207	106	106	106
query22	4674	4363	4607	4363
query23	34510	33655	34356	33655
query24	6163	3051	2991	2991
query25	560	429	431	429
query26	673	178	175	175
query27	1870	355	359	355
query28	4179	2434	2425	2425
query29	701	471	453	453
query30	246	166	160	160
query31	957	809	826	809
query32	67	53	57	53
query33	446	288	286	286
query34	903	511	525	511
query35	845	727	738	727
query36	1086	951	940	940
query37	128	68	71	68
query38	4180	4067	4012	4012
query39	1523	1499	1644	1499
query40	211	104	104	104
query41	51	52	51	51
query42	118	104	99	99
query43	534	490	492	490
query44	1192	799	808	799
query45	184	167	177	167
query46	1171	753	729	729
query47	2030	1883	1899	1883
query48	478	396	388	388
query49	730	401	391	391
query50	855	424	425	424
query51	7322	7150	7191	7150
query52	103	89	90	89
query53	270	194	197	194
query54	612	488	474	474
query55	86	79	82	79
query56	277	265	255	255
query57	1277	1192	1158	1158
query58	213	209	224	209
query59	3298	2893	2912	2893
query60	275	246	249	246
query61	111	108	123	108
query62	761	677	672	672
query63	223	195	189	189
query64	1386	676	653	653
query65	3319	3200	3201	3200
query66	664	307	307	307
query67	15838	15577	15481	15481
query68	4128	579	575	575
query69	431	301	258	258
query70	1174	1114	1120	1114
query71	372	254	266	254
query72	6488	3802	4052	3802
query73	773	347	364	347
query74	10572	9212	9047	9047
query75	3391	2688	2658	2658
query76	1823	1193	1037	1037
query77	504	283	269	269
query78	10488	9611	9651	9611
query79	2152	592	628	592
query80	1490	435	438	435
query81	523	241	243	241
query82	1299	92	89	89
query83	267	146	149	146
query84	285	83	78	78
query85	1044	300	296	296
query86	374	308	302	302
query87	4539	4222	4298	4222
query88	3947	2402	2365	2365
query89	423	294	293	293
query90	1887	185	186	185
query91	183	149	150	149
query92	62	54	51	51
query93	2919	551	552	551
query94	794	289	296	289
query95	361	261	260	260
query96	626	277	282	277
query97	3373	3170	3151	3151
query98	233	205	200	200
query99	1572	1302	1285	1285
Total cold run time: 314889 ms
Total hot run time: 196732 ms

@doris-robot
Copy link

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

query1	0.04	0.03	0.03
query2	0.07	0.03	0.03
query3	0.23	0.06	0.06
query4	1.63	0.10	0.11
query5	0.51	0.50	0.53
query6	1.13	0.72	0.72
query7	0.02	0.01	0.01
query8	0.04	0.03	0.03
query9	0.59	0.49	0.51
query10	0.56	0.56	0.56
query11	0.14	0.10	0.10
query12	0.14	0.11	0.11
query13	0.62	0.60	0.59
query14	2.74	2.78	2.77
query15	0.90	0.81	0.83
query16	0.37	0.37	0.37
query17	1.02	1.09	0.99
query18	0.23	0.22	0.22
query19	1.94	1.90	2.01
query20	0.01	0.01	0.02
query21	15.36	0.57	0.58
query22	2.66	2.21	1.88
query23	17.03	1.02	0.79
query24	2.94	1.17	2.01
query25	0.23	0.19	0.09
query26	0.44	0.14	0.15
query27	0.04	0.04	0.04
query28	9.37	0.48	0.45
query29	12.55	3.25	3.21
query30	0.24	0.06	0.06
query31	2.85	0.39	0.37
query32	3.25	0.45	0.46
query33	3.03	3.00	3.04
query34	17.01	4.50	4.45
query35	4.53	4.54	4.58
query36	0.68	0.48	0.50
query37	0.09	0.06	0.07
query38	0.05	0.03	0.03
query39	0.04	0.02	0.02
query40	0.17	0.12	0.12
query41	0.07	0.02	0.02
query42	0.03	0.02	0.02
query43	0.04	0.03	0.03
Total cold run time: 105.63 s
Total hot run time: 32.39 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 Feb 26, 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.

@morningman morningman merged commit dd2272b into apache:branch-3.0 Feb 26, 2025
22 of 25 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. reviewed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants