Skip to content

Conversation

@github-actions
Copy link
Contributor

Cherry-picked from #56152

…mpty (#56152)

### What problem does this PR solve?

This PR fixes an issue with Elasticsearch external tables when the table
is empty but contains object type fields. In such cases, the
Elasticsearch mapping still explicitly shows `"type": "object"` for
object fields, but Doris was not handling this type correctly, leading
to type mapping failures.
@github-actions github-actions bot requested a review from morrySnow as a code owner September 22, 2025 20:58
@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 Sep 22, 2025
@hello-stephen
Copy link
Contributor

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17598	5449	5408	5408
q2	2015	389	279	279
q3	12411	1224	725	725
q4	10548	850	457	457
q5	9652	2385	2082	2082
q6	196	163	132	132
q7	875	727	597	597
q8	9333	1386	1152	1152
q9	5240	4913	4841	4841
q10	6760	2267	1839	1839
q11	493	280	265	265
q12	338	358	205	205
q13	17775	3585	2986	2986
q14	231	219	208	208
q15	526	454	474	454
q16	430	424	362	362
q17	599	851	367	367
q18	6815	6259	6351	6259
q19	1587	937	550	550
q20	322	328	206	206
q21	2807	2116	1932	1932
q22	1062	997	972	972
Total cold run time: 107613 ms
Total hot run time: 32278 ms

----- Round 2, with runtime_filter_mode=off -----
q1	5508	5483	5459	5459
q2	229	319	228	228
q3	2241	2576	2329	2329
q4	1361	1789	1393	1393
q5	4346	4959	4952	4952
q6	164	167	127	127
q7	2020	2031	1883	1883
q8	2629	2887	2763	2763
q9	7331	7316	7249	7249
q10	3060	3266	2720	2720
q11	570	521	509	509
q12	637	789	633	633
q13	3501	3835	3230	3230
q14	272	321	275	275
q15	534	481	459	459
q16	436	494	451	451
q17	1228	1762	1249	1249
q18	7768	7654	7394	7394
q19	789	1114	1089	1089
q20	1981	2044	1894	1894
q21	5275	4874	4528	4528
q22	1083	1054	1034	1034
Total cold run time: 52963 ms
Total hot run time: 51848 ms

@doris-robot
Copy link

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

query1	945	397	393	393
query2	6236	1898	1858	1858
query3	8710	210	194	194
query4	33635	23858	23467	23467
query5	3772	597	455	455
query6	296	208	174	174
query7	4203	498	311	311
query8	304	229	242	229
query9	9539	2590	2576	2576
query10	484	324	250	250
query11	17957	15448	15166	15166
query12	164	113	107	107
query13	1555	557	426	426
query14	8887	7218	7620	7218
query15	236	188	178	178
query16	8116	660	504	504
query17	1606	778	569	569
query18	2133	415	341	341
query19	224	192	164	164
query20	124	123	122	122
query21	213	130	106	106
query22	4548	4706	4412	4412
query23	34837	34011	34033	34011
query24	7428	2652	2663	2652
query25	536	496	429	429
query26	780	295	174	174
query27	2295	503	380	380
query28	5398	2225	2222	2222
query29	725	618	469	469
query30	251	195	175	175
query31	989	928	830	830
query32	94	59	61	59
query33	498	377	320	320
query34	774	834	519	519
query35	812	812	719	719
query36	1052	1103	988	988
query37	102	96	70	70
query38	4013	4018	3972	3972
query39	1547	1456	1520	1456
query40	216	119	101	101
query41	48	46	47	46
query42	127	115	111	111
query43	508	521	471	471
query44	1334	819	834	819
query45	183	175	169	169
query46	889	1053	685	685
query47	1976	1998	1924	1924
query48	419	433	373	373
query49	723	518	404	404
query50	667	694	422	422
query51	7316	7299	7371	7299
query52	106	101	93	93
query53	225	252	194	194
query54	560	585	472	472
query55	79	76	85	76
query56	261	264	257	257
query57	1290	1280	1209	1209
query58	232	215	216	215
query59	3008	3047	2976	2976
query60	307	293	265	265
query61	118	109	128	109
query62	816	746	683	683
query63	229	192	192	192
query64	3691	1026	703	703
query65	3440	3265	3290	3265
query66	894	409	305	305
query67	16282	15782	15496	15496
query68	7477	841	552	552
query69	489	299	261	261
query70	1201	1145	1137	1137
query71	420	286	268	268
query72	5204	3750	3754	3750
query73	631	745	361	361
query74	10238	9356	8874	8874
query75	3738	3148	2696	2696
query76	3523	1133	765	765
query77	755	354	271	271
query78	10340	10506	9569	9569
query79	3542	890	601	601
query80	630	526	436	436
query81	488	257	216	216
query82	564	116	85	85
query83	183	158	139	139
query84	283	103	76	76
query85	798	360	303	303
query86	362	311	278	278
query87	4294	4295	4177	4177
query88	4785	2418	2413	2413
query89	400	334	296	296
query90	1813	190	183	183
query91	137	158	108	108
query92	65	54	50	50
query93	1972	932	557	557
query94	638	407	300	300
query95	338	273	268	268
query96	499	604	286	286
query97	3197	3272	3166	3166
query98	220	206	203	203
query99	1523	1400	1288	1288
Total cold run time: 292709 ms
Total hot run time: 191932 ms

@doris-robot
Copy link

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

query1	0.03	0.03	0.03
query2	0.07	0.03	0.03
query3	0.24	0.07	0.07
query4	1.62	0.10	0.11
query5	0.53	0.52	0.54
query6	1.12	0.72	0.72
query7	0.02	0.02	0.02
query8	0.04	0.03	0.03
query9	0.57	0.51	0.51
query10	0.56	0.56	0.56
query11	0.14	0.11	0.10
query12	0.13	0.10	0.10
query13	0.63	0.60	0.59
query14	0.78	0.79	0.78
query15	0.84	0.83	0.83
query16	0.39	0.39	0.38
query17	1.05	1.06	1.05
query18	0.24	0.22	0.22
query19	1.91	1.84	1.75
query20	0.01	0.01	0.01
query21	15.40	0.93	0.58
query22	0.74	0.71	0.53
query23	15.36	1.42	0.53
query24	3.01	0.97	1.20
query25	0.17	0.13	0.14
query26	0.25	0.14	0.14
query27	0.06	0.05	0.05
query28	13.92	1.01	0.43
query29	12.59	3.94	3.27
query30	0.25	0.08	0.07
query31	2.83	0.58	0.39
query32	3.22	0.54	0.46
query33	2.96	3.01	2.99
query34	16.64	5.22	4.54
query35	4.55	4.60	4.51
query36	0.64	0.49	0.47
query37	0.09	0.06	0.06
query38	0.04	0.04	0.04
query39	0.04	0.02	0.03
query40	0.17	0.13	0.12
query41	0.08	0.02	0.02
query42	0.03	0.02	0.02
query43	0.04	0.03	0.03
Total cold run time: 104 s
Total hot run time: 28.77 s

@hello-stephen
Copy link
Contributor

FE UT Coverage Report

Increment line coverage 100% (0/0) 🎉
Increment coverage report
Complete coverage report

@morningman morningman merged commit acacab3 into branch-3.1 Sep 28, 2025
23 of 24 checks passed
@github-actions github-actions bot deleted the auto-pick-56152-branch-3.1 branch September 28, 2025 02:24
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