This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch ZYBug
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/ZYBug by this push:
new 7df9a7d solve tests
7df9a7d is described below
commit 7df9a7d8c1074a552a8dc7cdeead637b910871ee
Author: JackieTien97 <[email protected]>
AuthorDate: Tue Oct 27 20:07:18 2020 +0800
solve tests
---
.../org/apache/iotdb/db/engine/cache/ChunkMetadataCache.java | 6 ++++--
.../apache/iotdb/db/engine/cache/ChunkMetadataCacheTest.java | 11 ++++++++---
.../test/java/org/apache/iotdb/db/engine/merge/MergeTest.java | 6 +++++-
.../iotdb/db/query/reader/series/SeriesReaderTestUtil.java | 4 ++++
.../test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java | 4 ++++
5 files changed, 25 insertions(+), 6 deletions(-)
diff --git
a/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkMetadataCache.java
b/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkMetadataCache.java
index 5865da3..f32c38b 100644
---
a/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkMetadataCache.java
+++
b/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkMetadataCache.java
@@ -20,6 +20,7 @@ package org.apache.iotdb.db.engine.cache;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.ReadWriteLock;
@@ -30,13 +31,11 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.conf.adapter.IoTDBConfigDynamicAdapter;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.query.control.FileReaderManager;
-import org.apache.iotdb.db.utils.FileLoaderUtils;
import org.apache.iotdb.db.utils.TestOnly;
import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata;
import org.apache.iotdb.tsfile.file.metadata.TimeseriesMetadata;
import org.apache.iotdb.tsfile.read.TsFileSequenceReader;
import org.apache.iotdb.tsfile.read.common.Path;
-import org.apache.iotdb.tsfile.utils.BloomFilter;
import org.apache.iotdb.tsfile.utils.RamUsageEstimator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -110,6 +109,9 @@ public class ChunkMetadataCache {
*/
public List<ChunkMetadata> get(String filePath, Path seriesPath,
TimeseriesMetadata timeSeriesMetadata) throws IOException {
+ if (timeSeriesMetadata == null) {
+ return Collections.emptyList();
+ }
if (!CACHE_ENABLE) {
// bloom filter part
TsFileSequenceReader tsFileReader =
FileReaderManager.getInstance().get(filePath, true);
diff --git
a/server/src/test/java/org/apache/iotdb/db/engine/cache/ChunkMetadataCacheTest.java
b/server/src/test/java/org/apache/iotdb/db/engine/cache/ChunkMetadataCacheTest.java
index 2926973..d7182ec 100644
---
a/server/src/test/java/org/apache/iotdb/db/engine/cache/ChunkMetadataCacheTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/engine/cache/ChunkMetadataCacheTest.java
@@ -20,18 +20,20 @@ package org.apache.iotdb.db.engine.cache;
import java.io.File;
import java.io.IOException;
+import java.util.Collections;
import java.util.List;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.conf.adapter.ActiveTimeSeriesCounter;
import org.apache.iotdb.db.constant.TestConstant;
import org.apache.iotdb.db.engine.MetadataManagerHelper;
+import
org.apache.iotdb.db.engine.cache.TimeSeriesMetadataCache.TimeSeriesMetadataCacheKey;
import org.apache.iotdb.db.engine.flush.TsFileFlushPolicy.DirectFlushPolicy;
import org.apache.iotdb.db.engine.querycontext.QueryDataSource;
import org.apache.iotdb.db.engine.storagegroup.StorageGroupProcessor;
import org.apache.iotdb.db.engine.storagegroup.TsFileProcessor;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
-import org.apache.iotdb.db.exception.query.QueryProcessException;
import org.apache.iotdb.db.exception.WriteProcessException;
+import org.apache.iotdb.db.exception.query.QueryProcessException;
import org.apache.iotdb.db.qp.physical.crud.InsertPlan;
import org.apache.iotdb.db.query.context.QueryContext;
import org.apache.iotdb.db.query.control.FileReaderManager;
@@ -134,8 +136,10 @@ public class ChunkMetadataCacheTest {
Assert.assertTrue(unseqResources.get(2).isClosed());
Assert.assertFalse(unseqResources.get(3).isClosed());
+ ;
+
List<ChunkMetadata> metaDataList = ChunkMetadataCache.getInstance()
- .get(seqResources.get(0).getPath(), new Path(storageGroup,
measurementId5));
+ .get(seqResources.get(0).getPath(), new Path(storageGroup,
measurementId5), null);
Assert.assertEquals(0, metaDataList.size());
}
@@ -157,7 +161,8 @@ public class ChunkMetadataCacheTest {
Assert.assertFalse(unseqResources.get(3).isClosed());
List<ChunkMetadata> metaDataList = ChunkMetadataCache.getInstance()
- .get(seqResources.get(0).getPath(), new Path(storageGroup,
measurementId5));
+ .get(seqResources.get(0).getPath(), new Path(storageGroup,
measurementId5), TimeSeriesMetadataCache.getInstance().get(new
TimeSeriesMetadataCacheKey(seqResources.get(0).getPath(), storageGroup,
measurementId5),
+ Collections.singleton(measurementId5)));
Assert.assertEquals(0, metaDataList.size());
}
diff --git
a/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java
b/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java
index 55cee97..9d9b7fd 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java
@@ -29,11 +29,13 @@ import java.util.List;
import org.apache.iotdb.db.conf.IoTDBConstant;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.constant.TestConstant;
+import org.apache.iotdb.db.engine.cache.ChunkCache;
import org.apache.iotdb.db.engine.cache.ChunkMetadataCache;
+import org.apache.iotdb.db.engine.cache.TimeSeriesMetadataCache;
import org.apache.iotdb.db.engine.merge.manage.MergeManager;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
-import org.apache.iotdb.db.exception.metadata.MetadataException;
import org.apache.iotdb.db.exception.StorageEngineException;
+import org.apache.iotdb.db.exception.metadata.MetadataException;
import org.apache.iotdb.db.metadata.MManager;
import org.apache.iotdb.db.query.control.FileReaderManager;
import org.apache.iotdb.db.utils.EnvironmentUtils;
@@ -86,7 +88,9 @@ abstract class MergeTest {
seqResources.clear();
unseqResources.clear();
IoTDBDescriptor.getInstance().getConfig().setChunkMergePointThreshold(prevMergeChunkThreshold);
+ ChunkCache.getInstance().clear();
ChunkMetadataCache.getInstance().clear();
+ TimeSeriesMetadataCache.getInstance().clear();
MManager.getInstance().clear();
EnvironmentUtils.cleanAllDir();
MergeManager.getINSTANCE().stop();
diff --git
a/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTestUtil.java
b/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTestUtil.java
index 58177fd..5466366 100644
---
a/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTestUtil.java
+++
b/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTestUtil.java
@@ -30,7 +30,9 @@ import java.util.Map;
import org.apache.iotdb.db.conf.IoTDBConstant;
import org.apache.iotdb.db.constant.TestConstant;
+import org.apache.iotdb.db.engine.cache.ChunkCache;
import org.apache.iotdb.db.engine.cache.ChunkMetadataCache;
+import org.apache.iotdb.db.engine.cache.TimeSeriesMetadataCache;
import org.apache.iotdb.db.engine.merge.manage.MergeManager;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.exception.metadata.MetadataException;
@@ -71,7 +73,9 @@ public class SeriesReaderTestUtil {
removeFiles(seqResources, unseqResources);
seqResources.clear();
unseqResources.clear();
+ ChunkCache.getInstance().clear();
ChunkMetadataCache.getInstance().clear();
+ TimeSeriesMetadataCache.getInstance().clear();
MManager.getInstance().clear();
EnvironmentUtils.cleanAllDir();
MergeManager.getINSTANCE().stop();
diff --git
a/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java
b/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java
index 6e1ff67..1e06653 100644
--- a/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java
+++ b/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java
@@ -36,7 +36,9 @@ import
org.apache.iotdb.db.conf.adapter.IoTDBConfigDynamicAdapter;
import org.apache.iotdb.db.conf.directories.DirectoryManager;
import org.apache.iotdb.db.constant.TestConstant;
import org.apache.iotdb.db.engine.StorageEngine;
+import org.apache.iotdb.db.engine.cache.ChunkCache;
import org.apache.iotdb.db.engine.cache.ChunkMetadataCache;
+import org.apache.iotdb.db.engine.cache.TimeSeriesMetadataCache;
import org.apache.iotdb.db.exception.StorageEngineException;
import org.apache.iotdb.db.metadata.MManager;
import org.apache.iotdb.db.query.context.QueryContext;
@@ -132,7 +134,9 @@ public class EnvironmentUtils {
// clean cache
if (config.isMetaDataCacheEnable()) {
+ ChunkCache.getInstance().clear();
ChunkMetadataCache.getInstance().clear();
+ TimeSeriesMetadataCache.getInstance().clear();
}
// close metadata
MManager.getInstance().clear();
