From c28b4ce92294a62b26f814d35d0bcaae9b605324 Mon Sep 17 00:00:00 2001 From: corysmith Date: Fri, 3 Nov 2017 21:04:40 +0100 Subject: Automated rollback of commit 3181c2f1362622985aca24747ed9512573d25dc0. RELNOTES: None PiperOrigin-RevId: 174502289 --- .../devtools/build/android/AndroidDataMerger.java | 135 ++++++++++++++++++--- .../devtools/build/android/ParsedAndroidData.java | 102 ++++++---------- 2 files changed, 153 insertions(+), 84 deletions(-) (limited to 'src/tools/android') diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java b/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java index 61d415787c..8e550a2d60 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java +++ b/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java @@ -16,7 +16,7 @@ package com.google.devtools.build.android; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; import com.google.common.base.Stopwatch; -import com.google.common.collect.Sets; +import com.google.common.collect.Iterables; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.devtools.build.android.AndroidResourceMerger.MergingException; @@ -24,7 +24,10 @@ import java.io.IOException; import java.io.InputStream; import java.nio.file.Path; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; @@ -227,7 +230,8 @@ class AndroidDataMerger { * the ultimate source of truth, provided it doesn't conflict with itself. * @return An UnwrittenMergedAndroidData, containing DataResource objects that can be written to * disk for aapt processing or serialized for future merge passes. - * @throws MergingException if there are issues with parsing resources from primaryData. + * @throws MergingException if there are issues with parsing resources from + * primaryData. * @throws MergeConflictException if there are merge conflicts */ UnwrittenMergedAndroidData merge( @@ -254,25 +258,123 @@ class AndroidDataMerger { private UnwrittenMergedAndroidData doMerge( ParsedAndroidData transitive, ParsedAndroidData direct, - ParsedAndroidData primary, + ParsedAndroidData parsedPrimary, Path primaryManifest, boolean allowPrimaryOverrideAll, boolean throwOnResourceConflict) { try { // Create the builders for the final parsed data. - ParsedAndroidData mergedPrimary = - primary - .overwrite(direct, false) - .combine(direct) - .overwrite(transitive, !allowPrimaryOverrideAll) - .combine(transitive); - // Filter out all the resources that are in the primary, as they only need to be written once. - // This also removes conflicts that have keys in the primary -- those conflicts are recorded - // in the overwrite steps above. - ParsedAndroidData mergedTransitive = direct.union(transitive).filterBy(mergedPrimary); + final ParsedAndroidData.Builder primaryBuilder = ParsedAndroidData.Builder.newBuilder(); + final ParsedAndroidData.Builder transitiveBuilder = ParsedAndroidData.Builder.newBuilder(); + final KeyValueConsumers transitiveConsumers = transitiveBuilder.consumers(); + final KeyValueConsumers primaryConsumers = primaryBuilder.consumers(); + final Set conflicts = new HashSet<>(); + + // Find all internal conflicts. + conflicts.addAll(parsedPrimary.conflicts()); + for (MergeConflict conflict : Iterables.concat(direct.conflicts(), transitive.conflicts())) { + if (allowPrimaryOverrideAll + && (parsedPrimary.containsOverwritable(conflict.dataKey()) + || parsedPrimary.containsAsset(conflict.dataKey()))) { + continue; + } + conflicts.add(conflict); + } + + // overwriting resources + for (Entry entry : parsedPrimary.iterateOverwritableEntries()) { + if (direct.containsOverwritable(entry.getKey())) { + primaryConsumers.overwritingConsumer.accept( + entry.getKey(), entry.getValue().overwrite(direct.getOverwritable(entry.getKey()))); + } else { + primaryConsumers.overwritingConsumer.accept(entry.getKey(), entry.getValue()); + } + } - Set conflicts = - Sets.union(mergedPrimary.conflicts(), mergedTransitive.conflicts()); + for (Map.Entry entry : direct.iterateOverwritableEntries()) { + // Direct dependencies are simply overwritten, no conflict. + if (!parsedPrimary.containsOverwritable(entry.getKey())) { + transitiveConsumers.overwritingConsumer.accept(entry.getKey(), entry.getValue()); + } + } + for (Map.Entry entry : transitive.iterateOverwritableEntries()) { + // If the primary is considered to be intentional (usually at the binary level), + // skip. + if (allowPrimaryOverrideAll && parsedPrimary.containsOverwritable(entry.getKey())) { + continue; + } + // If a transitive value is in the direct map, report a conflict, as it is commonly + // unintentional. + if (direct.containsOverwritable(entry.getKey())) { + conflicts.add(direct.foundResourceConflict(entry.getKey(), entry.getValue())); + } else if (parsedPrimary.containsOverwritable(entry.getKey())) { + // If overwriting a transitive value with a primary map, assume it's an unintentional + // override, unless allowPrimaryOverrideAll is set. At which point, this code path + // should not be reached. + conflicts.add(parsedPrimary.foundResourceConflict(entry.getKey(), entry.getValue())); + } else { + // If it's in none of the of sources, add it. + transitiveConsumers.overwritingConsumer.accept(entry.getKey(), entry.getValue()); + } + } + + // combining resources + for (Entry entry : parsedPrimary.iterateCombiningEntries()) { + primaryConsumers.combiningConsumer.accept(entry.getKey(), entry.getValue()); + } + for (Map.Entry entry : direct.iterateCombiningEntries()) { + if (parsedPrimary.containsCombineable(entry.getKey())) { + // If it is in the primary, add it to the primary to be combined. + primaryConsumers.combiningConsumer.accept(entry.getKey(), entry.getValue()); + } else { + // If the combining asset is not in the primary, put it into the transitive. + transitiveConsumers.combiningConsumer.accept(entry.getKey(), entry.getValue()); + } + } + for (Map.Entry entry : transitive.iterateCombiningEntries()) { + if (parsedPrimary.containsCombineable(entry.getKey())) { + primaryConsumers.combiningConsumer.accept(entry.getKey(), entry.getValue()); + } else { + transitiveConsumers.combiningConsumer.accept(entry.getKey(), entry.getValue()); + } + } + + // assets + for (Entry entry : parsedPrimary.iterateAssetEntries()) { + if (direct.containsAsset(entry.getKey())) { + primaryConsumers.assetConsumer.accept( + entry.getKey(), entry.getValue().overwrite(direct.getAsset(entry.getKey()))); + } else { + primaryConsumers.assetConsumer.accept(entry.getKey(), entry.getValue()); + } + } + + for (Map.Entry entry : direct.iterateAssetEntries()) { + // Direct dependencies are simply overwritten, no conflict. + if (!parsedPrimary.containsAsset(entry.getKey())) { + transitiveConsumers.assetConsumer.accept(entry.getKey(), entry.getValue()); + } + } + for (Map.Entry entry : transitive.iterateAssetEntries()) { + // If the primary is considered to be intentional (usually at the binary level), + // skip. + if (allowPrimaryOverrideAll && parsedPrimary.containsAsset(entry.getKey())) { + continue; + } + // If a transitive value is in the direct map report a conflict, as it is commonly + // unintentional. + if (direct.containsAsset(entry.getKey())) { + conflicts.add(direct.foundAssetConflict(entry.getKey(), entry.getValue())); + } else if (parsedPrimary.containsAsset(entry.getKey())) { + // If overwriting a transitive value with a primary map, assume it's an unintentional + // override, unless allowPrimaryOverrideAll is set. At which point, this code path + // should not be reached. + conflicts.add(parsedPrimary.foundAssetConflict(entry.getKey(), entry.getValue())); + } else { + // If it's in none of the of sources, add it. + transitiveConsumers.assetConsumer.accept(entry.getKey(), entry.getValue()); + } + } if (!conflicts.isEmpty()) { List messages = new ArrayList<>(); @@ -289,7 +391,8 @@ class AndroidDataMerger { logger.warning(conflictMessage); } } - return UnwrittenMergedAndroidData.of(primaryManifest, mergedPrimary, mergedTransitive); + return UnwrittenMergedAndroidData.of( + primaryManifest, primaryBuilder.build(), transitiveBuilder.build()); } catch (IOException e) { throw MergingException.wrapException(e); } diff --git a/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java b/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java index 1eea7a3904..fcc674d7f6 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java +++ b/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java @@ -13,10 +13,6 @@ // limitations under the License. package com.google.devtools.build.android; -import static com.google.common.base.Predicates.in; -import static com.google.common.base.Predicates.not; -import static com.google.common.collect.ImmutableSet.toImmutableSet; - import com.android.SdkConstants; import com.android.resources.FolderTypeRelationship; import com.android.resources.ResourceFolderType; @@ -27,6 +23,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import com.google.common.collect.Sets.SetView; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.devtools.build.android.AndroidResourceMerger.MergingException; @@ -40,8 +37,6 @@ import java.nio.file.SimpleFileVisitor; import java.nio.file.attribute.BasicFileAttributes; import java.util.ArrayList; import java.util.EnumSet; -import java.util.HashMap; -import java.util.HashSet; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; @@ -164,7 +159,7 @@ public class ParsedAndroidData { @Override public void accept(DataKey key, DataResource value) { if (target.containsKey(key)) { - target.put(key, value.combineWith(target.get(key))); + target.put(key, target.get(key).combineWith(value)); } else { target.put(key, value); } @@ -603,21 +598,17 @@ public class ParsedAndroidData { return overwritingResources.entrySet(); } - /** Overwrites the resources. */ ParsedAndroidData overwrite(ParsedAndroidData overwritableData, boolean createConflicts) { Map newEntries = new LinkedHashMap<>(); - Set newConflicts = new LinkedHashSet<>(); - newConflicts.addAll(conflicts); + Set newConflicts = + createConflicts ? new LinkedHashSet() : conflicts; overwrite( overwritableData.overwritingResources, overwritingResources, - new OverwritableConsumer<>(newEntries, newConflicts, createConflicts)); + new OverwritableConsumer<>(newEntries, newConflicts)); Map newAssets = new LinkedHashMap<>(); - overwrite( - overwritableData.assets, - assets, - new OverwritableConsumer<>(newAssets, newConflicts, createConflicts)); + overwrite(overwritableData.assets, assets, new OverwritableConsumer<>(newAssets, newConflicts)); return ParsedAndroidData.of( ImmutableSet.copyOf(newConflicts), @@ -627,76 +618,51 @@ public class ParsedAndroidData { } private static void overwrite( - Map overwritee, Map overwriter, BiConsumer consumer) { + Map overwritee, Map overwriter, OverwritableConsumer consumer) { + SetView overwritten = Sets.intersection(overwritee.keySet(), overwriter.keySet()); // Feed the consumer keys and values that will be overwritten, followed by the overwritting - // value. This ensures the proper bookkeeping is done inside the consumer. - Maps.filterKeys(overwritee, in(overwriter.keySet())).forEach(consumer); - overwriter.forEach(consumer); + // value. This ensures the proper book keeping is done inside the consumer. + for (K key : overwritten) { + consumer.accept(key, overwritee.get(key)); + } + for (K key : overwriter.keySet()) { + consumer.accept(key, overwriter.get(key)); + } } - /** Combines combinable resources from other. */ + /** Combines all combinable resources. */ ParsedAndroidData combine(ParsedAndroidData other) { Map combinedResources = new LinkedHashMap<>(); CombiningConsumer consumer = new CombiningConsumer(combinedResources); - - Maps.filterKeys(other.combiningResources, in(combiningResources.keySet())).forEach(consumer); - combiningResources.forEach(consumer); - - return of(conflicts, overwritingResources, ImmutableMap.copyOf(combinedResources), assets); - } - - Map combineResources(Map... combinableResources) { - Map combinedResources = new LinkedHashMap<>(); - CombiningConsumer consumer = new CombiningConsumer(combinedResources); - for (Map resources : combinableResources) { - resources.forEach(consumer); + for (Entry entry : + Iterables.concat(combiningResources.entrySet(), other.combiningResources.entrySet())) { + consumer.accept(entry.getKey(), entry.getValue()); } - return combinedResources; + return of(conflicts, overwritingResources, ImmutableMap.copyOf(combinedResources), assets); } - /** Removes all resources, assets, and conflicts that have keys in the filter. */ - ParsedAndroidData filterBy(ParsedAndroidData filter) { - Set conflictKeys = - Sets.union(filter.overwritingResources.keySet(), filter.assets.keySet()); + /** Removes conflicts, resources, and assets that are in the other. */ + ParsedAndroidData difference(ParsedAndroidData other) { return of( - conflicts - .stream() - .filter(m -> !conflictKeys.contains(m.dataKey())) - .collect(toImmutableSet()), + ImmutableSet.copyOf(Sets.difference(conflicts, other.conflicts)), ImmutableMap.copyOf( - Maps.filterKeys(overwritingResources, not(in(filter.overwritingResources.keySet())))), + Maps.difference(overwritingResources, other.overwritingResources).entriesOnlyOnLeft()), ImmutableMap.copyOf( - Maps.filterKeys(combiningResources, not(in(filter.combiningResources.keySet())))), - ImmutableMap.copyOf(Maps.filterKeys(assets, not(in(filter.assets.keySet()))))); + Maps.difference(combiningResources, other.combiningResources).entriesOnlyOnLeft()), + ImmutableMap.copyOf(Maps.difference(assets, other.assets).entriesOnlyOnLeft())); } - /** - * Creates a union of the android data, with any {@linkplain MergeConflict}s added to the result. - */ + /** Creates a union of both sets. Duplicates are ignored. */ ParsedAndroidData union(ParsedAndroidData other) { - Map newEntries = new HashMap<>(); - Set newConflicts = new HashSet<>(); - final OverwritableConsumer resourceConsumer = - new OverwritableConsumer<>(newEntries, newConflicts, true); - other.overwritingResources.forEach(resourceConsumer); - overwritingResources.forEach(resourceConsumer); - - Map newAssets = new HashMap<>(); - final OverwritableConsumer assetConsumer = - new OverwritableConsumer<>(newAssets, newConflicts, true); - other.assets.forEach(assetConsumer); - assets.forEach(assetConsumer); - return of( - ImmutableSet.builder() - .addAll(conflicts) - .addAll(other.conflicts) - .addAll(newConflicts) - .build(), - ImmutableMap.copyOf(newEntries), - ImmutableMap.copyOf(combineResources(combiningResources, other.combiningResources)), - ImmutableMap.copyOf(newAssets)); + ImmutableSet.copyOf(Sets.union(conflicts, other.conflicts)), + ImmutableMap.copyOf( + Iterables.concat( + overwritingResources.entrySet(), other.overwritingResources.entrySet())), + ImmutableMap.copyOf( + Iterables.concat(combiningResources.entrySet(), other.combiningResources.entrySet())), + ImmutableMap.copyOf(Iterables.concat(assets.entrySet(), other.assets.entrySet()))); } private Iterable> iterateDataResourceEntries() { -- cgit v1.2.3