Skip to content

[Fix](keywords) add composite time units to nonReserved#60775

Merged
yiguolei merged 1 commit intoapache:masterfrom
linrrzqqq:time-union-nonReserved
Feb 16, 2026
Merged

[Fix](keywords) add composite time units to nonReserved#60775
yiguolei merged 1 commit intoapache:masterfrom
linrrzqqq:time-union-nonReserved

Conversation

@linrrzqqq
Copy link
Contributor

@linrrzqqq linrrzqqq commented Feb 15, 2026

What problem does this PR solve?

Issue Number: close #xxx

Related PR: #60347

Problem Summary:

Before:

Doris> select now() day_hour;
ERROR 1105 (HY000): errCode = 2, detailMessage = 
extraneous input 'day_hour' expecting {<EOF>, ';'}(line 1, pos 13)

After:

Doris> select now() day_hour;
+---------------------+
| day_hour            |
+---------------------+
| 2026-02-16 02:31:36 |
+---------------------+

Release note

None

Check List (For Author)

  • Test

    • Regression test
    • Unit Test
    • Manual test (add detailed scripts or steps below)
    • No need to test or manual test. Explain why:
      • This is a refactor/code format and no logic has been changed.
      • Previous test can cover this change.
      • No code files have been changed.
      • Other reason

  • Behavior changed:

    • No.
    • Yes.

  • Does this need documentation?

    • No.
    • Yes.

Check List (For Reviewer who merge this PR)

  • Confirm the release note
  • Confirm test cases
  • Confirm document
  • Add branch pick label

@hello-stephen
Copy link
Contributor

hello-stephen commented Feb 15, 2026

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

Please clearly describe your PR:

  1. What problem was fixed (it's best to include specific error reporting information). How it was fixed.
  2. Which behaviors were modified. What was the previous behavior, what is it now, why was it modified, and what possible impacts might there be.
  3. What features were added. Why was this function added?
  4. Which code was refactored and why was this part of the code refactored?
  5. Which functions were optimized and what is the difference before and after the optimization?

@linrrzqqq
Copy link
Contributor Author

linrrzqqq commented Feb 15, 2026

run buildall

@doris-robot
Copy link

doris-robot commented Feb 15, 2026

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

------ Round 1 ----------------------------------
============================================
q1	17628	4537	4278	4278
q2	q3	10649	786	515	515
q4	4678	358	260	260
q5	7546	1200	1012	1012
q6	173	173	144	144
q7	789	840	654	654
q8	9281	1426	1303	1303
q9	4825	4777	4687	4687
q10	6811	1864	1640	1640
q11	466	255	239	239
q12	711	573	471	471
q13	17768	4234	3416	3416
q14	223	241	214	214
q15	926	788	786	786
q16	776	720	681	681
q17	719	845	418	418
q18	5939	5453	5349	5349
q19	1250	990	617	617
q20	491	486	384	384
q21	4803	2010	1475	1475
q22	399	336	261	261
Total cold run time: 96851 ms
Total hot run time: 28804 ms

----- Round 2, with runtime_filter_mode=off -----
============================================
q1	4817	4559	4634	4559
q2	q3	1866	2224	1845	1845
q4	853	1193	789	789
q5	4092	4439	4472	4439
q6	186	179	142	142
q7	1827	1671	1563	1563
q8	2499	2718	2605	2605
q9	7567	7410	7270	7270
q10	2646	2920	2471	2471
q11	515	441	424	424
q12	509	684	464	464
q13	3947	4394	3579	3579
q14	273	286	260	260
q15	851	802	795	795
q16	749	782	724	724
q17	1159	1551	1358	1358
q18	7102	6840	6542	6542
q19	869	857	905	857
q20	2060	2151	2040	2040
q21	4015	3490	3356	3356
q22	483	488	409	409
Total cold run time: 48885 ms
Total hot run time: 46491 ms

@doris-robot
Copy link

doris-robot commented Feb 15, 2026

TPC-DS: Total hot run time: 183781 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 1c9fcd5523ccd69edf7094315f17db28c928bac7, data reload: false

query5	5015	635	509	509
query6	317	239	202	202
query7	4214	457	272	272
query8	336	249	234	234
query9	8774	2693	2722	2693
query10	550	387	325	325
query11	17012	17575	17309	17309
query12	191	137	126	126
query13	1409	451	344	344
query14	7225	3358	3060	3060
query14_1	2860	3001	2918	2918
query15	212	203	177	177
query16	1248	508	485	485
query17	1745	721	621	621
query18	2857	456	352	352
query19	226	204	188	188
query20	147	134	132	132
query21	225	140	118	118
query22	5663	5136	4826	4826
query23	17182	16946	16629	16629
query23_1	16779	16632	16694	16632
query24	7262	1590	1213	1213
query24_1	1221	1234	1219	1219
query25	548	452	398	398
query26	1226	256	147	147
query27	2780	453	281	281
query28	4532	1880	1849	1849
query29	776	547	480	480
query30	313	245	210	210
query31	856	731	643	643
query32	87	67	70	67
query33	514	339	277	277
query34	902	919	560	560
query35	629	675	606	606
query36	1091	1105	983	983
query37	141	100	82	82
query38	2967	2974	2858	2858
query39	908	898	898	898
query39_1	816	843	851	843
query40	233	155	136	136
query41	68	64	63	63
query42	108	107	105	105
query43	368	377	347	347
query44	
query45	200	192	186	186
query46	872	987	620	620
query47	2146	2125	2066	2066
query48	318	331	238	238
query49	643	488	393	393
query50	674	278	219	219
query51	4052	4148	4047	4047
query52	110	111	97	97
query53	290	343	293	293
query54	322	280	273	273
query55	96	88	82	82
query56	344	338	311	311
query57	1366	1343	1280	1280
query58	294	286	279	279
query59	2574	2672	2520	2520
query60	357	344	333	333
query61	171	163	171	163
query62	640	605	544	544
query63	312	291	276	276
query64	4927	1342	1080	1080
query65	
query66	1420	464	366	366
query67	16409	16633	16282	16282
query68	
query69	413	331	296	296
query70	996	975	953	953
query71	339	299	308	299
query72	2780	2625	2384	2384
query73	534	545	320	320
query74	10003	9947	9716	9716
query75	2857	2750	2464	2464
query76	2295	1050	665	665
query77	362	355	310	310
query78	11155	11245	10699	10699
query79	3008	813	579	579
query80	1785	612	538	538
query81	588	285	244	244
query82	971	150	114	114
query83	334	252	237	237
query84	250	116	89	89
query85	886	453	432	432
query86	499	308	293	293
query87	3078	3129	3028	3028
query88	3626	2648	2653	2648
query89	416	375	345	345
query90	2170	172	169	169
query91	157	155	131	131
query92	95	73	67	67
query93	2862	819	495	495
query94	637	301	296	296
query95	571	388	308	308
query96	652	503	231	231
query97	2450	2476	2397	2397
query98	230	222	210	210
query99	1003	994	902	902
Total cold run time: 260391 ms
Total hot run time: 183781 ms

@hello-stephen
Copy link
Contributor

hello-stephen commented Feb 15, 2026

FE UT Coverage Report

Increment line coverage `` 🎉
Increment coverage report
Complete coverage report

@github-actions
Copy link
Contributor

github-actions bot commented Feb 16, 2026

PR approved by anyone and no changes requested.

@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Feb 16, 2026
@github-actions
Copy link
Contributor

github-actions bot commented Feb 16, 2026

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

@yiguolei yiguolei merged commit 48fc0ae into apache:master Feb 16, 2026
30 of 32 checks passed
github-actions bot pushed a commit that referenced this pull request Feb 16, 2026
@linrrzqqq
[Fix](keywords) add composite time units to nonReserved (#60775)
64aa45e 
### What problem does this PR solve?

Issue Number: close #xxx

Related PR: #60347 

Problem Summary:

Before:
```text
Doris> select now() day_hour;
ERROR 1105 (HY000): errCode = 2, detailMessage = 
extraneous input 'day_hour' expecting {<EOF>, ';'}(line 1, pos 13)
```

After:
```text
Doris> select now() day_hour;
+---------------------+
| day_hour            |
+---------------------+
| 2026-02-16 02:31:36 |
+---------------------+
```

### Release note

None

### Check List (For Author)

- Test <!-- At least one of them must be included. -->
    - [ ] Regression test
    - [ ] Unit Test
    - [ ] Manual test (add detailed scripts or steps below)
    - [ ] No need to test or manual test. Explain why:
- [ ] This is a refactor/code format and no logic has been changed.
        - [ ] Previous test can cover this change.
        - [ ] No code files have been changed.
        - [ ] Other reason <!-- Add your reason?  -->

- Behavior changed:
    - [x] No.
    - [ ] Yes. <!-- Explain the behavior change -->

- Does this need documentation?
    - [x] No.
- [ ] Yes. <!-- Add document PR link here. eg:
apache/doris-website#1214 -->

### Check List (For Reviewer who merge this PR)

- [ ] Confirm the release note
- [ ] Confirm test cases
- [ ] Confirm document
- [ ] Add branch pick label <!-- Add branch pick label that this PR
should merge into -->
@github-actions github-actions bot mentioned this pull request Feb 16, 2026
Merged
@linrrzqqq linrrzqqq deleted the time-union-nonReserved branch February 16, 2026 18:43
yiguolei pushed a commit that referenced this pull request Feb 16, 2026
@github-actions @linrrzqqq
branch-4.0: [Fix](keywords) add composite time units to nonReserved #…
ee6b9e8 
…60775 (#60778)

Cherry-picked from #60775

Co-authored-by: linrrarity <linzhenqi@selectdb.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yiguolei yiguolei yiguolei approved these changes

+1 more reviewer

@wyxxxcat wyxxxcat wyxxxcat approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

approved Indicates a PR has been approved by one committer. dev/4.0.4-merged reviewed

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@linrrzqqq @hello-stephen @doris-robot @yiguolei @wyxxxcat @zclllyybb