code review fix: fix bug with hasNext and one file

polis-vk · Dec 21, 2023 · 2b75a4d · 2b75a4d
1 parent 8756860
commit 2b75a4d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/main/java/ru/vk/itmo/pologovnikita/DaoImpl.java b/src/main/java/ru/vk/itmo/pologovnikita/DaoImpl.java
@@ -84,7 +84,7 @@ public Entry<MemorySegment> get(MemorySegment key) {
     @Override
     public void compact() throws IOException {
         Iterable<Entry<MemorySegment>> allEntities = this::all;
-        DiskStorage.compact(allEntities, compactionalPath, path);
+        DiskStorage.compact(path, allEntities, compactionalPath, path);
     }
 
     @Override

diff --git a/src/main/java/ru/vk/itmo/pologovnikita/DiskStorage.java b/src/main/java/ru/vk/itmo/pologovnikita/DiskStorage.java
@@ -191,8 +191,15 @@ public static void deleteFiles(Path path) throws IOException {
         }
     }
 
-    public static void compact(Iterable<Entry<MemorySegment>> entries, Path compactionalPath, Path path)
+    public static void compact(Path storagePath, Iterable<Entry<MemorySegment>> entries, Path compactionalPath, Path path)
             throws IOException {
+        Path indexFile = storagePath.resolve("index.tmp");
+        List<String> existedFiles = Files.readAllLines(indexFile, StandardCharsets.UTF_8);
+
+        if (existedFiles.isEmpty() && !entries.iterator().hasNext()) {
+            return;
+        }
+
         if (entries.iterator().hasNext()) {
             DiskStorage.save(compactionalPath, entries); //save all in compact file
         }