commit 4e0a5cb6209952ff9d83b9aa41d68c133ea4a964
author Googler <noreply@google.com> Sun Apr 09 17:58:18 2017 -0400
committer Kristina Chodorow <kchodorow@google.com> Tue May 09 10:54:03 2017 -0400
tree a230735a364d1d7e68755b30cd2dc76330ef35ce
parent 6daff173a68287452598f735f5bae2134fae0815

Optimize TransitiveInfoMap memory consumption.

Instead of using ImmutableMap, we share the keys between all provider maps with an identical key set.

PiperOrigin-RevId: 155432135

src/main/java/com/google/devtools/build/lib/analysis/TransitiveInfoProviderMapBuilder.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TransitiveInfoProviderMapBuilder.java b/src/main/java/com/google/devtools/build/lib/analysis/TransitiveInfoProviderMapBuilder.java
index ac68e3b..06a7726 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/TransitiveInfoProviderMapBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/TransitiveInfoProviderMapBuilder.java
@@ -55,7 +55,10 @@
   }
 
   public TransitiveInfoProviderMapBuilder addAll(TransitiveInfoProviderMap providers) {
-    return addAll(providers.values());
+    for (int i = 0; i < providers.getProviderCount(); ++i) {
+      add(providers.getProviderAt(i));
+    }
+    return this;
   }
 
   public TransitiveInfoProviderMapBuilder addAll(Iterable<TransitiveInfoProvider> providers) {
@@ -71,6 +74,6 @@
   }
 
   public TransitiveInfoProviderMap build() {
-    return new TransitiveInfoProviderMapImmutableMapBased(ImmutableMap.copyOf(providers));
+    return new TransitiveInfoProviderMapOffsetBased(ImmutableMap.copyOf(providers));
   }
 }