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

[fix](java) should use JAVA_OPTS_FOR_JDK_17 instead of JAVA_OPTS #48170

Merged
merged 5 commits into from
Feb 24, 2025
Merged

[fix](java) should use JAVA_OPTS_FOR_JDK_17 instead of JAVA_OPTS #48170

merged 5 commits into from
Feb 24, 2025
+6 −22

Conversation

morningman
Copy link
Contributor

@morningman morningman commented Feb 21, 2025 •
edited
Loading

What problem does this PR solve?

  1. no need to set CLASSPATH and LIBHDFS_OPTS again in BE code, this is all done in start_be.sh
  2. Print the final LIBHDFS_OPT env var in be.INFO, so that we can easily know the real JAVA OPTS for jni

Release note

None

Check List (For Author)

  • Test

    • Regression test
    • Unit Test
    • Manual test (add detailed scripts or steps below)
    • No need to test or manual test. Explain why:
      • This is a refactor/code format and no logic has been changed.
      • Previous test can cover this change.
      • No code files have been changed.
      • Other reason

  • Behavior changed:

    • No.
    • Yes.

  • Does this need documentation?

    • No.
    • Yes.

Check List (For Reviewer who merge this PR)

  • Confirm the release note
  • Confirm test cases
  • Confirm document
  • Add branch pick label

@hello-stephen
Copy link
Contributor

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

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17584	5460	5143	5143
q2	2045	301	167	167
q3	10412	1348	756	756
q4	10214	1027	558	558
q5	7503	2484	2282	2282
q6	196	169	138	138
q7	923	754	620	620
q8	9335	1306	1152	1152
q9	5038	4618	4572	4572
q10	6846	2345	1923	1923
q11	481	280	262	262
q12	348	364	225	225
q13	17759	3687	3057	3057
q14	225	224	206	206
q15	523	471	460	460
q16	627	616	576	576
q17	575	872	338	338
q18	6821	6179	6125	6125
q19	1223	957	532	532
q20	310	347	190	190
q21	2798	2167	1925	1925
q22	362	329	300	300
Total cold run time: 102148 ms
Total hot run time: 31507 ms

----- Round 2, with runtime_filter_mode=off -----
q1	5195	5143	5229	5143
q2	238	337	231	231
q3	2206	2710	2318	2318
q4	1472	1851	1376	1376
q5	4223	4100	4110	4100
q6	217	167	131	131
q7	1873	1832	1715	1715
q8	2623	2557	2497	2497
q9	7326	7079	7165	7079
q10	3014	3229	2741	2741
q11	565	496	491	491
q12	657	783	634	634
q13	3498	3959	3303	3303
q14	285	284	283	283
q15	517	455	453	453
q16	626	669	623	623
q17	1147	1623	1343	1343
q18	7681	7414	7293	7293
q19	791	828	830	828
q20	1963	2018	1848	1848
q21	5361	4981	4840	4840
q22	646	577	528	528
Total cold run time: 52124 ms
Total hot run time: 49798 ms

@morningman morningman changed the title [opt](jni) print final java opt for jni in BE log for debugging [fix](java) should use JAVA_OPTS_FOR_JDK_17 instead of JAVA_OPTS Feb 21, 2025
@morningman
Copy link
Contributor Author

run buildall

@github-actions GitHub Actions
Copy link
Contributor

PR approved by anyone and no changes requested.

@morningman
Copy link
Contributor Author

run buildall

1 similar comment
@morningman
Copy link
Contributor Author

run buildall

@doris-robot
Copy link

TeamCity be ut coverage result:
Function Coverage: 44.29% (11689/26394)
Line Coverage: 33.89% (97912/288883)
Region Coverage: 32.97% (50122/152031)
Branch Coverage: 28.63% (25198/88002)
Coverage Report: http://coverage.selectdb-in.cc/coverage/db05247d8b718358581a583ad2e0cfe9d362ca79_db05247d8b718358581a583ad2e0cfe9d362ca79/report/index.html

@morningman
Copy link
Contributor Author

run p0

@morningman
Copy link
Contributor Author

run buildall

@doris-robot
Copy link

TeamCity be ut coverage result:
Function Coverage: 44.51% (11753/26406)
Line Coverage: 34.01% (98271/288946)
Region Coverage: 33.09% (50321/152096)
Branch Coverage: 28.73% (25292/88040)
Coverage Report: http://coverage.selectdb-in.cc/coverage/0432c4e47183bee66d6b1efc82066570b852882b_0432c4e47183bee66d6b1efc82066570b852882b/report/index.html

@morningman
Copy link
Contributor Author

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17603	5328	5040	5040
q2	2050	301	170	170
q3	10417	1276	750	750
q4	10209	1018	541	541
q5	7514	2497	2261	2261
q6	194	170	136	136
q7	901	750	613	613
q8	9287	1297	1145	1145
q9	4865	4613	4567	4567
q10	6804	2330	1881	1881
q11	508	289	283	283
q12	346	367	224	224
q13	17742	3649	3033	3033
q14	239	233	208	208
q15	486	473	459	459
q16	625	619	577	577
q17	579	849	348	348
q18	6659	6217	6154	6154
q19	1203	950	543	543
q20	315	321	205	205
q21	2677	2177	1950	1950
q22	366	328	308	308
Total cold run time: 101589 ms
Total hot run time: 31396 ms

----- Round 2, with runtime_filter_mode=off -----
q1	5134	5050	4989	4989
q2	226	323	230	230
q3	2182	2668	2270	2270
q4	1387	1810	1369	1369
q5	4241	4132	4118	4118
q6	200	162	124	124
q7	1863	1824	1655	1655
q8	2568	2611	2554	2554
q9	7344	7107	7124	7107
q10	2967	3198	2735	2735
q11	570	507	487	487
q12	663	756	639	639
q13	3383	3941	3254	3254
q14	271	309	282	282
q15	511	467	469	467
q16	617	675	635	635
q17	1110	1607	1332	1332
q18	7534	7414	7230	7230
q19	775	886	1071	886
q20	1989	2040	1849	1849
q21	5265	4975	4770	4770
q22	590	564	530	530
Total cold run time: 51390 ms
Total hot run time: 49512 ms

@doris-robot
Copy link

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

query1	1022	422	366	366
query2	6558	1844	1813	1813
query3	6792	216	212	212
query4	26456	23850	23342	23342
query5	4396	667	490	490
query6	295	198	189	189
query7	4613	501	295	295
query8	307	242	238	238
query9	8635	2586	2574	2574
query10	479	320	252	252
query11	15440	15092	15196	15092
query12	157	114	107	107
query13	1672	513	403	403
query14	9625	6589	6389	6389
query15	214	191	183	183
query16	7575	646	475	475
query17	1194	707	568	568
query18	1985	395	309	309
query19	191	186	160	160
query20	119	114	130	114
query21	225	124	105	105
query22	4165	4227	4326	4227
query23	34555	33470	33174	33174
query24	7691	2376	2359	2359
query25	515	452	377	377
query26	1213	260	154	154
query27	2328	524	329	329
query28	4038	2408	2376	2376
query29	659	534	422	422
query30	239	182	154	154
query31	927	843	779	779
query32	78	65	63	63
query33	553	395	300	300
query34	765	842	521	521
query35	811	819	726	726
query36	961	992	892	892
query37	115	114	73	73
query38	4114	4187	4014	4014
query39	1460	1385	1375	1375
query40	208	116	105	105
query41	55	51	50	50
query42	121	104	99	99
query43	486	507	479	479
query44	1283	778	769	769
query45	172	170	167	167
query46	848	1024	634	634
query47	1749	1765	1708	1708
query48	402	415	299	299
query49	793	508	409	409
query50	672	738	422	422
query51	4185	4223	4088	4088
query52	102	107	93	93
query53	221	245	180	180
query54	481	483	406	406
query55	84	79	85	79
query56	260	266	248	248
query57	1129	1145	1061	1061
query58	250	234	239	234
query59	2678	2637	2585	2585
query60	293	298	268	268
query61	121	117	120	117
query62	777	700	668	668
query63	236	193	189	189
query64	4217	994	664	664
query65	3253	3132	3142	3132
query66	1081	389	293	293
query67	15679	15394	15827	15394
query68	7111	762	511	511
query69	472	289	261	261
query70	1229	1143	1097	1097
query71	409	298	263	263
query72	5646	3590	3700	3590
query73	724	739	351	351
query74	9245	9115	8818	8818
query75	3126	3148	2697	2697
query76	3278	1166	719	719
query77	452	358	284	284
query78	9919	10169	9208	9208
query79	2236	825	599	599
query80	599	512	529	512
query81	508	283	237	237
query82	462	130	95	95
query83	178	170	160	160
query84	243	95	73	73
query85	803	347	318	318
query86	384	288	318	288
query87	4391	4432	4367	4367
query88	4101	2220	2204	2204
query89	401	309	284	284
query90	1892	192	197	192
query91	143	144	106	106
query92	72	60	56	56
query93	1857	985	562	562
query94	699	422	294	294
query95	347	270	255	255
query96	492	548	278	278
query97	2753	2843	2720	2720
query98	229	212	205	205
query99	1317	1398	1263	1263
Total cold run time: 270691 ms
Total hot run time: 183698 ms

@doris-robot
Copy link

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

query1	0.04	0.03	0.03
query2	0.08	0.03	0.03
query3	0.23	0.07	0.06
query4	1.62	0.10	0.10
query5	0.41	0.41	0.41
query6	1.19	0.66	0.64
query7	0.02	0.02	0.01
query8	0.04	0.03	0.03
query9	0.60	0.51	0.53
query10	0.57	0.57	0.57
query11	0.15	0.11	0.10
query12	0.15	0.11	0.11
query13	0.62	0.59	0.60
query14	2.68	2.68	2.70
query15	0.92	0.86	0.85
query16	0.38	0.37	0.37
query17	1.04	1.03	1.04
query18	0.21	0.19	0.20
query19	1.90	1.77	1.95
query20	0.01	0.01	0.01
query21	15.37	0.93	0.54
query22	0.77	1.36	0.65
query23	14.75	1.37	0.61
query24	6.95	1.08	1.42
query25	0.53	0.24	0.11
query26	0.66	0.16	0.13
query27	0.05	0.04	0.05
query28	9.90	0.86	0.42
query29	12.58	3.91	3.26
query30	0.26	0.08	0.06
query31	2.82	0.58	0.38
query32	3.23	0.55	0.46
query33	2.95	3.04	3.03
query34	15.86	5.08	4.47
query35	4.52	4.50	4.52
query36	0.66	0.49	0.47
query37	0.09	0.06	0.06
query38	0.05	0.04	0.03
query39	0.03	0.02	0.03
query40	0.16	0.13	0.12
query41	0.08	0.02	0.03
query42	0.03	0.02	0.02
query43	0.04	0.03	0.03
Total cold run time: 105.2 s
Total hot run time: 30.6 s

@doris-robot
Copy link

TeamCity be ut coverage result:
Function Coverage: 44.51% (11753/26406)
Line Coverage: 34.01% (98268/288947)
Region Coverage: 33.09% (50322/152096)
Branch Coverage: 28.73% (25296/88040)
Coverage Report: http://coverage.selectdb-in.cc/coverage/6b323a63046dd80bd3ed6f261429a60ac0bde68b_6b323a63046dd80bd3ed6f261429a60ac0bde68b/report/index.html

@github-actions GitHub Actions
Copy link
Contributor

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 Feb 24, 2025
@morningman morningman merged commit 871a4a4 into apache:master Feb 24, 2025
24 of 26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CalvinKirs CalvinKirs CalvinKirs approved these changes

@wuwenchi wuwenchi wuwenchi approved these changes

@hubgeter hubgeter hubgeter approved these changes

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

Successfully merging this pull request may close these issues.
6 participants
@morningman @hello-stephen @doris-robot @CalvinKirs @wuwenchi @hubgeter