Fix codeclimate

polis-vk · Dec 6, 2023 · c7fd063 · c7fd063
1 parent 2fff4ba
commit c7fd063
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/src/main/java/ru/vk/itmo/solnyshkoksenia/DaoImpl.java b/src/main/java/ru/vk/itmo/solnyshkoksenia/DaoImpl.java
@@ -65,7 +65,7 @@ public void upsert(Entry<MemorySegment> entry, Long ttl) {
             try {
                 autoFlush();
             } catch (IOException e) {
-                throw new RuntimeException("Memory storage overflowed. Cannot flush: " + e.getMessage());
+                throw new DaoException("Memory storage overflowed. Cannot flush: " + e.getMessage());
             }
         }
     }
@@ -119,12 +119,12 @@ private void tryFlush() {
                 this.curState = new State(state.config, state.storage, new ConcurrentSkipListMap<>(comparator),
                         new DiskStorage(DiskStorage.loadOrRecover(path, arena), path));
             } catch (IOException e) {
-                throw new RuntimeException("Cannot recover storage on disk");
+                throw new DaoException("Cannot recover storage on disk", e);
             } finally {
                 lock.writeLock().unlock();
             }
         } catch (IOException e) {
-            throw new RuntimeException("Flush failed: " + e.getMessage());
+            throw new DaoException("Flush failed", e);
         }
     }
 
@@ -133,9 +133,9 @@ public void compact() throws IOException {
         try {
             executor.submit(this::tryCompact).get();
         } catch (InterruptedException e) {
-            throw new RuntimeException("Compaction failed. Thread interrupted: " + e.getMessage());
+            throw new DaoException("Compaction failed. Thread interrupted", e);
         } catch (ExecutionException e) {
-            throw new RuntimeException("Compaction failed: " + e.getMessage());
+            throw new DaoException("Compaction failed", e);
         }
     }
 
@@ -144,15 +144,15 @@ private Object tryCompact() {
         try {
             state.diskStorage.compact();
         } catch (IOException e) {
-            throw new RuntimeException("Cannot compact: " + e.getMessage());
+            throw new DaoException("Cannot compact", e);
         }
 
         lock.writeLock().lock();
         try {
             this.curState = new State(state.config, state.storage, state.flushingStorage,
                     new DiskStorage(DiskStorage.loadOrRecover(path, arena), path));
         } catch (IOException e) {
-            throw new RuntimeException("Cannot recover storage on disk after compaction: " + e.getMessage());
+            throw new DaoException("Cannot recover storage on disk after compaction", e);
         } finally {
             lock.writeLock().unlock();
         }

diff --git a/src/main/java/ru/vk/itmo/solnyshkoksenia/State.java b/src/main/java/ru/vk/itmo/solnyshkoksenia/State.java
@@ -44,12 +44,10 @@ public State(Config config,
     }
 
     public void putInMemory(Entry<MemorySegment> entry, Long ttl) {
-        MemorySegment expiration;
+        MemorySegment expiration = null;
         if (ttl != null) {
             long[] ar = {System.currentTimeMillis() + ttl};
             expiration = MemorySegment.ofArray(ar);
-        } else {
-            expiration = null;
         }
         Triple<MemorySegment> triple = new Triple<>(entry.key(), entry.value(), expiration);
         Triple<MemorySegment> previousEntry = storage.put(triple.key(), triple);
@@ -75,7 +73,7 @@ private static long getSize(Triple<MemorySegment> entry) {
 
     public State checkAndGet() {
         if (isClosed.get()) {
-            throw new RuntimeException("Dao is already closed");
+            throw new DaoException("Dao is already closed");
         }
         return this;
     }

diff --git a/src/main/java/ru/vk/itmo/solnyshkoksenia/storage/DiskStorage.java b/src/main/java/ru/vk/itmo/solnyshkoksenia/storage/DiskStorage.java
@@ -52,7 +52,6 @@ protected boolean skip(Triple<MemorySegment> memorySegmentEntry) {
                 if (memorySegmentEntry.expiration() != null) {
                     long currentTime = System.currentTimeMillis();
                     long expiration = memorySegmentEntry.expiration().toArray(ValueLayout.JAVA_LONG_UNALIGNED)[0];
-                    System.err.println(expiration + " || " + currentTime);
                     return memorySegmentEntry.value() == null || expiration <= currentTime;
                 }
                 return memorySegmentEntry.value() == null;
@@ -294,7 +293,7 @@ public Triple<MemorySegment> next() {
                 MemorySegment value =
                         startOfValue < 0
                                 ? null
-                                : utils.slice(page, startOfValue, utils.endOfValue(page, index, recordsCount));
+                                : utils.slice(page, startOfValue, utils.endOfValue(page, index));
                 long startOfExp = utils.startOfExpiration(page, index);
                 MemorySegment expiration =
                         startOfExp < 0

diff --git a/src/main/java/ru/vk/itmo/solnyshkoksenia/storage/StorageUtils.java b/src/main/java/ru/vk/itmo/solnyshkoksenia/storage/StorageUtils.java
@@ -27,7 +27,7 @@ protected long startOfValue(MemorySegment segment, long recordIndex) {
         return segment.get(ValueLayout.JAVA_LONG_UNALIGNED, recordIndex * 3 * Long.BYTES + Long.BYTES);
     }
 
-    protected long endOfValue(MemorySegment segment, long recordIndex, long recordsCount) {
+    protected long endOfValue(MemorySegment segment, long recordIndex) {
         return normalizedStartOfExpiration(segment, recordIndex);
     }