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:41 UTC
[iotdb] 07/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 94711f7d2ac28a46efa2e04cb33e15d0371bc28f
Author: Lei Rui <10...@qq.com>
AuthorDate: Thu Feb 3 01:12:32 2022 +0800
update
---
.../apache/iotdb/queryExp/QuerySyntheticData1.java | 6 +-
.../dataset/groupby/LocalGroupByExecutor4CPV.java | 78 ++++++++++++----------
2 files changed, 45 insertions(+), 39 deletions(-)
diff --git a/example/session/src/main/java/org/apache/iotdb/queryExp/QuerySyntheticData1.java b/example/session/src/main/java/org/apache/iotdb/queryExp/QuerySyntheticData1.java
index a444313..26d6de1 100644
--- a/example/session/src/main/java/org/apache/iotdb/queryExp/QuerySyntheticData1.java
+++ b/example/session/src/main/java/org/apache/iotdb/queryExp/QuerySyntheticData1.java
@@ -46,12 +46,10 @@ public class QuerySyntheticData1 {
long minTime = 0L;
long maxTime = 10000000L; // unit:ms. Set in iotdb-engine.properties `timestamp_precision`.
// 实验自变量1：w数量
- // int intervalNum = Integer.parseInt(args[0]);
- int intervalNum = 50;
+ int intervalNum = Integer.parseInt(args[0]);
// 实验自变量2：方法
// 1: MAC, 2: MOC, 3: CPV
- // int approach = Integer.parseInt(args[1]);
- int approach = 2;
+ int approach = Integer.parseInt(args[1]);
if (approach != 1 && approach != 2 && approach != 3) {
throw new TException("Wrong input parameter approach!");
}
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 157435a..02bbf35 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
@@ -135,7 +135,7 @@ public class LocalGroupByExecutor4CPV implements GroupByExecutor {
public List<AggregateResult> calcResult(
long curStartTime, long curEndTime, long startTime, long endTime, long interval)
throws IOException, QueryProcessException {
- // System.out.println("====DEBUG====: calcResult for [" + curStartTime + "," + curEndTime +
+ // System.out.println("====DEBUG====: calcResult for [" + curStartTime + "," + curEndTime +
// ")");
// clear result cache
@@ -145,7 +145,7 @@ public class LocalGroupByExecutor4CPV implements GroupByExecutor {
// empty currentChunkList
currentChunkList = new ArrayList<>();
- // System.out.println("====DEBUG====: deal with futureChunkList");
+ // System.out.println("====DEBUG====: deal with futureChunkList");
ListIterator itr = futureChunkList.listIterator();
List<ChunkSuit4CPV> tmpFutureChunkList = new ArrayList<>();
@@ -188,15 +188,16 @@ public class LocalGroupByExecutor4CPV implements GroupByExecutor {
// System.out.println(
// "====DEBUG====: load the chunk because overlaps the M4 interval. Version="
- // + chunkMetadata.getVersion() + " " +
- // chunkMetadata.getOffsetOfChunkHeader());
+ // + chunkMetadata.getVersion()
+ // + " "
+ // + chunkMetadata.getOffsetOfChunkHeader());
}
}
futureChunkList.addAll(tmpFutureChunkList);
tmpFutureChunkList = null;
itr = null;
- // System.out.println("====DEBUG====: deal with currentChunkList");
+ // System.out.println("====DEBUG====: deal with currentChunkList");
if (currentChunkList.size() == 0) {
return results;
@@ -215,7 +216,7 @@ public class LocalGroupByExecutor4CPV implements GroupByExecutor {
values[3] = null;
// find candidate points
- // System.out.println("====DEBUG====: find candidate points");
+ // System.out.println("====DEBUG====: find candidate points");
for (int j = 0; j < currentChunkList.size(); j++) {
ChunkMetadata chunkMetadata = currentChunkList.get(j).getChunkMetadata();
@@ -268,7 +269,7 @@ public class LocalGroupByExecutor4CPV implements GroupByExecutor {
}
}
- // System.out.println("====DEBUG====: verify candidate points");
+ // System.out.println("====DEBUG====: verify candidate points");
// verify candidate points.
// firstPoint and lastPoint are valid for sure.
@@ -292,8 +293,9 @@ public class LocalGroupByExecutor4CPV implements GroupByExecutor {
// System.out.println(
// "====DEBUG====: load the chunk because candidate firstPoint is actually
// deleted. Version="
- // + firstChunkMetadata.getVersion() + " " + firstChunkMetadata
- // .getOffsetOfChunkHeader());
+ // + firstChunkMetadata.getVersion()
+ // + " "
+ // + firstChunkMetadata.getOffsetOfChunkHeader());
currentChunkList.remove(listIdx[0]);
List<IPageReader> pageReaderList =
@@ -324,7 +326,7 @@ public class LocalGroupByExecutor4CPV implements GroupByExecutor {
1,
Arrays.copyOfRange(values, 0, 1)); // first_value
isFinal[0] = true;
- // System.out.println("====DEBUG====: find firstPoint");
+ // System.out.println("====DEBUG====: find firstPoint");
}
}
if (!isFinal[1]) { // lastPoint
@@ -345,8 +347,9 @@ public class LocalGroupByExecutor4CPV implements GroupByExecutor {
// System.out.println(
// "====DEBUG====: load the chunk because candidate lastPoint is actually
// deleted. Version="
- // + lastChunkMetadata.getVersion() + " " + lastChunkMetadata
- // .getOffsetOfChunkHeader());
+ // + lastChunkMetadata.getVersion()
+ // + " "
+ // + lastChunkMetadata.getOffsetOfChunkHeader());
currentChunkList.remove(listIdx[1]);
List<IPageReader> pageReaderList =
@@ -378,7 +381,7 @@ public class LocalGroupByExecutor4CPV implements GroupByExecutor {
Arrays.copyOfRange(values, 1, 2)); // first_value
isFinal[1] = true;
- // System.out.println("====DEBUG====: find lastPoint");
+ // System.out.println("====DEBUG====: find lastPoint");
}
}
// verify bottomPoint:
@@ -402,8 +405,9 @@ public class LocalGroupByExecutor4CPV implements GroupByExecutor {
// System.out.println(
// "====DEBUG====: load the chunk because candidate bottomPoint is actually
// deleted. Version="
- // + bottomChunkMetadata.getVersion() + " " + bottomChunkMetadata
- // .getOffsetOfChunkHeader());
+ // + bottomChunkMetadata.getVersion()
+ // + " "
+ // + bottomChunkMetadata.getOffsetOfChunkHeader());
currentChunkList.remove(listIdx[2]);
List<IPageReader> pageReaderList =
@@ -450,7 +454,7 @@ public class LocalGroupByExecutor4CPV implements GroupByExecutor {
toMerge.add(i);
}
if (toMerge.isEmpty()) {
- // System.out.println("====DEBUG====: find bottomPoint");
+ // System.out.println("====DEBUG====: find bottomPoint");
results
.get(4)
@@ -519,10 +523,10 @@ public class LocalGroupByExecutor4CPV implements GroupByExecutor {
chunkSuit4CPV = currentChunkList.get(toMerge.get(o));
// System.out.println(
- // "====DEBUG====: load chunk for update merge. Version=" +
- // chunkMetadata
- // .getVersion() + " " +
- // chunkMetadata.getOffsetOfChunkHeader());
+ // "====DEBUG====: load chunk for update merge. Version="
+ // + chunkMetadata.getVersion()
+ // + " "
+ // + chunkMetadata.getOffsetOfChunkHeader());
}
mergeReader.addReader(
chunkSuit4CPV.getBatchData().getBatchDataIterator(),
@@ -532,9 +536,10 @@ public class LocalGroupByExecutor4CPV implements GroupByExecutor {
Pair<TimeValuePair, MergeReaderPriority> res = mergeReader.nextElement();
TimeValuePair ret = res.left;
// System.out.println(
- // "====DEBUG====: merge for bottomPoint. (t,v)=" +
- // ret.getTimestamp() + "," + ret
- // .getValue().getValue());
+ // "====DEBUG====: merge for bottomPoint. (t,v)="
+ // + ret.getTimestamp()
+ // + ","
+ // + ret.getValue().getValue());
updateBatchDataMap
.get(res.right)
.putAnObject(ret.getTimestamp(), ret.getValue().getValue());
@@ -579,8 +584,9 @@ public class LocalGroupByExecutor4CPV implements GroupByExecutor {
.setStatistics(statisticsMap.get(mergeReaderPriority));
}
// System.out.println(
- // "====DEBUG====: merged chunks are : version=" + newMergedVersionList +
- // " offsets="
+ // "====DEBUG====: merged chunks are : version="
+ // + newMergedVersionList
+ // + " offsets="
// + newMergedOffsetList);
continue;
}
@@ -608,8 +614,9 @@ public class LocalGroupByExecutor4CPV implements GroupByExecutor {
// System.out.println(
// "====DEBUG====: load the chunk because candidate topPoint is actually
// deleted. Version="
- // + topChunkMetadata.getVersion() + " " + topChunkMetadata
- // .getOffsetOfChunkHeader());
+ // + topChunkMetadata.getVersion()
+ // + " "
+ // + topChunkMetadata.getOffsetOfChunkHeader());
currentChunkList.remove(listIdx[3]);
List<IPageReader> pageReaderList =
@@ -662,7 +669,7 @@ public class LocalGroupByExecutor4CPV implements GroupByExecutor {
1,
Arrays.copyOfRange(values, 3, 4)); // max_value
isFinal[3] = true;
- // System.out.println("====DEBUG====: find topPoint");
+ // System.out.println("====DEBUG====: find topPoint");
return results;
} else {
// deal with toMerge chunks: delete updated points
@@ -724,10 +731,10 @@ public class LocalGroupByExecutor4CPV implements GroupByExecutor {
chunkSuit4CPV = currentChunkList.get(toMerge.get(o));
// System.out.println(
- // "====DEBUG====: load chunk for update merge. Version=" +
- // chunkMetadata
- // .getVersion() + " " +
- // chunkMetadata.getOffsetOfChunkHeader());
+ // "====DEBUG====: load chunk for update merge. Version="
+ // + chunkMetadata.getVersion()
+ // + " "
+ // + chunkMetadata.getOffsetOfChunkHeader());
}
mergeReader.addReader(
chunkSuit4CPV.getBatchData().getBatchDataIterator(),
@@ -737,9 +744,10 @@ public class LocalGroupByExecutor4CPV implements GroupByExecutor {
Pair<TimeValuePair, MergeReaderPriority> res = mergeReader.nextElement();
TimeValuePair ret = res.left;
// System.out.println(
- // "====DEBUG====: merge for topPoint. (t,v)=" + ret.getTimestamp() +
- // "," + ret
- // .getValue().getValue());
+ // "====DEBUG====: merge for topPoint. (t,v)="
+ // + ret.getTimestamp()
+ // + ","
+ // + ret.getValue().getValue());
updateBatchDataMap
.get(res.right)
.putAnObject(ret.getTimestamp(), ret.getValue().getValue());