Skip to content

perf: reuse manifest json visitors #839

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

Open
He-Pin wants to merge 1 commit into
base: master
Choose a base branch
from
+34 −21
Open

perf: reuse manifest json visitors #839

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
55 changes: 34 additions & 21 deletions sjsonnet/src/sjsonnet/Renderer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,19 +206,9 @@ final case class MaterializeJsonRenderer(
private val newLineCharArray = newline.toCharArray
private val keyValueSeparatorCharArray = keyValueSeparator.toCharArray

override def visitArray(
length: Int,
index: Int): upickle.core.ArrVisitor[java.io.StringWriter, java.io.StringWriter] {
private val reusableArrVisitor: ArrVisitor[StringWriter, StringWriter] {
def subVisitor: sjsonnet.MaterializeJsonRenderer
} = new ArrVisitor[StringWriter, StringWriter] {
flushBuffer()
elemBuilder.append('[')

depth += 1
// account for rendering differences of whitespaces in ujson and jsonnet manifestJson
if (length == 0 && indent != -1)
elemBuilder.appendAll(newLineCharArray, newLineCharArray.length)
else renderIndent()
def subVisitor: sjsonnet.MaterializeJsonRenderer = MaterializeJsonRenderer.this
def visitValue(v: StringWriter, index: Int): Unit = {
flushBuffer()
Expand All @@ -234,19 +224,10 @@ final case class MaterializeJsonRenderer(
}
}

override def visitObject(
length: Int,
index: Int): upickle.core.ObjVisitor[java.io.StringWriter, java.io.StringWriter] {
private val reusableObjVisitor: ObjVisitor[StringWriter, StringWriter] {
def subVisitor: sjsonnet.MaterializeJsonRenderer
def visitKey(index: Int): sjsonnet.MaterializeJsonRenderer
} = new ObjVisitor[StringWriter, StringWriter] {
flushBuffer()
elemBuilder.append('{')
depth += 1
// account for rendering differences of whitespaces in ujson and jsonnet manifestJson
if (length == 0 && indent != -1)
elemBuilder.appendAll(newLineCharArray, newLineCharArray.length)
else renderIndent()
def subVisitor: sjsonnet.MaterializeJsonRenderer = MaterializeJsonRenderer.this
def visitKey(index: Int): sjsonnet.MaterializeJsonRenderer = MaterializeJsonRenderer.this
def visitKeyValue(s: Any): Unit = {
Expand All @@ -264,6 +245,38 @@ final case class MaterializeJsonRenderer(
out
}
}

override def visitArray(
length: Int,
index: Int): upickle.core.ArrVisitor[java.io.StringWriter, java.io.StringWriter] {
def subVisitor: sjsonnet.MaterializeJsonRenderer
} = {
flushBuffer()
elemBuilder.append('[')

depth += 1
// account for rendering differences of whitespaces in ujson and jsonnet manifestJson
if (length == 0 && indent != -1)
elemBuilder.appendAll(newLineCharArray, newLineCharArray.length)
else renderIndent()
reusableArrVisitor
}

override def visitObject(
length: Int,
index: Int): upickle.core.ObjVisitor[java.io.StringWriter, java.io.StringWriter] {
def subVisitor: sjsonnet.MaterializeJsonRenderer
def visitKey(index: Int): sjsonnet.MaterializeJsonRenderer
} = {
flushBuffer()
elemBuilder.append('{')
depth += 1
// account for rendering differences of whitespaces in ujson and jsonnet manifestJson
if (length == 0 && indent != -1)
elemBuilder.appendAll(newLineCharArray, newLineCharArray.length)
else renderIndent()
reusableObjVisitor
}
}

object RenderUtils {
Expand Down
Loading