Merge pull request #24 from runetopic/jordan

Cache Library Speed and Memory Improvements

Author: ultraviolet-jordan

README.md

@@ -24,8 +24,7 @@ A cache library written in Kotlin.
 # Implementation
 Just use cache if you do not require any of the revision specific loaders.
 ```groovy
-cache = { module = "com.runetopic.cache:cache", version.ref "1.4.19-SNAPSHOT" }
-loader = { module = "com.runetopic.cache:loader", version.ref "647.6.4-SNAPSHOT" }
+cache = { module = "com.runetopic.cache:cache", version.ref "2.0.0-SNAPSHOT" }
 ```
 
 ```groovy

build.gradle.kts

@@ -1,31 +1,40 @@
 import org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapper
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.tasks.UsesKotlinJavaToolchain
 
+@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
-    kotlin("jvm")
+    alias(deps.plugins.jvm)
 }
 
-configure(allprojects) {
+allprojects {
     group = "com.runetopic.cache"
 
-    plugins.withType<KotlinPluginWrapper> {
-        java.sourceCompatibility = JavaVersion.VERSION_16
-        java.targetCompatibility = JavaVersion.VERSION_16
-
-        tasks {
-            compileKotlin {
-                kotlinOptions.jvmTarget = "1.8"
-            }
-            compileTestKotlin {
-                kotlinOptions.jvmTarget = "1.8"
-            }
-        }
+    apply {
+        plugin("org.jetbrains.kotlin.jvm")
     }
-}
 
-configure(subprojects) {
     plugins.withType<KotlinPluginWrapper> {
         dependencies {
             implementation(kotlin("stdlib"))
         }
     }
+
+    tasks.withType<Test> {
+        dependencies {
+            testImplementation(kotlin("test"))
+        }
+    }
+
+    kotlin {
+        jvmToolchain {
+            languageVersion.set(JavaLanguageVersion.of(JavaVersion.VERSION_11.majorVersion))
+        }
+    }
+
+    java {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(JavaVersion.VERSION_11.majorVersion))
+        }
+    }
 }

cache/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
     signing
 }
 
-version = "1.6.0"
+version = "2.0.0-SNAPSHOT"
 
 java {
     withJavadocJar()
@@ -72,5 +72,5 @@ dependencies {
     implementation("com.michael-bull.kotlin-inline-logger:kotlin-inline-logger:1.0.4")
     implementation("org.slf4j:slf4j-simple:2.0.4")
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.14.0")
-    implementation("com.runetopic.cryptography:cryptography:1.0.6-SNAPSHOT")
+    implementation("com.runetopic.cryptography:cryptography:1.2.0-SNAPSHOT")
 }

cache/src/main/kotlin/com/runetopic/cache/codec/IFileCodec.kt renamed to cache/src/main/kotlin/com/runetopic/cache/codec/ArchiveCodec.kt

@@ -4,7 +4,6 @@ package com.runetopic.cache.codec
  * @author Tyler Telis
  * @email <xlitersps@gmail.com>
  */
-internal interface IFileCodec {
-    fun compress(data: ByteArray, length: Int, keys: IntArray): ByteArray
+internal interface ArchiveCodec {
     fun decompress(data: ByteArray, length: Int, keys: IntArray): ByteArray
 }

cache/src/main/kotlin/com/runetopic/cache/codec/CodecType.kt

@@ -2,19 +2,16 @@ package com.runetopic.cache.codec
 
 import com.runetopic.cache.codec.impl.BZip2Codec
 import com.runetopic.cache.codec.impl.GZipCodec
-import com.runetopic.cache.codec.impl.NoFileCodec
 
 /**
  * @author Tyler Telis
  * @email <xlitersps@gmail.com>
  *
  * @author Jordan Abraham
  */
-internal sealed class CodecType(
-    val codec: IFileCodec
-) {
-    object BadCodec : CodecType(NoFileCodec())
-    object NoCodec : CodecType(NoFileCodec())
-    object BZipCodec : CodecType(BZip2Codec())
-    object GZipCodec : CodecType(GZipCodec())
+internal class CodecType {
+    companion object {
+        val bzip = BZip2Codec()
+        val gzip = GZipCodec()
+    }
 }

cache/src/main/kotlin/com/runetopic/cache/codec/Container.kt

@@ -0,0 +1,14 @@
+package com.runetopic.cache.codec
+
+import java.nio.ByteBuffer
+
+/**
+ * @author Tyler Telis
+ * @email <xlitersps@gmail.com>
+ */
+data class DecompressedArchive(
+    val buffer: ByteBuffer,
+    val compression: Int,
+    val revision: Int,
+    val crc: Int
+)

cache/src/main/kotlin/com/runetopic/cache/codec/ContainerCodec.kt

@@ -1,43 +1,23 @@
 package com.runetopic.cache.codec.impl
 
-import com.runetopic.cache.codec.IFileCodec
+import com.runetopic.cache.codec.ArchiveCodec
 import com.runetopic.cache.store.Constants.BZIP_HEADER
 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream
-import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream
 import org.apache.commons.compress.utils.IOUtils
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
-import java.io.InputStream
-import java.util.Arrays
+import java.lang.System.arraycopy
 
 /**
  * @author Tyler Telis
  * @email <xlitersps@gmail.com>
  */
-internal class BZip2Codec : IFileCodec {
-    override fun compress(data: ByteArray, length: Int, keys: IntArray): ByteArray {
-        val stream: InputStream = ByteArrayInputStream(data)
-        val bout = ByteArrayOutputStream()
-        BZip2CompressorOutputStream(bout, 1).use { os -> IOUtils.copy(stream, os) }
-
-        val buffer = bout.toByteArray()
-
-        assert(BZIP_HEADER[0] == buffer[0])
-        assert(BZIP_HEADER[1] == buffer[1])
-        assert(BZIP_HEADER[2] == buffer[2])
-        assert(BZIP_HEADER[3] == buffer[3])
-
-        return Arrays.copyOfRange(buffer, BZIP_HEADER.size, buffer.size)
-    }
-
-    override fun decompress(data: ByteArray, length: Int, keys: IntArray): ByteArray {
-        val buffer = ByteArray(length + BZIP_HEADER.size)
-
-        System.arraycopy(BZIP_HEADER, 0, buffer, 0, BZIP_HEADER.size)
-        System.arraycopy(data, 0, buffer, BZIP_HEADER.size, length)
-
-        val stream = ByteArrayOutputStream()
-        BZip2CompressorInputStream(ByteArrayInputStream(buffer)).use { IOUtils.copy(it, stream) }
-        return stream.toByteArray()
+internal class BZip2Codec : ArchiveCodec {
+    override fun decompress(data: ByteArray, length: Int, keys: IntArray): ByteArray = with(ByteArray(length + BZIP_HEADER.size)) {
+        arraycopy(BZIP_HEADER, 0, this, 0, BZIP_HEADER.size)
+        arraycopy(data, 0, this, BZIP_HEADER.size, length)
+        ByteArrayOutputStream()
+            .apply { BZip2CompressorInputStream(ByteArrayInputStream(this@with)).use { IOUtils.copy(it, this) } }
+            .toByteArray()
     }
 }