DBot/KStarbound
DBot/KStarbound
3
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Строковый интернер создаём сразу

Browse Source
This commit is contained in:
DBotThePony 2022-12-30 11:40:30 +07:00
parent 1fe0b25efa
commit ec98c6970c
Signed by: DBot
GPG Key ID: DCC23B5715498507
2 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt
View File

@ -447,7 +447,5 @@ object Starbound {
} }
} }
} }
items.values.forEach { println(it) }
} }
} }

33
src/main/kotlin/ru/dbotthepony/kstarbound/io/KConcreteTypeAdapter.kt
View File

@ -18,7 +18,6 @@ import ru.dbotthepony.kstarbound.getValue
import ru.dbotthepony.kstarbound.setValue import ru.dbotthepony.kstarbound.setValue
import java.lang.reflect.Constructor import java.lang.reflect.Constructor
import kotlin.jvm.internal.DefaultConstructorMarker import kotlin.jvm.internal.DefaultConstructorMarker
import kotlin.properties.Delegates
import kotlin.reflect.* import kotlin.reflect.*
import kotlin.reflect.full.isSuperclassOf import kotlin.reflect.full.isSuperclassOf
import kotlin.reflect.full.isSupertypeOf import kotlin.reflect.full.isSupertypeOf
@ -113,7 +112,7 @@ private class MapAdapter<K, V>(private val boundKey: Class<K>, private val bound
} }
} }
private class StringMapAdapter<V>(private val bound: Class<V>, private val stringAdapter: TypeAdapter<String>, private val interner: () -> Interner<String>) : TypeAdapter<Map<String, V>?>() { private class StringMapAdapter<V>(private val bound: Class<V>, private val stringAdapter: TypeAdapter<String>, private val interner: Interner<String>) : TypeAdapter<Map<String, V>?>() {
private val resolvedBound by lazy { resolveBound(bound, stringAdapter) } private val resolvedBound by lazy { resolveBound(bound, stringAdapter) }
override fun write(out: JsonWriter, value: Map<String, V>?) { override fun write(out: JsonWriter, value: Map<String, V>?) {
@ -139,7 +138,7 @@ private class StringMapAdapter<V>(private val bound: Class<V>, private val strin
val resolvedBound = resolvedBound val resolvedBound = resolvedBound
while (reader.peek() != JsonToken.END_OBJECT) { while (reader.peek() != JsonToken.END_OBJECT) {
builder.put(interner.invoke().intern(reader.nextName()), resolvedBound.read(reader)) builder.put(interner.intern(reader.nextName()), resolvedBound.read(reader))
} }
reader.endObject() reader.endObject()
@ -174,10 +173,10 @@ private data class PackedProperty<Clazz : Any, T>(
class KConcreteTypeAdapter<T : Any> private constructor( class KConcreteTypeAdapter<T : Any> private constructor(
val bound: KClass<T>, val bound: KClass<T>,
private val types: ImmutableList<PackedProperty<T, *>>, private val types: ImmutableList<PackedProperty<T, *>>,
private val asJsonArray: Boolean = false private val asJsonArray: Boolean = false,
private val stringInterner: Interner<String>
) : TypeAdapter<T>() { ) : TypeAdapter<T>() {
private val mapped = Object2IntArrayMap<String>() private val mapped = Object2IntArrayMap<String>()
private val internedStrings = Interners.newWeakInterner<String>()
private val loggedMisses = ObjectArraySet<String>() private val loggedMisses = ObjectArraySet<String>()
var currentSymbolicName by ThreadLocal<String>() var currentSymbolicName by ThreadLocal<String>()
@ -347,13 +346,6 @@ class KConcreteTypeAdapter<T : Any> private constructor(
} }
} }
// intern'им строки для более быстрой работы сравнения последних
for (i in readValues.indices) {
if (readValues[i] is String) {
readValues[i] = internedStrings.intern(readValues[i] as String)
}
}
if (asJsonArray) { if (asJsonArray) {
reader.endArray() reader.endArray()
} else { } else {
@ -442,7 +434,7 @@ class KConcreteTypeAdapter<T : Any> private constructor(
*/ */
class Builder<T : Any>(val clazz: KClass<T>) { class Builder<T : Any>(val clazz: KClass<T>) {
private val types = ArrayList<PackedProperty<T, *>>() private val types = ArrayList<PackedProperty<T, *>>()
private var interner by Delegates.notNull<Interner<String>>() private val stringInterner = Interners.newWeakInterner<String>()
private val internedStringAdapter: TypeAdapter<String> = object : TypeAdapter<String>() { private val internedStringAdapter: TypeAdapter<String> = object : TypeAdapter<String>() {
override fun write(out: JsonWriter, value: String) { override fun write(out: JsonWriter, value: String) {
@ -450,7 +442,7 @@ class KConcreteTypeAdapter<T : Any> private constructor(
} }
override fun read(`in`: JsonReader): String { override fun read(`in`: JsonReader): String {
return interner.intern(TypeAdapters.STRING.read(`in`)) return stringInterner.intern(TypeAdapters.STRING.read(`in`))
} }
} }
@ -559,7 +551,7 @@ class KConcreteTypeAdapter<T : Any> private constructor(
* Таблица неизменяема (создаётся объект [ImmutableMap]) * Таблица неизменяема (создаётся объект [ImmutableMap])
*/ */
fun <V> map(field: KProperty1<T, Map<String, V>?>, valueType: Class<V>): Builder<T> { fun <V> map(field: KProperty1<T, Map<String, V>?>, valueType: Class<V>): Builder<T> {
types.add(PackedProperty(field, StringMapAdapter(valueType, internedStringAdapter, ::interner))) types.add(PackedProperty(field, StringMapAdapter(valueType, internedStringAdapter, stringInterner)))
return this return this
} }
@ -569,14 +561,17 @@ class KConcreteTypeAdapter<T : Any> private constructor(
* Таблица неизменяема (создаётся объект [ImmutableMap]) * Таблица неизменяема (создаётся объект [ImmutableMap])
*/ */
fun <V : Any> map(field: KProperty1<T, Map<String, V>?>, valueType: KClass<V>): Builder<T> { fun <V : Any> map(field: KProperty1<T, Map<String, V>?>, valueType: KClass<V>): Builder<T> {
types.add(PackedProperty(field, StringMapAdapter(valueType.java, internedStringAdapter, ::interner))) types.add(PackedProperty(field, StringMapAdapter(valueType.java, internedStringAdapter, stringInterner)))
return this return this
} }
fun build(asList: Boolean = false): KConcreteTypeAdapter<T> { fun build(asList: Boolean = false): KConcreteTypeAdapter<T> {
return KConcreteTypeAdapter(clazz, ImmutableList.copyOf(types), asJsonArray = asList).also { return KConcreteTypeAdapter(
interner = it.internedStrings bound = clazz,
} types = ImmutableList.copyOf(types),
asJsonArray = asList,
stringInterner = stringInterner
)
} }
} }