Skip to content

Commit

Permalink
Intern strings during deserialization.
Browse files Browse the repository at this point in the history
  • Loading branch information
Stu Hood committed Jun 1, 2018
1 parent 899d7bd commit 52abaaa
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 22 deletions.
4 changes: 3 additions & 1 deletion internal/zinc-persist/src/main/scala/sbt/internal/inc/binary/BinaryAnalysisFormat.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import xsbti.compile.{ CompileAnalysis, MiniSetup }
final class BinaryAnalysisFormat(mappers: ReadWriteMappers) {
private final val CurrentVersion = schema.Version.V1
private final val protobufWriters = new ProtobufWriters(mappers.getWriteMapper)
private final val protobufReaders = new ProtobufReaders(mappers.getReadMapper)
private final val readMapper = mappers.getReadMapper

def write(writer: CodedOutputStream, analysis0: CompileAnalysis, miniSetup: MiniSetup): Unit = {
val analysis = analysis0 match { case analysis: Analysis => analysis }
Expand All @@ -34,13 +34,15 @@ final class BinaryAnalysisFormat(mappers: ReadWriteMappers) {

def read(reader: CodedInputStream): (CompileAnalysis, MiniSetup) = {
val protobufFile = schema.AnalysisFile.parseFrom(reader)
val protobufReaders = new ProtobufReaders(readMapper)
val (analysis, miniSetup, _) = protobufReaders.fromAnalysisFile(protobufFile)
analysis -> miniSetup
}

def readAPIs(reader: CodedInputStream, analysis0: CompileAnalysis): CompileAnalysis = {
val analysis = analysis0 match { case analysis: Analysis => analysis }
val protobufAPIsFile = schema.APIsFile.parseFrom(reader)
val protobufReaders = new ProtobufReaders(readMapper)
val (apis, _) = protobufReaders.fromApisFile(protobufAPIsFile)
analysis.copy(apis = apis)
}
Expand Down
52 changes: 31 additions & 21 deletions ...rnal/zinc-persist/src/main/scala/sbt/internal/inc/binary/converters/ProtobufReaders.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
package sbt.internal.inc.binary.converters

import java.io.File
import scala.collection.mutable

import sbt.internal.inc.Relations.ClassDependencies
import sbt.internal.inc._
Expand All @@ -21,9 +22,18 @@ import sbt.internal.inc.binary.converters.ProtobufDefaults.{ Classes, ReadersCon
import sbt.internal.util.Relation
import xsbti.api._

/**
* Each instance of this class will intern (most) deserialized strings in one (instance-level)
* pool, so it's recommended to use a new instance per deserialized top-level object (generally
* `AnalysisFile`).
*/
final class ProtobufReaders(mapper: ReadMapper) {
private[this] val internMap = mutable.Map[String, String]()

private[this] def intern(str: String): String = internMap.getOrElseUpdate(str, str)

def fromPathString(path: String): File = {
java.nio.file.Paths.get(path).toFile
java.nio.file.Paths.get(intern(path)).toFile
}

def fromStampType(stampType: schema.Stamps.StampType): Stamp = {
Expand Down Expand Up @@ -117,7 +127,7 @@ final class ProtobufReaders(mapper: ReadMapper) {
def fromPosition(position: schema.Position): Position = {
import ProtobufDefaults.{ MissingString, MissingInt }
def fromString(value: String): Option[String] =
if (value == MissingString) None else Some(value)
if (value == MissingString) None else Some(intern(value))
def fromInt(value: Int): Option[Integer] =
if (value == MissingInt) None else Some(value)
InterfaceUtil.position(
Expand Down Expand Up @@ -151,7 +161,7 @@ final class ProtobufReaders(mapper: ReadMapper) {
}

def fromSourceInfo(sourceInfo: schema.SourceInfo): SourceInfo = {
val mainClasses = sourceInfo.mainClasses
val mainClasses = sourceInfo.mainClasses.map(intern)
val reportedProblems = sourceInfo.reportedProblems.map(fromProblem)
val unreportedProblems = sourceInfo.unreportedProblems.map(fromProblem)
SourceInfos.makeInfo(reported = reportedProblems,
Expand Down Expand Up @@ -240,7 +250,7 @@ final class ProtobufReaders(mapper: ReadMapper) {
import SchemaPath.{ Component => SchemaComponent }
import Classes.{ Component, PathComponent }
pathComponent.component match {
case SchemaComponent.Id(c) => Id.of(c.id)
case SchemaComponent.Id(c) => Id.of(intern(c.id))
case SchemaComponent.Super(c) =>
Super.of(c.qualifier.read(fromPath, ExpectedPathInSuper))
case SchemaComponent.This(_) => ReadersConstants.This
Expand All @@ -253,8 +263,8 @@ final class ProtobufReaders(mapper: ReadMapper) {

def fromAnnotation(annotation: schema.Annotation): Annotation = {
def fromAnnotationArgument(argument: schema.AnnotationArgument): AnnotationArgument = {
val name = argument.name
val value = argument.value
val name = intern(argument.name)
val value = intern(argument.value)
AnnotationArgument.of(name, value)
}

Expand All @@ -274,7 +284,7 @@ final class ProtobufReaders(mapper: ReadMapper) {
def fromType(`type`: schema.Type): Type = {
import ReadersFeedback.expectedBaseIn
def fromParameterRef(tpe: schema.Type.ParameterRef): ParameterRef = {
ParameterRef.of(tpe.id)
ParameterRef.of(intern(tpe.id))
}

def fromParameterized(tpe: schema.Type.Parameterized): Parameterized = {
Expand All @@ -291,7 +301,7 @@ final class ProtobufReaders(mapper: ReadMapper) {

def fromConstant(tpe: schema.Type.Constant): Constant = {
val baseType = tpe.baseType.read(fromType, expectedBaseIn(Classes.Constant))
val value = tpe.value
val value = intern(tpe.value)
Constant.of(baseType, value)
}

Expand All @@ -307,7 +317,7 @@ final class ProtobufReaders(mapper: ReadMapper) {
}

def fromProjection(tpe: schema.Type.Projection): Projection = {
val id = tpe.id
val id = intern(tpe.id)
val prefix = tpe.prefix.read(fromType, ReadersFeedback.ExpectedPrefixInProjection)
Projection.of(prefix, id)
}
Expand Down Expand Up @@ -340,7 +350,7 @@ final class ProtobufReaders(mapper: ReadMapper) {
def fromQualifier(qualifier: schema.Qualifier): Qualifier = {
import schema.Qualifier.{ Type => QualifierType }
qualifier.`type` match {
case QualifierType.IdQualifier(q) => IdQualifier.of(q.value)
case QualifierType.IdQualifier(q) => IdQualifier.of(intern(q.value))
case QualifierType.ThisQualifier(_) => ReadersConstants.ThisQualifier
case QualifierType.Unqualified(_) => ReadersConstants.Unqualified
case QualifierType.Empty => ReadersFeedback.ExpectedNonEmptyQualifier.!!
Expand Down Expand Up @@ -376,7 +386,7 @@ final class ProtobufReaders(mapper: ReadMapper) {
ExpectedUpperBoundInTypeDeclaration
}

val name = classDefinition.name
val name = intern(classDefinition.name)
val access = classDefinition.access.read(fromAccess, MissingAccessInDef)
val modifiers = classDefinition.modifiers.read(fromModifiers, MissingModifiersInDef)
val annotations = classDefinition.annotations.toZincArray(fromAnnotation)
Expand All @@ -392,7 +402,7 @@ final class ProtobufReaders(mapper: ReadMapper) {
ReadersFeedback.UnrecognizedParamModifier.!!
}
}
val name = methodParameter.name
val name = intern(methodParameter.name)
val hasDefault = methodParameter.hasDefault
val `type` = methodParameter.`type`.read(fromType, expectedTypeIn(Classes.MethodParameter))
val modifier = fromParameterModifier(methodParameter.modifier)
Expand Down Expand Up @@ -463,7 +473,7 @@ final class ProtobufReaders(mapper: ReadMapper) {
}

import ReadersFeedback.{ ExpectedLowerBoundInTypeParameter, ExpectedUpperBoundInTypeParameter }
val id = typeParameter.id
val id = intern(typeParameter.id)
val annotations = typeParameter.annotations.toZincArray(fromAnnotation)
val typeParameters = typeParameter.typeParameters.toZincArray(fromTypeParameter)
val variance = fromVariance(typeParameter.variance)
Expand All @@ -475,7 +485,7 @@ final class ProtobufReaders(mapper: ReadMapper) {
def fromClassLike(classLike: schema.ClassLike): ClassLike = {
def expectedMsg(msg: String) = ReadersFeedback.expected(msg, Classes.ClassLike)
def expected(clazz: Class[_]) = expectedMsg(clazz.getName)
val name = classLike.name
val name = intern(classLike.name)
val access = classLike.access.read(fromAccess, expected(Classes.Access))
val modifiers = classLike.modifiers.read(fromModifiers, expected(Classes.Modifiers))
val annotations = classLike.annotations.toZincArray(fromAnnotation)
Expand All @@ -484,7 +494,7 @@ final class ProtobufReaders(mapper: ReadMapper) {
val definitionType = fromDefinitionType(classLike.definitionType)
val selfType = mkLazy(classLike.selfType.read(fromType, expectedMsg("self type")))
val structure = mkLazy(classLike.structure.read(fromStructure, expected(Classes.Structure)))
val savedAnnotations = classLike.savedAnnotations.toArray
val savedAnnotations = classLike.savedAnnotations.map(intern).toArray
val childrenOfSealedClass = classLike.childrenOfSealedClass.toZincArray(fromType)
val topLevel = classLike.topLevel
val typeParameters = classLike.typeParameters.toZincArray(fromTypeParameter)
Expand Down Expand Up @@ -521,7 +531,7 @@ final class ProtobufReaders(mapper: ReadMapper) {
}

def fromNameHash(nameHash: schema.NameHash): NameHash = {
val name = nameHash.name
val name = intern(nameHash.name)
val hash = nameHash.hash
val scope = fromUseScope(nameHash.scope)
NameHash.of(name, scope, hash)
Expand All @@ -530,15 +540,15 @@ final class ProtobufReaders(mapper: ReadMapper) {
import SafeLazyProxy.{ strict => mkLazy }
import ReadersFeedback.ExpectedCompanionsInAnalyzedClass
val compilationTimestamp = analyzedClass.compilationTimestamp
val name = analyzedClass.name
val name = intern(analyzedClass.name)
val api = mkLazy(analyzedClass.api.read(fromCompanions, ExpectedCompanionsInAnalyzedClass))
val apiHash = analyzedClass.apiHash
val nameHashes = analyzedClass.nameHashes.toZincArray(fromNameHash)
val hasMacro = analyzedClass.hasMacro
AnalyzedClass.of(compilationTimestamp, name, api, apiHash, nameHashes, hasMacro)
}

private final val stringId = identity[String] _
private final val stringId = intern _
private final val stringToFile = (path: String) => fromPathString(path)
def fromRelations(relations: schema.Relations): Relations = {
def fromMap[K, V](map: Map[String, schema.Values],
Expand All @@ -559,7 +569,7 @@ final class ProtobufReaders(mapper: ReadMapper) {
}

def fromUsedName(usedName: schema.UsedName): UsedName = {
val name = usedName.name
val name = intern(usedName.name)
val scopes = usedName.scopes.iterator.map(fromUseScope).toIterable
UsedName.apply(name, scopes)
}
Expand Down Expand Up @@ -608,8 +618,8 @@ final class ProtobufReaders(mapper: ReadMapper) {
}

def fromApis(apis: schema.APIs): APIs = {
val internal = apis.internal.mapValues(fromAnalyzedClass)
val external = apis.external.mapValues(fromAnalyzedClass)
val internal = apis.internal.map { case (k, v) => intern(k) -> fromAnalyzedClass(v) }
val external = apis.external.map { case (k, v) => intern(k) -> fromAnalyzedClass(v) }
APIs(internal = internal, external = external)
}

Expand Down

0 comments on commit 52abaaa

Please sign in to comment.