Revert "supplement perf test"

This reverts commit b1ff701.
apache · Apr 16, 2024 · 138c1aa · 138c1aa
1 parent b1ff701
commit 138c1aa
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 232 deletions.
diff --git a/tsfile/src/main/java/org/apache/tsfile/read/controller/MetadataQuerierByFileImpl.java b/tsfile/src/main/java/org/apache/tsfile/read/controller/MetadataQuerierByFileImpl.java
@@ -133,7 +133,7 @@ public void loadChunkMetaDatas(List<Path> paths) throws IOException {
           measurementId = ((TimeseriesMetadata) timeseriesMetadata).getMeasurementId();
         }
         this.chunkMetaDataCache.put(
-            new Path(selectedDevice, measurementId, false), chunkMetadataList);
+            new Path(selectedDevice, measurementId, true), chunkMetadataList);
         count += chunkMetadataList.size();
         if (count == CACHED_ENTRY_NUMBER) {
           enough = true;

diff --git a/tsfile/src/main/java/org/apache/tsfile/write/TsFileWriter.java b/tsfile/src/main/java/org/apache/tsfile/write/TsFileWriter.java
@@ -356,7 +356,7 @@ private void checkIsTimeseriesExist(Tablet tablet, boolean isAligned)
     IChunkGroupWriter groupWriter =
         tryToInitialGroupWriter(new PlainDeviceID(tablet.deviceId), isAligned);
 
-    Path devicePath = new Path(tablet.deviceId, "", false);
+    Path devicePath = new Path(tablet.deviceId);
     List<MeasurementSchema> schemas = tablet.getSchemas();
     if (schema.containsDevice(devicePath)) {
       checkIsAllMeasurementsInGroup(schema.getSeriesSchema(devicePath), schemas, isAligned);

diff --git a/tsfile/src/test/java/org/apache/tsfile/write/PerformanceTest.java b/tsfile/src/test/java/org/apache/tsfile/write/PerformanceTest.java
diff --git a/tsfile/src/test/java/org/apache/tsfile/write/TsFileWriterTest.java b/tsfile/src/test/java/org/apache/tsfile/write/TsFileWriterTest.java
@@ -31,6 +31,7 @@
 import org.apache.tsfile.read.common.RowRecord;
 import org.apache.tsfile.read.expression.QueryExpression;
 import org.apache.tsfile.read.query.dataset.QueryDataSet;
+import org.apache.tsfile.utils.TsFileGeneratorForTest;
 import org.apache.tsfile.write.record.TSRecord;
 import org.apache.tsfile.write.record.Tablet;
 import org.apache.tsfile.write.record.datapoint.FloatDataPoint;
@@ -44,6 +45,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -55,7 +57,7 @@
 
 public class TsFileWriterTest {
   TsFileWriter writer = null;
-  String fileName = "target/v3TsFile";
+  String fileName = TsFileGeneratorForTest.getTestTsFilePath("root.sg1", 0, 0, 1);
   boolean closed = false;
 
   @Before
@@ -78,12 +80,12 @@ public void tearDown() {
     if (!closed) {
       closeFile();
     }
-    //    try {
-    //      Files.deleteIfExists(new File(fileName).toPath());
-    //    } catch (IOException e) {
-    //      e.printStackTrace();
-    //      fail(e.getMessage());
-    //    }
+    try {
+      Files.deleteIfExists(new File(fileName).toPath());
+    } catch (IOException e) {
+      e.printStackTrace();
+      fail(e.getMessage());
+    }
   }
 
   private void registerTimeseries() {