You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by le...@apache.org on 2022/02/14 04:06:49 UTC
[iotdb] 15/32: update
This is an automated email from the ASF dual-hosted git repository.
leirui pushed a commit to branch research/M4-visualization
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 3ce384cdd9d96ce27dd9337ff8f6db490f840157
Author: Lei Rui <10...@qq.com>
AuthorDate: Fri Feb 4 17:13:11 2022 +0800
update
---
.../iotdb/writeData/ExtractFullGameData.java | 7 +-
.../iotdb/db/integration/m4/MyDebugTest2.java | 116 ++++++---------------
2 files changed, 32 insertions(+), 91 deletions(-)
diff --git a/example/session/src/main/java/org/apache/iotdb/writeData/ExtractFullGameData.java b/example/session/src/main/java/org/apache/iotdb/writeData/ExtractFullGameData.java
index a3fd209..d343070 100644
--- a/example/session/src/main/java/org/apache/iotdb/writeData/ExtractFullGameData.java
+++ b/example/session/src/main/java/org/apache/iotdb/writeData/ExtractFullGameData.java
@@ -19,11 +19,8 @@ public class ExtractFullGameData {
PrintWriter printWriter = new PrintWriter(fileWriter);
while ((line = reader.readLine()) != null) {
String[] split = line.split(",");
- long sensorNum = Long.valueOf(split[0]);
- long timestamp = Long.valueOf(split[1]);
- long value = Long.valueOf(split[5]);
- printWriter.print(sensorNum);
- printWriter.print(",");
+ long timestamp = Long.valueOf(split[3]);
+ long value = Long.valueOf(split[4]);
printWriter.print(timestamp);
printWriter.print(",");
printWriter.print(value);
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/m4/MyDebugTest2.java b/server/src/test/java/org/apache/iotdb/db/integration/m4/MyDebugTest2.java
index 89be42a..13af30a 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/m4/MyDebugTest2.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/m4/MyDebugTest2.java
@@ -19,40 +19,40 @@
package org.apache.iotdb.db.integration.m4;
-import java.util.Random;
+import static org.junit.Assert.fail;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.util.Locale;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.engine.compaction.CompactionStrategy;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.Statement;
-import java.util.Locale;
-
-import static org.junit.Assert.fail;
-
public class MyDebugTest2 {
private static final String TIMESTAMP_STR = "Time";
private static String[] creationSqls =
- new String[] {
- "SET STORAGE GROUP TO root.vehicle.d0",
- "CREATE TIMESERIES root.vehicle.d0.s0 WITH DATATYPE=DOUBLE",
+ new String[]{
+ "SET STORAGE GROUP TO root.game",
+ "CREATE TIMESERIES root.game.s6 WITH DATATYPE=INT64",
};
private final String d0s0 = "root.vehicle.d0.s0";
private static final String insertTemplate =
- "INSERT INTO root.vehicle.d0(timestamp,s0)" + " VALUES(%d,%f)";
+ "INSERT INTO root.vehicle.d0(timestamp,s0)" + " VALUES(%d,%d)";
private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
private static boolean originalEnableCPV;
@@ -73,12 +73,12 @@ public class MyDebugTest2 {
originalUnSeqTsFileSize = config.getUnSeqTsFileSize();
config.setCompactionStrategy(CompactionStrategy.NO_COMPACTION);
-
config.setSeqTsFileSize(1024 * 1024 * 1024); // 1G
config.setUnSeqTsFileSize(1024 * 1024 * 1024); // 1G
- config.setAvgSeriesPointNumberThreshold(10); // this step cannot be omitted
+ config.setAvgSeriesPointNumberThreshold(10000); // this step cannot be omitted
+ config.setTimestampPrecision("ns");
-// config.setEnableCPV(false);
+ // config.setEnableCPV(false);
config.setEnableCPV(true);
}
@@ -95,22 +95,15 @@ public class MyDebugTest2 {
@Test
public void test1() {
// 现像：fullGame实验中，CPV第一个interval结果还是对的，第二个Interval开始结果不对了
- prepareData1();
-
- String[] res =
- new String[] {
- "0,1,20,5,20,5[1],30[10]",
- "25,25,45,8,30,8[25],40[30]",
- "50,52,54,8,18,8[52],18[54]",
- "75,null,null,null,null,null,null"
- };
+
+ String[] res = new String[]{};
try (Connection connection =
DriverManager.getConnection("jdbc:iotdb://127.0.0.1:6667/", "root", "root");
Statement statement = connection.createStatement()) {
boolean hasResultSet =
statement.execute(
- "SELECT min_time(s0), max_time(s0), first_value(s0), last_value(s0), min_value(s0), max_value(s0)"
- + " FROM root.vehicle.d0 group by ([0,100),25ms)");
+ "select min_time(s6), max_time(s6), first_value(s6), last_value(s6), min_value(s6), "
+ + "max_value(s6) from root.game group by ([426460081333,852920162666), 426460081333ns)");
Assert.assertTrue(hasResultSet);
try (ResultSet resultSet = statement.getResultSet()) {
@@ -141,8 +134,6 @@ public class MyDebugTest2 {
}
private static void prepareData1() {
- // data:
- // https://user-images.githubusercontent.com/33376433/151985070-73158010-8ba0-409d-a1c1-df69bad1aaee.png
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -151,65 +142,18 @@ public class MyDebugTest2 {
for (String sql : creationSqls) {
statement.execute(sql);
}
- Random random = new Random(100);
- for (int i = 0; i < 100; i++) {
- statement.execute(String.format(Locale.ENGLISH, insertTemplate, i, random.nextDouble()));
+ String path = "";
+ File f = new File(path);
+ String line = null;
+ BufferedReader reader = new BufferedReader(new FileReader(f));
+ while ((line = reader.readLine()) != null) {
+ String[] split = line.split(",");
+ long timestamp = Long.valueOf(split[0]);
+ long value = Long.valueOf(split[1]);
+ statement.execute(String.format(Locale.ENGLISH, insertTemplate, timestamp, value));
}
- for (int i = 4; i < 75; i=i+4) {
- statement.execute(String.format(Locale.ENGLISH, insertTemplate, i, random.nextDouble()));
- }
-
- for (int i = 8; i < 90; i=i+3) {
- statement.execute(String.format(Locale.ENGLISH, insertTemplate, i, random.nextDouble()));
- }
-
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 1, 2));
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 2, 5));
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 3, 1));
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 4, 3));
-//
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 8, 2));
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 9, 5));
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 10, 1));
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 11, 3));
-//
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 15, 2));
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 16, 5));
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 17, 1));
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 18, 3));
-//
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 24, 2));
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 25, 5));
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 26, 1));
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 27, 3));
-//
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 30, 2));
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 31, 5));
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 32, 1));
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 33, 3));
-//
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 40, 2));
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 41, 5));
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 42, 1));
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 43, 3));
-//
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 49, 2));
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 50, 5));
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 51, 1));
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 52, 3));
-//
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 2, 4));
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 10, 25));
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 30, 2));
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 33, 3));
-//
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 4, 4));
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 11, 25));
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 32, 2));
-// statement.execute(String.format(Locale.ENGLISH, insertTemplate, 40, 3));
-
statement.execute("FLUSH");
} catch (Exception e) {