Skip to content

[minor](variant) set variant_nested_group_discard_scalar_on_conflict default to false and refactor nested group interface#61065

Merged
eldenmoon merged 1 commit intoapache:masterfrom
eldenmoon:cf-conflict
Mar 6, 2026
Merged

[minor](variant) set variant_nested_group_discard_scalar_on_conflict default to false and refactor nested group interface#61065
eldenmoon merged 1 commit intoapache:masterfrom
eldenmoon:cf-conflict

Conversation

@eldenmoon
Copy link
Member

No description provided.

Copilot AI review requested due to automatic review settings March 5, 2026 07:13
@Thearas
Copy link
Contributor

Thearas commented Mar 5, 2026

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?

@eldenmoon
Copy link
Member Author

run buildall

Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Updates the BE configuration default for NestedGroup conflict handling in Variant columns, changing the default behavior when scalar data conflicts with NestedGroup array data.

Changes:

  • Set variant_nested_group_discard_scalar_on_conflict default from true to false.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
============================================
q1	17669	4491	4290	4290
q2	q3	10653	787	520	520
q4	4677	364	256	256
q5	7635	1221	1044	1044
q6	177	179	149	149
q7	793	840	670	670
q8	10152	1457	1338	1338
q9	5538	4775	4702	4702
q10	6338	1933	1678	1678
q11	450	268	231	231
q12	744	569	460	460
q13	18064	2961	2158	2158
q14	238	223	216	216
q15	966	812	809	809
q16	764	709	670	670
q17	773	869	408	408
q18	6273	5334	5342	5334
q19	1416	987	617	617
q20	496	502	388	388
q21	4767	1918	1494	1494
q22	388	329	254	254
Total cold run time: 98971 ms
Total hot run time: 27686 ms

----- Round 2, with runtime_filter_mode=off -----
============================================
q1	4784	4678	4665	4665
q2	q3	3919	4337	3847	3847
q4	856	1190	758	758
q5	4051	4382	4359	4359
q6	189	176	140	140
q7	1748	1638	1544	1544
q8	2514	2711	2614	2614
q9	7626	7082	7346	7082
q10	3738	3973	3663	3663
q11	524	482	448	448
q12	494	606	450	450
q13	2849	3139	2319	2319
q14	290	296	264	264
q15	891	861	820	820
q16	716	755	715	715
q17	1161	1403	1328	1328
q18	7108	6709	6856	6709
q19	897	859	878	859
q20	2081	2206	2024	2024
q21	3918	3481	3294	3294
q22	452	423	377	377
Total cold run time: 50806 ms
Total hot run time: 48279 ms

@doris-robot
Copy link

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

query5	4325	640	532	532
query6	326	222	198	198
query7	4201	466	263	263
query8	331	236	230	230
query9	8692	2707	2679	2679
query10	472	380	351	351
query11	7397	5796	5633	5633
query12	186	123	120	120
query13	1243	458	357	357
query14	6116	3905	3542	3542
query14_1	2809	2791	2806	2791
query15	210	195	176	176
query16	998	477	457	457
query17	1139	720	624	624
query18	2478	447	366	366
query19	218	214	185	185
query20	136	133	130	130
query21	227	143	130	130
query22	4922	5107	5034	5034
query23	16691	16155	15737	15737
query23_1	15956	15982	15791	15791
query24	7820	1718	1247	1247
query24_1	1276	1292	1297	1292
query25	620	523	472	472
query26	1314	299	171	171
query27	3279	509	336	336
query28	4478	1879	1878	1878
query29	845	548	468	468
query30	308	244	207	207
query31	1359	1270	1213	1213
query32	79	68	68	68
query33	496	326	270	270
query34	944	920	560	560
query35	642	663	602	602
query36	1088	1144	1034	1034
query37	131	101	83	83
query38	2909	2912	2937	2912
query39	871	866	844	844
query39_1	835	826	824	824
query40	231	150	134	134
query41	62	60	58	58
query42	305	299	293	293
query43	241	246	224	224
query44	
query45	198	189	188	188
query46	882	968	600	600
query47	2138	2162	2059	2059
query48	309	309	247	247
query49	620	478	378	378
query50	678	280	215	215
query51	4198	4178	4068	4068
query52	284	298	286	286
query53	289	337	280	280
query54	295	265	269	265
query55	89	84	82	82
query56	305	319	311	311
query57	1351	1332	1314	1314
query58	287	275	276	275
query59	1345	1429	1360	1360
query60	337	344	320	320
query61	146	143	142	142
query62	642	572	532	532
query63	304	273	275	273
query64	5069	1256	998	998
query65	
query66	1454	452	355	355
query67	16268	16425	16412	16412
query68	
query69	403	307	287	287
query70	978	940	937	937
query71	338	313	298	298
query72	2797	2246	2417	2246
query73	537	542	320	320
query74	9990	9933	9821	9821
query75	2824	2755	2447	2447
query76	2282	1021	657	657
query77	345	382	304	304
query78	11278	11450	10709	10709
query79	1876	815	591	591
query80	1610	617	546	546
query81	580	288	254	254
query82	1001	148	122	122
query83	362	263	246	246
query84	251	119	95	95
query85	1207	484	438	438
query86	413	305	292	292
query87	3120	3137	3008	3008
query88	3555	2671	2642	2642
query89	424	376	339	339
query90	1895	175	172	172
query91	166	158	132	132
query92	78	77	70	70
query93	1113	876	505	505
query94	642	311	291	291
query95	582	333	382	333
query96	645	504	231	231
query97	2492	2533	2471	2471
query98	238	230	221	221
query99	1021	984	924	924
Total cold run time: 236762 ms
Total hot run time: 153378 ms

@doris-robot
Copy link

BE UT Coverage Report

Increment line coverage 🎉

Increment coverage report
Complete coverage report

Category Coverage
Function Coverage 52.56% (19646/37381)
Line Coverage 36.18% (183412/506986)
Region Coverage 32.49% (142335/438100)
Branch Coverage 33.43% (61723/184658)

@hello-stephen
Copy link
Contributor

BE Regression && UT Coverage Report

Increment line coverage 100% (0/0) 🎉

Increment coverage report
Complete coverage report

Category Coverage
Function Coverage 73.23% (26805/36603)
Line Coverage 56.53% (285697/505433)
Region Coverage 54.00% (238823/442237)
Branch Coverage 55.57% (102936/185222)

@eldenmoon eldenmoon changed the title [config](variant) set variant_nested_group_discard_scalar_on_conflict default to false [config](variant) set variant_nested_group_discard_scalar_on_conflict default to false and refactor nested group interface Mar 5, 2026
@eldenmoon eldenmoon changed the title [config](variant) set variant_nested_group_discard_scalar_on_conflict default to false and refactor nested group interface [minor](variant) set variant_nested_group_discard_scalar_on_conflict default to false and refactor nested group interface Mar 5, 2026
@eldenmoon
Copy link
Member Author

run buildall

@eldenmoon
Copy link
Member Author

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
============================================
q1	17648	4457	4318	4318
q2	q3	10645	856	523	523
q4	4673	379	251	251
q5	7562	1193	1024	1024
q6	190	186	148	148
q7	836	869	670	670
q8	9293	1634	1426	1426
q9	5181	4954	4953	4953
q10	6289	1970	1644	1644
q11	472	255	235	235
q12	736	595	461	461
q13	18049	3031	2192	2192
q14	232	222	214	214
q15	942	790	799	790
q16	766	724	680	680
q17	697	918	423	423
q18	5890	5456	5163	5163
q19	1127	1139	626	626
q20	510	505	392	392
q21	4611	2081	1516	1516
q22	392	316	244	244
Total cold run time: 96741 ms
Total hot run time: 27893 ms

----- Round 2, with runtime_filter_mode=off -----
============================================
q1	4711	4675	4670	4670
q2	q3	3949	4346	3858	3858
q4	932	1267	765	765
q5	4076	4432	4394	4394
q6	206	187	143	143
q7	1833	1705	1537	1537
q8	2650	2952	2770	2770
q9	7654	7502	7567	7502
q10	3825	4073	3645	3645
q11	566	453	423	423
q12	560	619	445	445
q13	3026	3356	2336	2336
q14	286	303	284	284
q15	866	800	811	800
q16	711	769	725	725
q17	1332	1596	1333	1333
q18	7422	6851	6566	6566
q19	944	924	922	922
q20	2113	2192	1998	1998
q21	4258	3602	3480	3480
q22	558	421	369	369
Total cold run time: 52478 ms
Total hot run time: 48965 ms

@doris-robot
Copy link

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

query5	4331	640	510	510
query6	334	239	195	195
query7	4221	478	278	278
query8	332	274	229	229
query9	8674	2720	2725	2720
query10	499	398	333	333
query11	7426	5798	5645	5645
query12	182	124	122	122
query13	1240	438	340	340
query14	5679	3890	3592	3592
query14_1	2818	2864	2846	2846
query15	211	197	184	184
query16	1007	492	476	476
query17	855	683	607	607
query18	2416	456	340	340
query19	203	202	172	172
query20	135	129	125	125
query21	222	141	127	127
query22	4889	5088	4932	4932
query23	16510	15868	15573	15573
query23_1	15880	15961	15809	15809
query24	7679	1818	1328	1328
query24_1	1260	1296	1293	1293
query25	597	516	515	515
query26	1330	285	169	169
query27	2958	483	286	286
query28	4554	1868	1864	1864
query29	908	586	492	492
query30	311	246	209	209
query31	1330	1304	1218	1218
query32	83	71	75	71
query33	518	332	281	281
query34	948	966	584	584
query35	640	682	630	630
query36	1065	1080	971	971
query37	133	97	82	82
query38	2946	2962	2913	2913
query39	896	857	861	857
query39_1	824	831	831	831
query40	244	161	139	139
query41	68	64	64	64
query42	307	298	302	298
query43	239	252	229	229
query44	
query45	195	194	202	194
query46	896	986	613	613
query47	2140	2136	2061	2061
query48	321	329	238	238
query49	650	471	398	398
query50	689	275	215	215
query51	4123	4109	4014	4014
query52	295	295	291	291
query53	297	341	282	282
query54	316	279	285	279
query55	91	90	88	88
query56	334	336	315	315
query57	1372	1347	1269	1269
query58	302	291	287	287
query59	1408	1408	1248	1248
query60	353	345	362	345
query61	145	144	146	144
query62	627	586	530	530
query63	309	281	275	275
query64	5132	1303	970	970
query65	
query66	1457	471	348	348
query67	16355	16486	16355	16355
query68	
query69	388	293	272	272
query70	1015	995	948	948
query71	336	305	305	305
query72	2812	2705	2440	2440
query73	535	539	330	330
query74	9982	9939	9759	9759
query75	2854	2763	2457	2457
query76	2288	1025	673	673
query77	351	382	297	297
query78	11153	11306	10658	10658
query79	2504	805	618	618
query80	1783	633	542	542
query81	576	272	249	249
query82	1010	157	115	115
query83	343	274	249	249
query84	302	128	95	95
query85	894	502	434	434
query86	416	336	277	277
query87	3140	3116	2993	2993
query88	3559	2642	2642	2642
query89	422	375	342	342
query90	2021	172	193	172
query91	162	154	137	137
query92	75	76	70	70
query93	1024	829	520	520
query94	647	311	284	284
query95	579	341	388	341
query96	635	517	224	224
query97	2415	2531	2403	2403
query98	233	225	212	212
query99	1001	995	914	914
Total cold run time: 235367 ms
Total hot run time: 153271 ms

@doris-robot
Copy link

BE UT Coverage Report

Increment line coverage 33.33% (1/3) 🎉

Increment coverage report
Complete coverage report

Category Coverage
Function Coverage 52.56% (19646/37381)
Line Coverage 36.17% (183402/506986)
Region Coverage 32.48% (142300/438100)
Branch Coverage 33.43% (61727/184658)

@hello-stephen
Copy link
Contributor

BE Regression && UT Coverage Report

Increment line coverage 33.33% (1/3) 🎉

Increment coverage report
Complete coverage report

Category Coverage
Function Coverage 73.29% (26826/36603)
Line Coverage 56.61% (286130/505433)
Region Coverage 54.14% (239418/442237)
Branch Coverage 55.68% (103130/185222)

@eldenmoon
Copy link
Member Author

skip check_coverage

Copy link
Contributor

@csun5285 csun5285 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 Mar 6, 2026

PR approved by anyone and no changes requested.

Copy link
Member

@airborne12 airborne12 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Clean minor refactor: safer default for variant_nested_group_discard_scalar_on_conflict (throw on conflict instead of silent discard), and init_readers interface extended with ColumnMetaAccessor for downstream use. All implementations and tests updated consistently.

@github-actions
Copy link
Contributor

github-actions bot commented Mar 6, 2026

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 Mar 6, 2026
@eldenmoon eldenmoon merged commit 8c4209b into apache:master Mar 6, 2026
28 of 30 checks passed
mrhhsg pushed a commit that referenced this pull request Mar 6, 2026
…` default to false and refactor nested group interface (#61065)
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.

7 participants