-
Notifications
You must be signed in to change notification settings - Fork 4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This is a mechanical refactoring to replace `ImmutableList<FilesetOutputSymlink>` with an extra abstraction layer called `FilesetOutputTree`. In this change, `FilesetOutputTree` only contains `ImmutableList<FilesetOutputSymlink>`. In a subsequent change, we will also store a `boolean` indicating whether the fileset has any relative symlinks. If the fileset does not have any relative symlinks (expected to be a common case), we can make some significant performance optimizations. PiperOrigin-RevId: 681116734 Change-Id: If49f8acf15122f6287cd426cb36a081952424b84
- Loading branch information
1 parent
96f48e9
commit fd67506
Showing
45 changed files
with
340 additions
and
247 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
src/main/java/com/google/devtools/build/lib/actions/FilesetOutputTree.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| // Copyright 2024 The Bazel Authors. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| package com.google.devtools.build.lib.actions; | ||
|
|
||
| import static com.google.common.base.Preconditions.checkNotNull; | ||
|
|
||
| import com.google.common.base.MoreObjects; | ||
| import com.google.common.collect.ImmutableList; | ||
|
|
||
| /** A collection of {@link FilesetOutputSymlink}s comprising the output tree of a fileset. */ | ||
| public final class FilesetOutputTree { | ||
|
|
||
| public static final FilesetOutputTree EMPTY = new FilesetOutputTree(ImmutableList.of()); | ||
|
|
||
| public static FilesetOutputTree create(ImmutableList<FilesetOutputSymlink> symlinks) { | ||
| return symlinks.isEmpty() ? EMPTY : new FilesetOutputTree(symlinks); | ||
| } | ||
|
|
||
| private final ImmutableList<FilesetOutputSymlink> symlinks; | ||
|
|
||
| private FilesetOutputTree(ImmutableList<FilesetOutputSymlink> symlinks) { | ||
| this.symlinks = checkNotNull(symlinks); | ||
| } | ||
|
|
||
| public ImmutableList<FilesetOutputSymlink> symlinks() { | ||
| return symlinks; | ||
| } | ||
|
|
||
| public int size() { | ||
| return symlinks.size(); | ||
| } | ||
|
|
||
| public boolean isEmpty() { | ||
| return symlinks.isEmpty(); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return symlinks.hashCode(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) { | ||
| return true; | ||
| } | ||
| if (!(o instanceof FilesetOutputTree that)) { | ||
| return false; | ||
| } | ||
| return symlinks.equals(that.symlinks); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return MoreObjects.toStringHelper(this).add("symlinks", symlinks).toString(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.