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
The following commit(s) were added to refs/heads/expression-priority by this
push:
new 46bb29e434 modify ExpressionType's getExpressionTypeInShortEnum()
46bb29e434 is described below
commit 46bb29e434fce341a4db8bbd5cde2dc15a84b42d
Author: Steve Yurong Su <[email protected]>
AuthorDate: Tue Apr 26 11:49:25 2022 +0800
modify ExpressionType's getExpressionTypeInShortEnum()
---
.../main/java/org/apache/iotdb/db/query/expression/Expression.java | 5 +++--
.../java/org/apache/iotdb/db/query/expression/ExpressionType.java | 2 +-
.../apache/iotdb/db/query/expression/binary/AdditionExpression.java | 4 ++--
.../apache/iotdb/db/query/expression/binary/DivisionExpression.java | 4 ++--
.../apache/iotdb/db/query/expression/binary/EqualToExpression.java | 4 ++--
.../iotdb/db/query/expression/binary/GreaterEqualExpression.java | 4 ++--
.../iotdb/db/query/expression/binary/GreaterThanExpression.java | 4 ++--
.../apache/iotdb/db/query/expression/binary/LessEqualExpression.java | 4 ++--
.../apache/iotdb/db/query/expression/binary/LessThanExpression.java | 4 ++--
.../apache/iotdb/db/query/expression/binary/LogicAndExpression.java | 4 ++--
.../apache/iotdb/db/query/expression/binary/LogicOrExpression.java | 4 ++--
.../apache/iotdb/db/query/expression/binary/ModuloExpression.java | 4 ++--
.../iotdb/db/query/expression/binary/MultiplicationExpression.java | 4 ++--
.../apache/iotdb/db/query/expression/binary/NonEqualExpression.java | 4 ++--
.../iotdb/db/query/expression/binary/SubtractionExpression.java | 4 ++--
.../org/apache/iotdb/db/query/expression/unary/ConstantOperand.java | 4 ++--
.../apache/iotdb/db/query/expression/unary/FunctionExpression.java | 4 ++--
.../apache/iotdb/db/query/expression/unary/LogicNotExpression.java | 4 ++--
.../apache/iotdb/db/query/expression/unary/NegationExpression.java | 4 ++--
.../apache/iotdb/db/query/expression/unary/RegularExpression.java | 4 ++--
.../apache/iotdb/db/query/expression/unary/TimeSeriesOperand.java | 4 ++--
21 files changed, 42 insertions(+), 41 deletions(-)
diff --git
a/server/src/main/java/org/apache/iotdb/db/query/expression/Expression.java
b/server/src/main/java/org/apache/iotdb/db/query/expression/Expression.java
index 8f202932e7..a221014aae 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/expression/Expression.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/expression/Expression.java
@@ -215,10 +215,11 @@ public abstract class Expression {
}
}
- protected abstract short getExpressionType();
+ protected abstract ExpressionType getExpressionType();
public static void serialize(Expression expression, ByteBuffer byteBuffer) {
- ReadWriteIOUtils.write(expression.getExpressionType(), byteBuffer);
+ ReadWriteIOUtils.write(
+ expression.getExpressionType().getExpressionTypeInShortEnum(),
byteBuffer);
expression.serialize(byteBuffer);
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 748fb80a72..9e8d8096b3 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
@@ -58,7 +58,7 @@ public enum ExpressionType {
this.priority = priority;
}
- public short getExpressionType() {
+ public short getExpressionTypeInShortEnum() {
return expressionType;
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/query/expression/binary/AdditionExpression.java
b/server/src/main/java/org/apache/iotdb/db/query/expression/binary/AdditionExpression.java
index 9ad079daf1..a30a801828 100644
---
a/server/src/main/java/org/apache/iotdb/db/query/expression/binary/AdditionExpression.java
+++
b/server/src/main/java/org/apache/iotdb/db/query/expression/binary/AdditionExpression.java
@@ -50,7 +50,7 @@ public class AdditionExpression extends BinaryExpression {
}
@Override
- protected short getExpressionType() {
- return ExpressionType.ADDITION.getExpressionType();
+ protected ExpressionType getExpressionType() {
+ return ExpressionType.ADDITION;
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/query/expression/binary/DivisionExpression.java
b/server/src/main/java/org/apache/iotdb/db/query/expression/binary/DivisionExpression.java
index e72fe7ea86..713015fe5c 100644
---
a/server/src/main/java/org/apache/iotdb/db/query/expression/binary/DivisionExpression.java
+++
b/server/src/main/java/org/apache/iotdb/db/query/expression/binary/DivisionExpression.java
@@ -50,7 +50,7 @@ public class DivisionExpression extends BinaryExpression {
}
@Override
- protected short getExpressionType() {
- return ExpressionType.DIVISION.getExpressionType();
+ protected ExpressionType getExpressionType() {
+ return ExpressionType.DIVISION;
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/query/expression/binary/EqualToExpression.java
b/server/src/main/java/org/apache/iotdb/db/query/expression/binary/EqualToExpression.java
index d506f15ae6..4c1228634c 100644
---
a/server/src/main/java/org/apache/iotdb/db/query/expression/binary/EqualToExpression.java
+++
b/server/src/main/java/org/apache/iotdb/db/query/expression/binary/EqualToExpression.java
@@ -49,7 +49,7 @@ public class EqualToExpression extends BinaryExpression {
}
@Override
- protected short getExpressionType() {
- return ExpressionType.EQUAL_TO.getExpressionType();
+ protected ExpressionType getExpressionType() {
+ return ExpressionType.EQUAL_TO;
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/query/expression/binary/GreaterEqualExpression.java
b/server/src/main/java/org/apache/iotdb/db/query/expression/binary/GreaterEqualExpression.java
index 2a7944dfb1..b09ddc1d7e 100644
---
a/server/src/main/java/org/apache/iotdb/db/query/expression/binary/GreaterEqualExpression.java
+++
b/server/src/main/java/org/apache/iotdb/db/query/expression/binary/GreaterEqualExpression.java
@@ -50,7 +50,7 @@ public class GreaterEqualExpression extends BinaryExpression {
}
@Override
- protected short getExpressionType() {
- return ExpressionType.GREATER_EQUAL.getExpressionType();
+ protected ExpressionType getExpressionType() {
+ return ExpressionType.GREATER_EQUAL;
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/query/expression/binary/GreaterThanExpression.java
b/server/src/main/java/org/apache/iotdb/db/query/expression/binary/GreaterThanExpression.java
index 40e3c26ae0..dda0790388 100644
---
a/server/src/main/java/org/apache/iotdb/db/query/expression/binary/GreaterThanExpression.java
+++
b/server/src/main/java/org/apache/iotdb/db/query/expression/binary/GreaterThanExpression.java
@@ -50,7 +50,7 @@ public class GreaterThanExpression extends BinaryExpression {
}
@Override
- protected short getExpressionType() {
- return ExpressionType.GREATER_THAN.getExpressionType();
+ protected ExpressionType getExpressionType() {
+ return ExpressionType.GREATER_THAN;
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/query/expression/binary/LessEqualExpression.java
b/server/src/main/java/org/apache/iotdb/db/query/expression/binary/LessEqualExpression.java
index 9fe0213afa..8f3aed491c 100644
---
a/server/src/main/java/org/apache/iotdb/db/query/expression/binary/LessEqualExpression.java
+++
b/server/src/main/java/org/apache/iotdb/db/query/expression/binary/LessEqualExpression.java
@@ -49,7 +49,7 @@ public class LessEqualExpression extends BinaryExpression {
}
@Override
- protected short getExpressionType() {
- return ExpressionType.LESS_EQUAL.getExpressionType();
+ protected ExpressionType getExpressionType() {
+ return ExpressionType.LESS_EQUAL;
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/query/expression/binary/LessThanExpression.java
b/server/src/main/java/org/apache/iotdb/db/query/expression/binary/LessThanExpression.java
index e0a9e2e4f5..d8e477c1a2 100644
---
a/server/src/main/java/org/apache/iotdb/db/query/expression/binary/LessThanExpression.java
+++
b/server/src/main/java/org/apache/iotdb/db/query/expression/binary/LessThanExpression.java
@@ -49,7 +49,7 @@ public class LessThanExpression extends BinaryExpression {
}
@Override
- protected short getExpressionType() {
- return ExpressionType.LESS_THAN.getExpressionType();
+ protected ExpressionType getExpressionType() {
+ return ExpressionType.LESS_THAN;
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/query/expression/binary/LogicAndExpression.java
b/server/src/main/java/org/apache/iotdb/db/query/expression/binary/LogicAndExpression.java
index a35ef9cf8c..536e92bcd3 100644
---
a/server/src/main/java/org/apache/iotdb/db/query/expression/binary/LogicAndExpression.java
+++
b/server/src/main/java/org/apache/iotdb/db/query/expression/binary/LogicAndExpression.java
@@ -49,7 +49,7 @@ public class LogicAndExpression extends BinaryExpression {
}
@Override
- protected short getExpressionType() {
- return ExpressionType.LOGIC_AND.getExpressionType();
+ protected ExpressionType getExpressionType() {
+ return ExpressionType.LOGIC_AND;
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/query/expression/binary/LogicOrExpression.java
b/server/src/main/java/org/apache/iotdb/db/query/expression/binary/LogicOrExpression.java
index 2c031fb746..b0f1523040 100644
---
a/server/src/main/java/org/apache/iotdb/db/query/expression/binary/LogicOrExpression.java
+++
b/server/src/main/java/org/apache/iotdb/db/query/expression/binary/LogicOrExpression.java
@@ -49,7 +49,7 @@ public class LogicOrExpression extends BinaryExpression {
}
@Override
- protected short getExpressionType() {
- return ExpressionType.LOGIC_OR.getExpressionType();
+ protected ExpressionType getExpressionType() {
+ return ExpressionType.LOGIC_OR;
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/query/expression/binary/ModuloExpression.java
b/server/src/main/java/org/apache/iotdb/db/query/expression/binary/ModuloExpression.java
index 39f1b90a3f..ae5f65e130 100644
---
a/server/src/main/java/org/apache/iotdb/db/query/expression/binary/ModuloExpression.java
+++
b/server/src/main/java/org/apache/iotdb/db/query/expression/binary/ModuloExpression.java
@@ -49,7 +49,7 @@ public class ModuloExpression extends BinaryExpression {
}
@Override
- protected short getExpressionType() {
- return ExpressionType.MODULO.getExpressionType();
+ protected ExpressionType getExpressionType() {
+ return ExpressionType.MODULO;
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/query/expression/binary/MultiplicationExpression.java
b/server/src/main/java/org/apache/iotdb/db/query/expression/binary/MultiplicationExpression.java
index 86a3539c10..490a3728fe 100644
---
a/server/src/main/java/org/apache/iotdb/db/query/expression/binary/MultiplicationExpression.java
+++
b/server/src/main/java/org/apache/iotdb/db/query/expression/binary/MultiplicationExpression.java
@@ -50,7 +50,7 @@ public class MultiplicationExpression extends
BinaryExpression {
}
@Override
- protected short getExpressionType() {
- return ExpressionType.MULTIPLICATION.getExpressionType();
+ protected ExpressionType getExpressionType() {
+ return ExpressionType.MULTIPLICATION;
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/query/expression/binary/NonEqualExpression.java
b/server/src/main/java/org/apache/iotdb/db/query/expression/binary/NonEqualExpression.java
index 159ff11522..90fa0aafb5 100644
---
a/server/src/main/java/org/apache/iotdb/db/query/expression/binary/NonEqualExpression.java
+++
b/server/src/main/java/org/apache/iotdb/db/query/expression/binary/NonEqualExpression.java
@@ -49,7 +49,7 @@ public class NonEqualExpression extends BinaryExpression {
}
@Override
- protected short getExpressionType() {
- return ExpressionType.NON_EQUAL.getExpressionType();
+ protected ExpressionType getExpressionType() {
+ return ExpressionType.NON_EQUAL;
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/query/expression/binary/SubtractionExpression.java
b/server/src/main/java/org/apache/iotdb/db/query/expression/binary/SubtractionExpression.java
index dd91f9e7d5..1ebca2878b 100644
---
a/server/src/main/java/org/apache/iotdb/db/query/expression/binary/SubtractionExpression.java
+++
b/server/src/main/java/org/apache/iotdb/db/query/expression/binary/SubtractionExpression.java
@@ -50,7 +50,7 @@ public class SubtractionExpression extends BinaryExpression {
}
@Override
- protected short getExpressionType() {
- return ExpressionType.SUBTRACTION.getExpressionType();
+ protected ExpressionType getExpressionType() {
+ return ExpressionType.SUBTRACTION;
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/query/expression/unary/ConstantOperand.java
b/server/src/main/java/org/apache/iotdb/db/query/expression/unary/ConstantOperand.java
index 8da3c75ee7..59543567b7 100644
---
a/server/src/main/java/org/apache/iotdb/db/query/expression/unary/ConstantOperand.java
+++
b/server/src/main/java/org/apache/iotdb/db/query/expression/unary/ConstantOperand.java
@@ -146,8 +146,8 @@ public class ConstantOperand extends Expression {
}
@Override
- protected short getExpressionType() {
- return ExpressionType.CONSTANT.getExpressionType();
+ protected ExpressionType getExpressionType() {
+ return ExpressionType.CONSTANT;
}
@Override
diff --git
a/server/src/main/java/org/apache/iotdb/db/query/expression/unary/FunctionExpression.java
b/server/src/main/java/org/apache/iotdb/db/query/expression/unary/FunctionExpression.java
index 43ff8c5162..cfa896a63b 100644
---
a/server/src/main/java/org/apache/iotdb/db/query/expression/unary/FunctionExpression.java
+++
b/server/src/main/java/org/apache/iotdb/db/query/expression/unary/FunctionExpression.java
@@ -458,8 +458,8 @@ public class FunctionExpression extends Expression {
}
@Override
- protected short getExpressionType() {
- return ExpressionType.FUNCTION.getExpressionType();
+ protected ExpressionType getExpressionType() {
+ return ExpressionType.FUNCTION;
}
@Override
diff --git
a/server/src/main/java/org/apache/iotdb/db/query/expression/unary/LogicNotExpression.java
b/server/src/main/java/org/apache/iotdb/db/query/expression/unary/LogicNotExpression.java
index 9c36b3a810..2e9dc2552c 100644
---
a/server/src/main/java/org/apache/iotdb/db/query/expression/unary/LogicNotExpression.java
+++
b/server/src/main/java/org/apache/iotdb/db/query/expression/unary/LogicNotExpression.java
@@ -202,8 +202,8 @@ public class LogicNotExpression extends Expression {
}
@Override
- protected short getExpressionType() {
- return ExpressionType.LOGIC_NOT.getExpressionType();
+ protected ExpressionType getExpressionType() {
+ return ExpressionType.LOGIC_NOT;
}
@Override
diff --git
a/server/src/main/java/org/apache/iotdb/db/query/expression/unary/NegationExpression.java
b/server/src/main/java/org/apache/iotdb/db/query/expression/unary/NegationExpression.java
index 28ed84613e..7f59fe336e 100644
---
a/server/src/main/java/org/apache/iotdb/db/query/expression/unary/NegationExpression.java
+++
b/server/src/main/java/org/apache/iotdb/db/query/expression/unary/NegationExpression.java
@@ -202,8 +202,8 @@ public class NegationExpression extends Expression {
}
@Override
- protected short getExpressionType() {
- return ExpressionType.NEGATION.getExpressionType();
+ protected ExpressionType getExpressionType() {
+ return ExpressionType.NEGATION;
}
@Override
diff --git
a/server/src/main/java/org/apache/iotdb/db/query/expression/unary/RegularExpression.java
b/server/src/main/java/org/apache/iotdb/db/query/expression/unary/RegularExpression.java
index 0ce8f8589f..e778f4aa45 100644
---
a/server/src/main/java/org/apache/iotdb/db/query/expression/unary/RegularExpression.java
+++
b/server/src/main/java/org/apache/iotdb/db/query/expression/unary/RegularExpression.java
@@ -168,8 +168,8 @@ public class RegularExpression extends Expression {
}
@Override
- protected short getExpressionType() {
- return ExpressionType.REGULAR.getExpressionType();
+ protected ExpressionType getExpressionType() {
+ return ExpressionType.REGULAR;
}
@Override
diff --git
a/server/src/main/java/org/apache/iotdb/db/query/expression/unary/TimeSeriesOperand.java
b/server/src/main/java/org/apache/iotdb/db/query/expression/unary/TimeSeriesOperand.java
index e8cf2566d1..5380d30feb 100644
---
a/server/src/main/java/org/apache/iotdb/db/query/expression/unary/TimeSeriesOperand.java
+++
b/server/src/main/java/org/apache/iotdb/db/query/expression/unary/TimeSeriesOperand.java
@@ -167,8 +167,8 @@ public class TimeSeriesOperand extends Expression {
}
@Override
- protected short getExpressionType() {
- return ExpressionType.TIME_SERIES.getExpressionType();
+ protected ExpressionType getExpressionType() {
+ return ExpressionType.TIME_SERIES;
}
@Override
