Skip to content

perf: cache sorted visible key names on Val.Obj #784

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

Merged
stephenamar-db merged 1 commit into from
Apr 24, 2026
Merged

perf: cache sorted visible key names on Val.Obj #784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion sjsonnet/src/sjsonnet/ByteRenderer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ class ByteRenderer(out: OutputStream = new java.io.ByteArrayOutputStream(), inde
matDepth: Int,
ctx: Materializer.MaterializeContext)(implicit evaluator: EvalScope): Unit = {
val keys =
if (ctx.sort) obj.visibleKeyNames.sorted(Util.CodepointStringOrdering)
if (ctx.sort) obj.sortedVisibleKeyNames
else obj.visibleKeyNames

openObjBrace()
Expand Down
4 changes: 2 additions & 2 deletions sjsonnet/src/sjsonnet/Materializer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ abstract class Materializer {
else materializeInlineObj(obj, visitor, depth, ctx)
} else {
val keys =
if (ctx.sort) obj.visibleKeyNames.sorted(Util.CodepointStringOrdering)
if (ctx.sort) obj.sortedVisibleKeyNames
else obj.visibleKeyNames
val ov = visitor.visitObject(keys.length, jsonableKeys = true, -1)
var i = 0
Expand Down Expand Up @@ -432,7 +432,7 @@ abstract class Materializer {
storePos(obj.pos)
obj.triggerAllAsserts(ctx.brokenAssertionLogic)
val keyNames =
if (ctx.sort) obj.visibleKeyNames.sorted(Util.CodepointStringOrdering)
if (ctx.sort) obj.sortedVisibleKeyNames
else obj.visibleKeyNames
val objVisitor = visitor.visitObject(keyNames.length, jsonableKeys = true, -1)
stack.push(
Expand Down
15 changes: 13 additions & 2 deletions sjsonnet/src/sjsonnet/Val.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,7 +884,18 @@ object Val {
* Cached sorted field order for inline objects. Shared across all objects from the same
* MemberList to avoid per-object sort + allocation.
*/
@volatile private[sjsonnet] var _sortedInlineOrder: Array[Int] = null
private[sjsonnet] var _sortedInlineOrder: Array[Int] = null

private[sjsonnet] var _sortedVisibleKeyNames: Array[String] = null

private[sjsonnet] def sortedVisibleKeyNames: Array[String] = {
var r = _sortedVisibleKeyNames
if (r == null) {
r = visibleKeyNames.sorted(Util.CodepointStringOrdering)
_sortedVisibleKeyNames = r
}
r
}

/**
* When true, field caching can be skipped during materialization because no field body
Expand Down Expand Up @@ -1402,7 +1413,7 @@ object Val {

def foreachElement(sort: Boolean, pos: Position)(f: (String, Val) => Unit)(implicit
ev: EvalScope): Unit = {
val keys = if (sort) visibleKeyNames.sorted(Util.CodepointStringOrdering) else visibleKeyNames
val keys = if (sort) sortedVisibleKeyNames else visibleKeyNames
for (k <- keys) {
val v = value(k, pos)
f(k, v)
Expand Down
Loading