commit 4e47cbe5964772024261d01526be4e17b8132ef6
author Edwin Kempin <ekempin@google.com> Mon Jun 17 11:00:18 2024 +0000
committer Patrick Hiesel <hiesel@google.com> Mon Jun 17 12:12:23 2024 +0000
tree f9abacf3ed0929632cc7ac016ba02a1d9a78f29a
parent 762423203fc1fe73ab66893b4ba3657488c1ffb4

Fix usage of ChangedFilesByPatchSetCache

This caching didn't work because we created a new instance in the
callback that is invoked per file, rather than creating one instance and
using it for the whole request.

Note, this cache is only relevant when sticky code owner approvals are
enabled.

Change-Id: Ic2357878227e5f1ffac99530f0584d42b7f1ea3b
Signed-off-by: Edwin Kempin <ekempin@google.com>
Reviewed-on: https://gerrit-review.googlesource.com/c/plugins/code-owners/+/430377
Reviewed-by: Patrick Hiesel <hiesel@google.com>
Tested-by: Zuul <zuul-63@gerritcodereview-ci.iam.gserviceaccount.com>

java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheck.java

diff --git a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheck.java b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheck.java
index d0a6da5..6abc820 100644
--- a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheck.java
+++ b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheck.java
@@ -360,7 +360,8 @@
 
       CodeOwnerApprovalCheckInput input =
           inputLoaderFactory.create(codeOwnersConfig, codeOwnerResolver, changeNotes).load();
-
+      ChangedFilesByPatchSetCache changedFilesByPatchSetCache =
+          changedFilesByPatchSetCacheFactory.create(codeOwnersConfig, changeNotes);
       return changedFiles
           .getFromDiffCache(
               changeNotes.getProjectName(), changeNotes.getCurrentPatchSet().commitId())
@@ -371,7 +372,7 @@
                       codeOwnerConfigHierarchy,
                       codeOwnerResolver,
                       codeOwnersConfig,
-                      changedFilesByPatchSetCacheFactory.create(codeOwnersConfig, changeNotes),
+                      changedFilesByPatchSetCache,
                       branch,
                       revision.orElse(null),
                       changedFile,
@@ -435,6 +436,8 @@
       CodeOwnerApprovalCheckInput input =
           CodeOwnerApprovalCheckInput.createForComputingOwnedPaths(
               codeOwnersConfig, codeOwnerResolver, changeNotes, accountIds);
+      ChangedFilesByPatchSetCache changedFilesByPatchSetCache =
+          changedFilesByPatchSetCacheFactory.create(codeOwnersConfig, changeNotes);
       return changedFiles.getFromDiffCache(changeNotes.getProjectName(), patchSet.commitId())
           .stream()
           .map(
@@ -443,7 +446,7 @@
                       codeOwnerConfigHierarchy,
                       codeOwnerResolver,
                       codeOwnersConfig,
-                      changedFilesByPatchSetCacheFactory.create(codeOwnersConfig, changeNotes),
+                      changedFilesByPatchSetCache,
                       branch,
                       revision.orElse(null),
                       changedFile,