Skip to content

[fix](warmup) prevent NPE when upgrading from older versions #53555

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
Merged
dataroaring merged 1 commit into from
Jul 21, 2025
Merged

[fix](warmup) prevent NPE when upgrading from older versions #53555

dataroaring merged 1 commit into from
Jul 21, 2025

Conversation

@kaijchen
Copy link
Member

@kaijchen kaijchen commented Jul 18, 2025

What problem does this PR solve?

Issue Number: DORIS-21489

Problem Summary:

In older versions, the tables field doesn't exist.
When a newer version reads this data, the field becomes null, leading to a NullPointerException.
This fix adds a null check to handle the upgrade path safely.

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

@Thearas
Copy link
Contributor

Thearas commented Jul 18, 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?

@kaijchen
Copy link
Member Author

kaijchen commented Jul 18, 2025

run buildall

@doris-robot
Copy link

doris-robot commented Jul 18, 2025

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

------ Round 1 ----------------------------------
q1	17618	5263	5068	5068
q2	1934	304	203	203
q3	10275	1270	706	706
q4	10232	1024	533	533
q5	7563	2435	2341	2341
q6	186	170	142	142
q7	917	772	636	636
q8	9344	1315	1084	1084
q9	6826	5101	5111	5101
q10	6877	2408	1957	1957
q11	503	302	283	283
q12	349	362	230	230
q13	17791	3645	3138	3138
q14	232	253	225	225
q15	574	532	538	532
q16	449	451	404	404
q17	590	879	374	374
q18	7827	7203	7002	7002
q19	1253	969	579	579
q20	361	366	240	240
q21	3766	2565	2357	2357
q22	1073	1062	967	967
Total cold run time: 106540 ms
Total hot run time: 34102 ms

----- Round 2, with runtime_filter_mode=off -----
q1	5154	5100	5149	5100
q2	263	343	248	248
q3	2190	2719	2350	2350
q4	1372	1809	1351	1351
q5	4202	4520	4469	4469
q6	223	177	140	140
q7	2051	1983	1802	1802
q8	2619	2689	2604	2604
q9	7227	7347	7298	7298
q10	3110	3285	2854	2854
q11	578	524	511	511
q12	708	803	640	640
q13	3763	3920	3370	3370
q14	296	297	301	297
q15	564	514	512	512
q16	484	533	458	458
q17	1149	1606	1364	1364
q18	7920	7604	7620	7604
q19	831	855	954	855
q20	2100	2063	1944	1944
q21	5029	4644	4500	4500
q22	1136	1109	1072	1072
Total cold run time: 52969 ms
Total hot run time: 51343 ms

@doris-robot
Copy link

doris-robot commented Jul 18, 2025

TPC-DS: Total hot run time: 191255 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 4490a81545d000d31489aad1fdc257eb04fea75b, data reload: false

query1	1021	404	424	404
query2	6542	1747	1793	1747
query3	6763	233	222	222
query4	26158	23492	23243	23243
query5	4528	721	567	567
query6	310	249	220	220
query7	4678	517	308	308
query8	402	354	337	337
query9	8676	2680	2685	2680
query10	526	345	289	289
query11	15564	15120	14812	14812
query12	176	121	123	121
query13	1663	559	419	419
query14	9692	6078	6042	6042
query15	211	210	177	177
query16	7570	665	473	473
query17	1202	750	614	614
query18	2032	422	329	329
query19	201	201	197	197
query20	137	132	129	129
query21	233	143	137	137
query22	4082	4798	4589	4589
query23	35116	33704	33710	33704
query24	8464	2439	2493	2439
query25	607	519	476	476
query26	1243	281	170	170
query27	2731	549	379	379
query28	4387	2183	2164	2164
query29	740	572	451	451
query30	302	230	207	207
query31	962	892	826	826
query32	82	79	74	74
query33	580	404	340	340
query34	800	860	534	534
query35	789	851	754	754
query36	1025	1000	947	947
query37	120	110	86	86
query38	4222	4091	4022	4022
query39	1511	1495	1497	1495
query40	226	136	130	130
query41	107	101	99	99
query42	131	119	127	119
query43	526	519	497	497
query44	1341	844	854	844
query45	190	186	176	176
query46	852	1026	653	653
query47	1793	1813	1757	1757
query48	418	482	351	351
query49	815	573	477	477
query50	668	699	444	444
query51	5605	5510	5479	5479
query52	124	118	109	109
query53	247	278	199	199
query54	599	595	533	533
query55	88	87	87	87
query56	334	337	343	337
query57	1232	1206	1165	1165
query58	312	296	305	296
query59	2584	2721	2570	2570
query60	349	351	332	332
query61	186	148	151	148
query62	834	775	698	698
query63	248	217	216	216
query64	4394	1065	728	728
query65	4284	4198	4196	4196
query66	1281	586	512	512
query67	15934	15646	15508	15508
query68	8097	922	561	561
query69	501	341	294	294
query70	1201	1192	1157	1157
query71	497	340	327	327
query72	5553	4890	4811	4811
query73	754	641	372	372
query74	9190	9095	9024	9024
query75	3942	3235	2736	2736
query76	3705	1180	742	742
query77	885	471	362	362
query78	10133	10177	9406	9406
query79	3065	805	589	589
query80	687	564	501	501
query81	493	291	245	245
query82	476	136	105	105
query83	309	283	266	266
query84	299	119	97	97
query85	831	405	413	405
query86	350	298	303	298
query87	4519	4420	4534	4420
query88	2976	2364	2366	2364
query89	437	383	300	300
query90	1962	232	223	223
query91	161	158	131	131
query92	92	73	66	66
query93	1920	951	596	596
query94	696	431	326	326
query95	399	308	323	308
query96	497	581	286	286
query97	2762	2761	2635	2635
query98	231	219	220	219
query99	1476	1439	1299	1299
Total cold run time: 280846 ms
Total hot run time: 191255 ms

@doris-robot
Copy link

doris-robot commented Jul 18, 2025

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

query1	0.04	0.04	0.05
query2	0.08	0.05	0.04
query3	0.25	0.07	0.08
query4	1.61	0.11	0.11
query5	0.43	0.43	0.40
query6	1.15	0.65	0.67
query7	0.03	0.02	0.02
query8	0.05	0.04	0.05
query9	0.59	0.52	0.52
query10	0.59	0.57	0.58
query11	0.17	0.12	0.11
query12	0.16	0.12	0.12
query13	0.63	0.63	0.62
query14	0.81	0.81	0.82
query15	0.90	0.87	0.86
query16	0.41	0.39	0.40
query17	1.08	1.04	1.10
query18	0.23	0.22	0.22
query19	1.97	1.89	1.88
query20	0.02	0.02	0.02
query21	15.38	0.89	0.55
query22	0.75	1.21	0.74
query23	14.89	1.39	0.64
query24	7.26	1.21	0.66
query25	0.50	0.16	0.10
query26	0.63	0.16	0.14
query27	0.07	0.06	0.05
query28	8.92	0.91	0.44
query29	12.55	3.93	3.31
query30	3.15	3.05	3.07
query31	2.83	0.57	0.38
query32	3.24	0.55	0.49
query33	3.04	3.16	3.14
query34	16.01	5.39	4.80
query35	4.80	4.82	4.87
query36	0.70	0.51	0.49
query37	0.10	0.07	0.07
query38	0.06	0.05	0.05
query39	0.05	0.03	0.03
query40	0.19	0.16	0.16
query41	0.08	0.04	0.04
query42	0.04	0.04	0.03
query43	0.05	0.05	0.05
Total cold run time: 106.49 s
Total hot run time: 32.76 s

@hello-stephen
Copy link
Contributor

hello-stephen commented Jul 18, 2025

FE UT Coverage Report

Increment line coverage 0.00% (0/1) 🎉
Increment coverage report
Complete coverage report

@github-actions
Copy link
Contributor

github-actions bot commented Jul 21, 2025

PR approved by anyone and no changes requested.

dataroaring
dataroaring approved these changes Jul 21, 2025
View reviewed changes
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
Copy link
Contributor

github-actions bot commented Jul 21, 2025

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 21, 2025
@dataroaring dataroaring merged commit 24e4369 into apache:master Jul 21, 2025
30 checks passed
github-actions bot pushed a commit that referenced this pull request Jul 21, 2025
@kaijchen
[fix](warmup) prevent NPE when upgrading from older versions (#53555)
603bd41 
### What problem does this PR solve?

Issue Number: DORIS-21489

Problem Summary:

In older versions, the `tables` field doesn't exist.
When a newer version reads this data, the field becomes `null`, leading
to a `NullPointerException`.
This fix adds a null check to handle the upgrade path safely.
@github-actions github-actions bot mentioned this pull request Jul 21, 2025
Merged
github-actions bot pushed a commit that referenced this pull request Jul 21, 2025
@kaijchen
[fix](warmup) prevent NPE when upgrading from older versions (#53555)
f54a35f 
### What problem does this PR solve?

Issue Number: DORIS-21489

Problem Summary:

In older versions, the `tables` field doesn't exist.
When a newer version reads this data, the field becomes `null`, leading
to a `NullPointerException`.
This fix adds a null check to handle the upgrade path safely.
@github-actions github-actions bot mentioned this pull request Jul 21, 2025
Merged
morrySnow pushed a commit that referenced this pull request Jul 22, 2025
@github-actions @kaijchen
branch-3.1: [fix](warmup) prevent NPE when upgrading from older versi…
6ef29b1 
…ons #53555 (#53667)

Cherry-picked from #53555

Co-authored-by: Kaijie Chen <chenkaijie@selectdb.com>
dataroaring pushed a commit that referenced this pull request Jul 23, 2025
@github-actions @kaijchen
branch-3.0: [fix](warmup) prevent NPE when upgrading from older versi…
0bc9f88 
…ons #53555 (#53666)

Cherry-picked from #53555

Co-authored-by: Kaijie Chen <chenkaijie@selectdb.com>
@kaijchen kaijchen deleted the DORIS-21489 branch July 23, 2025 16:28
@gavinchou gavinchou mentioned this pull request Aug 15, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dataroaring dataroaring dataroaring approved these changes

@gavinchou gavinchou Awaiting requested review from gavinchou gavinchou is a code owner

@w41ter w41ter Awaiting requested review from w41ter w41ter is a code owner

+1 more reviewer

@pingchunzhang pingchunzhang pingchunzhang approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

approved Indicates a PR has been approved by one committer. dev/3.0.7-merged dev/3.1.0-merged reviewed

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@kaijchen @Thearas @doris-robot @hello-stephen @pingchunzhang @dataroaring @morrySnow