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.

Sign up for GitHub

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

Jump to bottom

[fix](keyword) let some keyword be non-reserved between old parser and new parser #35938

Merged
merged 1 commit into from
Jun 6, 2024
Merged

[fix](keyword) let some keyword be non-reserved between old parser and new parser #35938

merged 1 commit into from
Jun 6, 2024

Conversation

caiconghui
Copy link
Contributor

@caiconghui caiconghui commented Jun 5, 2024 •
edited by morningman
Loading

Proposed changes

Followup #35822

@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

@wm1581066 wm1581066 requested a review from morrySnow June 5, 2024 14:07
@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17624	4365	4260	4260
q2	2019	188	192	188
q3	10459	1177	1150	1150
q4	10200	856	736	736
q5	7496	2715	2668	2668
q6	226	131	135	131
q7	960	623	613	613
q8	9221	2121	2086	2086
q9	9385	6703	6675	6675
q10	9218	3985	3945	3945
q11	465	244	243	243
q12	502	236	232	232
q13	18236	3250	3219	3219
q14	276	209	227	209
q15	517	462	479	462
q16	502	394	398	394
q17	977	609	635	609
q18	8313	7739	7716	7716
q19	3829	1401	1371	1371
q20	644	318	319	318
q21	5181	3357	3990	3357
q22	405	322	340	322
Total cold run time: 116655 ms
Total hot run time: 40904 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4637	4432	4421	4421
q2	380	274	269	269
q3	3156	3009	2961	2961
q4	1884	1601	1689	1601
q5	5472	5497	5467	5467
q6	233	130	134	130
q7	2165	1803	1854	1803
q8	3217	3405	3393	3393
q9	8623	8659	8761	8659
q10	4110	3783	3671	3671
q11	588	487	491	487
q12	815	639	630	630
q13	17096	3120	3158	3120
q14	309	275	260	260
q15	520	484	473	473
q16	490	436	421	421
q17	1838	1535	1524	1524
q18	7832	7486	7301	7301
q19	1686	1629	1514	1514
q20	2092	1810	1827	1810
q21	4930	4735	4774	4735
q22	628	552	509	509
Total cold run time: 72701 ms
Total hot run time: 55159 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 169411 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 0d144564a16fafceeb89319d4c42eaae080d7ccd, data reload: false

query1	933	374	373	373
query2	6463	2348	2304	2304
query3	6649	210	211	210
query4	21237	17456	17170	17170
query5	4154	439	444	439
query6	241	155	148	148
query7	4594	289	292	289
query8	325	284	279	279
query9	8607	2351	2352	2351
query10	438	311	277	277
query11	10615	10123	10010	10010
query12	133	105	82	82
query13	1619	365	358	358
query14	9568	7597	6743	6743
query15	233	189	186	186
query16	7632	268	256	256
query17	1352	538	501	501
query18	1944	263	282	263
query19	187	143	142	142
query20	89	84	85	84
query21	199	132	126	126
query22	4410	4111	4068	4068
query23	33753	33060	33032	33032
query24	11251	2867	2794	2794
query25	623	353	361	353
query26	1395	153	153	153
query27	3053	306	317	306
query28	7661	2037	2026	2026
query29	942	610	594	594
query30	268	156	154	154
query31	993	748	723	723
query32	93	51	53	51
query33	770	307	266	266
query34	960	466	469	466
query35	732	617	597	597
query36	1053	925	933	925
query37	148	66	68	66
query38	2895	2757	2754	2754
query39	872	778	783	778
query40	211	125	120	120
query41	57	50	51	50
query42	119	97	100	97
query43	564	549	500	500
query44	1214	733	745	733
query45	191	167	162	162
query46	1072	719	706	706
query47	1877	1768	1763	1763
query48	385	297	296	296
query49	1092	405	424	405
query50	773	393	389	389
query51	6707	6715	6710	6710
query52	103	89	93	89
query53	359	290	289	289
query54	890	451	438	438
query55	77	74	74	74
query56	268	254	254	254
query57	1102	1041	1124	1041
query58	258	238	237	237
query59	3297	3140	3185	3140
query60	300	280	268	268
query61	86	84	84	84
query62	654	454	424	424
query63	319	288	288	288
query64	9014	2162	1727	1727
query65	3207	3094	3112	3094
query66	1168	328	340	328
query67	15462	14874	14909	14874
query68	4596	554	548	548
query69	593	471	376	376
query70	1149	1150	1079	1079
query71	402	277	265	265
query72	8030	5184	2775	2775
query73	746	330	331	330
query74	6018	5581	5608	5581
query75	3497	2607	2637	2607
query76	2881	939	927	927
query77	658	298	287	287
query78	10193	9843	9706	9706
query79	2419	519	516	516
query80	805	462	452	452
query81	591	216	217	216
query82	792	101	98	98
query83	262	162	160	160
query84	239	84	86	84
query85	1483	281	300	281
query86	488	336	286	286
query87	3311	3137	3132	3132
query88	3802	2499	2440	2440
query89	464	378	374	374
query90	1758	189	194	189
query91	127	92	99	92
query92	64	49	52	49
query93	1920	518	499	499
query94	1187	182	183	182
query95	403	312	313	312
query96	585	272	274	272
query97	3186	2992	2980	2980
query98	231	200	199	199
query99	1137	840	851	840
Total cold run time: 273927 ms
Total hot run time: 169411 ms

@doris-robot
Copy link

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

query1	0.04	0.03	0.03
query2	0.08	0.04	0.04
query3	0.23	0.05	0.04
query4	1.68	0.07	0.08
query5	0.50	0.48	0.48
query6	1.12	0.72	0.72
query7	0.01	0.01	0.01
query8	0.05	0.04	0.04
query9	0.54	0.48	0.48
query10	0.54	0.54	0.54
query11	0.15	0.11	0.11
query12	0.14	0.11	0.12
query13	0.58	0.59	0.60
query14	0.78	0.77	0.79
query15	0.82	0.80	0.83
query16	0.38	0.37	0.36
query17	1.03	0.94	0.95
query18	0.23	0.23	0.26
query19	1.74	1.69	1.71
query20	0.01	0.02	0.01
query21	15.46	0.69	0.67
query22	4.46	7.31	2.30
query23	18.31	1.36	1.25
query24	2.09	0.20	0.21
query25	0.15	0.09	0.08
query26	0.25	0.17	0.16
query27	0.08	0.08	0.08
query28	13.29	1.00	1.00
query29	13.36	3.27	3.29
query30	0.24	0.06	0.05
query31	2.88	0.38	0.38
query32	3.28	0.47	0.46
query33	2.90	2.90	2.91
query34	17.05	4.42	4.41
query35	4.48	4.49	4.72
query36	0.64	0.46	0.49
query37	0.17	0.14	0.15
query38	0.14	0.13	0.14
query39	0.04	0.03	0.04
query40	0.17	0.13	0.15
query41	0.09	0.04	0.04
query42	0.06	0.04	0.04
query43	0.03	0.04	0.04
Total cold run time: 110.27 s
Total hot run time: 30.77 s

morningman
morningman approved these changes Jun 6, 2024
View reviewed changes
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

morningman
morningman approved these changes Jun 6, 2024
View reviewed changes
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

@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Jun 6, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 6, 2024

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

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 6, 2024

PR approved by anyone and no changes requested.

@morningman morningman merged commit fbfcd10 into master Jun 6, 2024
34 of 37 checks passed
dataroaring pushed a commit that referenced this pull request Jun 7, 2024
@caiconghui @dataroaring
[fix](keyword) let some keyword be non-reserved between old parser an…
3fc552f 
…d new parser (#35938)

Followup #35822

Co-authored-by: caiconghui1 <[email protected]>
caiconghui added a commit that referenced this pull request Jul 16, 2024
@caiconghui
[fix](keyword) let some keyword be non-reserved between old parser an…
ae62284 
…d new parser (#35938)

Followup #35822

Co-authored-by: caiconghui1 <[email protected]>
@caiconghui caiconghui mentioned this pull request Jul 16, 2024
Merged
caiconghui added a commit that referenced this pull request Jul 16, 2024
@caiconghui
[fix](keyword) let some keyword be non-reserved between old parser an…
f87b9f1 
…d new parser (#35938)

Followup #35822

Co-authored-by: caiconghui1 <[email protected]>
yiguolei pushed a commit that referenced this pull request Jul 16, 2024
@caiconghui
[fix](stream_load) fix stream load may failed caused by column name w…
9ff129b 
…ith keyword (#35822) (#37890)

#35938 #35822 
let 
KW_SQL,
KW_CACHE,
KW_COLOCATE,
KW_COMPRESS_TYPE,
KW_DORIS_INTERNAL_TABLE_ID,
KW_HOTSPOT,
KW_PRIVILEGES,
KW_RECENT,
KW_STAGES,
KW_WARM,
KW_UP,
KW_CONVERT_LSC
be as non-reserved

## Proposed changes

Issue Number: close #xxx

<!--Describe your changes.-->

---------

Co-authored-by: caiconghui1 <[email protected]>
@yiguolei yiguolei mentioned this pull request Jul 19, 2024
Open
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@morrySnow morrySnow morrySnow approved these changes

@morningman morningman morningman approved these changes

Assignees
No one assigned
Labels
approved Indicates a PR has been approved by one committer. dev/2.1.5-merged dev/3.0.0-merged reviewed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@caiconghui @doris-robot @morningman @morrySnow @yiguolei @dataroaring