fix codeclimate

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

Hide file tree

Showing 2 changed files with 9 additions and 5 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(path, allEntities, compactionalPath, path);
+        DiskStorage.compact(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
@@ -58,7 +58,7 @@ protected boolean skip(Entry<MemorySegment> memorySegmentEntry) {
 
     public static void save(Path storagePath, Iterable<Entry<MemorySegment>> iterable)
             throws IOException {
-        final Path indexTmp = storagePath.resolve("index.tmp");
+        final Path indexTmp = getIndexFile(storagePath);
         final Path indexFile = storagePath.resolve("index.idx");
 
         try {
@@ -151,7 +151,7 @@ public static void save(Path storagePath, Iterable<Entry<MemorySegment>> iterabl
     }
 
     public static List<MemorySegment> loadOrRecover(Path storagePath, Arena arena) throws IOException {
-        Path indexTmp = storagePath.resolve("index.tmp");
+        Path indexTmp = getIndexFile(storagePath);
         Path indexFile = storagePath.resolve("index.idx");
 
         if (Files.exists(indexTmp)) {
@@ -191,9 +191,9 @@ public static void deleteFiles(Path path) throws IOException {
         }
     }
 
-    public static void compact(Path storagePath, Iterable<Entry<MemorySegment>> entries, Path compactionalPath, Path path)
+    public static void compact(Iterable<Entry<MemorySegment>> entries, Path compactionalPath, Path path)
             throws IOException {
-        Path indexFile = storagePath.resolve("index.tmp");
+        Path indexFile = getIndexFile(path);
         List<String> existedFiles = Files.readAllLines(indexFile, StandardCharsets.UTF_8);
 
         if (existedFiles.isEmpty() && !entries.iterator().hasNext()) {
@@ -210,6 +210,10 @@ public static void compact(Path storagePath, Iterable<Entry<MemorySegment>> entr
         }
     }
 
+    private static Path getIndexFile(Path path) {
+        return path.resolve("index.tmp");
+    }
+
     private static long indexOf(MemorySegment segment, MemorySegment key) {
         long recordsCount = recordsCount(segment);