This is an automated email from the ASF dual-hosted git repository. rong pushed a commit to branch expression-priority in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 5fb68376e56219466656925a898c3d8372980103 Author: Steve Yurong Su <[email protected]> AuthorDate: Tue Apr 26 11:07:40 2022 +0800 expr priority in ExpressionType --- .../iotdb/db/query/expression/ExpressionType.java | 58 ++++++++++++++-------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/query/expression/ExpressionType.java b/server/src/main/java/org/apache/iotdb/db/query/expression/ExpressionType.java index 4510f4a4a1..748fb80a72 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/expression/ExpressionType.java +++ b/server/src/main/java/org/apache/iotdb/db/query/expression/ExpressionType.java @@ -19,34 +19,50 @@ package org.apache.iotdb.db.query.expression; public enum ExpressionType { - ADDITION((short) 0), - DIVISION((short) 1), - EQUAL_TO((short) 2), - GREATER_EQUAL((short) 3), - GREATER_THAN((short) 4), - LESS_EQUAL((short) 5), - LESS_THAN((short) 6), - LOGIC_AND((short) 7), - LOGIC_OR((short) 8), - MODULO((short) 9), - MULTIPLICATION((short) 10), - NON_EQUAL((short) 11), - SUBTRACTION((short) 12), - FUNCTION((short) 13), - LOGIC_NOT((short) 14), - NEGATION((short) 15), - TIME_SERIES((short) 16), - CONSTANT((short) 17), - IN((short) 18), - REGULAR((short) 19); + CONSTANT((short) -3, (short) 1300), + TIME_COLUMN((short) -2, (short) 1200), + TIME_SERIES((short) -1, (short) 1100), + + NEGATION((short) 0, (short) 1000), + LOGIC_NOT((short) 1, (short) 1000), + + MULTIPLICATION((short) 2, (short) 900), + DIVISION((short) 3, (short) 900), + MODULO((short) 4, (short) 900), + + ADDITION((short) 5, (short) 800), + SUBTRACTION((short) 6, (short) 800), + + EQUAL_TO((short) 7, (short) 600), + NON_EQUAL((short) 8, (short) 600), + GREATER_EQUAL((short) 9, (short) 600), + GREATER_THAN((short) 10, (short) 600), + LESS_EQUAL((short) 11, (short) 600), + LESS_THAN((short) 12, (short) 600), + + REGULAR((short) 13, (short) 500), + IN((short) 14, (short) 400), + + LOGIC_AND((short) 15, (short) 300), + + LOGIC_OR((short) 16, (short) 200), + + FUNCTION((short) 17, (short) 100), + ; private final short expressionType; + private final short priority; - ExpressionType(short expressionType) { + ExpressionType(short expressionType, short priority) { this.expressionType = expressionType; + this.priority = priority; } public short getExpressionType() { return expressionType; } + + public short getPriority() { + return priority; + } }
