[fix](inverted index) multi_match supports any, all, phrase. #41663

zzzxl1993 · 2024-10-10T09:35:20Z

Implemented multi_match query support for 'any', 'all', and 'phrase' types as the second to last argument.
select * from tbl where multi_match(c1, c2, 'any | all | phrase | phrase_prefix', 'x');

doris-robot · 2024-10-10T09:35:26Z

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See How to process your PR

Since 2024-03-18, the Document has been moved to doris-website.
See Doris Document.

zzzxl1993 · 2024-10-10T09:35:33Z

run buildall

github-actions · 2024-10-10T09:40:02Z

clang-tidy review says "All clean, LGTM! 👍"

doris-robot · 2024-10-10T10:09:46Z

TeamCity be ut coverage result:
Function Coverage: 37.41% (9662/25825)
Line Coverage: 28.68% (80164/279471)
Region Coverage: 28.12% (41455/147419)
Branch Coverage: 24.72% (21109/85402)
Coverage Report: http://coverage.selectdb-in.cc/coverage/ae91cfe1badb1cf5e4857d8987b59d64be30b257_ae91cfe1badb1cf5e4857d8987b59d64be30b257/report/index.html

airborne12

LGTM

github-actions · 2024-10-10T10:21:14Z

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

github-actions · 2024-10-10T10:21:17Z

PR approved by anyone and no changes requested.

csun5285

LGTM

qidaye

LGTM

doris-robot · 2024-10-12T03:09:22Z

TPC-H: Total hot run time: 40986 ms

machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/tpch-tools
Tpch sf100 test result on commit ae91cfe1badb1cf5e4857d8987b59d64be30b257, data reload: false

------ Round 1 ----------------------------------
q1	17589	7348	7325	7325
q2	2009	282	264	264
q3	12106	1040	1162	1040
q4	10566	781	802	781
q5	7755	2875	2832	2832
q6	240	151	146	146
q7	985	635	603	603
q8	9343	1940	1982	1940
q9	6537	6463	6413	6413
q10	6946	2293	2338	2293
q11	439	246	245	245
q12	412	227	227	227
q13	17760	2993	2976	2976
q14	237	206	206	206
q15	573	518	520	518
q16	650	581	573	573
q17	966	511	498	498
q18	7191	6673	6750	6673
q19	1368	940	1032	940
q20	470	205	195	195
q21	4012	3284	3461	3284
q22	1138	1014	1020	1014
Total cold run time: 109292 ms
Total hot run time: 40986 ms

----- Round 2, with runtime_filter_mode=off -----
q1	7321	7261	7257	7257
q2	329	234	239	234
q3	3038	2914	2933	2914
q4	2102	1831	1790	1790
q5	5735	5734	5692	5692
q6	229	149	149	149
q7	2252	1857	1782	1782
q8	3353	3559	3426	3426
q9	8871	8910	8836	8836
q10	3580	3523	3527	3523
q11	574	523	490	490
q12	822	680	656	656
q13	10803	3192	3166	3166
q14	320	272	270	270
q15	582	530	529	529
q16	682	650	645	645
q17	1860	1640	1601	1601
q18	8260	7886	7372	7372
q19	1686	1357	1370	1357
q20	2109	1866	1854	1854
q21	5568	5381	5347	5347
q22	1145	1053	1039	1039
Total cold run time: 71221 ms
Total hot run time: 59929 ms

doris-robot · 2024-10-12T03:21:25Z

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

query1	919	393	410	393
query2	6241	2041	1977	1977
query3	8683	194	196	194
query4	34134	23633	23760	23633
query5	3543	483	487	483
query6	266	163	159	159
query7	4181	299	298	298
query8	276	219	228	219
query9	9479	2683	2657	2657
query10	476	279	267	267
query11	17777	15221	15279	15221
query12	156	99	95	95
query13	1579	458	439	439
query14	9657	7416	6601	6601
query15	246	177	180	177
query16	7994	437	416	416
query17	1664	625	586	586
query18	2150	336	326	326
query19	366	158	152	152
query20	124	116	116	116
query21	212	105	102	102
query22	4800	4368	4354	4354
query23	35024	34073	33979	33979
query24	10982	2875	2932	2875
query25	624	405	403	403
query26	1177	162	162	162
query27	2286	305	300	300
query28	7427	2407	2406	2406
query29	841	435	433	433
query30	255	148	151	148
query31	1023	810	804	804
query32	98	54	55	54
query33	757	302	298	298
query34	910	493	515	493
query35	872	722	720	720
query36	1086	949	954	949
query37	157	85	86	85
query38	3963	3924	3816	3816
query39	1487	1403	1432	1403
query40	210	97	96	96
query41	46	44	44	44
query42	121	98	99	98
query43	524	492	470	470
query44	1223	800	794	794
query45	193	162	164	162
query46	1154	716	725	716
query47	1896	1814	1798	1798
query48	448	348	356	348
query49	914	412	406	406
query50	823	415	420	415
query51	7018	6879	6917	6879
query52	97	84	91	84
query53	259	182	180	180
query54	1219	480	485	480
query55	82	79	79	79
query56	280	264	295	264
query57	1244	1139	1134	1134
query58	221	226	235	226
query59	3096	2930	2812	2812
query60	296	256	282	256
query61	109	101	100	100
query62	871	669	685	669
query63	229	196	194	194
query64	3909	637	616	616
query65	3274	3162	3205	3162
query66	828	299	302	299
query67	15780	15504	15451	15451
query68	4672	572	571	571
query69	451	298	295	295
query70	1203	1132	1121	1121
query71	336	267	266	266
query72	7136	4043	3886	3886
query73	761	357	358	357
query74	10275	8980	8931	8931
query75	3377	2697	2659	2659
query76	2596	904	932	904
query77	418	301	302	301
query78	11514	10060	9506	9506
query79	2637	586	602	586
query80	1806	451	431	431
query81	581	236	234	234
query82	622	136	134	134
query83	289	133	136	133
query84	277	76	77	76
query85	989	290	288	288
query86	496	305	297	297
query87	4399	4286	4281	4281
query88	4266	2426	2424	2424
query89	411	296	281	281
query90	2096	186	183	183
query91	146	107	107	107
query92	67	48	46	46
query93	2291	564	557	557
query94	1085	292	292	292
query95	352	249	253	249
query96	607	291	279	279
query97	3251	3125	3116	3116
query98	210	200	198	198
query99	1558	1331	1290	1290
Total cold run time: 301431 ms
Total hot run time: 190704 ms

doris-robot · 2024-10-12T03:26:53Z

ClickBench: Total hot run time: 33.03 s

machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/clickbench-tools
ClickBench test result on commit ae91cfe1badb1cf5e4857d8987b59d64be30b257, data reload: false

query1	0.04	0.03	0.02
query2	0.07	0.03	0.03
query3	0.23	0.07	0.06
query4	1.65	0.10	0.10
query5	0.51	0.51	0.52
query6	1.14	0.73	0.73
query7	0.02	0.01	0.01
query8	0.04	0.03	0.03
query9	0.57	0.53	0.49
query10	0.54	0.55	0.54
query11	0.14	0.11	0.11
query12	0.13	0.11	0.11
query13	0.60	0.59	0.59
query14	2.73	2.78	2.74
query15	0.90	0.82	0.84
query16	0.38	0.38	0.38
query17	1.04	1.08	1.05
query18	0.20	0.19	0.20
query19	1.88	1.91	1.99
query20	0.01	0.01	0.02
query21	15.35	0.61	0.62
query22	2.98	2.50	1.73
query23	16.97	1.06	0.85
query24	3.22	1.31	2.08
query25	0.23	0.17	0.07
query26	0.68	0.13	0.13
query27	0.05	0.04	0.04
query28	9.47	1.10	1.07
query29	12.57	3.26	3.22
query30	0.24	0.06	0.06
query31	2.86	0.39	0.37
query32	3.30	0.48	0.46
query33	2.97	2.98	3.05
query34	16.85	4.46	4.46
query35	4.50	4.48	4.48
query36	0.66	0.47	0.46
query37	0.08	0.06	0.07
query38	0.04	0.03	0.04
query39	0.03	0.02	0.02
query40	0.14	0.12	0.12
query41	0.08	0.02	0.02
query42	0.03	0.02	0.02
query43	0.03	0.03	0.03
Total cold run time: 106.15 s
Total hot run time: 33.03 s

zzzxl1993 · 2024-10-15T07:27:03Z

run buildall

github-actions · 2024-10-15T07:30:59Z

clang-tidy review says "All clean, LGTM! 👍"

doris-robot · 2024-10-15T07:54:30Z

TeamCity be ut coverage result:
Function Coverage: 37.45% (9706/25916)
Line Coverage: 28.72% (80566/280493)
Region Coverage: 28.18% (41692/147972)
Branch Coverage: 24.75% (21199/85638)
Coverage Report: http://coverage.selectdb-in.cc/coverage/a8bca8f9e6a808c14d90886623ad3aa203bd060b_a8bca8f9e6a808c14d90886623ad3aa203bd060b/report/index.html

doris-robot · 2024-10-15T08:04:57Z

TPC-H: Total hot run time: 41474 ms

machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/tpch-tools
Tpch sf100 test result on commit a8bca8f9e6a808c14d90886623ad3aa203bd060b, data reload: false

------ Round 1 ----------------------------------
q1	17621	7485	7305	7305
q2	2047	285	274	274
q3	12106	1056	1116	1056
q4	10591	880	854	854
q5	7764	3109	3036	3036
q6	243	157	152	152
q7	1033	614	601	601
q8	9356	1929	1962	1929
q9	6568	6517	6387	6387
q10	7055	2413	2455	2413
q11	446	252	243	243
q12	414	229	227	227
q13	17754	3040	3070	3040
q14	247	206	218	206
q15	587	516	513	513
q16	643	572	594	572
q17	987	584	609	584
q18	7352	6769	6901	6769
q19	1351	1023	992	992
q20	483	186	185	185
q21	4003	3226	3133	3133
q22	1133	1019	1003	1003
Total cold run time: 109784 ms
Total hot run time: 41474 ms

----- Round 2, with runtime_filter_mode=off -----
q1	7404	7368	7330	7330
q2	324	241	241	241
q3	3123	3041	3138	3041
q4	2149	1860	1908	1860
q5	5926	5950	5946	5946
q6	251	157	158	157
q7	2323	1977	1998	1977
q8	3509	3524	3638	3524
q9	9094	9000	8999	8999
q10	3611	3563	3540	3540
q11	608	493	494	493
q12	865	634	607	607
q13	15778	3168	3182	3168
q14	313	276	273	273
q15	560	529	516	516
q16	668	637	651	637
q17	1870	1660	1616	1616
q18	8309	7927	7504	7504
q19	1756	1698	1551	1551
q20	2123	1846	1898	1846
q21	5723	5491	5316	5316
q22	1157	1079	1025	1025
Total cold run time: 77444 ms
Total hot run time: 61167 ms

doris-robot · 2024-10-15T08:17:02Z

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

query1	922	394	398	394
query2	6265	2050	2021	2021
query3	8690	198	209	198
query4	34132	23712	23489	23489
query5	3496	493	461	461
query6	271	162	159	159
query7	4193	295	288	288
query8	290	227	237	227
query9	9414	2751	2754	2751
query10	455	279	287	279
query11	17838	15224	15179	15179
query12	136	99	99	99
query13	1558	457	409	409
query14	10254	7671	7535	7535
query15	280	168	179	168
query16	7750	494	495	494
query17	1619	630	578	578
query18	1481	316	312	312
query19	385	161	158	158
query20	119	117	118	117
query21	216	105	106	105
query22	4939	4522	4563	4522
query23	34989	34142	34365	34142
query24	11043	2794	2781	2781
query25	606	409	394	394
query26	1115	159	165	159
query27	2235	293	284	284
query28	7332	2473	2422	2422
query29	745	428	424	424
query30	269	150	154	150
query31	1034	784	821	784
query32	103	54	58	54
query33	768	307	300	300
query34	957	506	512	506
query35	930	773	760	760
query36	1137	941	971	941
query37	147	88	90	88
query38	4055	3913	3895	3895
query39	1485	1427	1448	1427
query40	213	99	98	98
query41	46	44	44	44
query42	117	98	101	98
query43	551	490	499	490
query44	1320	822	825	822
query45	194	163	164	163
query46	1129	712	734	712
query47	1931	1820	1822	1820
query48	424	325	320	320
query49	949	431	418	418
query50	831	390	408	390
query51	7039	6981	6897	6897
query52	99	87	96	87
query53	256	181	185	181
query54	1201	432	442	432
query55	84	78	81	78
query56	283	273	284	273
query57	1282	1154	1121	1121
query58	229	223	228	223
query59	3136	2986	2900	2900
query60	302	271	257	257
query61	109	119	100	100
query62	855	664	660	660
query63	220	199	191	191
query64	4026	640	613	613
query65	3269	3265	3226	3226
query66	823	299	294	294
query67	15852	16139	15810	15810
query68	4416	561	563	561
query69	563	285	287	285
query70	1213	1148	1139	1139
query71	360	280	273	273
query72	7502	3999	3997	3997
query73	777	353	360	353
query74	10526	9021	9130	9021
query75	3654	2728	2667	2667
query76	3451	836	939	836
query77	657	315	313	313
query78	10519	9605	9665	9605
query79	1142	610	603	603
query80	2634	456	456	456
query81	581	240	235	235
query82	409	146	142	142
query83	308	139	131	131
query84	281	73	68	68
query85	1457	294	297	294
query86	409	313	303	303
query87	4579	4371	4365	4365
query88	3525	2235	2165	2165
query89	407	294	292	292
query90	2139	188	186	186
query91	137	102	100	100
query92	68	53	49	49
query93	1150	545	532	532
query94	1166	298	299	298
query95	355	247	253	247
query96	623	284	293	284
query97	3273	3127	3164	3127
query98	214	205	198	198
query99	1578	1309	1300	1300
Total cold run time: 300496 ms
Total hot run time: 192597 ms

doris-robot · 2024-10-15T08:22:30Z

ClickBench: Total hot run time: 32.65 s

machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/clickbench-tools
ClickBench test result on commit a8bca8f9e6a808c14d90886623ad3aa203bd060b, data reload: false

query1	0.03	0.03	0.03
query2	0.06	0.03	0.03
query3	0.23	0.06	0.06
query4	1.64	0.10	0.10
query5	0.52	0.50	0.51
query6	1.15	0.72	0.72
query7	0.01	0.03	0.02
query8	0.04	0.04	0.03
query9	0.57	0.51	0.49
query10	0.56	0.56	0.55
query11	0.14	0.11	0.11
query12	0.14	0.11	0.11
query13	0.61	0.60	0.59
query14	2.70	2.75	2.80
query15	0.90	0.82	0.82
query16	0.38	0.38	0.38
query17	1.02	1.07	1.08
query18	0.20	0.19	0.20
query19	1.92	1.80	1.97
query20	0.01	0.00	0.00
query21	15.36	0.61	0.61
query22	3.03	2.25	1.65
query23	17.01	1.08	0.86
query24	3.24	1.00	0.99
query25	0.31	0.09	0.10
query26	0.46	0.13	0.13
query27	0.04	0.04	0.03
query28	10.56	1.10	1.07
query29	12.58	3.30	3.26
query30	0.24	0.06	0.06
query31	2.88	0.39	0.38
query32	3.27	0.46	0.45
query33	3.02	3.00	3.06
query34	17.18	4.48	4.49
query35	4.47	4.54	4.46
query36	0.67	0.49	0.50
query37	0.08	0.05	0.06
query38	0.05	0.03	0.03
query39	0.04	0.02	0.02
query40	0.17	0.13	0.12
query41	0.08	0.02	0.02
query42	0.03	0.03	0.02
query43	0.03	0.03	0.03
Total cold run time: 107.63 s
Total hot run time: 32.65 s

airborne12

LGTM

…41663) 1. Implemented multi_match query support for 'any', 'all', and 'phrase' types as the second to last argument. 2. select * from tbl where multi_match(c1, c2, 'any | all | phrase | phrase_prefix', 'x');

…#42097) #41663

…41663) 1. Implemented multi_match query support for 'any', 'all', and 'phrase' types as the second to last argument. 2. select * from tbl where multi_match(c1, c2, 'any | all | phrase | phrase_prefix', 'x');

…#43396) pick #41663

airborne12 approved these changes Oct 10, 2024

View reviewed changes

github-actions bot added approved Indicates a PR has been approved by one committer. reviewed labels Oct 10, 2024

csun5285 approved these changes Oct 10, 2024

View reviewed changes

qidaye approved these changes Oct 10, 2024

View reviewed changes

[fix](inverted index) multi_match supports any, all, phrase.

a8bca8f

zzzxl1993 force-pushed the 202410101616 branch from ae91cfe to a8bca8f Compare October 15, 2024 07:26

airborne12 added dev/2.1.x dev/3.0.x labels Oct 16, 2024

airborne12 approved these changes Oct 16, 2024

View reviewed changes

airborne12 merged commit 5c1c4f1 into apache:master Oct 16, 2024

This was referenced Oct 18, 2024

[fix] Implementing match_phrase_edge without index query method (#41658) #42098

Merged

[fix](inverted index) multi_match supports any, all, phrase. (#41663) #42097

Merged

yiguolei pushed a commit that referenced this pull request Oct 22, 2024

[fix](inverted index) multi_match supports any, all, phrase. (#41663) (…

1f8d685

…#42097) #41663

yiguolei added dev/2.1.7-merged and removed dev/2.1.x labels Oct 22, 2024

zzzxl1993 mentioned this pull request Nov 7, 2024

[fix](inverted index) multi_match supports any, all, phrase. (#41663) #43396

Merged

airborne12 pushed a commit that referenced this pull request Nov 8, 2024

[fix](inverted index) multi_match supports any, all, phrase. (#41663) (…

9d96a4b

…#43396) pick #41663

airborne12 added dev/3.0.3-merged and removed dev/3.0.x labels Nov 8, 2024

[fix](inverted index) multi_match supports any, all, phrase. #41663

[fix](inverted index) multi_match supports any, all, phrase. #41663

Uh oh!

Conversation

zzzxl1993 commented Oct 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

doris-robot commented Oct 10, 2024

Uh oh!

zzzxl1993 commented Oct 10, 2024

Uh oh!

github-actions bot commented Oct 10, 2024

Uh oh!

doris-robot commented Oct 10, 2024

Uh oh!

airborne12 left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Oct 10, 2024

Uh oh!

github-actions bot commented Oct 10, 2024

Uh oh!

csun5285 left a comment

Choose a reason for hiding this comment

Uh oh!

qidaye left a comment

Choose a reason for hiding this comment

Uh oh!

doris-robot commented Oct 12, 2024

Uh oh!

doris-robot commented Oct 12, 2024

Uh oh!

doris-robot commented Oct 12, 2024

Uh oh!

zzzxl1993 commented Oct 15, 2024

Uh oh!

github-actions bot commented Oct 15, 2024

Uh oh!

doris-robot commented Oct 15, 2024

Uh oh!

doris-robot commented Oct 15, 2024

Uh oh!

doris-robot commented Oct 15, 2024

Uh oh!

doris-robot commented Oct 15, 2024

Uh oh!

airborne12 left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

zzzxl1993 commented Oct 10, 2024 •

edited

Loading