This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch memtsblock in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 9ff8571c474c9ed86c74ba7aaf1ececf2c61e8eb Author: HTHou <[email protected]> AuthorDate: Mon May 2 21:49:48 2022 +0800 update --- .../iotdb/db/utils/datastructure/BinaryTVList.java | 2 +- .../db/utils/datastructure/BooleanTVList.java | 2 +- .../iotdb/db/utils/datastructure/DoubleTVList.java | 2 +- .../iotdb/db/utils/datastructure/FloatTVList.java | 2 +- .../iotdb/db/utils/datastructure/IntTVList.java | 2 +- .../iotdb/db/utils/datastructure/LongTVList.java | 2 +- .../iotdb/db/utils/datastructure/TVList.java | 30 +++++----------------- 7 files changed, 13 insertions(+), 29 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/BinaryTVList.java b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/BinaryTVList.java index fa78d82255..bcf791c3e2 100644 --- a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/BinaryTVList.java +++ b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/BinaryTVList.java @@ -217,7 +217,7 @@ public class BinaryTVList extends TVList { List<TimeRange> deletionList) { Integer deleteCursor = 0; for (int i = 0; i < rowCount; i++) { - if (!isPointDeleted(getTime(i), deletionList, deleteCursor)) { + if (pointNotDeleted(getTime(i), deletionList, deleteCursor)) { valueBuilder.writeBoolean(getBoolean(i)); } } diff --git a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/BooleanTVList.java b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/BooleanTVList.java index c2a648557a..bb9df63817 100644 --- a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/BooleanTVList.java +++ b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/BooleanTVList.java @@ -217,7 +217,7 @@ public class BooleanTVList extends TVList { List<TimeRange> deletionList) { Integer deleteCursor = 0; for (int i = 0; i < rowCount; i++) { - if (!isPointDeleted(getTime(i), deletionList, deleteCursor)) { + if (pointNotDeleted(getTime(i), deletionList, deleteCursor)) { valueBuilder.writeBoolean(getBoolean(i)); } } diff --git a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/DoubleTVList.java b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/DoubleTVList.java index 39a64e1265..89da1cdacb 100644 --- a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/DoubleTVList.java +++ b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/DoubleTVList.java @@ -227,7 +227,7 @@ public class DoubleTVList extends TVList { List<TimeRange> deletionList) { Integer deleteCursor = 0; for (int i = 0; i < rowCount; i++) { - if (!isPointDeleted(getTime(i), deletionList, deleteCursor)) { + if (pointNotDeleted(getTime(i), deletionList, deleteCursor)) { valueBuilder.writeDouble( roundValueWithGivenPrecision(getDouble(i), floatPrecision, encoding)); } diff --git a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/FloatTVList.java b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/FloatTVList.java index f010489059..178f8391a6 100644 --- a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/FloatTVList.java +++ b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/FloatTVList.java @@ -227,7 +227,7 @@ public class FloatTVList extends TVList { List<TimeRange> deletionList) { Integer deleteCursor = 0; for (int i = 0; i < rowCount; i++) { - if (!isPointDeleted(getTime(i), deletionList, deleteCursor)) { + if (pointNotDeleted(getTime(i), deletionList, deleteCursor)) { valueBuilder.writeFloat( roundValueWithGivenPrecision(getFloat(i), floatPrecision, encoding)); } diff --git a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/IntTVList.java b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/IntTVList.java index e07d0c3876..3543b6921a 100644 --- a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/IntTVList.java +++ b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/IntTVList.java @@ -215,7 +215,7 @@ public class IntTVList extends TVList { List<TimeRange> deletionList) { Integer deleteCursor = 0; for (int i = 0; i < rowCount; i++) { - if (!isPointDeleted(getTime(i), deletionList, deleteCursor)) { + if (pointNotDeleted(getTime(i), deletionList, deleteCursor)) { valueBuilder.writeInt(getInt(i)); } } diff --git a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/LongTVList.java b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/LongTVList.java index 65d706a725..ed1c84c109 100644 --- a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/LongTVList.java +++ b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/LongTVList.java @@ -215,7 +215,7 @@ public class LongTVList extends TVList { List<TimeRange> deletionList) { Integer deleteCursor = 0; for (int i = 0; i < rowCount; i++) { - if (!isPointDeleted(getTime(i), deletionList, deleteCursor)) { + if (pointNotDeleted(getTime(i), deletionList, deleteCursor)) { valueBuilder.writeLong(getLong(i)); } } diff --git a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/TVList.java b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/TVList.java index e9f13ef4fe..e16a3c8c3b 100644 --- a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/TVList.java +++ b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/TVList.java @@ -97,9 +97,9 @@ public abstract class TVList implements WALEntryValue { // value array mem size size += (long) PrimitiveArrayManager.ARRAY_SIZE * (long) type.getDataTypeSize(); // two array headers mem size - size += NUM_BYTES_ARRAY_HEADER * 2; + size += NUM_BYTES_ARRAY_HEADER * 2L; // Object references size in ArrayList - size += NUM_BYTES_OBJECT_REF * 2; + size += NUM_BYTES_OBJECT_REF * 2L; return size; } @@ -213,10 +213,6 @@ public abstract class TVList implements WALEntryValue { throw new UnsupportedOperationException(ERR_DATATYPE_NOT_CONSISTENT); } - public Object getAlignedValue(int index, Integer floatPrecision, TSEncoding encoding) { - throw new UnsupportedOperationException(ERR_DATATYPE_NOT_CONSISTENT); - } - public TVList getTvListByColumnIndex(List<Integer> columnIndexList) { throw new UnsupportedOperationException(ERR_DATATYPE_NOT_CONSISTENT); } @@ -492,10 +488,6 @@ public abstract class TVList implements WALEntryValue { } } - void updateMinTimeAndSorted(long[] time) { - updateMinTimeAndSorted(time, 0, time.length); - } - void updateMinTimeAndSorted(long[] time, int start, int end) { int length = time.length; long inPutMinTime = Long.MAX_VALUE; @@ -516,14 +508,6 @@ public abstract class TVList implements WALEntryValue { protected abstract TimeValuePair getTimeValuePair( int index, long time, Integer floatPrecision, TSEncoding encoding); - public TimeValuePair getTimeValuePairForTimeDuplicatedRows( - List<Integer> timeDuplicatedVectorRowIndexList, - long time, - Integer floatPrecision, - TSEncoding encoding) { - throw new UnsupportedOperationException(ERR_DATATYPE_NOT_CONSISTENT); - } - public TsBlock getTsBlock(int floatPrecision, TSEncoding encoding, List<TimeRange> deletionList) { if (deletionList == null) { return this.getTsBlockWithoutDeletionList(floatPrecision, encoding); @@ -533,7 +517,7 @@ public abstract class TVList implements WALEntryValue { // Time column TimeColumnBuilder timeBuilder = builder.getTimeColumnBuilder(); for (int i = 0; i < rowCount; i++) { - if (!isPointDeleted(getTime(i), deletionList, deleteCursor)) { + if (pointNotDeleted(getTime(i), deletionList, deleteCursor)) { timeBuilder.writeLong(this.getTime(i)); } } @@ -572,18 +556,18 @@ public abstract class TVList implements WALEntryValue { TSEncoding encoding, List<TimeRange> deletionList); - protected boolean isPointDeleted( + protected boolean pointNotDeleted( long timestamp, List<TimeRange> deletionList, Integer deleteCursor) { while (deleteCursor < deletionList.size()) { if (deletionList.get(deleteCursor).contains(timestamp)) { - return true; + return false; } else if (deletionList.get(deleteCursor).getMax() < timestamp) { deleteCursor++; } else { - return false; + return true; } } - return false; + return true; } public abstract TSDataType getDataType();
