Skip to content

perf: use in-place Arrays.sort for std.sort/std.set/std.uniq #664

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

Closed
He-Pin wants to merge 1 commit into from
Closed

perf: use in-place Arrays.sort for std.sort/std.set/std.uniq #664

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
25 changes: 22 additions & 3 deletions sjsonnet/src/sjsonnet/stdlib/SetModule.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,17 +125,36 @@ object SetModule extends AbstractFunctionModule {
if (!strict.forall(_.getClass == keyType))
Error.fail("Cannot sort with values that are not all the same type")

// Sort in-place to avoid intermediate array allocations from map+sortBy
if (keyType == classOf[Val.Str]) {
strict.map(_.cast[Val.Str]).sortBy(_.asString)(Util.CodepointStringOrdering)
java.util.Arrays.sort(
strict.asInstanceOf[Array[AnyRef]],
(a: AnyRef, b: AnyRef) =>
Util.compareStringsByCodepoint(
a.asInstanceOf[Val.Str].asString,
b.asInstanceOf[Val.Str].asString
)
)
} else if (keyType == classOf[Val.Num]) {
strict.map(_.cast[Val.Num]).sortBy(_.asDouble)
java.util.Arrays.sort(
strict.asInstanceOf[Array[AnyRef]],
(a: AnyRef, b: AnyRef) =>
java.lang.Double.compare(
a.asInstanceOf[Val.Num].asDouble,
b.asInstanceOf[Val.Num].asDouble
)
)
} else if (keyType == classOf[Val.Arr]) {
strict.map(_.cast[Val.Arr]).sortBy(identity)(ev.compare(_, _))
java.util.Arrays.sort(
strict.asInstanceOf[Array[AnyRef]],
(a: AnyRef, b: AnyRef) => ev.compare(a.asInstanceOf[Val.Arr], b.asInstanceOf[Val.Arr])
)
} else if (keyType == classOf[Val.Obj]) {
Error.fail("Unable to sort array of objects without key function")
} else {
Error.fail("Cannot sort array of " + strict(0).prettyName)
}
strict
}
)
}
Expand Down