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](auth)Fix no auth,but can select count(*) #35465

Merged
merged 3 commits into from
May 29, 2024

Conversation

zddr
Copy link
Contributor

@zddr zddr commented May 27, 2024

Proposed changes

Issue Number: close #xxx

when select count(*),cols is empty, should check table priv

Further comments

If this is a relatively large or complex change, kick off the discussion at dev@doris.apache.org by explaining why you chose the solution you did and what alternatives you considered, etc...

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

morrySnow
morrySnow previously approved these changes May 27, 2024
@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label May 27, 2024
Copy link
Contributor

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

Copy link
Contributor

PR approved by anyone and no changes requested.

@morrySnow morrySnow added dev/2.1.x usercase Important user case type label labels May 27, 2024
@morrySnow
Copy link
Contributor

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17763	4417	4377	4377
q2	2662	198	188	188
q3	12068	1231	1253	1231
q4	10845	805	813	805
q5	7736	2678	2687	2678
q6	224	136	133	133
q7	951	596	589	589
q8	9209	2033	2036	2033
q9	8791	6486	6471	6471
q10	9006	3748	3679	3679
q11	455	243	242	242
q12	396	215	212	212
q13	18691	2961	2956	2956
q14	274	226	211	211
q15	501	469	463	463
q16	517	383	386	383
q17	954	707	813	707
q18	8202	7480	7451	7451
q19	7690	1548	1508	1508
q20	650	304	296	296
q21	4912	3161	3856	3161
q22	337	264	271	264
Total cold run time: 122834 ms
Total hot run time: 40038 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4390	4193	4206	4193
q2	372	269	277	269
q3	2973	2710	2705	2705
q4	1893	1547	1604	1547
q5	5234	5306	5280	5280
q6	209	124	124	124
q7	2156	1757	1760	1757
q8	3161	3288	3307	3288
q9	8382	8324	8348	8324
q10	3859	3662	3701	3662
q11	580	478	484	478
q12	747	570	629	570
q13	17003	3012	2991	2991
q14	286	262	262	262
q15	516	460	479	460
q16	459	411	432	411
q17	1777	1504	1463	1463
q18	7583	7678	7599	7599
q19	1643	1566	1561	1561
q20	1982	1771	1791	1771
q21	9877	4678	4683	4678
q22	575	489	493	489
Total cold run time: 75657 ms
Total hot run time: 53882 ms
@doris-robot
Copy link

TPC-DS: Total hot run time: 169537 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 075194e473c7c3ec3493da13770e2000a3ecd065, data reload: false

query1	908	379	365	365
query2	6734	2350	2539	2350
query3	6650	206	203	203
query4	19804	17269	17190	17190
query5	4173	422	415	415
query6	247	156	151	151
query7	4607	301	300	300
query8	234	180	182	180
query9	8635	2348	2316	2316
query10	476	287	275	275
query11	10484	9988	10037	9988
query12	132	94	88	88
query13	1652	376	357	357
query14	9376	7626	6981	6981
query15	215	170	169	169
query16	7803	255	256	255
query17	1861	532	538	532
query18	1917	289	273	273
query19	208	153	163	153
query20	91	84	86	84
query21	202	164	132	132
query22	4251	4061	4081	4061
query23	33754	33116	33171	33116
query24	11988	2927	2887	2887
query25	677	372	366	366
query26	1779	158	155	155
query27	2920	327	321	321
query28	7435	1992	2008	1992
query29	1146	617	599	599
query30	282	150	152	150
query31	1001	795	747	747
query32	94	52	56	52
query33	786	276	289	276
query34	986	474	478	474
query35	790	600	598	598
query36	1035	946	918	918
query37	232	66	66	66
query38	2922	2756	2810	2756
query39	859	788	788	788
query40	271	129	127	127
query41	49	46	46	46
query42	102	101	98	98
query43	587	573	533	533
query44	1209	729	749	729
query45	180	165	161	161
query46	1063	727	726	726
query47	1837	1760	1779	1760
query48	374	308	296	296
query49	1189	407	385	385
query50	772	392	391	391
query51	6745	6658	6853	6658
query52	99	92	91	91
query53	354	290	286	286
query54	1004	443	430	430
query55	76	72	76	72
query56	260	238	247	238
query57	1158	1061	992	992
query58	233	206	213	206
query59	3725	3415	3145	3145
query60	278	266	266	266
query61	92	87	96	87
query62	686	472	469	469
query63	312	288	286	286
query64	9860	2324	1781	1781
query65	3211	3114	3087	3087
query66	1383	352	338	338
query67	15402	14846	14634	14634
query68	4597	537	526	526
query69	466	302	276	276
query70	1202	1134	1136	1134
query71	407	279	288	279
query72	7621	2865	2662	2662
query73	721	323	325	323
query74	6015	5708	5659	5659
query75	3372	2632	2645	2632
query76	2812	943	971	943
query77	645	274	278	274
query78	10350	9995	9773	9773
query79	3912	522	513	513
query80	1311	472	472	472
query81	529	232	221	221
query82	1479	101	106	101
query83	235	192	185	185
query84	276	96	96	96
query85	1715	303	263	263
query86	472	321	274	274
query87	3350	3085	3121	3085
query88	4509	2420	2409	2409
query89	497	402	379	379
query90	1981	196	190	190
query91	130	102	95	95
query92	61	48	48	48
query93	4910	512	500	500
query94	1220	186	190	186
query95	403	345	317	317
query96	619	271	269	269
query97	3267	3035	3018	3018
query98	240	216	205	205
query99	1221	855	833	833
Total cold run time: 282402 ms
Total hot run time: 169537 ms
@doris-robot
Copy link

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

query1	0.03	0.03	0.03
query2	0.09	0.04	0.04
query3	0.23	0.05	0.06
query4	1.66	0.06	0.07
query5	0.50	0.50	0.49
query6	1.13	0.73	0.73
query7	0.02	0.01	0.02
query8	0.05	0.05	0.04
query9	0.54	0.48	0.48
query10	0.53	0.53	0.53
query11	0.16	0.11	0.10
query12	0.14	0.12	0.11
query13	0.60	0.59	0.58
query14	0.80	0.76	0.78
query15	0.82	0.82	0.81
query16	0.38	0.36	0.36
query17	0.96	0.97	0.93
query18	0.21	0.26	0.24
query19	1.85	1.74	1.64
query20	0.02	0.01	0.01
query21	15.71	0.65	0.65
query22	4.40	7.04	1.84
query23	18.25	1.31	1.23
query24	1.51	0.30	0.23
query25	0.15	0.08	0.08
query26	0.27	0.18	0.17
query27	0.09	0.08	0.08
query28	13.43	1.02	1.08
query29	12.71	3.31	3.28
query30	0.24	0.05	0.06
query31	2.88	0.37	0.37
query32	3.34	0.47	0.47
query33	2.86	2.93	2.93
query34	17.22	4.40	4.48
query35	4.53	4.50	4.53
query36	0.66	0.46	0.46
query37	0.18	0.15	0.16
query38	0.15	0.15	0.15
query39	0.04	0.03	0.04
query40	0.16	0.15	0.14
query41	0.09	0.05	0.04
query42	0.05	0.04	0.06
query43	0.03	0.04	0.04
Total cold run time: 109.67 s
Total hot run time: 30.35 s
yiguolei
yiguolei previously approved these changes May 28, 2024
morningman
morningman previously approved these changes May 28, 2024
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

@zddr zddr dismissed stale reviews from morningman, yiguolei, and morrySnow via 020673c May 28, 2024 08:55
@github-actions github-actions bot removed approved Indicates a PR has been approved by one committer. labels May 28, 2024
@zddr
Copy link
Contributor Author

zddr commented May 28, 2024

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17616	4325	4229	4229
q2	2039	202	198	198
q3	10454	1220	1276	1220
q4	10193	913	789	789
q5	7502	2759	2733	2733
q6	221	131	125	125
q7	990	602	591	591
q8	9227	2178	2114	2114
q9	9296	6713	6769	6713
q10	9370	3895	3847	3847
q11	436	246	243	243
q12	471	220	230	220
q13	17468	3148	3235	3148
q14	296	222	214	214
q15	509	458	466	458
q16	490	384	403	384
q17	1010	740	685	685
q18	8485	7946	7913	7913
q19	4285	1557	1463	1463
q20	660	338	337	337
q21	5147	4027	4112	4027
q22	352	279	282	279
Total cold run time: 116517 ms
Total hot run time: 41930 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4585	4389	4418	4389
q2	379	272	267	267
q3	3264	3007	2753	2753
q4	1880	1598	1676	1598
q5	5531	5489	5467	5467
q6	215	121	130	121
q7	2219	1810	1826	1810
q8	3246	3392	3384	3384
q9	8609	8692	8668	8668
q10	3892	3773	3804	3773
q11	591	486	497	486
q12	814	605	620	605
q13	16939	3120	3175	3120
q14	295	262	260	260
q15	527	483	480	480
q16	492	431	405	405
q17	1785	1484	1456	1456
q18	7769	7601	7493	7493
q19	1657	1562	1572	1562
q20	1942	1769	1771	1769
q21	4930	4628	4793	4628
q22	574	485	485	485
Total cold run time: 72135 ms
Total hot run time: 54979 ms
@doris-robot
Copy link

TPC-DS: Total hot run time: 169200 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 020673c9b38718f3be54539d163fcafa4d791a84, data reload: false

query1	919	374	383	374
query2	6457	2512	2311	2311
query3	6653	202	204	202
query4	20865	17391	17321	17321
query5	4134	426	414	414
query6	245	174	152	152
query7	4588	301	294	294
query8	235	185	183	183
query9	8530	2464	2446	2446
query10	445	284	272	272
query11	10601	9984	10123	9984
query12	145	93	87	87
query13	1656	382	393	382
query14	8937	7703	6669	6669
query15	205	165	166	165
query16	7292	263	264	263
query17	1308	530	511	511
query18	1910	275	271	271
query19	202	155	156	155
query20	93	84	91	84
query21	197	131	127	127
query22	4284	4139	4281	4139
query23	33462	32958	33202	32958
query24	5027	2965	2837	2837
query25	473	359	369	359
query26	708	158	156	156
query27	1846	312	323	312
query28	3728	2100	2101	2100
query29	839	608	602	602
query30	226	148	152	148
query31	903	754	725	725
query32	65	52	55	52
query33	421	281	286	281
query34	843	485	486	485
query35	686	593	608	593
query36	1046	934	915	915
query37	107	70	68	68
query38	2851	2838	2807	2807
query39	839	790	799	790
query40	197	126	120	120
query41	48	45	44	44
query42	101	97	98	97
query43	602	559	556	556
query44	1095	734	762	734
query45	177	162	160	160
query46	1054	726	713	713
query47	1868	1758	1789	1758
query48	368	297	306	297
query49	769	394	378	378
query50	769	391	394	391
query51	6889	6776	6811	6776
query52	103	92	95	92
query53	353	284	281	281
query54	549	440	438	438
query55	72	73	73	73
query56	261	272	246	246
query57	1102	1023	1065	1023
query58	220	211	206	206
query59	3286	3170	3263	3170
query60	275	263	262	262
query61	87	87	84	84
query62	533	441	460	441
query63	305	289	283	283
query64	2540	1765	1750	1750
query65	3197	3106	3114	3106
query66	687	331	330	330
query67	15193	14620	14827	14620
query68	4559	555	548	548
query69	427	269	267	267
query70	1113	1065	1151	1065
query71	399	270	307	270
query72	7513	2703	2574	2574
query73	713	337	331	331
query74	6029	5550	5575	5550
query75	3282	2615	2600	2600
query76	2152	977	904	904
query77	391	259	266	259
query78	10376	9781	9628	9628
query79	1773	523	517	517
query80	1054	425	422	422
query81	548	222	217	217
query82	939	92	92	92
query83	248	169	194	169
query84	251	88	81	81
query85	954	267	288	267
query86	479	304	304	304
query87	3274	3105	3119	3105
query88	3567	2456	2452	2452
query89	483	393	391	391
query90	2002	193	190	190
query91	137	107	114	107
query92	67	51	52	51
query93	1800	528	516	516
query94	1268	202	201	201
query95	423	327	327	327
query96	603	272	270	270
query97	3185	3027	3032	3027
query98	238	221	223	221
query99	1167	902	854	854
Total cold run time: 248085 ms
Total hot run time: 169200 ms
@doris-robot
Copy link

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

query1	0.04	0.03	0.03
query2	0.08	0.04	0.04
query3	0.22	0.06	0.06
query4	1.65	0.10	0.10
query5	0.51	0.49	0.51
query6	1.13	0.73	0.73
query7	0.02	0.01	0.02
query8	0.05	0.04	0.04
query9	0.52	0.50	0.50
query10	0.54	0.56	0.55
query11	0.15	0.11	0.11
query12	0.15	0.12	0.11
query13	0.60	0.59	0.60
query14	0.79	0.77	0.78
query15	0.83	0.83	0.81
query16	0.36	0.36	0.38
query17	1.00	1.02	0.99
query18	0.22	0.24	0.26
query19	1.87	1.78	1.72
query20	0.02	0.01	0.02
query21	15.43	0.69	0.67
query22	5.38	7.21	1.47
query23	18.24	1.42	1.29
query24	2.02	0.22	0.21
query25	0.13	0.08	0.08
query26	0.26	0.16	0.17
query27	0.08	0.08	0.08
query28	13.28	1.02	1.00
query29	12.92	3.35	3.29
query30	0.23	0.05	0.05
query31	2.89	0.39	0.38
query32	3.28	0.48	0.46
query33	2.93	2.92	2.84
query34	17.20	4.41	4.43
query35	4.50	4.52	4.58
query36	0.68	0.49	0.47
query37	0.18	0.16	0.15
query38	0.15	0.15	0.15
query39	0.05	0.03	0.04
query40	0.17	0.14	0.14
query41	0.08	0.04	0.05
query42	0.05	0.04	0.05
query43	0.04	0.04	0.03
Total cold run time: 110.92 s
Total hot run time: 30.22 s
@zddr
Copy link
Contributor Author

zddr commented May 28, 2024

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	18351	4550	4452	4452
q2	2502	192	192	192
q3	11390	1177	1176	1176
q4	10649	758	752	752
q5	8129	2765	2819	2765
q6	225	136	135	135
q7	972	599	611	599
q8	9348	2084	2102	2084
q9	8871	6547	6534	6534
q10	9014	3720	3711	3711
q11	442	251	241	241
q12	458	227	217	217
q13	17791	2974	3004	2974
q14	275	224	220	220
q15	520	472	477	472
q16	523	387	394	387
q17	978	656	705	656
q18	8043	7547	7393	7393
q19	6567	1589	1514	1514
q20	664	313	317	313
q21	5003	3968	3216	3216
q22	347	282	274	274
Total cold run time: 121062 ms
Total hot run time: 40277 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4452	4256	4272	4256
q2	380	264	274	264
q3	3003	2768	2756	2756
q4	1900	1591	1575	1575
q5	5274	5309	5299	5299
q6	217	127	132	127
q7	2168	1728	1743	1728
q8	3205	3344	3363	3344
q9	8307	8376	8353	8353
q10	3884	3652	3674	3652
q11	590	494	497	494
q12	774	613	622	613
q13	16307	2985	2989	2985
q14	303	282	263	263
q15	519	481	477	477
q16	497	425	432	425
q17	1794	1534	1478	1478
q18	7704	7451	7372	7372
q19	1668	1566	1540	1540
q20	2003	1782	1794	1782
q21	5015	4716	4660	4660
q22	584	521	490	490
Total cold run time: 70548 ms
Total hot run time: 53933 ms
@doris-robot
Copy link

TPC-DS: Total hot run time: 170450 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 020673c9b38718f3be54539d163fcafa4d791a84, data reload: false

query1	937	393	381	381
query2	6471	2668	2337	2337
query3	6648	206	207	206
query4	19014	17444	17358	17358
query5	4176	427	423	423
query6	257	161	158	158
query7	4584	297	292	292
query8	245	183	175	175
query9	8466	2474	2448	2448
query10	458	292	267	267
query11	10627	10169	10101	10101
query12	139	85	83	83
query13	1638	365	374	365
query14	10076	7404	7485	7404
query15	226	177	160	160
query16	8049	281	258	258
query17	1845	536	533	533
query18	2065	292	269	269
query19	197	156	166	156
query20	93	86	83	83
query21	203	138	133	133
query22	4144	4088	4048	4048
query23	33602	32953	33158	32953
query24	11925	2896	2790	2790
query25	645	360	367	360
query26	1755	161	159	159
query27	2936	329	316	316
query28	7627	2089	2082	2082
query29	1067	612	605	605
query30	278	151	159	151
query31	959	743	750	743
query32	98	54	55	54
query33	770	278	285	278
query34	971	496	477	477
query35	762	618	598	598
query36	1062	877	923	877
query37	279	66	70	66
query38	2930	2802	2792	2792
query39	851	789	802	789
query40	275	122	128	122
query41	47	44	50	44
query42	104	99	98	98
query43	604	532	563	532
query44	1188	727	745	727
query45	180	164	163	163
query46	1074	718	732	718
query47	1856	1770	1784	1770
query48	373	298	292	292
query49	1212	377	385	377
query50	786	389	383	383
query51	6902	6802	6787	6787
query52	99	92	95	92
query53	349	282	297	282
query54	990	431	434	431
query55	72	73	71	71
query56	262	244	245	244
query57	1121	1024	1021	1021
query58	244	224	216	216
query59	3397	3219	3297	3219
query60	277	270	270	270
query61	91	87	121	87
query62	643	466	453	453
query63	307	296	286	286
query64	9777	2166	1741	1741
query65	3229	3151	3120	3120
query66	1375	353	333	333
query67	15454	15180	14887	14887
query68	4585	567	546	546
query69	463	297	288	288
query70	1169	1060	1128	1060
query71	408	279	277	277
query72	7363	2713	2557	2557
query73	716	329	330	329
query74	6055	5684	5609	5609
query75	3340	2591	2613	2591
query76	2638	934	1005	934
query77	415	267	271	267
query78	10278	10031	9819	9819
query79	2354	520	521	520
query80	1408	447	437	437
query81	532	213	220	213
query82	1263	94	91	91
query83	281	173	172	172
query84	246	88	86	86
query85	1558	280	272	272
query86	478	310	317	310
query87	3302	3188	3067	3067
query88	4086	2439	2446	2439
query89	487	403	388	388
query90	1977	190	190	190
query91	126	96	99	96
query92	62	47	49	47
query93	2164	525	517	517
query94	1251	187	188	187
query95	404	316	315	315
query96	589	276	270	270
query97	3257	3052	3016	3016
query98	243	229	206	206
query99	1234	845	840	840
Total cold run time: 276095 ms
Total hot run time: 170450 ms
@doris-robot
Copy link

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

query1	0.04	0.03	0.04
query2	0.08	0.04	0.04
query3	0.23	0.04	0.05
query4	1.68	0.08	0.08
query5	0.50	0.49	0.49
query6	1.12	0.73	0.72
query7	0.02	0.01	0.01
query8	0.05	0.04	0.04
query9	0.54	0.50	0.50
query10	0.55	0.55	0.55
query11	0.16	0.11	0.11
query12	0.14	0.11	0.12
query13	0.59	0.58	0.58
query14	0.78	0.76	0.79
query15	0.83	0.81	0.80
query16	0.37	0.35	0.37
query17	0.96	1.03	1.01
query18	0.22	0.27	0.22
query19	1.81	1.74	1.81
query20	0.02	0.01	0.01
query21	15.56	0.68	0.65
query22	3.83	7.23	1.89
query23	18.31	1.36	1.26
query24	2.04	0.23	0.20
query25	0.13	0.09	0.08
query26	0.26	0.16	0.16
query27	0.08	0.08	0.08
query28	13.28	1.01	0.99
query29	13.15	3.26	3.28
query30	0.25	0.06	0.06
query31	2.87	0.38	0.38
query32	3.29	0.48	0.47
query33	2.86	2.95	2.90
query34	17.26	4.44	4.36
query35	4.49	4.48	4.48
query36	0.65	0.46	0.46
query37	0.17	0.15	0.15
query38	0.15	0.14	0.15
query39	0.05	0.03	0.04
query40	0.17	0.13	0.13
query41	0.10	0.05	0.04
query42	0.05	0.05	0.05
query43	0.04	0.03	0.04
Total cold run time: 109.73 s
Total hot run time: 30.44 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

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 May 29, 2024
@morrySnow morrySnow merged commit f63d5a4 into apache:master May 29, 2024
29 of 31 checks passed
yiguolei pushed a commit that referenced this pull request May 29, 2024
when select count(*),cols is empty, should check table priv
dataroaring pushed a commit that referenced this pull request May 31, 2024
when select count(*),cols is empty, should check table priv
@morningman morningman mentioned this pull request Jun 1, 2024
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.4-merged reviewed usercase Important user case type label
5 participants