You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ge...@apache.org on 2020/04/22 08:47:49 UTC
[incubator-iotdb] 01/01: change to fullPath
This is an automated email from the ASF dual-hosted git repository.
geniuspig pushed a commit to branch IOTDB-551
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit ee6567dfa200df3ef3714ee581db315c9ad09ac0
Author: zhutianci <zh...@gmail.com>
AuthorDate: Wed Apr 22 16:47:32 2020 +0800
change to fullPath
---
server/src/main/antlr4/org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 4 ++--
.../main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/server/src/main/antlr4/org/apache/iotdb/db/qp/strategy/SqlBase.g4 b/server/src/main/antlr4/org/apache/iotdb/db/qp/strategy/SqlBase.g4
index 34fbee9..18f74bf 100644
--- a/server/src/main/antlr4/org/apache/iotdb/db/qp/strategy/SqlBase.g4
+++ b/server/src/main/antlr4/org/apache/iotdb/db/qp/strategy/SqlBase.g4
@@ -160,8 +160,8 @@ andExpression
;
predicate
- : (TIME | TIMESTAMP | suffixPath | prefixPath) comparisonOperator constant
- | (TIME | TIMESTAMP | suffixPath | prefixPath) inClause
+ : (TIME | TIMESTAMP | suffixPath | fullPath) comparisonOperator constant
+ | (TIME | TIMESTAMP | suffixPath | fullPath) inClause
| OPERATOR_NOT? LR_BRACKET orExpression RR_BRACKET
;
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java b/server/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java
index 330345a..f8bb52a 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java
@@ -586,7 +586,7 @@ public class LogicalGenerator extends SqlBaseBaseListener {
throw new SQLParserException("group by fill doesn't support linear fill");
}
// all type use the same fill way
- if (SQLConstant.ALL.equals(typeClause.dataType().getText().toLowerCase())) {
+ if (SQLConstant.ALL.equalsIgnoreCase(typeClause.dataType().getText())) {
IFill fill;
if (typeClause.previousUntilLastClause() != null) {
fill = new PreviousFill(-1, true);
@@ -1147,8 +1147,8 @@ public class LogicalGenerator extends SqlBaseBaseListener {
if (ctx.TIME() != null || ctx.TIMESTAMP() != null) {
path = new Path(SQLConstant.RESERVED_TIME);
}
- if (ctx.prefixPath() != null) {
- path = parsePrefixPath(ctx.prefixPath());
+ if (ctx.fullPath() != null) {
+ path = parseFullPath(ctx.fullPath());
}
if (ctx.suffixPath() != null) {
path = parseSuffixPath(ctx.suffixPath());