You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/02/27 08:53:43 UTC
[incubator-iotdb] 02/03: fix set storage group grammar
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch fix_timegenerator
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 5370b30261b54b9f3bc5305478581912285462b8
Author: qiaojialin <64...@qq.com>
AuthorDate: Thu Feb 27 15:47:49 2020 +0800
fix set storage group grammar
---
server/src/assembly/resources/conf/iotdb-engine.properties | 2 +-
.../main/antlr4/org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 14 +++++++-------
.../org/apache/iotdb/db/qp/strategy/LogicalGenerator.java | 10 +++++-----
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties b/server/src/assembly/resources/conf/iotdb-engine.properties
index f9906c7..eb7897c 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -430,7 +430,7 @@ compressor=SNAPPY
# Time series data will divide into groups by this time range
# Unit is second
# default value is one week, which is 604800 seconds
-partition_interval = 604800
+partition_interval=604800
# the num of memtables in each storage group
# This config decides how many time partitions in a storage group can be inserted concurrently
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 81b69c4..3665f1e 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
@@ -24,17 +24,17 @@ singleStatement
;
statement
- : CREATE TIMESERIES timeseriesPath WITH attributeClauses #createTimeseries
+ : CREATE TIMESERIES fullPath WITH attributeClauses #createTimeseries
| DELETE TIMESERIES prefixPath (COMMA prefixPath)* #deleteTimeseries
- | INSERT INTO timeseriesPath insertColumnSpec VALUES insertValuesSpec #insertStatement
+ | INSERT INTO fullPath insertColumnSpec VALUES insertValuesSpec #insertStatement
| UPDATE prefixPath setClause whereClause? #updateStatement
| DELETE FROM prefixPath (COMMA prefixPath)* (whereClause)? #deleteStatement
- | SET STORAGE GROUP TO prefixPath #setStorageGroup
+ | SET STORAGE GROUP TO fullPath #setStorageGroup
| DELETE STORAGE GROUP prefixPath (COMMA prefixPath)* #deleteStorageGroup
| SHOW METADATA #showMetadata // not support yet
| DESCRIBE prefixPath #describePath // not support yet
- | CREATE INDEX ON timeseriesPath USING function=ID indexWithClause? whereClause? #createIndex //not support yet
- | DROP INDEX function=ID ON timeseriesPath #dropIndex //not support yet
+ | CREATE INDEX ON fullPath USING function=ID indexWithClause? whereClause? #createIndex //not support yet
+ | DROP INDEX function=ID ON fullPath #dropIndex //not support yet
| MERGE #merge //not support yet
| CREATE USER userName=ID password=STRING_LITERAL #createUser
| ALTER USER userName=(ROOT|ID) SET PASSWORD password=STRING_LITERAL #alterUser
@@ -77,7 +77,7 @@ statement
| MOVE FILE FILE #moveFile
| SELECT INDEX func=ID //not support yet
LR_BRACKET
- p1=timeseriesPath COMMA p2=timeseriesPath COMMA n1=timeValue COMMA n2=timeValue COMMA
+ p1=fullPath COMMA p2=fullPath COMMA n1=timeValue COMMA n2=timeValue COMMA
epsilon=constant (COMMA alpha=constant COMMA beta=constant)?
RR_BRACKET
fromClause
@@ -271,7 +271,7 @@ propertyLabelPair
: propertyName=ID DOT labelName=ID
;
-timeseriesPath
+fullPath
: ROOT (DOT nodeNameWithoutStar)*
;
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 9c5d837..318d1b6 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
@@ -80,6 +80,7 @@ import org.apache.iotdb.db.qp.strategy.SqlBaseParser.DropRoleContext;
import org.apache.iotdb.db.qp.strategy.SqlBaseParser.DropUserContext;
import org.apache.iotdb.db.qp.strategy.SqlBaseParser.FillClauseContext;
import org.apache.iotdb.db.qp.strategy.SqlBaseParser.FromClauseContext;
+import org.apache.iotdb.db.qp.strategy.SqlBaseParser.FullPathContext;
import org.apache.iotdb.db.qp.strategy.SqlBaseParser.FunctionCallContext;
import org.apache.iotdb.db.qp.strategy.SqlBaseParser.FunctionElementContext;
import org.apache.iotdb.db.qp.strategy.SqlBaseParser.GrantRoleContext;
@@ -135,7 +136,6 @@ import org.apache.iotdb.db.qp.strategy.SqlBaseParser.SlimitClauseContext;
import org.apache.iotdb.db.qp.strategy.SqlBaseParser.SoffsetClauseContext;
import org.apache.iotdb.db.qp.strategy.SqlBaseParser.SuffixPathContext;
import org.apache.iotdb.db.qp.strategy.SqlBaseParser.TimeIntervalContext;
-import org.apache.iotdb.db.qp.strategy.SqlBaseParser.TimeseriesPathContext;
import org.apache.iotdb.db.qp.strategy.SqlBaseParser.TypeClauseContext;
import org.apache.iotdb.db.qp.strategy.SqlBaseParser.UnsetTTLStatementContext;
import org.apache.iotdb.db.qp.strategy.SqlBaseParser.UpdateStatementContext;
@@ -298,7 +298,7 @@ public class LogicalGenerator extends SqlBaseBaseListener {
super.enterCreateTimeseries(ctx);
createTimeSeriesOperator = new CreateTimeSeriesOperator(SQLConstant.TOK_METADATA_CREATE);
operatorType = SQLConstant.TOK_METADATA_CREATE;
- createTimeSeriesOperator.setPath(parseTimeseriesPath(ctx.timeseriesPath()));
+ createTimeSeriesOperator.setPath(parseFullPath(ctx.fullPath()));
}
@Override
@@ -624,7 +624,7 @@ public class LogicalGenerator extends SqlBaseBaseListener {
super.enterSetStorageGroup(ctx);
SetStorageGroupOperator setStorageGroupOperator = new SetStorageGroupOperator(
SQLConstant.TOK_METADATA_SET_FILE_LEVEL);
- Path path = parsePrefixPath(ctx.prefixPath());
+ Path path = parseFullPath(ctx.fullPath());
setStorageGroupOperator.setPath(path);
initializedOperator = setStorageGroupOperator;
operatorType = SQLConstant.TOK_METADATA_SET_FILE_LEVEL;
@@ -870,7 +870,7 @@ public class LogicalGenerator extends SqlBaseBaseListener {
initializedOperator = insertOp;
}
- private Path parseTimeseriesPath(TimeseriesPathContext ctx) {
+ private Path parseFullPath(FullPathContext ctx) {
List<NodeNameWithoutStarContext> nodeNamesWithoutStar = ctx.nodeNameWithoutStar();
List<String> path = new ArrayList<>();
if (ctx.ROOT() != null) {
@@ -916,7 +916,7 @@ public class LogicalGenerator extends SqlBaseBaseListener {
insertOp = new InsertOperator(SQLConstant.TOK_INSERT);
selectOp = new SelectOperator(SQLConstant.TOK_SELECT);
operatorType = SQLConstant.TOK_INSERT;
- selectOp.addSelectPath(parseTimeseriesPath(ctx.timeseriesPath()));
+ selectOp.addSelectPath(parseFullPath(ctx.fullPath()));
insertOp.setSelectOperator(selectOp);
}