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:48 UTC
[iotdb] 14/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 8eb47c8ea87fc8ea09fd9cab77851e1eb7373ce7
Author: Lei Rui <10...@qq.com>
AuthorDate: Fri Feb 4 17:03:06 2022 +0800
update
---
.../iotdb/writeData/ExtractFullGameData.java | 35 ++++++++++++++++++++++
.../org/apache/iotdb/writeData/WriteFullGame.java | 9 ++++--
.../dataset/groupby/LocalGroupByExecutor4CPV.java | 10 +++----
3 files changed, 47 insertions(+), 7 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
new file mode 100644
index 0000000..a3fd209
--- /dev/null
+++ b/example/session/src/main/java/org/apache/iotdb/writeData/ExtractFullGameData.java
@@ -0,0 +1,35 @@
+package org.apache.iotdb.writeData;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+public class ExtractFullGameData {
+
+ public static void main(String[] args) throws IOException {
+ String inPath = args[0];
+ String outPath = args[1];
+ File f = new File(inPath);
+ FileWriter fileWriter = new FileWriter(outPath);
+ String line;
+ BufferedReader reader = new BufferedReader(new FileReader(f));
+ 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(",");
+ printWriter.print(timestamp);
+ printWriter.print(",");
+ printWriter.print(value);
+ printWriter.println();
+ }
+ reader.close();
+ printWriter.close();
+ }
+}
diff --git a/example/session/src/main/java/org/apache/iotdb/writeData/WriteFullGame.java b/example/session/src/main/java/org/apache/iotdb/writeData/WriteFullGame.java
index d3409d5..899cc84 100644
--- a/example/session/src/main/java/org/apache/iotdb/writeData/WriteFullGame.java
+++ b/example/session/src/main/java/org/apache/iotdb/writeData/WriteFullGame.java
@@ -15,6 +15,7 @@ import java.util.List;
import java.util.Random;
public class WriteFullGame {
+
/** Before writing data, make sure check the server parameter configurations. */
public static void main(String[] args)
throws IoTDBConnectionException, StatementExecutionException, IOException {
@@ -30,6 +31,10 @@ public class WriteFullGame {
long deleteFreq = Long.parseLong(args[1]); // 0 means no deletes
// 实验自变量3：每次删除的时间长度
long deleteLen = Long.parseLong(args[2]);
+ // 参数4：时间戳idx，从0开始
+ int timeIdx = Integer.parseInt(args[3]);
+ // 参数5：值idx，从0开始
+ int valueIdx = Integer.parseInt(args[4]);
Session session = new Session("127.0.0.1", 6667, "root", "root");
session.open(false);
@@ -40,7 +45,7 @@ public class WriteFullGame {
BufferedReader reader = new BufferedReader(new FileReader(f));
while ((line = reader.readLine()) != null) {
String[] split = line.split(",");
- long timestamp = Long.valueOf(split[3]);
+ long timestamp = Long.valueOf(split[timeIdx]);
if (minTime == -1) {
minTime = timestamp;
timestamp = 0;
@@ -58,7 +63,7 @@ public class WriteFullGame {
session.deleteData(deletePaths, deleteStartTime, deleteEndTime);
}
- long value = Long.valueOf(split[7]);
+ long value = Long.valueOf(split[valueIdx]);
session.insertRecord(
device,
timestamp,
diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutor4CPV.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutor4CPV.java
index 02bbf35..33c7109 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutor4CPV.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutor4CPV.java
@@ -535,11 +535,11 @@ public class LocalGroupByExecutor4CPV implements GroupByExecutor {
while (mergeReader.hasNextTimeValuePair()) {
Pair<TimeValuePair, MergeReaderPriority> res = mergeReader.nextElement();
TimeValuePair ret = res.left;
- // System.out.println(
- // "====DEBUG====: merge for bottomPoint. (t,v)="
- // + ret.getTimestamp()
- // + ","
- // + ret.getValue().getValue());
+ // System.out.println(
+ // "====DEBUG====: merge for bottomPoint. (t,v)="
+ // + ret.getTimestamp()
+ // + ","
+ // + ret.getValue().getValue());
updateBatchDataMap
.get(res.right)
.putAnObject(ret.getTimestamp(), ret.getValue().getValue());