Skip to content

Conversation

@github-actions
Copy link
Contributor

Cherry-picked from #53555

### 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 requested a review from morrySnow as a code owner July 21, 2025 11:59
@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?

@dataroaring dataroaring reopened this Jul 21, 2025
@hello-stephen
Copy link
Contributor

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17621	5505	5385	5385
q2	2075	299	185	185
q3	10398	1262	779	779
q4	10206	880	467	467
q5	7659	2403	2118	2118
q6	196	182	140	140
q7	933	764	628	628
q8	9346	1479	1244	1244
q9	5233	4954	4999	4954
q10	6779	2275	1822	1822
q11	502	297	279	279
q12	365	371	231	231
q13	17814	3637	3048	3048
q14	245	244	227	227
q15	565	510	512	510
q16	457	459	405	405
q17	616	874	370	370
q18	7097	6564	6512	6512
q19	1242	998	586	586
q20	352	362	223	223
q21	2808	2203	1993	1993
q22	1099	1036	992	992
Total cold run time: 103608 ms
Total hot run time: 33098 ms

----- Round 2, with runtime_filter_mode=off -----
q1	5577	5536	5444	5444
q2	252	346	261	261
q3	2282	2647	2331	2331
q4	1402	1814	1325	1325
q5	4478	4864	4990	4864
q6	177	173	143	143
q7	2075	1964	1839	1839
q8	2634	2845	2713	2713
q9	7256	7175	7265	7175
q10	3095	3310	2796	2796
q11	584	520	501	501
q12	707	752	618	618
q13	3366	3761	3181	3181
q14	295	321	288	288
q15	561	511	495	495
q16	475	494	451	451
q17	1219	1751	1293	1293
q18	7659	7319	7183	7183
q19	815	1203	1091	1091
q20	2028	2067	1924	1924
q21	5366	4849	4767	4767
q22	1175	1117	1045	1045
Total cold run time: 53478 ms
Total hot run time: 51728 ms

@hello-stephen
Copy link
Contributor

FE UT Coverage Report

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

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17593	5450	5395	5395
q2	2065	314	184	184
q3	10459	1228	742	742
q4	10214	864	449	449
q5	8204	2361	2113	2113
q6	186	160	138	138
q7	913	736	615	615
q8	9339	1425	1201	1201
q9	5187	4870	4960	4870
q10	6792	2264	1826	1826
q11	484	284	254	254
q12	347	353	216	216
q13	17771	3564	3016	3016
q14	229	227	216	216
q15	524	459	463	459
q16	441	439	386	386
q17	606	852	357	357
q18	6843	6361	6304	6304
q19	2005	946	560	560
q20	336	348	206	206
q21	2778	2095	1994	1994
q22	1079	1006	980	980
Total cold run time: 104395 ms
Total hot run time: 32481 ms

----- Round 2, with runtime_filter_mode=off -----
q1	5607	5568	5491	5491
q2	235	332	235	235
q3	2238	2597	2305	2305
q4	1320	1801	1334	1334
q5	4384	4813	4938	4813
q6	163	164	129	129
q7	2060	1946	1776	1776
q8	2601	2771	2670	2670
q9	7247	7195	7218	7195
q10	3055	3314	2800	2800
q11	564	493	493	493
q12	637	743	594	594
q13	3363	3782	3186	3186
q14	305	293	289	289
q15	523	473	469	469
q16	442	491	433	433
q17	1194	1716	1266	1266
q18	7529	7432	7445	7432
q19	820	1136	1079	1079
q20	2000	2089	1926	1926
q21	5317	4943	4701	4701
q22	1090	1045	1006	1006
Total cold run time: 52694 ms
Total hot run time: 51622 ms

@doris-robot
Copy link

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

query1	1314	928	896	896
query2	6260	2027	2015	2015
query3	10993	4248	4678	4248
query4	33353	23700	23886	23700
query5	4804	628	460	460
query6	277	184	171	171
query7	4005	484	319	319
query8	284	249	231	231
query9	9441	2593	2577	2577
query10	521	321	266	266
query11	17880	15671	15093	15093
query12	163	105	102	102
query13	1560	547	418	418
query14	10920	6640	6939	6640
query15	227	214	186	186
query16	7954	657	494	494
query17	1560	760	610	610
query18	2129	426	325	325
query19	212	190	173	173
query20	126	127	124	124
query21	215	132	108	108
query22	4500	4567	4508	4508
query23	34888	33806	33788	33788
query24	7331	2762	2807	2762
query25	509	493	442	442
query26	901	293	177	177
query27	1969	490	368	368
query28	5338	2241	2210	2210
query29	646	604	500	500
query30	239	192	165	165
query31	1067	929	844	844
query32	72	56	56	56
query33	494	347	296	296
query34	761	861	520	520
query35	786	798	747	747
query36	1005	1063	941	941
query37	103	94	64	64
query38	3963	4023	4014	4014
query39	1547	1461	1466	1461
query40	206	114	106	106
query41	47	50	47	47
query42	115	104	109	104
query43	553	554	491	491
query44	1415	850	839	839
query45	182	178	174	174
query46	922	1066	686	686
query47	1949	1961	1900	1900
query48	400	432	340	340
query49	729	483	382	382
query50	690	698	428	428
query51	7355	7334	7173	7173
query52	100	100	95	95
query53	241	266	197	197
query54	544	563	482	482
query55	82	84	86	84
query56	270	296	281	281
query57	1248	1231	1222	1222
query58	253	219	260	219
query59	3247	3315	3140	3140
query60	295	275	270	270
query61	113	113	112	112
query62	824	720	726	720
query63	244	199	203	199
query64	3255	1021	659	659
query65	3370	3299	3228	3228
query66	795	424	303	303
query67	15864	15699	15410	15410
query68	7935	846	535	535
query69	497	312	262	262
query70	1139	1139	1122	1122
query71	387	305	261	261
query72	5798	3689	3758	3689
query73	631	744	350	350
query74	10480	9375	9279	9279
query75	3231	3126	2657	2657
query76	3082	1194	757	757
query77	496	360	280	280
query78	10393	10256	9689	9689
query79	3653	888	588	588
query80	707	529	433	433
query81	508	265	220	220
query82	664	117	90	90
query83	176	166	144	144
query84	283	98	82	82
query85	770	387	298	298
query86	389	314	295	295
query87	4367	4328	4230	4230
query88	5210	2414	2401	2401
query89	418	333	297	297
query90	1781	186	184	184
query91	136	138	108	108
query92	62	56	52	52
query93	2294	876	551	551
query94	674	395	290	290
query95	332	279	266	266
query96	489	608	287	287
query97	3204	3268	3147	3147
query98	220	210	198	198
query99	1538	1425	1289	1289
Total cold run time: 297569 ms
Total hot run time: 196641 ms

@doris-robot
Copy link

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

query1	0.04	0.03	0.02
query2	0.07	0.03	0.04
query3	0.24	0.06	0.07
query4	1.62	0.10	0.11
query5	0.50	0.50	0.52
query6	1.12	0.72	0.72
query7	0.02	0.01	0.01
query8	0.04	0.03	0.03
query9	0.55	0.49	0.50
query10	0.55	0.56	0.56
query11	0.13	0.10	0.10
query12	0.14	0.11	0.12
query13	0.61	0.60	0.58
query14	0.77	0.79	0.81
query15	0.84	0.84	0.83
query16	0.39	0.39	0.39
query17	1.06	1.02	1.05
query18	0.24	0.21	0.22
query19	1.82	1.90	1.87
query20	0.01	0.01	0.01
query21	15.39	0.90	0.56
query22	0.73	0.77	0.69
query23	15.14	1.44	0.59
query24	3.26	1.20	1.84
query25	0.20	0.25	0.10
query26	0.22	0.15	0.14
query27	0.08	0.05	0.04
query28	14.33	0.97	0.44
query29	12.61	3.91	3.23
query30	0.24	0.08	0.07
query31	2.85	0.60	0.38
query32	3.23	0.53	0.47
query33	2.97	3.02	3.02
query34	16.78	5.10	4.53
query35	4.58	4.59	4.57
query36	0.64	0.48	0.49
query37	0.10	0.06	0.06
query38	0.05	0.04	0.03
query39	0.03	0.02	0.02
query40	0.16	0.13	0.12
query41	0.08	0.03	0.02
query42	0.04	0.02	0.02
query43	0.03	0.02	0.02
Total cold run time: 104.5 s
Total hot run time: 29.23 s

@morrySnow morrySnow merged commit 6ef29b1 into branch-3.1 Jul 22, 2025
22 checks passed
@github-actions github-actions bot deleted the auto-pick-53555-branch-3.1 branch July 22, 2025 06:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants