Skip to content

Speedup ProtoWriteType.from #2879

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/*
* Copyright 2017-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
*/

package kotlinx.benchmarks.protobuf

import kotlinx.serialization.Serializable
import kotlinx.serialization.encodeToByteArray
import kotlinx.serialization.protobuf.ProtoBuf
import org.openjdk.jmh.annotations.*
import java.util.concurrent.TimeUnit

@Warmup(iterations = 5, time = 1)
@Measurement(iterations = 5, time = 1)
@BenchmarkMode(Mode.Throughput)
@OutputTimeUnit(TimeUnit.MILLISECONDS)
@State(Scope.Benchmark)
@Fork(1)
open class ProtoMapBenchmark {

@Serializable
class Holder(val map: Map<String, Int>)

private val value = Holder((0..128).associateBy { it.toString() })
private val bytes = ProtoBuf.encodeToByteArray(value)

@Benchmark
fun toBytes() = ProtoBuf.encodeToByteArray(Holder.serializer(), value)

@Benchmark
fun fromBytes() = ProtoBuf.decodeFromByteArray(Holder.serializer(), bytes)
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,17 @@ internal enum class ProtoWireType(val typeId: Int) {
;

companion object {
fun from(typeId: Int): ProtoWireType {
return ProtoWireType.entries.find { it.typeId == typeId } ?: INVALID
private val entryArray = Array(8) { typeId ->
ProtoWireType.entries.find { it.typeId == typeId } ?: INVALID
}

/**
* Extracts three least significant bits from the [value] and
* returns [ProtoWireType] with corresponding type id, or [ProtoWireType.INVALID]
* if there are no such a type.
*/
fun fromLeastSignificantBits(value: Int): ProtoWireType {
return entryArray[value and 0b111]
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ internal class ProtobufReader(private val input: ByteArrayInput) {
-1
} else {
currentId = header ushr 3
currentType = ProtoWireType.from(header and 0b111)
currentType = ProtoWireType.fromLeastSignificantBits(header)
currentId
}
}
Expand Down