From dabbf4e7e40e5c655eddf791fad2c063d232c0f1 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sat, 24 Feb 2024 22:41:46 +0700 Subject: [PATCH] Rename emergency to panic --- .../kotlin/ru/dbotthepony/kommons/io/BTreeDB6.kt | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/kommons/io/BTreeDB6.kt b/src/main/kotlin/ru/dbotthepony/kommons/io/BTreeDB6.kt index 2bab0d3..9156ed3 100644 --- a/src/main/kotlin/ru/dbotthepony/kommons/io/BTreeDB6.kt +++ b/src/main/kotlin/ru/dbotthepony/kommons/io/BTreeDB6.kt @@ -8,7 +8,6 @@ import it.unimi.dsi.fastutil.io.FastByteArrayOutputStream import it.unimi.dsi.fastutil.objects.Object2IntAVLTreeMap import it.unimi.dsi.fastutil.objects.ObjectArrayList import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet -import ru.dbotthepony.kommons.util.CarriedExecutor import ru.dbotthepony.kommons.util.KOptional import java.io.Closeable import java.io.DataInputStream @@ -19,11 +18,7 @@ import java.io.OutputStream import java.io.RandomAccessFile import java.nio.ByteBuffer import java.util.* -import java.util.concurrent.CompletableFuture -import java.util.concurrent.Executor -import java.util.concurrent.TimeUnit import java.util.function.IntConsumer -import java.util.function.Supplier import java.util.stream.IntStream import java.util.stream.Stream import kotlin.collections.ArrayList @@ -138,7 +133,7 @@ class BTreeDB6 private constructor(val file: File, private var reader: RandomAcc occupiedBlocksBitmap = BitSet.valueOf(ByteBuffer.wrap(bytes.elements(), 0, bytes.size)) } else if (rootBlockIndex > 0) { - emergency() + panic() } } @@ -165,14 +160,14 @@ class BTreeDB6 private constructor(val file: File, private var reader: RandomAcc * This method creates new file, and tries to recover current file's contents * into new file. */ - private fun emergency() { - throw IllegalStateException("emergency() has been called, but currently we can't recover corrupt file!") + private fun panic() { + throw IllegalStateException("panic() has been called, but currently we can't recover corrupt file!") } private val headerBuf = ByteArray(16) /** - * Checks free bitmap for validity + * Checks free bitmap for consistency with file's contents */ fun checkFreeBitmap() { val length = reader.length()