)]}' { "commit": "f15d08d4e48336c5f16b1d74400a7f95b7986fa5", "tree": "d511132d7f7e0e65d391f46f4a4f5d99a770c394", "parents": [ "1d7db16c095d976d54570f3f28a4c1c9a30bb40c" ], "author": { "name": "janakr", "email": "janakr@google.com", "time": "Wed Apr 22 12:53:03 2020 -0700" }, "committer": { "name": "Copybara-Service", "email": "copybara-worker@google.com", "time": "Wed Apr 22 12:54:36 2020 -0700" }, "message": "Try to clean up some of the excess baggage Aspects are carting around, mainly from a code cleanliness perspective, but with some minor memory benefits:\n\n1. Use AspectKey instead of AspectValue wherever possible at the top-level, since keys are what callers should be using, not values.\n2. Remove the freestanding label field from AspectKey. It is always equal to its ConfiguredTargetKey field\u0027s label. Having two fields with redundant data is confusing.\n3. Remove the freestanding label field from AspectValue. Same reason: it was always the AspectKey\u0027s label.\n4. Remove AspectDescriptor from ConfiguredAspect: it comes from the AspectKey, so just use the key.\n\nThis is also good because I think maximizing correspondence between ConfiguredAspect and ConfiguredTarget is a goal. Having an AspectValue muddies the waters. Note that, for historical reasons, ConfiguredTarget has much more data in it than we\u0027d want a ConfiguredAspect to have (ideally, both would just have actions and providers).\n\nIn a follow-up, I may wrap AspectValue together with an AspectKey in TopLevelSkylarkAspectFunction#compute\u0027s return value. I think that, plus some tolerable casting, would remove the only remaining real need for AspectValue to have an AspectKey inside it.\n\nPiperOrigin-RevId: 307877866\n", "tree_diff": [ { "type": "modify", "old_id": "60edd8f600d07b59a096c08c8e3e2dfeda5946d1", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/analysis/AnalysisResult.java", "new_id": "ae0382606eebd885f1712378ce7b19108403b2af", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/analysis/AnalysisResult.java" }, { "type": "modify", "old_id": "650a8410d063d0df3a2d152acb37f258792ca07e", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/analysis/AspectCompleteEvent.java", "new_id": "3d4289612fcd1b3fe1e05a85d49c71daa8127277", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/analysis/AspectCompleteEvent.java" }, { "type": "modify", "old_id": "57a80c34f65ef54908b7e6bd81bbacb51326a596", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/analysis/AspectValue.java", "new_id": "6735b6c47709c6a1b70e4d9f67589318b76b0ccb", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/analysis/AspectValue.java" }, { "type": "modify", "old_id": "90bdded769171721c03a5bb33a85b36f2fdba8cd", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/analysis/BuildView.java", "new_id": "2e4a23b924c3b18b98f17aef7677f040afd17135", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/analysis/BuildView.java" }, { "type": "modify", "old_id": "29fc277ec6a6d85e7f152068b3264adaf62371f5", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java", "new_id": "d7b6386269a492007c0a9bb85e1cc3b27efca068", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java" }, { "type": "rename", "old_id": "014168338eb5a989d75a7bcf7f31a4581c7455af", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredObjectValue.java", "new_id": "6b15159f10fb60e6fd5158af49be7a8b8b7e4d70", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/analysis/ConfiguredObjectValue.java", "score": 88 }, { "type": "modify", "old_id": "efa2699aea723317289631af5e8a45bec2ba7907", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java", "new_id": "59c5526613200d657b4c3476057043020b777441", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java" }, { "type": "modify", "old_id": "981166a9118c272fa404ff62aa913468bf2e1a35", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactHelper.java", "new_id": "6cd33a3fbb5b74a89d1618b524d4cbb9a4c8960a", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactHelper.java" }, { "type": "modify", "old_id": "25816fe550354224f21b8b0e53908761de72cd18", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/buildtool/AnalysisPhaseRunner.java", "new_id": "4772624e870da53574f88aeaf2abfcf4cff89f7d", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/buildtool/AnalysisPhaseRunner.java" }, { "type": "modify", "old_id": "77dcc8b70f33cc3dbeb9d1f808208b97db44fb07", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/buildtool/BuildResult.java", "new_id": "22f4672b0b7d50a119b06de9636728cec48a9b2c", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/buildtool/BuildResult.java" }, { "type": "modify", "old_id": "2a140ffac8d5f8491dadb87a98438c063820ab19", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/buildtool/BuildResultPrinter.java", "new_id": "d4a0e89ba553e87fba380a19e481b25041ec19b1", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/buildtool/BuildResultPrinter.java" }, { "type": "modify", "old_id": "7d172c01788f42bfb19dff50d3c63f090e48be2e", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java", "new_id": "0fce14cb7d65fdf12b499837a2e68cd937cb8a3d", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java" }, { "type": "modify", "old_id": "17d92cc772228062a6cea951e084aed974f9929a", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/buildtool/SkyframeBuilder.java", "new_id": "2b8f90e1b977ebf71b89027756c2a8a612270708", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/buildtool/SkyframeBuilder.java" }, { "type": "modify", "old_id": "5abefc9dc09c03e392e516240e387dbc94b5da6b", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/query2/ConfiguredTargetValueAccessor.java", "new_id": "081f57647b9e405fe34e7f6bcbd2b42d959068ce", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/query2/ConfiguredTargetValueAccessor.java" }, { "type": "modify", "old_id": "1c345c8d8d134f8d01dc16061615ac775f364a7d", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java", "new_id": "ee2107e722e811b73de9f0fa510445de37dbf6a3", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java" }, { "type": "modify", "old_id": "dd8d6f076943f9293bdf8936494417e195362596", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/rules/android/AndroidNeverlinkAspect.java", "new_id": "2edb3e8e11e0340876bab3807bb00a786402bc40", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/rules/android/AndroidNeverlinkAspect.java" }, { "type": "modify", "old_id": "01e5bad711e035363f74588bce9c60bf39fb5e1a", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java", "new_id": "498d7c8c5393c4e25c0e1144a9b821b167c00525", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java" }, { "type": "modify", "old_id": "9ad3a7abf65406f38890eee27878724b38efc340", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/rules/cpp/GraphNodeAspect.java", "new_id": "6d0aac1c7b28d9f5a3fad84798382b3019902440", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/rules/cpp/GraphNodeAspect.java" }, { "type": "modify", "old_id": "84ec348f43e68c39366efe889009eda19617b553", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java", "new_id": "0ddd3ca8f173ca24ba231149eabe4977e12c749f", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java" }, { "type": "modify", "old_id": "cb6af8efa75460d79ce46b9fb0c8e4aa22b296bb", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java", "new_id": "f1246695e2bdb59ea2bb8fa7ce3e2c66121e14b7", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java" }, { "type": "modify", "old_id": "3777d14b8bfe5ff617ffd57ebfabf431b2ab47a3", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java", "new_id": "33167de4358c14f3362132ed2ad02f8c6bf78a6e", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java" }, { "type": "modify", "old_id": "0bb0c7120d2b5499c3401402f2fc2bd5e6417108", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java", "new_id": "169d08cc89a950c1ef7e3838fb2077be9b1c8e2c", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java" }, { "type": "modify", "old_id": "31aa172738e2f256eb777829410771b8b7ca8d0b", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoAspect.java", "new_id": "fceff47361a9506f840d105bf85252931a4322f9", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoAspect.java" }, { "type": "modify", "old_id": "163ea67341d265a878f65ab9d8c4a816843bce0a", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/runtime/BlazeModule.java", "new_id": "a9644e73085caf47d8c1b483289c6fd704510e86", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/runtime/BlazeModule.java" }, { "type": "modify", "old_id": "e7931778b44fedd6c8c60a858fb84e2e9e514b18", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/skyframe/AspectCompletionValue.java", "new_id": "1e7b3159c5d34ca39fa030530a4a958aeecf02e3", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/skyframe/AspectCompletionValue.java" }, { "type": "modify", "old_id": "b3c645583e4ba95425ff29b3b0bea8e2cd70045b", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/skyframe/AspectCompletor.java", "new_id": "2f5a251e8c2d9772215c0fe0f144d55a111faf37", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/skyframe/AspectCompletor.java" }, { "type": "modify", "old_id": "6dbeaa07c22d5aa68da35c5c8dcdb7db40615d47", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java", "new_id": "a15c5a138026780bffeb012361fe4e43dae1646c", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java" }, { "type": "modify", "old_id": "77ee26100d8fc50717845da426beb4186ed35155", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/skyframe/AspectValueKey.java", "new_id": "bfd526608c2ebb0a5bb4a10b07b873bda10bacda", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/skyframe/AspectValueKey.java" }, { "type": "modify", "old_id": "753f61186d4f253eb0a11cea8ea26014729f60f3", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/skyframe/Builder.java", "new_id": "0fb582840f8ed42630e29d745a836e804e30a970", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/skyframe/Builder.java" }, { "type": "modify", "old_id": "b1539d53e452c1303c5cea0600443e71ecc16f14", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/skyframe/CompletionFunction.java", "new_id": "3002c8b9e0a9e27c5b51ec14fe18050da3373f4c", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/skyframe/CompletionFunction.java" }, { "type": "modify", "old_id": "b65aa1377b5889f6e3f17cd32bfb645cb4f45b96", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetValue.java", "new_id": "c0f8f7759c8971de5d99c91253a7f3f504fe3746", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetValue.java" }, { "type": "modify", "old_id": "f138d57a4202304dfaa9e46e9b8e2e3bcbbc17cc", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java", "new_id": "cbec84069e68a6b3f22d08d41235d711fb72959e", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java" }, { "type": "modify", "old_id": "22397e433c3d52282556de0e661b172efcf62667", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java", "new_id": "c74cde75671e2e2581102c54045ea27c00b01019", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java" }, { "type": "modify", "old_id": "75bda41a9e81d0e1ecb3e5c57ca555b1754f3233", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/skyframe/SkyframeAnalysisResult.java", "new_id": "47e88064df102fe0cc8405bc684432b74aa2756c", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/skyframe/SkyframeAnalysisResult.java" }, { "type": "modify", "old_id": "1fe695169ca8cd2a984d4d5374de445a239b3362", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java", "new_id": "98bc45634b402a2c2c1e9a68b9ca2152ad0094a1", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java" }, { "type": "modify", "old_id": "9d53ba4c74c2e3fc05fc9ce4f8bbf3bfb927bf9d", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java", "new_id": "915f58a81658eda33c2a54dc86e8efd5345f2828", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java" }, { "type": "modify", "old_id": "09cc299a43de130b51faf30eb56cc76912d70771", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/skyframe/SkylarkAspectFactory.java", "new_id": "1d152eca37407ddaadf33f07c00106a2ac794ddc", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/skyframe/SkylarkAspectFactory.java" }, { "type": "modify", "old_id": "26611d9beed34c48d881abdceb92410b2c3bc03f", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/skyframe/TargetCompletor.java", "new_id": "76ad043460317611ecde6d9c80ed0e42d355ad31", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/skyframe/TargetCompletor.java" }, { "type": "modify", "old_id": "7f77c62251931b402aede09abb61d19cdf3a5c3b", "old_mode": 33188, "old_path": "src/main/java/com/google/devtools/build/lib/skyframe/TopLevelActionLookupConflictFindingFunction.java", "new_id": "3ff17d95c1227f757f5a8ddb633c8f37f6ae981f", "new_mode": 33188, "new_path": "src/main/java/com/google/devtools/build/lib/skyframe/TopLevelActionLookupConflictFindingFunction.java" }, { "type": "modify", "old_id": "901c8fc3688665c0c76da52f1b69bb582e3139ba", "old_mode": 33188, "old_path": "src/test/java/com/google/devtools/build/lib/analysis/AnalysisCachingTest.java", "new_id": "dafb67945dd3ecb4a4b36c48823ddc1f90a9e8f0", "new_mode": 33188, "new_path": "src/test/java/com/google/devtools/build/lib/analysis/AnalysisCachingTest.java" }, { "type": "modify", "old_id": "51e522565a3690706e8435aba98db58978a6aa45", "old_mode": 33188, "old_path": "src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java", "new_id": "60164a6881cfb6c636cfdfb87b09f6b5b7267608", "new_mode": 33188, "new_path": "src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java" }, { "type": "modify", "old_id": "274c558019096653346c5da5cd0135a4ec27c2b1", "old_mode": 33188, "old_path": "src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java", "new_id": "209ad606b09abe9ac5097ae1fe77a0b68b62b61e", "new_mode": 33188, "new_path": "src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java" }, { "type": "modify", "old_id": "cdc67d407c456236017e12763193b7fe9f532445", "old_mode": 33188, "old_path": "src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java", "new_id": "972d7576d4e88c9b01da7057cebd70a6e2d59638", "new_mode": 33188, "new_path": "src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java" }, { "type": "modify", "old_id": "e4f25da5296d267b09304715899bf198735447b0", "old_mode": 33188, "old_path": "src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java", "new_id": "3177a5ed8a8d8a0ffd4f24ac2be9d7030785d4bb", "new_mode": 33188, "new_path": "src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java" }, { "type": "modify", "old_id": "64ece7d0fc44976539d52758fd2ec5290de05fdc", "old_mode": 33188, "old_path": "src/test/java/com/google/devtools/build/lib/rules/apple/AppleRulesTest.java", "new_id": "e77bf686008ac29cddfe00ca4952ee0c18d9dac5", "new_mode": 33188, "new_path": "src/test/java/com/google/devtools/build/lib/rules/apple/AppleRulesTest.java" }, { "type": "modify", "old_id": "8cc0d279f8c77c9327084fb3c2894ff695de4709", "old_mode": 33188, "old_path": "src/test/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetCycleReporterTest.java", "new_id": "41bebf20ad95a99a1fbbc3976a82d19382128b58", "new_mode": 33188, "new_path": "src/test/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetCycleReporterTest.java" }, { "type": "modify", "old_id": "43b0e9b813b5c73c64f69745d0142c77cb3ac58e", "old_mode": 33188, "old_path": "src/test/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutorTest.java", "new_id": "1262cfe37e96507096143523e716fe4e887bb451", "new_mode": 33188, "new_path": "src/test/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutorTest.java" }, { "type": "modify", "old_id": "504898dbd7be21e55b62a5f8b27dbe53d4bdb0b4", "old_mode": 33188, "old_path": "src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java", "new_id": "40892d58c380933db9bac237a8c340e768911d39", "new_mode": 33188, "new_path": "src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java" }, { "type": "modify", "old_id": "7c2b1f50c0c1e8e6fc7f7c507fa2d49e94f38512", "old_mode": 33188, "old_path": "src/test/java/com/google/devtools/build/lib/skylark/SkylarkActionProviderTest.java", "new_id": "3df8e8b00d7c6ba3a97801e1a2619b0ff605aebf", "new_mode": 33188, "new_path": "src/test/java/com/google/devtools/build/lib/skylark/SkylarkActionProviderTest.java" }, { "type": "modify", "old_id": "f43ad96ec13e2172dcff4bea8a4bfb78a193ad29", "old_mode": 33188, "old_path": "src/test/java/com/google/devtools/build/lib/skylark/SkylarkDefinedAspectsTest.java", "new_id": "88e98b3fa1454ab122f227fd18b86f114811b9f3", "new_mode": 33188, "new_path": "src/test/java/com/google/devtools/build/lib/skylark/SkylarkDefinedAspectsTest.java" } ] }