Add timestampadd/timestampdiff function #2725
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kangkaisen
reviewed
Jan 10, 2020
fe/src/main/java/org/apache/doris/analysis/TimestampArithmeticExpr.java
Outdated
Show resolved
Hide resolved
HangyuanLiu
force-pushed
the
timestampdiff
branch
from
f5bd079 to
c02ed75
Compare
imay
reviewed
Jan 10, 2020
HangyuanLiu
force-pushed
the
timestampdiff
branch
from
c02ed75 to
d2ea231
Compare
# Conflicts: # be/src/exprs/timestamp_functions.cpp # be/test/exprs/timestamp_functions_test.cpp
imay
requested changes
Jan 11, 2020
fe/src/main/cup/sql_parser.cup
Outdated
| ; | ||
|
|
||
| unit ::= | ||
| KW_YEAR |
There was a problem hiding this comment.
should add this new keyword to keywords rule
docs/documentation/cn/sql-reference/sql-functions/date-time-functions/timestampadd.md
Outdated
Show resolved
Hide resolved
docs/documentation/cn/sql-reference/sql-functions/date-time-functions/timestampdiff.md
Outdated
Show resolved
Hide resolved
HangyuanLiu
force-pushed
the
timestampdiff
branch
from
149b1c7 to
afeaba2
Compare
imay
reviewed
Jan 13, 2020
Comment on lines
131
to
140
| Type dateType = fixType(); | ||
| if (dateType.isDate() && timeUnit.isDateTime()) { | ||
| dateType = Type.DATETIME; | ||
| } | ||
| // The first child must return a timestamp or null. | ||
| if (!getChild(0).getType().isDateType() && !getChild(0).getType().isNull()) { | ||
| if (!dateType.isValid()) { | ||
| throw new AnalysisException("Operand '" + getChild(0).toSql() | ||
| + "' of timestamp arithmetic expression '" + toSql() + "' returns type '" | ||
| + getChild(0).getType() + "'. Expected type 'TIMESTAMP/DATE/DATETIME'."); | ||
| } | ||
| castChild(dateType, 0); | ||
| } |
There was a problem hiding this comment.
seems that these codes are the same with others.
Could you try to reduce these same code?
HangyuanLiu
force-pushed
the
timestampdiff
branch
from
afeaba2 to
8b478b4
Compare
yangzhg
added a commit
to yangzhg/doris
that referenced
this pull request
Feb 14, 2020
yangzhg
added a commit
to yangzhg/doris
that referenced
this pull request
Feb 14, 2020
morningman
pushed a commit
that referenced
this pull request
Feb 14, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
1.Support timestampdiff function
2.Support timestampadd function
3.Add Doris keyword (YRAR,MONTH,WEEK,DAY,HOUR,MINUTE,SECOND)
4.Fix some cup format
#2703