Skip to content
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

Jump to bottom

Optimize knownProducts for direct-to-JAR compilation #939

Merged
merged 3 commits into from
Nov 9, 2020
Merged

Optimize knownProducts for direct-to-JAR compilation #939

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46d2659
Optimize knownProducts for direct-to-JAR compilation
retronym Nov 3, 2020
f00ef7d
Remove parallel collection of known products
retronym Nov 9, 2020
0ed5242
Use relations.allProducts rather than reconstructing
retronym Nov 9, 2020
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
21 changes: 14 additions & 7 deletions internal/zinc-classfile/src/main/scala/sbt/internal/inc/JarUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,24 @@ object JarUtils {
* "C:\develop\zinc\target\output.jar!sbt\internal\inc\Compile.class"
*/
class ClassInJar(override val toString: String) extends AnyVal {
def toClassFilePath: Option[ClassFilePath] = splitJarReference._2
def toClassFilePath: Option[ClassFilePath] = Option(toClassFilePathOrNull)
def toClassFilePathOrNull: ClassFilePath = {
val idx = toString.indexOf('!')
if (idx < 0) null
else toClassFilePath(idx)
}
def splitJarReference: (File, Option[ClassFilePath]) = {
if (toString.contains("!")) {
val Array(jar, cls) = toString.split("!")
// ClassInJar stores RelClass part with File.separatorChar, however actual paths in zips always use '/'
val classFilePath = cls.replace('\\', '/')
(new File(jar), Some(classFilePath))
} else {
val idx = toString.indexOf('!')
if (idx < 0) {
(new File(toString), None)
} else {
(new File(toString.substring(0, idx)), Some(toClassFilePath(idx)))
}
}
private def toClassFilePath(idx: Int): String = {
// ClassInJar stores RelClass part with File.separatorChar, however actual paths in zips always use '/'
toString.substring(idx + 1).replace('\\', '/')
}

/**
* Wraps the string value inside a java.io.File object.
Expand Down
17 changes: 9 additions & 8 deletions internal/zinc-core/src/main/scala/sbt/internal/inc/Incremental.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import sbt.util.{ InterfaceUtil, Level, Logger }
import sbt.util.InterfaceUtil.{ jo2o, t2 }
import scala.collection.JavaConverters._
import scala.util.control.NonFatal
import scala.collection.parallel.immutable.ParVector
import xsbti.{ FileConverter, Position, Problem, Severity, UseScope, VirtualFile, VirtualFileRef }
import xsbt.api.{ APIUtil, HashAPI, NameHashing }
import xsbti.api._
Expand Down Expand Up @@ -1086,16 +1085,18 @@ private final class AnalysisCallback(

private def knownProducts(merged: Analysis) = {
// List classes defined in the files that were compiled in this run.
val ps = java.util.concurrent.ConcurrentHashMap.newKeySet[String]
val knownProducts: ParVector[VirtualFileRef] =
new ParVector(merged.relations.allSources.toVector)
.flatMap(merged.relations.products)
// extract product paths in parallel
val ps: java.util.Set[String] = new java.util.HashSet[String]()
val knownProducts: Vector[VirtualFileRef] =
merged.relations.allSources.toVector.flatMap(merged.relations.products)

// extract product paths
jo2o(output.getSingleOutputAsPath) match {
case Some(so) if so.getFileName.toString.endsWith(".jar") =>
knownProducts foreach { product =>
new JarUtils.ClassInJar(product.id).toClassFilePath foreach { path =>
ps.add(path.replace('\\', '/'))
new JarUtils.ClassInJar(product.id).toClassFilePathOrNull match {
case null =>
case path =>
ps.add(path.replace('\\', '/'))
}
}
case Some(so) =>
Expand Down