You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2019/06/29 09:31:04 UTC
[incubator-iotdb] branch feature_async_close_tsfile updated: rename
PrimitiveDataListPool to PrimitiveArrayPool and remove useless classes
This is an automated email from the ASF dual-hosted git repository.
qiaojialin 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 c36beb4 rename PrimitiveDataListPool to PrimitiveArrayPool and remove useless classes
c36beb4 is described below
commit c36beb48e3ed6aeb5236fd289983cfde8908eb1e
Author: qiaojialin <64...@qq.com>
AuthorDate: Sat Jun 29 17:30:43 2019 +0800
rename PrimitiveDataListPool to PrimitiveArrayPool and remove useless classes
---
.../querycontext/GlobalSortedSeriesDataSource.java | 92 ----------------------
...veDataListPool.java => PrimitiveArrayPool.java} | 45 ++++++-----
.../iotdb/db/utils/datastructure/BinaryTVList.java | 16 ++--
.../db/utils/datastructure/BooleanTVList.java | 16 ++--
.../iotdb/db/utils/datastructure/DoubleTVList.java | 16 ++--
.../iotdb/db/utils/datastructure/FloatTVList.java | 16 ++--
.../iotdb/db/utils/datastructure/IntTVList.java | 16 ++--
.../iotdb/db/utils/datastructure/LongTVList.java | 16 ++--
.../iotdb/db/utils/datastructure/TVList.java | 10 +--
9 files changed, 81 insertions(+), 162 deletions(-)
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/GlobalSortedSeriesDataSource.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/GlobalSortedSeriesDataSource.java
deleted file mode 100644
index 374c790..0000000
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/GlobalSortedSeriesDataSource.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.iotdb.db.engine.querycontext;
-
-import java.util.List;
-import org.apache.iotdb.db.engine.filenodeV2.TsFileResourceV2;
-import org.apache.iotdb.tsfile.read.common.Path;
-
-public class GlobalSortedSeriesDataSource {
-
- private Path seriesPath;
-
- // sealed tsfile
- private List<TsFileResourceV2> sealedTsFiles;
-
- // unsealed tsfile
- private UnsealedTsFile unsealedTsFile;
-
- // seq mem-table
- private ReadOnlyMemChunk readableChunk;
-
- public GlobalSortedSeriesDataSource(Path seriesPath, List<TsFileResourceV2> sealedTsFiles,
- UnsealedTsFile unsealedTsFile,
- ReadOnlyMemChunk readableChunk) {
- this.seriesPath = seriesPath;
- this.sealedTsFiles = sealedTsFiles;
- this.unsealedTsFile = unsealedTsFile;
-
- this.readableChunk = readableChunk;
- }
-
- public boolean hasSealedTsFiles() {
- return sealedTsFiles != null && !sealedTsFiles.isEmpty();
- }
-
- public List<TsFileResourceV2> getSealedTsFiles() {
- return sealedTsFiles;
- }
-
- public void setSealedTsFiles(List<TsFileResourceV2> sealedTsFiles) {
- this.sealedTsFiles = sealedTsFiles;
- }
-
- public boolean hasUnsealedTsFile() {
- return unsealedTsFile != null;
- }
-
- public UnsealedTsFile getUnsealedTsFile() {
- return unsealedTsFile;
- }
-
- public void setUnsealedTsFile(UnsealedTsFile unsealedTsFile) {
- this.unsealedTsFile = unsealedTsFile;
- }
-
- public boolean hasRawSeriesChunk() {
- return readableChunk != null;
- }
-
- public ReadOnlyMemChunk getReadableChunk() {
- return readableChunk;
- }
-
- public void setReadableChunk(ReadOnlyMemChunk readableChunk) {
- this.readableChunk = readableChunk;
- }
-
- public Path getSeriesPath() {
- return seriesPath;
- }
-
- public void setSeriesPath(Path seriesPath) {
- this.seriesPath = seriesPath;
- }
-
-}
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/rescon/PrimitiveDataListPool.java b/iotdb/src/main/java/org/apache/iotdb/db/rescon/PrimitiveArrayPool.java
similarity index 76%
rename from iotdb/src/main/java/org/apache/iotdb/db/rescon/PrimitiveDataListPool.java
rename to iotdb/src/main/java/org/apache/iotdb/db/rescon/PrimitiveArrayPool.java
index a1dfd5f..dde4beb 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/rescon/PrimitiveDataListPool.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/rescon/PrimitiveArrayPool.java
@@ -20,10 +20,6 @@ package org.apache.iotdb.db.rescon;
import java.util.ArrayDeque;
import java.util.EnumMap;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import org.apache.iotdb.db.utils.PrimitiveArrayListV2;
import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.utils.Binary;
@@ -33,34 +29,37 @@ import org.slf4j.LoggerFactory;
/**
* Manage all primitive data list in memory, including get and release operation.
*/
-public class PrimitiveDataListPool {
+public class PrimitiveArrayPool {
- private static final Logger LOGGER = LoggerFactory.getLogger(PrimitiveDataListPool.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(PrimitiveArrayPool.class);
- private static final EnumMap<TSDataType, ArrayDeque> primitiveDataListsMap = new EnumMap<>(TSDataType.class);
+ /**
+ * data type -> Array<PrimitiveArray>
+ */
+ private static final EnumMap<TSDataType, ArrayDeque> primitiveArraysMap = new EnumMap<>(TSDataType.class);
public static final int ARRAY_SIZE = 128;
static {
- primitiveDataListsMap.put(TSDataType.BOOLEAN, new ArrayDeque());
- primitiveDataListsMap.put(TSDataType.INT32, new ArrayDeque());
- primitiveDataListsMap.put(TSDataType.INT64, new ArrayDeque());
- primitiveDataListsMap.put(TSDataType.FLOAT, new ArrayDeque());
- primitiveDataListsMap.put(TSDataType.DOUBLE, new ArrayDeque());
- primitiveDataListsMap.put(TSDataType.TEXT, new ArrayDeque());
+ primitiveArraysMap.put(TSDataType.BOOLEAN, new ArrayDeque());
+ primitiveArraysMap.put(TSDataType.INT32, new ArrayDeque());
+ primitiveArraysMap.put(TSDataType.INT64, new ArrayDeque());
+ primitiveArraysMap.put(TSDataType.FLOAT, new ArrayDeque());
+ primitiveArraysMap.put(TSDataType.DOUBLE, new ArrayDeque());
+ primitiveArraysMap.put(TSDataType.TEXT, new ArrayDeque());
}
- public static PrimitiveDataListPool getInstance() {
+ public static PrimitiveArrayPool getInstance() {
return INSTANCE;
}
- private static final PrimitiveDataListPool INSTANCE = new PrimitiveDataListPool();
+ private static final PrimitiveArrayPool INSTANCE = new PrimitiveArrayPool();
- private PrimitiveDataListPool() {}
+ private PrimitiveArrayPool() {}
public synchronized Object getPrimitiveDataListByType(TSDataType dataType) {
- ArrayDeque dataListQueue = primitiveDataListsMap.computeIfAbsent(dataType, (k)->new ArrayDeque<>());
+ ArrayDeque dataListQueue = primitiveArraysMap.computeIfAbsent(dataType, (k)->new ArrayDeque<>());
Object dataArray = dataListQueue.poll();
switch (dataType) {
case BOOLEAN:
@@ -102,17 +101,17 @@ public class PrimitiveDataListPool {
public synchronized void release(Object dataArray) {
if (dataArray instanceof boolean[]) {
- primitiveDataListsMap.get(TSDataType.BOOLEAN).add(dataArray);
+ primitiveArraysMap.get(TSDataType.BOOLEAN).add(dataArray);
} else if (dataArray instanceof int[]) {
- primitiveDataListsMap.get(TSDataType.INT32).add(dataArray);
+ primitiveArraysMap.get(TSDataType.INT32).add(dataArray);
} else if (dataArray instanceof long[]){
- primitiveDataListsMap.get(TSDataType.INT64).add(dataArray);
+ primitiveArraysMap.get(TSDataType.INT64).add(dataArray);
} else if (dataArray instanceof float[]) {
- primitiveDataListsMap.get(TSDataType.FLOAT).add(dataArray);
+ primitiveArraysMap.get(TSDataType.FLOAT).add(dataArray);
} else if (dataArray instanceof double[]) {
- primitiveDataListsMap.get(TSDataType.DOUBLE).add(dataArray);
+ primitiveArraysMap.get(TSDataType.DOUBLE).add(dataArray);
} else if (dataArray instanceof Binary[]) {
- primitiveDataListsMap.get(TSDataType.TEXT).add(dataArray);
+ primitiveArraysMap.get(TSDataType.TEXT).add(dataArray);
}
}
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 cb63650..a9c94c7 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
@@ -18,11 +18,11 @@
*/
package org.apache.iotdb.db.utils.datastructure;
-import static org.apache.iotdb.db.rescon.PrimitiveDataListPool.ARRAY_SIZE;
+import static org.apache.iotdb.db.rescon.PrimitiveArrayPool.ARRAY_SIZE;
import java.util.ArrayList;
import java.util.List;
-import org.apache.iotdb.db.rescon.PrimitiveDataListPool;
+import org.apache.iotdb.db.rescon.PrimitiveArrayPool;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.utils.Binary;
@@ -99,10 +99,12 @@ public class BinaryTVList extends TVList {
public void sort() {
if (sortedTimestamps == null || sortedTimestamps.length < size) {
- sortedTimestamps = (long[][]) PrimitiveDataListPool.getInstance().getDataListsByType(TSDataType.INT64, size);
+ sortedTimestamps = (long[][]) PrimitiveArrayPool
+ .getInstance().getDataListsByType(TSDataType.INT64, size);
}
if (sortedValues == null || sortedValues.length < size) {
- sortedValues = (Binary[][]) PrimitiveDataListPool.getInstance().getDataListsByType(TSDataType.TEXT, size);
+ sortedValues = (Binary[][]) PrimitiveArrayPool
+ .getInstance().getDataListsByType(TSDataType.TEXT, size);
}
sort(0, size);
clearTime();
@@ -114,7 +116,7 @@ public class BinaryTVList extends TVList {
void clearValue() {
if (values != null) {
for (Binary[] dataArray : values) {
- PrimitiveDataListPool.getInstance().release(dataArray);
+ PrimitiveArrayPool.getInstance().release(dataArray);
}
values.clear();
}
@@ -124,7 +126,7 @@ public class BinaryTVList extends TVList {
void clearSortedValue() {
if (sortedValues != null) {
for (Binary[] dataArray : sortedValues) {
- PrimitiveDataListPool.getInstance().release(dataArray);
+ PrimitiveArrayPool.getInstance().release(dataArray);
}
sortedValues = null;
}
@@ -160,7 +162,7 @@ public class BinaryTVList extends TVList {
@Override
protected void expandValues() {
- values.add((Binary[]) PrimitiveDataListPool
+ values.add((Binary[]) PrimitiveArrayPool
.getInstance().getPrimitiveDataListByType(TSDataType.TEXT));
}
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 43ce3ce..243dcce 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
@@ -18,11 +18,11 @@
*/
package org.apache.iotdb.db.utils.datastructure;
-import static org.apache.iotdb.db.rescon.PrimitiveDataListPool.ARRAY_SIZE;
+import static org.apache.iotdb.db.rescon.PrimitiveArrayPool.ARRAY_SIZE;
import java.util.ArrayList;
import java.util.List;
-import org.apache.iotdb.db.rescon.PrimitiveDataListPool;
+import org.apache.iotdb.db.rescon.PrimitiveArrayPool;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
public class BooleanTVList extends TVList {
@@ -98,10 +98,12 @@ public class BooleanTVList extends TVList {
public void sort() {
if (sortedTimestamps == null || sortedTimestamps.length < size) {
- sortedTimestamps = (long[][]) PrimitiveDataListPool.getInstance().getDataListsByType(TSDataType.INT64, size);
+ sortedTimestamps = (long[][]) PrimitiveArrayPool
+ .getInstance().getDataListsByType(TSDataType.INT64, size);
}
if (sortedValues == null || sortedValues.length < size) {
- sortedValues = (boolean[][]) PrimitiveDataListPool.getInstance().getDataListsByType(TSDataType.BOOLEAN, size);
+ sortedValues = (boolean[][]) PrimitiveArrayPool
+ .getInstance().getDataListsByType(TSDataType.BOOLEAN, size);
}
sort(0, size);
clearTime();
@@ -113,7 +115,7 @@ public class BooleanTVList extends TVList {
void clearValue() {
if (values != null) {
for (boolean[] dataArray : values) {
- PrimitiveDataListPool.getInstance().release(dataArray);
+ PrimitiveArrayPool.getInstance().release(dataArray);
}
values.clear();
}
@@ -123,7 +125,7 @@ public class BooleanTVList extends TVList {
void clearSortedValue() {
if (sortedValues != null) {
for (boolean[] dataArray : sortedValues) {
- PrimitiveDataListPool.getInstance().release(dataArray);
+ PrimitiveArrayPool.getInstance().release(dataArray);
}
sortedValues = null;
}
@@ -159,7 +161,7 @@ public class BooleanTVList extends TVList {
@Override
protected void expandValues() {
- values.add((boolean[]) PrimitiveDataListPool
+ values.add((boolean[]) PrimitiveArrayPool
.getInstance().getPrimitiveDataListByType(TSDataType.BOOLEAN));
}
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 af712e9..7a0d4e1 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
@@ -18,11 +18,11 @@
*/
package org.apache.iotdb.db.utils.datastructure;
-import static org.apache.iotdb.db.rescon.PrimitiveDataListPool.ARRAY_SIZE;
+import static org.apache.iotdb.db.rescon.PrimitiveArrayPool.ARRAY_SIZE;
import java.util.ArrayList;
import java.util.List;
-import org.apache.iotdb.db.rescon.PrimitiveDataListPool;
+import org.apache.iotdb.db.rescon.PrimitiveArrayPool;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
public class DoubleTVList extends TVList {
@@ -98,10 +98,12 @@ public class DoubleTVList extends TVList {
public void sort() {
if (sortedTimestamps == null || sortedTimestamps.length < size) {
- sortedTimestamps = (long[][]) PrimitiveDataListPool.getInstance().getDataListsByType(TSDataType.INT64, size);
+ sortedTimestamps = (long[][]) PrimitiveArrayPool
+ .getInstance().getDataListsByType(TSDataType.INT64, size);
}
if (sortedValues == null || sortedValues.length < size) {
- sortedValues = (double[][]) PrimitiveDataListPool.getInstance().getDataListsByType(TSDataType.DOUBLE, size);
+ sortedValues = (double[][]) PrimitiveArrayPool
+ .getInstance().getDataListsByType(TSDataType.DOUBLE, size);
}
sort(0, size);
clearTime();
@@ -113,7 +115,7 @@ public class DoubleTVList extends TVList {
void clearValue() {
if (values != null) {
for (double[] dataArray : values) {
- PrimitiveDataListPool.getInstance().release(dataArray);
+ PrimitiveArrayPool.getInstance().release(dataArray);
}
values.clear();
}
@@ -123,7 +125,7 @@ public class DoubleTVList extends TVList {
void clearSortedValue() {
if (sortedValues != null) {
for (double[] dataArray : sortedValues) {
- PrimitiveDataListPool.getInstance().release(dataArray);
+ PrimitiveArrayPool.getInstance().release(dataArray);
}
sortedValues = null;
}
@@ -159,7 +161,7 @@ public class DoubleTVList extends TVList {
@Override
protected void expandValues() {
- values.add((double[]) PrimitiveDataListPool
+ values.add((double[]) PrimitiveArrayPool
.getInstance().getPrimitiveDataListByType(TSDataType.DOUBLE));
}
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 bfa1390..e7e3484 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
@@ -18,11 +18,11 @@
*/
package org.apache.iotdb.db.utils.datastructure;
-import static org.apache.iotdb.db.rescon.PrimitiveDataListPool.ARRAY_SIZE;
+import static org.apache.iotdb.db.rescon.PrimitiveArrayPool.ARRAY_SIZE;
import java.util.ArrayList;
import java.util.List;
-import org.apache.iotdb.db.rescon.PrimitiveDataListPool;
+import org.apache.iotdb.db.rescon.PrimitiveArrayPool;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
public class FloatTVList extends TVList {
@@ -98,10 +98,12 @@ public class FloatTVList extends TVList {
public void sort() {
if (sortedTimestamps == null || sortedTimestamps.length < size) {
- sortedTimestamps = (long[][]) PrimitiveDataListPool.getInstance().getDataListsByType(TSDataType.INT64, size);
+ sortedTimestamps = (long[][]) PrimitiveArrayPool
+ .getInstance().getDataListsByType(TSDataType.INT64, size);
}
if (sortedValues == null || sortedValues.length < size) {
- sortedValues = (float[][]) PrimitiveDataListPool.getInstance().getDataListsByType(TSDataType.FLOAT, size);
+ sortedValues = (float[][]) PrimitiveArrayPool
+ .getInstance().getDataListsByType(TSDataType.FLOAT, size);
}
sort(0, size);
clearTime();
@@ -113,7 +115,7 @@ public class FloatTVList extends TVList {
void clearValue() {
if (values != null) {
for (float[] dataArray : values) {
- PrimitiveDataListPool.getInstance().release(dataArray);
+ PrimitiveArrayPool.getInstance().release(dataArray);
}
values.clear();
}
@@ -123,7 +125,7 @@ public class FloatTVList extends TVList {
void clearSortedValue() {
if (sortedValues != null) {
for (float[] dataArray : sortedValues) {
- PrimitiveDataListPool.getInstance().release(dataArray);
+ PrimitiveArrayPool.getInstance().release(dataArray);
}
sortedValues = null;
}
@@ -159,7 +161,7 @@ public class FloatTVList extends TVList {
@Override
protected void expandValues() {
- values.add((float[]) PrimitiveDataListPool
+ values.add((float[]) PrimitiveArrayPool
.getInstance().getPrimitiveDataListByType(TSDataType.FLOAT));
}
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 54ab5dd..5d1cdc6 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
@@ -18,11 +18,11 @@
*/
package org.apache.iotdb.db.utils.datastructure;
-import static org.apache.iotdb.db.rescon.PrimitiveDataListPool.ARRAY_SIZE;
+import static org.apache.iotdb.db.rescon.PrimitiveArrayPool.ARRAY_SIZE;
import java.util.ArrayList;
import java.util.List;
-import org.apache.iotdb.db.rescon.PrimitiveDataListPool;
+import org.apache.iotdb.db.rescon.PrimitiveArrayPool;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
public class IntTVList extends TVList {
@@ -98,10 +98,12 @@ public class IntTVList extends TVList {
public void sort() {
if (sortedTimestamps == null || sortedTimestamps.length < size) {
- sortedTimestamps = (long[][]) PrimitiveDataListPool.getInstance().getDataListsByType(TSDataType.INT64, size);
+ sortedTimestamps = (long[][]) PrimitiveArrayPool
+ .getInstance().getDataListsByType(TSDataType.INT64, size);
}
if (sortedValues == null || sortedValues.length < size) {
- sortedValues = (int[][]) PrimitiveDataListPool.getInstance().getDataListsByType(TSDataType.INT32, size);
+ sortedValues = (int[][]) PrimitiveArrayPool
+ .getInstance().getDataListsByType(TSDataType.INT32, size);
}
sort(0, size);
clearTime();
@@ -113,7 +115,7 @@ public class IntTVList extends TVList {
void clearValue() {
if (values != null) {
for (int[] dataArray : values) {
- PrimitiveDataListPool.getInstance().release(dataArray);
+ PrimitiveArrayPool.getInstance().release(dataArray);
}
values.clear();
}
@@ -123,7 +125,7 @@ public class IntTVList extends TVList {
void clearSortedValue() {
if (sortedValues != null) {
for (int[] dataArray : sortedValues) {
- PrimitiveDataListPool.getInstance().release(dataArray);
+ PrimitiveArrayPool.getInstance().release(dataArray);
}
sortedValues = null;
}
@@ -159,7 +161,7 @@ public class IntTVList extends TVList {
@Override
protected void expandValues() {
- values.add((int[]) PrimitiveDataListPool
+ values.add((int[]) PrimitiveArrayPool
.getInstance().getPrimitiveDataListByType(TSDataType.INT32));
}
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 0edd86b..a63a31d 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
@@ -18,11 +18,11 @@
*/
package org.apache.iotdb.db.utils.datastructure;
-import static org.apache.iotdb.db.rescon.PrimitiveDataListPool.ARRAY_SIZE;
+import static org.apache.iotdb.db.rescon.PrimitiveArrayPool.ARRAY_SIZE;
import java.util.ArrayList;
import java.util.List;
-import org.apache.iotdb.db.rescon.PrimitiveDataListPool;
+import org.apache.iotdb.db.rescon.PrimitiveArrayPool;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
public class LongTVList extends TVList {
@@ -98,10 +98,12 @@ public class LongTVList extends TVList {
public void sort() {
if (sortedTimestamps == null || sortedTimestamps.length < size) {
- sortedTimestamps = (long[][]) PrimitiveDataListPool.getInstance().getDataListsByType(TSDataType.INT64, size);
+ sortedTimestamps = (long[][]) PrimitiveArrayPool
+ .getInstance().getDataListsByType(TSDataType.INT64, size);
}
if (sortedValues == null || sortedValues.length < size) {
- sortedValues = (long[][]) PrimitiveDataListPool.getInstance().getDataListsByType(TSDataType.INT64, size);
+ sortedValues = (long[][]) PrimitiveArrayPool
+ .getInstance().getDataListsByType(TSDataType.INT64, size);
}
sort(0, size);
clearTime();
@@ -113,7 +115,7 @@ public class LongTVList extends TVList {
void clearValue() {
if (values != null) {
for (long[] dataArray : values) {
- PrimitiveDataListPool.getInstance().release(dataArray);
+ PrimitiveArrayPool.getInstance().release(dataArray);
}
values.clear();
}
@@ -123,7 +125,7 @@ public class LongTVList extends TVList {
void clearSortedValue() {
if (sortedValues != null) {
for (long[] dataArray : sortedValues) {
- PrimitiveDataListPool.getInstance().release(dataArray);
+ PrimitiveArrayPool.getInstance().release(dataArray);
}
sortedValues = null;
}
@@ -159,7 +161,7 @@ public class LongTVList extends TVList {
@Override
protected void expandValues() {
- values.add((long[]) PrimitiveDataListPool
+ values.add((long[]) PrimitiveArrayPool
.getInstance().getPrimitiveDataListByType(TSDataType.INT64));
}
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 f9462cf..22145d6 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
@@ -19,11 +19,11 @@
package org.apache.iotdb.db.utils.datastructure;
-import static org.apache.iotdb.db.rescon.PrimitiveDataListPool.ARRAY_SIZE;
+import static org.apache.iotdb.db.rescon.PrimitiveArrayPool.ARRAY_SIZE;
import java.util.ArrayList;
import java.util.List;
-import org.apache.iotdb.db.rescon.PrimitiveDataListPool;
+import org.apache.iotdb.db.rescon.PrimitiveArrayPool;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.utils.Binary;
@@ -166,7 +166,7 @@ public abstract class TVList {
protected void clearTime() {
if (timestamps != null) {
for (long[] dataArray : timestamps) {
- PrimitiveDataListPool.getInstance().release(dataArray);
+ PrimitiveArrayPool.getInstance().release(dataArray);
}
timestamps.clear();
}
@@ -175,7 +175,7 @@ public abstract class TVList {
protected void clearSortedTime() {
if (sortedTimestamps != null) {
for (long[] dataArray : sortedTimestamps) {
- PrimitiveDataListPool.getInstance().release(dataArray);
+ PrimitiveArrayPool.getInstance().release(dataArray);
}
sortedTimestamps = null;
}
@@ -188,7 +188,7 @@ public abstract class TVList {
protected void checkExpansion() {
if ((size % ARRAY_SIZE) == 0) {
expandValues();
- timestamps.add((long[]) PrimitiveDataListPool.getInstance().getPrimitiveDataListByType(TSDataType.INT64));
+ timestamps.add((long[]) PrimitiveArrayPool.getInstance().getPrimitiveDataListByType(TSDataType.INT64));
}
}