Skip to content

Conversation

@mrhhsg
Copy link
Member

@mrhhsg mrhhsg commented Jul 15, 2025

What problem does this PR solve?

Fix the incorrect results and remove unused code.

Related PR: #xxx

Problem Summary:

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?

@mrhhsg
Copy link
Member Author

mrhhsg commented Jul 15, 2025

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17611	5520	5438	5438
q2	1929	288	184	184
q3	10301	1384	723	723
q4	10223	1066	539	539
q5	7519	2519	2486	2486
q6	204	176	132	132
q7	978	769	619	619
q8	9309	1484	1267	1267
q9	7362	5388	5375	5375
q10	6944	2400	1973	1973
q11	495	293	264	264
q12	354	396	222	222
q13	17756	3841	3120	3120
q14	227	229	211	211
q15	556	489	479	479
q16	434	444	377	377
q17	613	961	384	384
q18	7576	7219	7132	7132
q19	1072	1097	611	611
q20	366	359	224	224
q21	4021	3238	2421	2421
q22	374	321	294	294
Total cold run time: 106224 ms
Total hot run time: 34475 ms

----- Round 2, with runtime_filter_mode=off -----
q1	5509	5511	5530	5511
q2	263	340	220	220
q3	2253	2716	2377	2377
q4	1379	1823	1351	1351
q5	4564	4623	4481	4481
q6	264	191	131	131
q7	2113	1975	1850	1850
q8	2976	2891	2918	2891
q9	7402	7104	7449	7104
q10	3184	3375	2878	2878
q11	615	532	495	495
q12	730	788	651	651
q13	3926	4093	3304	3304
q14	301	328	282	282
q15	553	486	471	471
q16	459	521	464	464
q17	1273	1825	1432	1432
q18	8000	7746	7887	7746
q19	909	905	1176	905
q20	2061	2042	2007	2007
q21	5242	4753	4601	4601
q22	707	619	561	561
Total cold run time: 54683 ms
Total hot run time: 51713 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 189368 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 1c95b0aa17cc86de8a4aedee58c0d774264339cb, data reload: false

query1	997	408	388	388
query2	6505	1646	1706	1646
query3	6741	214	213	213
query4	26527	23958	22962	22962
query5	4372	579	431	431
query6	300	223	213	213
query7	4630	506	288	288
query8	279	216	207	207
query9	8632	2629	2665	2629
query10	459	334	285	285
query11	15479	15229	15361	15229
query12	159	108	108	108
query13	1664	520	389	389
query14	9317	6115	6078	6078
query15	204	205	178	178
query16	7677	439	263	263
query17	1319	727	610	610
query18	2026	412	305	305
query19	245	188	156	156
query20	122	114	113	113
query21	211	131	111	111
query22	4213	4592	4663	4592
query23	35289	34382	33789	33789
query24	8450	2376	2395	2376
query25	508	474	388	388
query26	1228	266	145	145
query27	2740	506	337	337
query28	4291	2143	2117	2117
query29	721	546	438	438
query30	283	217	195	195
query31	951	865	777	777
query32	78	61	58	58
query33	571	350	277	277
query34	813	836	507	507
query35	618	661	572	572
query36	992	1011	899	899
query37	113	100	76	76
query38	4204	4061	4163	4061
query39	1480	1421	1460	1421
query40	209	122	112	112
query41	57	52	51	51
query42	118	103	104	103
query43	484	518	492	492
query44	1327	840	824	824
query45	179	168	168	168
query46	830	1019	617	617
query47	1734	1816	1710	1710
query48	375	425	299	299
query49	724	466	374	374
query50	659	711	431	431
query51	5535	5642	5366	5366
query52	109	104	101	101
query53	224	254	183	183
query54	576	577	486	486
query55	81	78	84	78
query56	302	309	277	277
query57	1185	1170	1147	1147
query58	264	260	257	257
query59	2553	2604	2578	2578
query60	336	328	310	310
query61	127	124	150	124
query62	799	732	665	665
query63	219	186	184	184
query64	4255	1201	870	870
query65	4281	4191	4202	4191
query66	1077	442	303	303
query67	16004	15875	15518	15518
query68	7931	903	534	534
query69	504	334	274	274
query70	1232	1163	1140	1140
query71	464	312	296	296
query72	5612	4779	4880	4779
query73	730	638	353	353
query74	9008	9083	9021	9021
query75	3844	3194	2795	2795
query76	3714	1143	725	725
query77	782	377	289	289
query78	10820	11140	10332	10332
query79	2202	844	586	586
query80	609	521	438	438
query81	475	268	222	222
query82	456	128	101	101
query83	249	251	236	236
query84	239	111	85	85
query85	788	417	313	313
query86	385	335	295	295
query87	4464	4411	4371	4371
query88	3728	2312	2295	2295
query89	395	320	283	283
query90	1844	222	214	214
query91	140	144	113	113
query92	76	67	58	58
query93	1708	981	598	598
query94	673	324	215	215
query95	371	297	290	290
query96	503	581	284	284
query97	2715	2723	2658	2658
query98	227	203	205	203
query99	1330	1414	1326	1326
Total cold run time: 278249 ms
Total hot run time: 189368 ms

@doris-robot
Copy link

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

query1	0.04	0.04	0.03
query2	0.08	0.04	0.05
query3	0.25	0.08	0.07
query4	1.62	0.11	0.10
query5	0.44	0.44	0.42
query6	1.17	0.66	0.67
query7	0.02	0.02	0.02
query8	0.05	0.05	0.04
query9	0.60	0.52	0.51
query10	0.57	0.57	0.59
query11	0.16	0.11	0.12
query12	0.15	0.12	0.11
query13	0.64	0.61	0.62
query14	0.80	0.83	0.82
query15	0.89	0.87	0.87
query16	0.39	0.39	0.39
query17	1.10	1.11	1.05
query18	0.23	0.21	0.21
query19	1.93	1.88	1.80
query20	0.02	0.01	0.01
query21	15.41	0.90	0.56
query22	0.76	1.15	0.65
query23	14.95	1.41	0.64
query24	6.58	1.88	1.04
query25	0.48	0.14	0.15
query26	0.64	0.17	0.15
query27	0.06	0.05	0.05
query28	9.90	0.85	0.45
query29	12.53	3.94	3.35
query30	3.06	2.99	2.93
query31	2.82	0.58	0.39
query32	3.24	0.56	0.48
query33	3.13	3.04	3.09
query34	16.26	5.49	4.85
query35	4.93	4.87	4.83
query36	0.68	0.52	0.50
query37	0.09	0.06	0.06
query38	0.05	0.04	0.04
query39	0.04	0.02	0.02
query40	0.18	0.15	0.14
query41	0.08	0.03	0.03
query42	0.03	0.02	0.03
query43	0.04	0.04	0.03
Total cold run time: 107.09 s
Total hot run time: 32.83 s

@hello-stephen
Copy link
Contributor

BE UT Coverage Report

Increment line coverage 0.00% (0/6) 🎉

Increment coverage report
Complete coverage report

Category Coverage
Function Coverage 57.52% (15736/27358)
Line Coverage 46.17% (140359/304027)
Region Coverage 35.45% (104634/295156)
Branch Coverage 38.05% (46105/121160)

@mrhhsg
Copy link
Member Author

mrhhsg commented Jul 15, 2025

run p0

Copy link
Member

@eldenmoon eldenmoon 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

PR approved by at least one committer and no changes requested.

@github-actions github-actions bot added approved Indicates a PR has been approved by one committer. reviewed labels Jul 16, 2025
@github-actions
Copy link
Contributor

PR approved by anyone and no changes requested.

@mrhhsg mrhhsg merged commit da01b9b into apache:master Jul 16, 2025
27 of 30 checks passed
@mrhhsg mrhhsg deleted the fix_json_contains branch July 16, 2025 03:58
mrhhsg added a commit to mrhhsg/doris that referenced this pull request Jul 16, 2025
Fix the incorrect results and remove unused code.

Related PR: #xxx

Problem Summary:

None

- Test <!-- At least one of them must be included. -->
    - [ ] 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 <!-- Add your reason?  -->

- Behavior changed:
    - [ ] No.
    - [ ] Yes. <!-- Explain the behavior change -->

- Does this need documentation?
    - [ ] No.
- [ ] Yes. <!-- Add document PR link here. eg:
apache/doris-website#1214 -->

- [ ] Confirm the release note
- [ ] Confirm test cases
- [ ] Confirm document
- [ ] Add branch pick label <!-- Add branch pick label that this PR
should merge into -->
mrhhsg added a commit to mrhhsg/doris that referenced this pull request Jul 16, 2025
Fix the incorrect results and remove unused code.

Related PR: #xxx

Problem Summary:

None

- Test <!-- At least one of them must be included. -->
    - [ ] 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 <!-- Add your reason?  -->

- Behavior changed:
    - [ ] No.
    - [ ] Yes. <!-- Explain the behavior change -->

- Does this need documentation?
    - [ ] No.
- [ ] Yes. <!-- Add document PR link here. eg:
apache/doris-website#1214 -->

- [ ] Confirm the release note
- [ ] Confirm test cases
- [ ] Confirm document
- [ ] Add branch pick label <!-- Add branch pick label that this PR
should merge into -->
dataroaring pushed a commit that referenced this pull request Jul 17, 2025
Fix the incorrect results and remove unused code.

Pick: #53291
mrhhsg added a commit to mrhhsg/doris that referenced this pull request Jul 17, 2025
@lucienlgl
Copy link

When I was using version 2.1.8, I also encountered a situation where the json_contains function returned incorrect results. I would like to confirm if this is the same issue as this one? If so, is there any plan to fix version 2.1.x?

My test case:

  1. SELECT JSON_CONTAINS('{}', '{"key": "key1", "value": "value1"}'); --- return 1
  2. SELECT JSON_CONTAINS('{"2":"2","1":"1","3":"3"}', '{"key": "value"}'); --- return 1

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. dev/3.0.7-merged dev/3.1.0-merged reviewed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants