Skip to content
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

[MBUILDCACHE-106] Missing compile source roots matching 'generated-sources' and 'generated-test-sources' when compiler is skipped #178

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

reda-alaoui
Copy link
Member

Following this checklist to help us incorporate your
contribution quickly and easily:

  • Make sure there is a MBUILDCACHE JIRA issue filed
    for the change (usually before you start working on it). Trivial changes like typos do not
    require a JIRA issue. Your pull request should address just this issue, without
    pulling in other changes.
  • Each commit in the pull request should have a meaningful subject line and body.
  • Format the pull request title like [MBUILDCACHE-XXX] - Fixes bug in ApproximateQuantiles,
    where you replace MBUILDCACHE-XXX with the appropriate JIRA issue. Best practice
    is to use the JIRA issue title in the pull request title and in the first line of the
    commit message.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Run mvn clean verify to make sure basic checks pass. A more thorough check will
    be performed on your pull request automatically.
  • You have run the Core IT successfully.

If your pull request is about ~20 lines of code you don't need to sign an
Individual Contributor License Agreement if you are unsure
please ask on the developers list.

To make clear that you license your contribution under
the Apache License Version 2.0, January 2004
you have to acknowledge this by using the following check-box.

@reda-alaoui reda-alaoui changed the title Missing compile source roots matching 'generated-sources' and 'generated-test-sources' when compiler is skipped [MBUILDCACHE-106] Missing compile source roots matching 'generated-sources' and 'generated-test-sources' when compiler is skipped Aug 21, 2024
return;
}
Path targetDir = Paths.get(project.getBuild().getDirectory());
if (outputDir.equals(targetDir.resolve("generated-sources"))
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you please explain why we need to attach the sources to the project? The cache should not affect the build; it should only restore dependencies. If the build doesn't require these source roots, it doesn't seem correct to attach them.

Copy link
Member Author

@reda-alaoui reda-alaoui Aug 28, 2024

Choose a reason for hiding this comment

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

The bug fixed by this PR can emerge with #177 merged.
If reconciliation is done like proposed in #177, we can have the following situation.

A project uses an annotation processor to generate some java files. A cached entry exists and comes from a verify -DskipTests. The new build verify reuses this entry by skipping all plugin executions preceding maven-surefire-plugin. Among the skipped executions is compiler:compile. After the tests comes maven-javadoc-plugin. When maven-javadoc-plugin runs, the build fails because maven-javadoc-plugin is unable to find the source files of the compiled generated-sources.
This is because maven-javadoc-plugin expects maven-compiler-plugin to have enriched the maven context with the additional source roots. But since this later was skipped by the cache, additional source roots are missing.

Copy link
Contributor

@AlexanderAshitkin AlexanderAshitkin Aug 30, 2024

Choose a reason for hiding this comment

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

It's possible that there are multiple generated source roots attached at different levels. The best solution would be to add extra metadata to accurately track and restore all the source roots. Alternatively, it's possible to implement a convention-based restoration by matching the logic in CacheControllerImpl#attachGeneratedSources to restore all the sources associated with a GENERATED_SOURCE cache entry. Check this part too:

        for (String sourceRoot : sourceRoots) {
            final Path sourceRootPath = Paths.get(sourceRoot);
            if (Files.isDirectory(sourceRootPath)
                    && sourceRootPath.startsWith(targetDir)
                    && !(sourceRootPath.startsWith(generatedSourcesDir)
                            || sourceRootPath.startsWith(generatedTestSourcesDir))) { // dir within target
                attachDirIfNotEmpty(sourceRootPath, targetDir, project);
            }
        }

Copy link
Contributor

@AlexanderAshitkin AlexanderAshitkin left a comment

Choose a reason for hiding this comment

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

The fix should work in a generic case

return;
}
Path targetDir = Paths.get(project.getBuild().getDirectory());
if (outputDir.equals(targetDir.resolve("generated-sources"))
Copy link
Contributor

@AlexanderAshitkin AlexanderAshitkin Aug 30, 2024

Choose a reason for hiding this comment

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

It's possible that there are multiple generated source roots attached at different levels. The best solution would be to add extra metadata to accurately track and restore all the source roots. Alternatively, it's possible to implement a convention-based restoration by matching the logic in CacheControllerImpl#attachGeneratedSources to restore all the sources associated with a GENERATED_SOURCE cache entry. Check this part too:

        for (String sourceRoot : sourceRoots) {
            final Path sourceRootPath = Paths.get(sourceRoot);
            if (Files.isDirectory(sourceRootPath)
                    && sourceRootPath.startsWith(targetDir)
                    && !(sourceRootPath.startsWith(generatedSourcesDir)
                            || sourceRootPath.startsWith(generatedTestSourcesDir))) { // dir within target
                attachDirIfNotEmpty(sourceRootPath, targetDir, project);
            }
        }

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants