You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by lt...@apache.org on 2019/12/07 03:29:57 UTC
[incubator-iotdb] branch master updated: fix a bug of loading
external tsfile test
This is an automated email from the ASF dual-hosted git repository.
lta pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 4325ae4 fix a bug of loading external tsfile test
4325ae4 is described below
commit 4325ae4dc562930f21d0ff0ded5ca83659a120b9
Author: lta <li...@163.com>
AuthorDate: Sat Dec 7 11:29:40 2019 +0800
fix a bug of loading external tsfile test
---
.../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 3 +-
.../iotdb/db/qp/strategy/LogicalGenerator.java | 37 +++++++++++++---------
.../integration/IoTDBLoadExternalTsfileTest.java | 23 +++++++++++---
3 files changed, 41 insertions(+), 22 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 f5c6459..aabcca8 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
@@ -305,8 +305,7 @@ property
;
autoCreateSchema
- :
- | ID
+ : ID
| ID INT
;
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 3fc692b..273c4d1 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
@@ -59,6 +59,7 @@ import org.apache.iotdb.db.qp.strategy.SqlBaseParser.AddLabelContext;
import org.apache.iotdb.db.qp.strategy.SqlBaseParser.AlterUserContext;
import org.apache.iotdb.db.qp.strategy.SqlBaseParser.AndExpressionContext;
import org.apache.iotdb.db.qp.strategy.SqlBaseParser.AttributeClausesContext;
+import org.apache.iotdb.db.qp.strategy.SqlBaseParser.AutoCreateSchemaContext;
import org.apache.iotdb.db.qp.strategy.SqlBaseParser.ConstantContext;
import org.apache.iotdb.db.qp.strategy.SqlBaseParser.CreatePropertyContext;
import org.apache.iotdb.db.qp.strategy.SqlBaseParser.CreateRoleContext;
@@ -169,18 +170,21 @@ public class LogicalGenerator extends SqlBaseBaseListener {
@Override
public void enterLoadFiles(LoadFilesContext ctx) {
super.enterLoadFiles(ctx);
- if (ctx.getChild(2).getChild(0) != null && !ctx.getChild(2).getChild(0).getText()
- .equalsIgnoreCase("true") && !ctx.getChild(2)
- .getChild(0).getText().equalsIgnoreCase("false")) {
- initializedOperator = new LoadFilesOperator(true,
- "Please check the statement: load [FILE] true/false [storage group level]");
+ AutoCreateSchemaContext acsc = ctx.autoCreateSchema();
+ if (acsc != null) {
+ if (!acsc.ID().getText().equalsIgnoreCase("true") && !acsc.ID().getText()
+ .equalsIgnoreCase("false")) {
+ initializedOperator = new LoadFilesOperator(true,
+ "Please check the statement: load [FILE] true/false [storage group level]");
+ } else {
+ int sgLevel = acsc.INT() == null ? IoTDBDescriptor.getInstance().getConfig()
+ .getDefaultStorageGroupLevel() : Integer.parseInt(acsc.INT().getText());
+ initializedOperator = new LoadFilesOperator(new File(ctx.FILE().getText()), Boolean
+ .parseBoolean(acsc.ID().getText()), sgLevel);
+ }
} else {
- boolean createSchemaAutomatically = ctx.getChild(2).getChild(0) == null || Boolean
- .parseBoolean(ctx.getChild(2).getChild(0).getText());
- int sgLevel = ctx.getChild(2).getChild(1) == null ? IoTDBDescriptor.getInstance().getConfig()
- .getDefaultStorageGroupLevel() : Integer.parseInt(ctx.getChild(2).getChild(1).getText());
- initializedOperator = new LoadFilesOperator(new File(ctx.getChild(1).getText()),
- createSchemaAutomatically, sgLevel);
+ initializedOperator = new LoadFilesOperator(new File(ctx.getChild(1).getText()), true,
+ IoTDBDescriptor.getInstance().getConfig().getDefaultStorageGroupLevel());
}
}
@@ -647,19 +651,21 @@ public class LogicalGenerator extends SqlBaseBaseListener {
// parse sliding step
if (ctx.DURATION().size() == 2) {
queryOp.setSlidingStep(parseDuration(ctx.DURATION(1).getText()));
- if (queryOp.getSlidingStep() < queryOp.getUnit())
- throw new SQLParserException("The third parameter sliding step shouldn't be smaller than the second parameter time interval.");
+ if (queryOp.getSlidingStep() < queryOp.getUnit()) {
+ throw new SQLParserException(
+ "The third parameter sliding step shouldn't be smaller than the second parameter time interval.");
+ }
}
long startTime;
long endTime;
TimeIntervalContext timeInterval = ctx.timeInterval();
- if(timeInterval.timeValue(0).INT() != null) {
+ if (timeInterval.timeValue(0).INT() != null) {
startTime = Long.parseLong(timeInterval.timeValue(0).INT().getText());
} else {
startTime = parseTimeFormat(timeInterval.timeValue(0).dateFormat().getText());
}
- if(timeInterval.timeValue(1).INT() != null) {
+ if (timeInterval.timeValue(1).INT() != null) {
endTime = Long.parseLong(timeInterval.timeValue(1).INT().getText());
} else {
endTime = parseTimeFormat(timeInterval.timeValue(1).dateFormat().getText());
@@ -964,6 +970,7 @@ public class LogicalGenerator extends SqlBaseBaseListener {
/**
* parse duration to time value.
+ *
* @param durationStr represent duration string like: 12d8m9ns, 1y1mo, etc.
* @return time in milliseconds, microseconds, or nanoseconds depending on the profile
*/
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsfileTest.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsfileTest.java
index a822f0f..5303558 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsfileTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsfileTest.java
@@ -118,12 +118,12 @@ public class IoTDBLoadExternalTsfileTest {
StorageEngine.getInstance().getProcessor("root.vehicle")
.getSequenceFileList());
assertEquals(1, resources.size());
- File tmpDir = new File(resources.get(0).getFile().getParentFile().getParentFile(), "tmp");
+ File tmpDir = new File(resources.get(0).getFile().getParentFile().getParentFile(),
+ "tmp" + File.separator + "root.vehicle");
if (!tmpDir.exists()) {
tmpDir.mkdirs();
}
for (TsFileResource resource : resources) {
- System.out.println(String.format("move %s %s", resource.getFile().getPath(), tmpDir));
statement.execute(String.format("move %s %s", resource.getFile().getPath(), tmpDir));
}
assertEquals(0, StorageEngine.getInstance().getProcessor("root.vehicle")
@@ -136,13 +136,18 @@ public class IoTDBLoadExternalTsfileTest {
StorageEngine.getInstance().getProcessor("root.test")
.getSequenceFileList());
assertEquals(2, resources.size());
+ tmpDir = new File(resources.get(0).getFile().getParentFile().getParentFile(),
+ "tmp" + File.separator + "root.test");
+ if (!tmpDir.exists()) {
+ tmpDir.mkdirs();
+ }
for (TsFileResource resource : resources) {
statement.execute(String.format("move %s %s", resource.getFile().getPath(), tmpDir));
}
assertEquals(0, StorageEngine.getInstance().getProcessor("root.test")
.getSequenceFileList().size());
assertNotNull(tmpDir.listFiles());
- assertEquals(3, tmpDir.listFiles().length >> 1);
+ assertEquals(2, tmpDir.listFiles().length >> 1);
} catch (StorageEngineException e) {
Assert.fail();
}
@@ -158,7 +163,8 @@ public class IoTDBLoadExternalTsfileTest {
List<TsFileResource> resources = new ArrayList<>(
StorageEngine.getInstance().getProcessor("root.vehicle")
.getSequenceFileList());
- File tmpDir = new File(resources.get(0).getFile().getParentFile().getParentFile(), "tmp");
+ File tmpDir = new File(resources.get(0).getFile().getParentFile().getParentFile(),
+ "tmp" + File.separator + "root.vehicle");
if (!tmpDir.exists()) {
tmpDir.mkdirs();
}
@@ -170,11 +176,17 @@ public class IoTDBLoadExternalTsfileTest {
resources = new ArrayList<>(
StorageEngine.getInstance().getProcessor("root.test")
.getSequenceFileList());
+ tmpDir = new File(resources.get(0).getFile().getParentFile().getParentFile(),
+ "tmp" + File.separator + "root.test");
+ if (!tmpDir.exists()) {
+ tmpDir.mkdirs();
+ }
for (TsFileResource resource : resources) {
statement.execute(String.format("move %s %s", resource.getFile().getPath(), tmpDir));
}
// load all tsfile in tmp dir
+ tmpDir = new File(resources.get(0).getFile().getParentFile().getParentFile(), "tmp");
statement.execute(String.format("load %s", tmpDir.getAbsolutePath()));
resources = new ArrayList<>(
StorageEngine.getInstance().getProcessor("root.vehicle")
@@ -185,7 +197,8 @@ public class IoTDBLoadExternalTsfileTest {
.getSequenceFileList());
assertEquals(2, resources.size());
assertNotNull(tmpDir.listFiles());
- assertEquals(0, tmpDir.listFiles().length >> 1);
+ assertEquals(0, new File(tmpDir, "root.vehicle").listFiles().length);
+ assertEquals(0, new File(tmpDir, "root.test").listFiles().length);
} catch (StorageEngineException e) {
Assert.fail();
}