Skip to content

[AOSP-pick] qs_info groups are not concern of ArtifactTracker #7427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 6, 2025

Conversation

sellophane
Copy link
Collaborator

Cherry pick AOSP commit 634ac56970c0b24819e52c2d583baecab5e421e9.

Artifacts from these groups describe the input to the artifact tracker
and are already processed at this point. While there is no harm in
processing them twice they result in misleading messages to the build
output about the number of artifacts requested and actually fetched.

Bug: n/a
Test: n/a
Change-Id: I0ea69b11e5aba00f38fee80f57afe8009c9d86c0

AOSP: 634ac56970c0b24819e52c2d583baecab5e421e9

@sellophane sellophane requested a review from mai93 as a code owner March 6, 2025 11:20
@sellophane sellophane requested a review from LeFrosch March 6, 2025 11:20
@github-actions github-actions bot added product: CLion CLion plugin product: IntelliJ IntelliJ plugin product: GoLand GoLand plugin awaiting-review Awaiting review from Bazel team on PRs labels Mar 6, 2025
Copy link
Collaborator

@LeFrosch LeFrosch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like an actual issue I'd suggest the following fix:

diff --git a/querysync/java/com/google/idea/blaze/qsync/deps/OutputInfo.java b/querysync/java/com/google/idea/blaze/qsync/deps/OutputInfo.java
--- a/querysync/java/com/google/idea/blaze/qsync/deps/OutputInfo.java	(revision 4dea0bb962de32ca4be66e5f5c135b08fc4c46a8)
+++ b/querysync/java/com/google/idea/blaze/qsync/deps/OutputInfo.java	(date 1741265237189)
@@ -67,7 +67,7 @@
   }
 
   public boolean isEmpty() {
-    return getOutputGroups().isEmpty();
+    return getOutputGroups().isEmpty() && getCcCompilationInfo().isEmpty();
   }
 
   @VisibleForTesting

Or even:

diff --git a/querysync/java/com/google/idea/blaze/qsync/deps/OutputInfo.java b/querysync/java/com/google/idea/blaze/qsync/deps/OutputInfo.java
--- a/querysync/java/com/google/idea/blaze/qsync/deps/OutputInfo.java	(revision 4dea0bb962de32ca4be66e5f5c135b08fc4c46a8)
+++ b/querysync/java/com/google/idea/blaze/qsync/deps/OutputInfo.java	(date 1741265374278)
@@ -67,7 +67,7 @@
   }
 
   public boolean isEmpty() {
-    return getOutputGroups().isEmpty();
+    return getOutputGroups().isEmpty() && getCcCompilationInfo().isEmpty() && getArtifactInfo().isEmpty();
   }
 
   @VisibleForTesting

Artifacts from these groups describe the input to the artifact tracker
and are already processed at this point. While there is no harm in
processing them twice they result in misleading messages to the build
output about the number of artifacts requested and actually fetched.

Bug: n/a
Test: n/a
Change-Id: I0ea69b11e5aba00f38fee80f57afe8009c9d86c0

AOSP: 634ac56970c0b24819e52c2d583baecab5e421e9
@sellophane sellophane force-pushed the AOSP/634ac56970c0b24819e52c2d583baecab5e421e9 branch from 4dea0bb to 19dbbd1 Compare March 6, 2025 14:26
@LeFrosch LeFrosch merged commit 63bfadf into master Mar 6, 2025
7 checks passed
@github-project-automation github-project-automation bot moved this from Untriaged to Done in Bazel IntelliJ Plugin Mar 6, 2025
@github-actions github-actions bot removed the awaiting-review Awaiting review from Bazel team on PRs label Mar 6, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
product: CLion CLion plugin product: GoLand GoLand plugin product: IntelliJ IntelliJ plugin
Projects
Development

Successfully merging this pull request may close these issues.

4 participants