Add a serialization proxy to RepositoryName instead of PackageIdentifier so that naked RepositoryName objects can also be serialized properly. Also store the initial offset a target pattern was parsed with. -- MOS_MIGRATED_REVID=103921930
diff --git a/src/main/java/com/google/devtools/build/lib/cmdline/PackageIdentifier.java b/src/main/java/com/google/devtools/build/lib/cmdline/PackageIdentifier.java index a315716..716f1ee 100644 --- a/src/main/java/com/google/devtools/build/lib/cmdline/PackageIdentifier.java +++ b/src/main/java/com/google/devtools/build/lib/cmdline/PackageIdentifier.java
@@ -48,7 +48,45 @@ /** * A human-readable name for the repository. */ - public static final class RepositoryName { + public static final class RepositoryName implements Serializable { + /** Helper for serializing {@link RepositoryName}. */ + private static final class SerializationProxy implements Serializable { + private RepositoryName repositoryName; + + private SerializationProxy(RepositoryName repositoryName) { + this.repositoryName = repositoryName; + } + + private void writeObject(ObjectOutputStream out) throws IOException { + out.writeObject(repositoryName.toString()); + } + + private void readObject(ObjectInputStream in) + throws IOException, ClassNotFoundException { + try { + repositoryName = RepositoryName.create((String) in.readObject()); + } catch (LabelSyntaxException e) { + throw new IOException("Error serializing repository name: " + e.getMessage()); + } + } + + @SuppressWarnings("unused") + private void readObjectNoData() throws ObjectStreamException { + } + + private Object readResolve() { + return repositoryName; + } + } + + private void readObject(ObjectInputStream in) throws IOException { + throw new IOException("Serialization is allowed only by proxy"); + } + + private Object writeReplace() { + return new SerializationProxy(this); + } + private static final LoadingCache<String, RepositoryName> repositoryNameCache = CacheBuilder.newBuilder() .weakValues() @@ -235,42 +273,6 @@ } } - /** - * Helper for serializing PackageIdentifiers. - * - * <p>PackageIdentifier's field should be final, but then it couldn't be deserialized. This - * allows the fields to be deserialized and copied into a new PackageIdentifier.</p> - */ - private static final class SerializationProxy implements Serializable { - PackageIdentifier packageId; - - public SerializationProxy(PackageIdentifier packageId) { - this.packageId = packageId; - } - - private void writeObject(ObjectOutputStream out) throws IOException { - out.writeObject(packageId.repository.toString()); - out.writeObject(packageId.pkgName); - } - - private void readObject(ObjectInputStream in) - throws IOException, ClassNotFoundException { - try { - packageId = new PackageIdentifier((String) in.readObject(), (PathFragment) in.readObject()); - } catch (LabelSyntaxException e) { - throw new IOException("Error serializing package identifier: " + e.getMessage()); - } - } - - @SuppressWarnings("unused") - private void readObjectNoData() throws ObjectStreamException { - } - - private Object readResolve() { - return packageId; - } - } - // Temporary factory for identifiers without explicit repositories. // TODO(bazel-team): remove all usages of this. public static PackageIdentifier createInDefaultRepo(String name) { @@ -336,18 +338,6 @@ return new PackageIdentifier(repo, new PathFragment(packageName)); } - private Object writeReplace() { - return new SerializationProxy(this); - } - - private void readObject(ObjectInputStream in) throws IOException { - throw new IOException("Serialization is allowed only by proxy"); - } - - @SuppressWarnings("unused") - private void readObjectNoData() throws ObjectStreamException { - } - public RepositoryName getRepository() { return repository; }
diff --git a/src/main/java/com/google/devtools/build/lib/cmdline/TargetPattern.java b/src/main/java/com/google/devtools/build/lib/cmdline/TargetPattern.java index d456059..3fd93f2 100644 --- a/src/main/java/com/google/devtools/build/lib/cmdline/TargetPattern.java +++ b/src/main/java/com/google/devtools/build/lib/cmdline/TargetPattern.java
@@ -56,6 +56,7 @@ private final Type type; private final String originalPattern; + private final String offset; /** * Returns a parser with no offset. Note that the Parser class is immutable, so this method may @@ -108,10 +109,11 @@ return SLASH_JOINER.join(pieces); } - private TargetPattern(Type type, String originalPattern) { + private TargetPattern(Type type, String originalPattern, String offset) { // Don't allow inheritance outside this class. this.type = type; this.originalPattern = Preconditions.checkNotNull(originalPattern); + this.offset = Preconditions.checkNotNull(offset); } /** @@ -130,6 +132,13 @@ } /** + * Return the offset this target pattern was parsed with. + */ + public String getOffset() { + return offset; + } + + /** * Evaluates the current target pattern and returns the result. */ public <T> ResolvedTargets<T> eval(TargetPatternResolver<T> resolver) @@ -186,8 +195,9 @@ private final String targetName; private final String directory; - private SingleTarget(String targetName, String directory, String originalPattern) { - super(Type.SINGLE_TARGET, originalPattern); + private SingleTarget( + String targetName, String directory, String originalPattern, String offset) { + super(Type.SINGLE_TARGET, originalPattern, offset); this.targetName = Preconditions.checkNotNull(targetName); this.directory = Preconditions.checkNotNull(directory); } @@ -239,8 +249,8 @@ private final String path; - private InterpretPathAsTarget(String path, String originalPattern) { - super(Type.PATH_AS_TARGET, originalPattern); + private InterpretPathAsTarget(String path, String originalPattern, String offset) { + super(Type.PATH_AS_TARGET, originalPattern, offset); this.path = normalize(Preconditions.checkNotNull(path)); } @@ -313,9 +323,10 @@ private final boolean rulesOnly; private final boolean checkWildcardConflict; - private TargetsInPackage(String originalPattern, PackageIdentifier packageIdentifier, - String suffix, boolean isAbsolute, boolean rulesOnly, boolean checkWildcardConflict) { - super(Type.TARGETS_IN_PACKAGE, originalPattern); + private TargetsInPackage(String originalPattern, String offset, + PackageIdentifier packageIdentifier, String suffix, boolean isAbsolute, boolean rulesOnly, + boolean checkWildcardConflict) { + super(Type.TARGETS_IN_PACKAGE, originalPattern, offset); this.packageIdentifier = packageIdentifier; this.suffix = Preconditions.checkNotNull(suffix); this.isAbsolute = isAbsolute; @@ -420,8 +431,9 @@ private final String directory; private final boolean rulesOnly; - private TargetsBelowDirectory(String originalPattern, String directory, boolean rulesOnly) { - super(Type.TARGETS_BELOW_DIRECTORY, originalPattern); + private TargetsBelowDirectory( + String originalPattern, String offset, String directory, boolean rulesOnly) { + super(Type.TARGETS_BELOW_DIRECTORY, originalPattern, offset); this.directory = Preconditions.checkNotNull(directory); this.rulesOnly = rulesOnly; } @@ -593,9 +605,11 @@ if (packagePart.endsWith("/...")) { String realPackagePart = removeSuffix(packagePart, "/..."); if (targetPart.isEmpty() || ALL_RULES_IN_SUFFIXES.contains(targetPart)) { - return new TargetsBelowDirectory(originalPattern, realPackagePart, true); + return new TargetsBelowDirectory( + originalPattern, relativeDirectory, realPackagePart, true); } else if (ALL_TARGETS_IN_SUFFIXES.contains(targetPart)) { - return new TargetsBelowDirectory(originalPattern, realPackagePart, false); + return new TargetsBelowDirectory( + originalPattern, relativeDirectory, realPackagePart, false); } } @@ -607,8 +621,8 @@ throw new TargetParsingException( "Invalid package name '" + packagePart + "': " + e.getMessage()); } - return new TargetsInPackage( - originalPattern, packageIdentifier, targetPart, isAbsolute, true, true); + return new TargetsInPackage(originalPattern, relativeDirectory, packageIdentifier, + targetPart, isAbsolute, true, true); } if (ALL_TARGETS_IN_SUFFIXES.contains(targetPart)) { @@ -619,8 +633,8 @@ throw new TargetParsingException( "Invalid package name '" + packagePart + "': " + e.getMessage()); } - return new TargetsInPackage( - originalPattern, packageIdentifier, targetPart, isAbsolute, false, true); + return new TargetsInPackage(originalPattern, relativeDirectory, packageIdentifier, + targetPart, isAbsolute, false, true); } if (includesRepo || isAbsolute || pattern.contains(":")) { @@ -632,7 +646,8 @@ String error = "invalid target format '" + originalPattern + "': " + e.getMessage(); throw new TargetParsingException(error); } - return new SingleTarget(fullLabel, packageAndTarget.getPackageName(), originalPattern); + return new SingleTarget( + fullLabel, packageAndTarget.getPackageName(), originalPattern, relativeDirectory); } // This is a stripped-down version of interpretPathAsTarget that does no I/O. We have a basic @@ -650,7 +665,7 @@ throw new TargetParsingException("Bad target pattern '" + originalPattern + "': " + errorMessage); } - return new InterpretPathAsTarget(pattern, originalPattern); + return new InterpretPathAsTarget(pattern, originalPattern, relativeDirectory); } /**