You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2019/06/28 14:57:04 UTC
[incubator-iotdb] branch feature_async_close_tsfile updated: fix
how a memory chuck is processed during deletion
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch feature_async_close_tsfile
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/feature_async_close_tsfile by this push:
new e63fc83 fix how a memory chuck is processed during deletion
new 69829ca Merge branch 'feature_async_close_tsfile' of github.com:apache/incubator-iotdb into feature_async_close_tsfile
e63fc83 is described below
commit e63fc83599126935ee384c03651c45ea783aa18e
Author: 江天 <jt...@163.com>
AuthorDate: Fri Jun 28 22:54:23 2019 +0800
fix how a memory chuck is processed during deletion
---
.../org/apache/iotdb/db/engine/memtable/AbstractMemTable.java | 5 +++--
.../apache/iotdb/db/engine/memtable/IWritableMemChunk.java | 4 ++++
.../apache/iotdb/db/engine/memtable/WritableMemChunkV2.java | 11 +++++++++++
.../org/apache/iotdb/db/utils/datastructure/BinaryTVList.java | 1 +
.../apache/iotdb/db/utils/datastructure/BooleanTVList.java | 1 +
.../org/apache/iotdb/db/utils/datastructure/DoubleTVList.java | 1 +
.../org/apache/iotdb/db/utils/datastructure/FloatTVList.java | 1 +
.../org/apache/iotdb/db/utils/datastructure/IntTVList.java | 1 +
.../org/apache/iotdb/db/utils/datastructure/LongTVList.java | 1 +
.../java/org/apache/iotdb/db/utils/datastructure/TVList.java | 9 +++++++++
10 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
index 798743d..8c83bd2 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
@@ -213,8 +213,9 @@ public abstract class AbstractMemTable implements IMemTable {
* null.
*/
private IWritableMemChunk filterChunk(IWritableMemChunk chunk, long timestamp, String path) {
- List<TimeValuePair> timeValuePairs = chunk.getSortedTimeValuePairList();
- if (!timeValuePairs.isEmpty() && timeValuePairs.get(0).getTimestamp() <= timestamp) {
+
+ if (!chunk.isEmpty() && chunk.getMinTime() <= timestamp) {
+ List<TimeValuePair> timeValuePairs = chunk.getSortedTimeValuePairList();
TSDataType dataType = chunk.getType();
IWritableMemChunk newChunk = genMemSeries(dataType, path);
for (TimeValuePair pair : timeValuePairs) {
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java
index f59ab3e..3296ab2 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java
@@ -67,4 +67,8 @@ public interface IWritableMemChunk extends TimeValuePairSorter {
default TVList getSortedTVList(){return null;}
default TVList getTVList(){return null;}
+
+ default long getMinTime() {
+ return Long.MIN_VALUE;
+ }
}
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunkV2.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunkV2.java
index 8d34e67..596e715 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunkV2.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunkV2.java
@@ -70,6 +70,7 @@ public class WritableMemChunkV2 implements IWritableMemChunk {
default:
throw new UnSupportedDataTypeException("Unsupported data type:" + dataType);
}
+ sortedList = null;
}
@Override
@@ -96,6 +97,7 @@ public class WritableMemChunkV2 implements IWritableMemChunk {
default:
throw new UnSupportedDataTypeException("Unsupported data type:" + dataType);
}
+ sortedList = null;
}
@@ -198,4 +200,13 @@ public class WritableMemChunkV2 implements IWritableMemChunk {
@Override
public void releasePrimitiveArrayList(){}
+ @Override
+ public boolean isEmpty() {
+ return list.size() == 0;
+ }
+
+ @Override
+ public long getMinTime() {
+ return list.getMinTime();
+ }
}
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/BinaryTVList.java b/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/BinaryTVList.java
index 73cb711..b881c13 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/BinaryTVList.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/BinaryTVList.java
@@ -40,6 +40,7 @@ public class BinaryTVList extends TVList {
checkExpansion();
int arrayIndex = size / SINGLE_ARRAY_SIZE;
int elementIndex = size % SINGLE_ARRAY_SIZE;
+ minTime = minTime <= timestamp ? minTime : timestamp;
timestamps.get(arrayIndex)[elementIndex] = timestamp;
values.get(arrayIndex)[elementIndex] = value;
size++;
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/BooleanTVList.java b/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/BooleanTVList.java
index f0c1b40..c882750 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/BooleanTVList.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/BooleanTVList.java
@@ -39,6 +39,7 @@ public class BooleanTVList extends TVList {
checkExpansion();
int arrayIndex = size / SINGLE_ARRAY_SIZE;
int elementIndex = size % SINGLE_ARRAY_SIZE;
+ minTime = minTime <= timestamp ? minTime : timestamp;
timestamps.get(arrayIndex)[elementIndex] = timestamp;
values.get(arrayIndex)[elementIndex] = value;
size++;
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/DoubleTVList.java b/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/DoubleTVList.java
index 61aaeb7..f108e67 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/DoubleTVList.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/DoubleTVList.java
@@ -39,6 +39,7 @@ public class DoubleTVList extends TVList {
checkExpansion();
int arrayIndex = size / SINGLE_ARRAY_SIZE;
int elementIndex = size % SINGLE_ARRAY_SIZE;
+ minTime = minTime <= timestamp ? minTime : timestamp;
timestamps.get(arrayIndex)[elementIndex] = timestamp;
values.get(arrayIndex)[elementIndex] = value;
size++;
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/FloatTVList.java b/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/FloatTVList.java
index e7083bf..0585bec 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/FloatTVList.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/FloatTVList.java
@@ -39,6 +39,7 @@ public class FloatTVList extends TVList {
checkExpansion();
int arrayIndex = size / SINGLE_ARRAY_SIZE;
int elementIndex = size % SINGLE_ARRAY_SIZE;
+ minTime = minTime <= timestamp ? minTime : timestamp;
timestamps.get(arrayIndex)[elementIndex] = timestamp;
values.get(arrayIndex)[elementIndex] = value;
size++;
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/IntTVList.java b/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/IntTVList.java
index b2a5ad0..4da7914 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/IntTVList.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/IntTVList.java
@@ -39,6 +39,7 @@ public class IntTVList extends TVList {
checkExpansion();
int arrayIndex = size / SINGLE_ARRAY_SIZE;
int elementIndex = size % SINGLE_ARRAY_SIZE;
+ minTime = minTime <= timestamp ? minTime : timestamp;
timestamps.get(arrayIndex)[elementIndex] = timestamp;
values.get(arrayIndex)[elementIndex] = value;
size++;
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/LongTVList.java b/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/LongTVList.java
index 08844a5..f9a8704 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/LongTVList.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/LongTVList.java
@@ -39,6 +39,7 @@ public class LongTVList extends TVList {
checkExpansion();
int arrayIndex = size / SINGLE_ARRAY_SIZE;
int elementIndex = size % SINGLE_ARRAY_SIZE;
+ minTime = minTime <= timestamp ? minTime : timestamp;
timestamps.get(arrayIndex)[elementIndex] = timestamp;
values.get(arrayIndex)[elementIndex] = value;
size++;
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/TVList.java b/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/TVList.java
index 35e9fd6..62f9702 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/TVList.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/TVList.java
@@ -43,10 +43,13 @@ public abstract class TVList {
protected long pivotTime;
+ protected long minTime;
+
public TVList() {
timestamps = new ArrayList<>();
size = 0;
limit = 0;
+ minTime = Long.MIN_VALUE;
}
public int size() {
@@ -116,6 +119,10 @@ public abstract class TVList {
public abstract void sort();
+ public long getMinTime() {
+ return minTime;
+ }
+
protected abstract void set(int src, int dest);
protected abstract void setFromSorted(int src, int dest);
@@ -140,12 +147,14 @@ public abstract class TVList {
cloneList.size = size;
cloneList.sorted = sorted;
cloneList.limit = limit;
+ cloneList.minTime = minTime;
}
public void reset() {
size = 0;
timeOffset = -1;
sorted = false;
+ minTime = Long.MIN_VALUE;
}
protected void checkExpansion() {