Skip to content

Fix Scala Native build #647

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
Mar 15, 2026
Merged

Fix Scala Native build #647

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 .github/workflows/release-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v6
- uses: actions/setup-java@v5
with:
java-version: 17
java-version: 21
distribution: 'zulu'
- name: Set up Node.js 24
uses: actions/setup-node@v6
Expand Down
2 changes: 2 additions & 0 deletions sjsonnet/src-js/sjsonnet/Platform.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,4 +144,6 @@ object Platform {
}

def regexQuote(s: String): String = Pattern.quote(s)

def appendMemoryStats(sb: StringBuilder): Unit = {}
}
18 changes: 18 additions & 0 deletions sjsonnet/src-jvm/sjsonnet/Platform.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,4 +165,22 @@ object Platform {
quote
}
}

def appendMemoryStats(sb: StringBuilder): Unit = {
val rt = Runtime.getRuntime
val usedBytes = rt.totalMemory() - rt.freeMemory()
val maxBytes = rt.maxMemory()
sb.append(formatBytesLine("heap_used", usedBytes))
sb.append(formatBytesLine("heap_max", maxBytes))
}

private def formatBytesLine(label: String, bytes: Long): String =
f"$label%-25s ${formatBytes(bytes)}%s%n"

private def formatBytes(bytes: Long): String = {
if (bytes < 1024L) s"${bytes}B"
else if (bytes < 1024L * 1024) f"${bytes / 1024.0}%.1fKB"
else if (bytes < 1024L * 1024 * 1024) f"${bytes / (1024.0 * 1024)}%.1fMB"
else f"${bytes / (1024.0 * 1024 * 1024)}%.2fGB"
}
}
2 changes: 2 additions & 0 deletions sjsonnet/src-native/sjsonnet/Platform.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,4 +188,6 @@ object Platform {
quote
}
}

def appendMemoryStats(sb: StringBuilder): Unit = {}
}
16 changes: 1 addition & 15 deletions sjsonnet/src/sjsonnet/DebugStats.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,7 @@ final class DebugStats {
sb.append(formatTimeLine("materialize_time", materializeTimeNs))
sb.append(formatTimeLine("total_time", totalTimeNs))

val rt = Runtime.getRuntime
val usedBytes = rt.totalMemory() - rt.freeMemory()
val maxBytes = rt.maxMemory()
sb.append(formatBytesLine("heap_used", usedBytes))
sb.append(formatBytesLine("heap_max", maxBytes))
Platform.appendMemoryStats(sb)

sb.toString
}
Expand All @@ -68,22 +64,12 @@ final class DebugStats {
private def formatTimeLine(label: String, ns: Long): String =
f"$label%-25s ${formatNs(ns)}%s%n"

private def formatBytesLine(label: String, bytes: Long): String =
f"$label%-25s ${formatBytes(bytes)}%s%n"

private def formatNs(ns: Long): String = {
if (ns < 1000L) s"${ns}ns"
else if (ns < 1000000L) f"${ns / 1000.0}%.1fμs"
else if (ns < 1000000000L) f"${ns / 1000000.0}%.1fms"
else f"${ns / 1000000000.0}%.3fs"
}

private def formatBytes(bytes: Long): String = {
if (bytes < 1024L) s"${bytes}B"
else if (bytes < 1024L * 1024) f"${bytes / 1024.0}%.1fKB"
else if (bytes < 1024L * 1024 * 1024) f"${bytes / (1024.0 * 1024)}%.1fMB"
else f"${bytes / (1024.0 * 1024 * 1024)}%.2fGB"
}
}

/**
Expand Down