Skip to content

[fix](auditlog) set isQuery to true when query is short circuited(#42647)#43067

Merged
eldenmoon merged 2 commits intobranch-3.0from
auto-pick-42647-branch-3.0
Nov 5, 2024
Merged

[fix](auditlog) set isQuery to true when query is short circuited(#42647)#43067
eldenmoon merged 2 commits intobranch-3.0from
auto-pick-42647-branch-3.0

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

@github-actions github-actions bot commented Nov 1, 2024

PR Body: None
Cherry-picked from #42647

@github-actions
Copy link
Copy Markdown
Contributor Author

github-actions bot commented Nov 1, 2024

run buildall

@doris-robot
Copy link
Copy Markdown

doris-robot commented Nov 1, 2024

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.

@eldenmoon eldenmoon changed the title branch-3.0: [fix](auditlog) set isQuery to true when query is short circuited [fix](auditlog) set isQuery to true when query is short circuited(#42647) Nov 4, 2024
@eldenmoon
Copy link
Copy Markdown
Member

eldenmoon commented Nov 4, 2024

run buildall

@doris-robot
Copy link
Copy Markdown

doris-robot commented Nov 4, 2024

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

------ Round 1 ----------------------------------
q1	17953	7433	7385	7385
q2	2044	156	150	150
q3	12487	1106	1203	1106
q4	10554	763	731	731
q5	7746	2824	2853	2824
q6	230	149	145	145
q7	969	611	609	609
q8	9570	1923	1969	1923
q9	6712	6467	6495	6467
q10	7217	2272	2342	2272
q11	463	265	262	262
q12	412	222	223	222
q13	18426	3086	3161	3086
q14	241	224	227	224
q15	574	538	520	520
q16	651	614	636	614
q17	1228	520	506	506
q18	8568	6683	6675	6675
q19	6458	1060	1023	1023
q20	480	195	197	195
q21	3933	3023	3109	3023
q22	1102	1008	953	953
Total cold run time: 118018 ms
Total hot run time: 40915 ms

----- Round 2, with runtime_filter_mode=off -----
q1	7491	7242	7440	7242
q2	335	236	232	232
q3	3011	2853	2866	2853
q4	2008	1705	1759	1705
q5	5647	5676	5749	5676
q6	224	137	144	137
q7	2112	1751	1781	1751
q8	3236	3453	3482	3453
q9	8808	8781	8800	8781
q10	3495	3490	3514	3490
q11	594	496	492	492
q12	792	598	610	598
q13	16522	3151	3188	3151
q14	295	269	277	269
q15	546	518	518	518
q16	705	670	667	667
q17	1881	1628	1623	1623
q18	8091	7814	7610	7610
q19	1743	1487	1623	1487
q20	2039	1841	1857	1841
q21	9944	5171	5195	5171
q22	1129	1034	1027	1027
Total cold run time: 80648 ms
Total hot run time: 59774 ms

@doris-robot
Copy link
Copy Markdown

doris-robot commented Nov 4, 2024

TPC-DS: Total hot run time: 193119 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 25e213ed97f8296ca3c3d24746ed4878741b800c, data reload: false

query1	1205	922	889	889
query2	6219	2087	2044	2044
query3	10727	3847	3754	3754
query4	69295	28242	23460	23460
query5	5493	429	416	416
query6	414	161	157	157
query7	5843	303	299	299
query8	334	223	230	223
query9	9016	2642	2622	2622
query10	499	265	249	249
query11	17878	15269	15694	15269
query12	163	105	107	105
query13	1559	432	401	401
query14	10016	6939	7277	6939
query15	221	180	176	176
query16	7173	453	462	453
query17	1033	551	544	544
query18	1850	300	291	291
query19	189	147	148	147
query20	112	103	107	103
query21	202	99	103	99
query22	4459	4338	4040	4040
query23	34150	33705	33838	33705
query24	5887	2815	2739	2739
query25	530	416	389	389
query26	673	155	157	155
query27	1726	282	297	282
query28	4260	2514	2480	2480
query29	679	429	424	424
query30	228	158	152	152
query31	973	803	759	759
query32	67	55	54	54
query33	407	272	277	272
query34	895	489	477	477
query35	858	716	721	716
query36	1058	943	924	924
query37	120	73	71	71
query38	3971	3797	3784	3784
query39	1467	1411	1427	1411
query40	195	97	96	96
query41	51	49	46	46
query42	109	97	99	97
query43	529	476	476	476
query44	1115	765	763	763
query45	183	164	161	161
query46	1112	694	700	694
query47	1882	1803	1796	1796
query48	451	363	365	363
query49	749	379	373	373
query50	808	410	396	396
query51	7220	7148	7052	7052
query52	104	88	97	88
query53	257	179	180	179
query54	545	456	437	437
query55	79	76	76	76
query56	258	232	255	232
query57	1222	1101	1102	1101
query58	198	196	202	196
query59	3260	2917	2986	2917
query60	269	241	235	235
query61	102	114	135	114
query62	788	661	670	661
query63	209	179	177	177
query64	1692	611	568	568
query65	3297	3122	3121	3121
query66	708	298	295	295
query67	15654	15291	15149	15149
query68	4896	536	540	536
query69	470	255	244	244
query70	1159	1130	1110	1110
query71	445	253	245	245
query72	6604	3828	3869	3828
query73	765	335	328	328
query74	10260	8915	8884	8884
query75	3381	2632	2625	2625
query76	2603	972	1003	972
query77	510	249	252	249
query78	10697	9584	9545	9545
query79	8690	570	572	570
query80	1884	418	416	416
query81	549	245	246	245
query82	1477	118	110	110
query83	290	132	134	132
query84	283	76	72	72
query85	1108	279	266	266
query86	438	296	280	280
query87	4373	4190	4203	4190
query88	5458	2378	2393	2378
query89	526	292	277	277
query90	2249	178	172	172
query91	174	139	137	137
query92	61	47	51	47
query93	6545	526	519	519
query94	816	282	288	282
query95	333	236	244	236
query96	639	278	287	278
query97	3321	3137	3126	3126
query98	227	193	191	191
query99	1711	1307	1296	1296
Total cold run time: 337837 ms
Total hot run time: 193119 ms

@eldenmoon
Copy link
Copy Markdown
Member

eldenmoon commented Nov 4, 2024

run buildall

@doris-robot
Copy link
Copy Markdown

doris-robot commented Nov 4, 2024

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

------ Round 1 ----------------------------------
q1	17652	7355	7330	7330
q2	2045	155	165	155
q3	10707	1600	1215	1215
q4	10574	738	719	719
q5	7727	2834	2759	2759
q6	240	148	143	143
q7	954	645	619	619
q8	9572	1919	1917	1917
q9	8081	6381	6424	6381
q10	6995	2271	2313	2271
q11	449	259	264	259
q12	457	214	212	212
q13	17793	2968	2945	2945
q14	242	214	233	214
q15	566	512	521	512
q16	659	590	601	590
q17	995	557	540	540
q18	7115	6570	6527	6527
q19	1384	1088	998	998
q20	465	200	205	200
q21	3984	3022	3033	3022
q22	1084	1020	969	969
Total cold run time: 109740 ms
Total hot run time: 40497 ms

----- Round 2, with runtime_filter_mode=off -----
q1	7251	7203	7172	7172
q2	320	228	223	223
q3	2899	2837	2848	2837
q4	1969	1751	1738	1738
q5	5677	5693	5675	5675
q6	218	143	147	143
q7	2190	1794	1760	1760
q8	3272	3492	3452	3452
q9	8711	8823	8776	8776
q10	3505	3500	3482	3482
q11	597	494	489	489
q12	769	566	605	566
q13	16360	3115	3150	3115
q14	304	275	269	269
q15	558	504	506	504
q16	711	666	668	666
q17	1850	1624	1577	1577
q18	7971	7892	7733	7733
q19	7562	1583	1629	1583
q20	2061	1878	1851	1851
q21	5213	5138	5142	5138
q22	1140	993	1042	993
Total cold run time: 81108 ms
Total hot run time: 59742 ms

@doris-robot
Copy link
Copy Markdown

doris-robot commented Nov 4, 2024

TPC-DS: Total hot run time: 193326 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 25e213ed97f8296ca3c3d24746ed4878741b800c, data reload: false

query1	1234	897	976	897
query2	6240	2058	2080	2058
query3	10809	3866	3598	3598
query4	67641	29930	23335	23335
query5	5691	453	440	440
query6	490	171	193	171
query7	6304	304	302	302
query8	344	228	229	228
query9	9325	2652	2642	2642
query10	534	262	244	244
query11	17941	15292	15648	15292
query12	160	101	108	101
query13	1592	440	418	418
query14	11270	7340	6817	6817
query15	221	187	189	187
query16	7362	478	483	478
query17	1065	552	553	552
query18	1886	303	291	291
query19	186	148	147	147
query20	116	107	113	107
query21	215	99	100	99
query22	4190	4171	4339	4171
query23	34122	33888	33807	33807
query24	5588	2859	2839	2839
query25	520	410	402	402
query26	691	157	173	157
query27	1720	297	301	297
query28	3989	2494	2482	2482
query29	672	428	443	428
query30	231	155	164	155
query31	991	792	799	792
query32	63	56	56	56
query33	469	271	277	271
query34	895	483	494	483
query35	854	725	710	710
query36	1057	955	936	936
query37	117	73	71	71
query38	3954	3796	3774	3774
query39	1630	1417	1410	1410
query40	196	96	98	96
query41	52	50	49	49
query42	111	97	95	95
query43	539	492	488	488
query44	1109	775	768	768
query45	182	166	170	166
query46	1124	723	707	707
query47	1918	1785	1818	1785
query48	454	361	379	361
query49	747	405	395	395
query50	806	411	410	410
query51	7259	6981	7067	6981
query52	101	84	88	84
query53	251	181	186	181
query54	559	443	440	440
query55	78	72	73	72
query56	250	227	229	227
query57	1164	1117	1087	1087
query58	198	196	199	196
query59	3095	3113	2833	2833
query60	270	249	251	249
query61	100	120	139	120
query62	785	660	666	660
query63	223	190	179	179
query64	1804	607	624	607
query65	3274	3136	3194	3136
query66	733	284	298	284
query67	15747	15202	15378	15202
query68	4580	566	549	549
query69	422	246	252	246
query70	1172	1114	1104	1104
query71	434	252	262	252
query72	6487	3864	3986	3864
query73	752	336	335	335
query74	10114	8841	8866	8841
query75	3333	2626	2604	2604
query76	2323	999	1009	999
query77	507	258	251	251
query78	10774	9675	9463	9463
query79	9306	580	583	580
query80	1901	409	414	409
query81	560	242	239	239
query82	1317	115	119	115
query83	305	137	140	137
query84	283	81	78	78
query85	1842	288	270	270
query86	471	297	308	297
query87	4483	4236	4239	4236
query88	5622	2388	2385	2385
query89	547	285	292	285
query90	2060	185	183	183
query91	175	136	140	136
query92	57	47	45	45
query93	6659	547	530	530
query94	866	292	282	282
query95	339	246	252	246
query96	625	279	284	279
query97	3362	3101	3132	3101
query98	235	193	186	186
query99	1685	1296	1303	1296
Total cold run time: 339106 ms
Total hot run time: 193326 ms

@eldenmoon
Copy link
Copy Markdown
Member

eldenmoon commented Nov 4, 2024

run buildall

@doris-robot
Copy link
Copy Markdown

doris-robot commented Nov 4, 2024

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

------ Round 1 ----------------------------------
q1	17812	7458	7364	7364
q2	2667	184	149	149
q3	12146	1107	1161	1107
q4	10225	708	692	692
q5	7736	2821	2814	2814
q6	230	149	145	145
q7	977	637	603	603
q8	9350	1953	1961	1953
q9	6738	6437	6402	6402
q10	6958	2260	2273	2260
q11	458	254	256	254
q12	405	218	210	210
q13	17784	2968	2974	2968
q14	231	208	212	208
q15	572	515	502	502
q16	665	589	604	589
q17	961	544	528	528
q18	7321	6735	6587	6587
q19	1374	1034	1026	1026
q20	476	195	200	195
q21	4129	3209	3270	3209
q22	1102	999	1001	999
Total cold run time: 110317 ms
Total hot run time: 40764 ms

----- Round 2, with runtime_filter_mode=off -----
q1	7278	7239	7474	7239
q2	326	230	234	230
q3	2887	2680	2697	2680
q4	1889	1670	1586	1586
q5	5372	5422	5432	5422
q6	211	132	136	132
q7	2060	1650	1621	1621
q8	3176	3323	3373	3323
q9	8542	8405	8425	8405
q10	3444	3400	3375	3375
q11	576	485	489	485
q12	754	559	570	559
q13	16893	2962	2980	2962
q14	303	266	270	266
q15	559	500	510	500
q16	688	645	645	645
q17	1800	1574	1546	1546
q18	7759	7415	7332	7332
q19	3373	1564	1379	1379
q20	1985	1815	1783	1783
q21	5238	5176	5083	5083
q22	1096	1001	993	993
Total cold run time: 76209 ms
Total hot run time: 57546 ms

@doris-robot
Copy link
Copy Markdown

doris-robot commented Nov 4, 2024

TPC-DS: Total hot run time: 189120 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 8af0dd25a8ea0034148e0a5535d17abdfde6ff7b, data reload: false

query1	964	390	380	380
query2	6537	2152	2096	2096
query3	6697	222	229	222
query4	33739	23221	23371	23221
query5	4321	452	437	437
query6	275	180	178	178
query7	4622	311	306	306
query8	292	237	232	232
query9	9413	2652	2636	2636
query10	479	265	269	265
query11	18140	15082	15128	15082
query12	145	98	98	98
query13	1629	426	403	403
query14	9773	7023	6632	6632
query15	211	171	178	171
query16	7776	484	547	484
query17	1518	568	555	555
query18	1965	308	308	308
query19	200	155	152	152
query20	118	108	116	108
query21	206	101	105	101
query22	4376	4126	4253	4126
query23	34472	33830	33971	33830
query24	12353	2811	2799	2799
query25	718	400	403	400
query26	1838	162	163	162
query27	2962	291	305	291
query28	8165	2490	2468	2468
query29	1186	431	439	431
query30	329	165	155	155
query31	1017	793	814	793
query32	100	58	60	58
query33	777	279	270	270
query34	1026	492	499	492
query35	890	706	713	706
query36	1088	936	938	936
query37	281	74	75	74
query38	4134	3882	3896	3882
query39	1478	1421	1412	1412
query40	298	101	103	101
query41	55	51	51	51
query42	114	106	99	99
query43	533	484	490	484
query44	1324	784	794	784
query45	185	167	164	164
query46	1122	720	701	701
query47	1891	1777	1799	1777
query48	454	363	381	363
query49	1310	418	399	399
query50	791	402	413	402
query51	7211	6935	7032	6935
query52	108	92	95	92
query53	260	187	182	182
query54	1199	452	454	452
query55	78	84	80	80
query56	266	258	233	233
query57	1210	1084	1093	1084
query58	243	208	214	208
query59	3041	2827	3134	2827
query60	286	260	270	260
query61	142	120	120	120
query62	877	674	667	667
query63	219	190	187	187
query64	5352	679	588	588
query65	3234	3245	3165	3165
query66	1419	300	312	300
query67	15947	15345	15651	15345
query68	4628	548	538	538
query69	429	250	259	250
query70	1151	1106	1161	1106
query71	423	259	261	259
query72	6573	3908	3902	3902
query73	747	341	344	341
query74	10203	8890	8954	8890
query75	3362	2617	2600	2600
query76	3034	964	978	964
query77	382	270	263	263
query78	10711	9695	9371	9371
query79	9664	581	603	581
query80	2172	420	413	413
query81	566	241	241	241
query82	1415	119	115	115
query83	273	138	146	138
query84	293	82	79	79
query85	2314	301	273	273
query86	490	293	295	293
query87	4527	4350	4098	4098
query88	5779	2380	2363	2363
query89	556	288	286	286
query90	2114	179	178	178
query91	174	144	139	139
query92	65	49	48	48
query93	7546	555	548	548
query94	910	288	286	286
query95	349	246	254	246
query96	633	275	273	273
query97	3315	3147	3234	3147
query98	216	198	193	193
query99	1644	1305	1296	1296
Total cold run time: 322037 ms
Total hot run time: 189120 ms

@eldenmoon eldenmoon merged commit 6429b0d into branch-3.0 Nov 5, 2024
eldenmoon pushed a commit to eldenmoon/incubator-doris that referenced this pull request Nov 12, 2024
@github-actions @eldenmoon
[fix](auditlog) set isQuery to true when query is short circuited(apa…
85a6223 
…che#42647) (apache#43067)

PR Body: None 
 Cherry-picked from apache#42647
@dataroaring dataroaring deleted the auto-pick-42647-branch-3.0 branch December 27, 2024 07:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@doris-robot @eldenmoon