Skip to content

perf: cached renderDouble for small integers + Builtin1/3 apply overrides #763

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

Draft
He-Pin wants to merge 1 commit into
base: master
Choose a base branch
from
+31 −6
Draft

perf: cached renderDouble for small integers + Builtin1/3 apply overrides #763

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
5 changes: 1 addition & 4 deletions sjsonnet/src/sjsonnet/Materializer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,7 @@ abstract class Materializer {
case Val.False(_) => "false"
case Val.Null(_) => "null"
case Val.Num(_, _) =>
val d = v.asDouble
val l = d.toLong
if (l.toDouble == d) java.lang.Long.toString(l)
else RenderUtils.renderDouble(d)
RenderUtils.renderDouble(v.asDouble)
case _ => apply0(v, new sjsonnet.Renderer()).toString
}
}
Expand Down
10 changes: 8 additions & 2 deletions sjsonnet/src/sjsonnet/Renderer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,12 +268,18 @@ final case class MaterializeJsonRenderer(

object RenderUtils {

// Pre-cached string representations of small integers (0-255)
private val intStrCache: Array[String] = Array.tabulate(256)(_.toString)

/**
* Custom rendering of Doubles used in rendering
*/
def renderDouble(d: Double): String = {
if (d.toLong == d) d.toLong.toString
else if (d % 1 == 0) {
val l = d.toLong
if (l.toDouble == d) {
if (l >= 0 && l < 256) intStrCache(l.toInt)
else l.toString
} else if (d % 1 == 0) {
BigDecimal(d).setScale(0, BigDecimal.RoundingMode.HALF_EVEN).toBigInt.toString()
} else d.toString
}
Expand Down
22 changes: 22 additions & 0 deletions sjsonnet/src/sjsonnet/Val.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1869,6 +1869,15 @@ object Val {
tailstrictMode: TailstrictMode): Val =
if (namedNames == null && argVals.length == 1) evalRhs(argVals(0).value, ev, outerPos)
else super.apply(argVals, namedNames, outerPos)

override def apply1(argVal: Eval, outerPos: Position)(implicit
ev: EvalScope,
tailstrictMode: TailstrictMode): Val =
if (params.names.length != 1) apply(Array(argVal), null, outerPos)
else {
if (tailstrictMode == TailstrictModeEnabled) argVal.value
evalRhs(argVal.value, ev, outerPos)
}
}

abstract class Builtin2(fn: String, pn1: String, pn2: String, defs: Array[Expr] = null)
Expand Down Expand Up @@ -1912,6 +1921,19 @@ object Val {
if (namedNames == null && argVals.length == 3)
evalRhs(argVals(0).value, argVals(1).value, argVals(2).value, ev, outerPos)
else super.apply(argVals, namedNames, outerPos)

override def apply3(argVal1: Eval, argVal2: Eval, argVal3: Eval, outerPos: Position)(implicit
ev: EvalScope,
tailstrictMode: TailstrictMode): Val =
if (params.names.length != 3) apply(Array(argVal1, argVal2, argVal3), null, outerPos)
else {
if (tailstrictMode == TailstrictModeEnabled) {
argVal1.value
argVal2.value
argVal3.value
}
evalRhs(argVal1.value, argVal2.value, argVal3.value, ev, outerPos)
}
}

abstract class Builtin4(
Expand Down
Loading