You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ka...@apache.org on 2019/06/12 01:58:54 UTC
[incubator-iotdb] 02/03: redo change
This is an automated email from the ASF dual-hosted git repository.
kangrong pushed a commit to branch feature_async_close_tsfile
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit c9b8dad1a552070674d97fd27d61b74089e9ad55
Author: kr11 <30...@qq.com>
AuthorDate: Wed Jun 12 09:52:58 2019 +0800
redo change
---
.../db/engine/overflow/io/OverflowMemtable.java | 80 +++++++++++-----------
1 file changed, 40 insertions(+), 40 deletions(-)
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/io/OverflowMemtable.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/io/OverflowMemtable.java
index 46231fc..91ef235 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/io/OverflowMemtable.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/io/OverflowMemtable.java
@@ -38,44 +38,44 @@ import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
*/
public class OverflowMemtable extends PrimitiveMemTable {
-// /**
-// * store update and delete data
-// */
-// private Map<String, Map<String, LongStatistics>> indexTrees;
-//
-// /**
-// * store insert data
-// */
-// private IMemTable memTable;
-//
-// public OverflowMemtable() {
-// indexTrees = new HashMap<>();
-// memTable = new PrimitiveMemTable();
-// }
-//
-// public void insert(TSRecord tsRecord) {
-// for (DataPoint dataPoint : tsRecord.dataPointList) {
-// memTable.write(tsRecord.deviceId, dataPoint.getMeasurementId(), dataPoint.getType(),
-// tsRecord.time,
-// dataPoint.getValue().toString());
-// }
-// }
-//
-// /**
-// * @deprecated update time series data
-// */
-// @Deprecated
-// public void update(String deviceId, String measurementId, long startTime, long endTime,
-// TSDataType dataType,
-// byte[] value) {
-// if (!indexTrees.containsKey(deviceId)) {
-// indexTrees.put(deviceId, new HashMap<>());
-// }
-// if (!indexTrees.get(deviceId).containsKey(measurementId)) {
-// indexTrees.get(deviceId).put(measurementId, new LongStatistics());
-// }
-// indexTrees.get(deviceId).get(measurementId).updateStats(startTime, endTime);
-// }
+ /**
+ * store update and delete data
+ */
+ private Map<String, Map<String, LongStatistics>> indexTrees;
+
+ /**
+ * store insert data
+ */
+ private IMemTable memTable;
+
+ public OverflowMemtable() {
+ indexTrees = new HashMap<>();
+ memTable = new PrimitiveMemTable();
+ }
+
+ public void insert(TSRecord tsRecord) {
+ for (DataPoint dataPoint : tsRecord.dataPointList) {
+ memTable.write(tsRecord.deviceId, dataPoint.getMeasurementId(), dataPoint.getType(),
+ tsRecord.time,
+ dataPoint.getValue().toString());
+ }
+ }
+
+ /**
+ * @deprecated update time series data
+ */
+ @Deprecated
+ public void update(String deviceId, String measurementId, long startTime, long endTime,
+ TSDataType dataType,
+ byte[] value) {
+ if (!indexTrees.containsKey(deviceId)) {
+ indexTrees.put(deviceId, new HashMap<>());
+ }
+ if (!indexTrees.get(deviceId).containsKey(measurementId)) {
+ indexTrees.get(deviceId).put(measurementId, new LongStatistics());
+ }
+ indexTrees.get(deviceId).get(measurementId).updateStats(startTime, endTime);
+ }
public void delete(String deviceId, String measurementId, long timestamp, boolean isFlushing) {
super.delete(deviceId, measurementId, timestamp);
@@ -95,7 +95,7 @@ public class OverflowMemtable extends PrimitiveMemTable {
// }
public boolean isEmptyOfMemTable() {
- return this.isEmpty();
+ return super.isEmpty();
}
public IMemTable getMemTabale() {
@@ -109,6 +109,6 @@ public class OverflowMemtable extends PrimitiveMemTable {
public void clear() {
// indexTrees.clear();
- this.clear();
+ super.clear();
}
}