Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fix](audit_loader) fix that old external audit loader plugin not work because of incompatibility with new audit plugin #40565

Merged
merged 1 commit into from
Sep 10, 2024

Conversation

caiconghui
Copy link
Contributor

@caiconghui caiconghui commented Sep 9, 2024

1、rename org.apache.doris.plugin.audit.AuditLoaderPlugin to org.apache.doris.plugin.audit.AuditLoader to avoid potential conflict with old external audit plugin
2、rename org.apache.doris.plugin.audit.AuditEvent to org.apache.doris.plugin.AuditEvent to keep eventFilter in AuditPlugin be compatible with old external audit plugin

…k because of incompatibility with new audit plugin
@doris-robot
Copy link

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.

@caiconghui
Copy link
Contributor Author

run buildall

@caiconghui caiconghui added the kind/fix Categorizes issue or PR as related to a bug. label Sep 9, 2024
@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17607	4343	4331	4331
q2	2019	190	183	183
q3	11680	934	1134	934
q4	10507	718	702	702
q5	7755	2817	2803	2803
q6	226	141	140	140
q7	958	610	591	591
q8	9318	2080	2067	2067
q9	7280	6538	6556	6538
q10	7004	2206	2214	2206
q11	465	246	239	239
q12	389	232	236	232
q13	17765	3110	3121	3110
q14	292	242	247	242
q15	538	497	496	496
q16	528	426	424	424
q17	979	731	649	649
q18	7312	6944	6787	6787
q19	1398	1051	884	884
q20	673	335	334	334
q21	3956	3267	2895	2895
q22	1136	1032	991	991
Total cold run time: 109785 ms
Total hot run time: 37778 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4352	4294	4252	4252
q2	378	281	274	274
q3	2859	2667	2627	2627
q4	1961	1651	1678	1651
q5	5534	5686	5699	5686
q6	233	141	153	141
q7	2224	1819	1873	1819
q8	3361	3468	3462	3462
q9	8982	8939	8831	8831
q10	3557	3397	3413	3397
q11	600	520	521	520
q12	839	696	676	676
q13	15283	3270	3365	3270
q14	330	295	302	295
q15	539	497	526	497
q16	539	491	504	491
q17	1835	1586	1536	1536
q18	8115	7781	8049	7781
q19	1777	1543	1533	1533
q20	2174	1992	1975	1975
q21	6036	5882	5790	5790
q22	1216	1122	1127	1122
Total cold run time: 72724 ms
Total hot run time: 57626 ms

@doris-robot
Copy link

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

query1	3042	891	877	877
query2	6402	1910	1941	1910
query3	10602	3992	3949	3949
query4	33175	23069	23170	23069
query5	3807	500	490	490
query6	243	161	162	161
query7	3941	291	302	291
query8	277	221	217	217
query9	8628	2512	2485	2485
query10	429	262	258	258
query11	17630	14940	15233	14940
query12	158	97	96	96
query13	1527	371	348	348
query14	9770	7314	7108	7108
query15	253	167	203	167
query16	8000	508	487	487
query17	1586	597	602	597
query18	2207	304	320	304
query19	295	153	150	150
query20	121	111	112	111
query21	205	109	111	109
query22	4709	4547	4458	4458
query23	36445	34351	33720	33720
query24	10984	2841	2797	2797
query25	507	383	390	383
query26	707	156	150	150
query27	2163	271	268	268
query28	6663	2022	2001	2001
query29	632	398	407	398
query30	266	148	148	148
query31	950	773	754	754
query32	99	54	61	54
query33	739	284	278	278
query34	897	478	461	461
query35	849	708	708	708
query36	1077	958	954	954
query37	152	87	88	87
query38	3973	3886	3808	3808
query39	1457	1391	1403	1391
query40	206	117	118	117
query41	48	48	47	47
query42	118	100	95	95
query43	506	487	463	463
query44	1208	749	746	746
query45	196	165	169	165
query46	1112	742	720	720
query47	1895	1800	1811	1800
query48	374	291	297	291
query49	889	460	463	460
query50	812	408	417	408
query51	7011	6976	6921	6921
query52	102	91	90	90
query53	252	185	185	185
query54	936	466	467	466
query55	75	80	77	77
query56	287	274	267	267
query57	1184	1082	1078	1078
query58	235	235	243	235
query59	3129	2780	2836	2780
query60	303	280	279	279
query61	125	122	119	119
query62	776	644	642	642
query63	224	193	182	182
query64	3890	760	756	756
query65	3221	3134	3159	3134
query66	772	345	352	345
query67	15763	15416	15451	15416
query68	4477	567	569	567
query69	426	281	288	281
query70	1190	1095	1055	1055
query71	349	284	276	276
query72	6417	4210	4098	4098
query73	746	317	319	317
query74	9133	8866	8826	8826
query75	3364	2712	2730	2712
query76	2554	964	953	953
query77	447	323	331	323
query78	9948	9089	9055	9055
query79	2350	526	539	526
query80	964	520	493	493
query81	596	229	226	226
query82	794	139	132	132
query83	262	149	147	147
query84	226	73	75	73
query85	1534	287	280	280
query86	450	276	299	276
query87	4362	4446	4287	4287
query88	4247	2280	2246	2246
query89	407	289	282	282
query90	1799	190	188	188
query91	127	99	98	98
query92	61	49	48	48
query93	2331	544	528	528
query94	849	292	298	292
query95	351	245	251	245
query96	588	271	265	265
query97	3219	3087	3082	3082
query98	222	245	192	192
query99	1530	1282	1253	1253
Total cold run time: 297536 ms
Total hot run time: 192848 ms

@doris-robot
Copy link

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

query1	0.04	0.05	0.04
query2	0.08	0.04	0.04
query3	0.22	0.05	0.05
query4	1.68	0.08	0.08
query5	0.52	0.49	0.50
query6	1.13	0.73	0.72
query7	0.02	0.01	0.01
query8	0.06	0.05	0.05
query9	0.54	0.51	0.50
query10	0.54	0.55	0.54
query11	0.15	0.12	0.11
query12	0.15	0.13	0.12
query13	0.60	0.59	0.58
query14	1.40	1.38	1.42
query15	0.84	0.85	0.82
query16	0.37	0.37	0.37
query17	1.05	0.96	0.99
query18	0.23	0.22	0.21
query19	1.93	1.73	1.87
query20	0.01	0.01	0.01
query21	15.39	0.68	0.67
query22	4.10	7.53	1.87
query23	18.28	1.42	1.26
query24	2.10	0.23	0.21
query25	0.15	0.08	0.08
query26	0.27	0.18	0.18
query27	0.08	0.07	0.08
query28	13.24	1.01	1.00
query29	12.66	3.32	3.35
query30	0.24	0.05	0.06
query31	2.89	0.40	0.40
query32	3.23	0.48	0.47
query33	3.00	2.94	3.02
query34	17.16	4.35	4.41
query35	4.39	4.43	4.43
query36	0.66	0.48	0.48
query37	0.18	0.16	0.16
query38	0.15	0.15	0.14
query39	0.05	0.04	0.04
query40	0.16	0.13	0.12
query41	0.09	0.04	0.04
query42	0.06	0.05	0.04
query43	0.05	0.04	0.04
Total cold run time: 110.14 s
Total hot run time: 31.17 s

Copy link
Contributor

@morningman morningman left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

github-actions bot commented Sep 9, 2024

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 Sep 9, 2024
Copy link
Contributor

github-actions bot commented Sep 9, 2024

PR approved by anyone and no changes requested.

Copy link
Contributor

@GoGoWen GoGoWen left a comment

Choose a reason for hiding this comment

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

LGTM

@caiconghui caiconghui merged commit baefde9 into master Sep 10, 2024
32 of 35 checks passed
morningman pushed a commit to morningman/doris that referenced this pull request Sep 27, 2024
…k because of incompatibility with new audit plugin (apache#40565)

1、rename org.apache.doris.plugin.audit.AuditLoaderPlugin to
org.apache.doris.plugin.audit.AuditLoader to avoid potential conflict
with old external audit plugin
2、rename org.apache.doris.plugin.audit.AuditEvent to
org.apache.doris.plugin.AuditEvent to keep eventFilter in AuditPlugin be
compatible with old external audit plugin

Co-authored-by: caiconghui1 <[email protected]>
morningman pushed a commit to morningman/doris that referenced this pull request Sep 27, 2024
…k because of incompatibility with new audit plugin (apache#40565)

1、rename org.apache.doris.plugin.audit.AuditLoaderPlugin to
org.apache.doris.plugin.audit.AuditLoader to avoid potential conflict
with old external audit plugin
2、rename org.apache.doris.plugin.audit.AuditEvent to
org.apache.doris.plugin.AuditEvent to keep eventFilter in AuditPlugin be
compatible with old external audit plugin

Co-authored-by: caiconghui1 <[email protected]>
morningman added a commit that referenced this pull request Sep 27, 2024
…k because of incompatibility with new audit plugin (#40565) (#41401)

bp #40565

Co-authored-by: caiconghui <[email protected]>
Co-authored-by: caiconghui1 <[email protected]>
yiguolei pushed a commit that referenced this pull request Sep 28, 2024
…k because of incompatibility with new audit plugin (#40565) (#41400)

bp #40565

Co-authored-by: caiconghui <[email protected]>
Co-authored-by: caiconghui1 <[email protected]>
@dataroaring dataroaring deleted the log_loader branch January 19, 2025 09:13
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/2.1.7-merged dev/3.0.2-merged kind/fix Categorizes issue or PR as related to a bug. p0_b reviewed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants