Skip to content
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.

Sign up for GitHub

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

More efficient scan for the discriminator field in enums with more than 64 cases #784

Merged
merged 2 commits into from
Jan 13, 2025
+375 −12
Merged

More efficient scan for the discriminator field in enums with more than 64 cases #784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f7ac5f
More efficient scan for discriminator field for enums with more than …
plokhotnyuk Jan 12, 2025
6269847
Formatting
plokhotnyuk Jan 13, 2025
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
19 changes: 8 additions & 11 deletions zio-schema-json/shared/src/main/scala/zio/schema/codec/JsonCodec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,15 +838,15 @@ object JsonCodec {
discriminator match {
case None =>
if (caseNameAliases.size <= 64) {
val stringMatrix = new StringMatrix(caseNameAliases.keys.toArray)
val caseMatrix = new StringMatrix(caseNameAliases.keys.toArray)
val cases = caseNameAliases.values.map { case_ =>
(JsonError.ObjectAccess(case_.caseName), schemaDecoder(case_.schema))
}.toArray
(trace: List[JsonError], in: RetractReader) => {
val lexer = Lexer
lexer.char(trace, in, '{')
if (!lexer.firstField(trace, in)) error("missing subtype", trace)
val idx = lexer.field(trace, in, stringMatrix)
val idx = lexer.field(trace, in, caseMatrix)
if (idx < 0) error("unrecognized subtype", trace)
val spanWithDecoder = cases(idx)
val trace_ = spanWithDecoder._1 :: trace
Expand Down Expand Up @@ -876,10 +876,10 @@ object JsonCodec {
}
}
case Some(discriminatorName) =>
val discriminatorMatrix = new StringMatrix(Array(discriminatorName))
val discriminatorSpan = JsonError.ObjectAccess(discriminatorName)
if (caseNameAliases.size <= 64) {
val discriminatorMatrix = new StringMatrix(Array(discriminatorName))
val discriminatorSpan = JsonError.ObjectAccess(discriminatorName)
val caseMatrix = new StringMatrix(caseNameAliases.keys.toArray)
val caseMatrix = new StringMatrix(caseNameAliases.keys.toArray)
val cases = caseNameAliases.values.map { case_ =>
(JsonError.ObjectAccess(case_.caseName), schemaDecoder(case_.schema, discriminator))
}.toArray
Expand All @@ -902,7 +902,6 @@ object JsonCodec {
spanWithDecoder._2.unsafeDecode(spanWithDecoder._1 :: trace_, rr).asInstanceOf[Z]
}
} else {
val discriminatorSpan = JsonError.ObjectAccess(discriminatorName)
val cases =
new util.HashMap[String, (JsonError.ObjectAccess, ZJsonDecoder[Any])](caseNameAliases.size << 1)
caseNameAliases.foreach {
Expand All @@ -915,14 +914,12 @@ object JsonCodec {
if (!lexer.firstField(trace, in)) error("missing subtype", trace)
val rr = RecordingReader(in)
while ({
(lexer.string(trace, rr).toString != discriminatorName) && {
lexer.char(trace, rr, ':')
(lexer.field(trace, rr, discriminatorMatrix) < 0) && {
lexer.skipValue(trace, rr)
lexer.nextField(trace, rr) || error("missing subtype", trace)
}
}) ()
val trace_ = discriminatorSpan :: trace
lexer.char(trace_, rr, ':')
val trace_ = discriminatorSpan :: trace
val fieldValue = lexer.string(trace_, rr).toString
rr.rewind()
val spanWithDecoder = cases.get(fieldValue)
Expand Down Expand Up @@ -1099,7 +1096,7 @@ object JsonCodec {
})

private[codec] def caseClassEncoder[Z](schema: Schema.Record[Z], cfg: Config, discriminatorTuple: DiscriminatorTuple): ZJsonEncoder[Z] = {
val nonTransientFields = schema.nonTransientFields.map(_.asInstanceOf[Schema.Field[Z, Any]]).toArray
val nonTransientFields = schema.nonTransientFields.toArray.asInstanceOf[Array[Schema.Field[Z, Any]]]
val encoders = nonTransientFields.map(s => JsonEncoder.schemaEncoder(s.schema, cfg, discriminatorTuple))
(a: Z, indent: Option[Int], out: Write) => {
out.write('{')
Expand Down
Loading
Loading