commit 6f9f77d1673578cf5cf7dfc85ed2614a12208cd9
author Marcin Czech <maczech@gmail.com> Tue Feb 02 14:45:38 2021 +0100
committer Luca Milanesio <luca.milanesio@gmail.com> Sat Feb 13 00:07:35 2021 +0000
tree c87dcef8b3509f8f1eb6868d0c07dad20817d45c
parent 3209d7a1415f48e171055e31aa3850ab4a303e39

Reuse repository object when calculating target and meta SHA

ChangeCheckerImpl creates and check if IndexEvent is up to date. During
those operations target branch and meta ref SHA are calculated. To
improve performance make sure that repository object is created only
once for those operations.

Feature: Issue 13847
Change-Id: Icff402aaeb923acc76a7997daedff3b8b3ab8fe4

src/main/java/com/ericsson/gerrit/plugins/highavailability/index/ChangeCheckerImpl.java

diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/ChangeCheckerImpl.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/ChangeCheckerImpl.java
index bd8493c..a1b797f 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/ChangeCheckerImpl.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/ChangeCheckerImpl.java
@@ -71,15 +71,23 @@
   @Override
   public Optional<IndexEvent> newIndexEvent() throws IOException, OrmException {
     Optional<Long> changeTs = getComputedChangeTs();
-    if (changeTs.isPresent()) {
-      IndexEvent event = new IndexEvent();
-      event.eventCreatedOn = changeTs.get();
-      event.targetSha = getBranchTargetSha();
-      event.metaSha = getMetaSha();
-      return Optional.of(event);
+    if (!changeTs.isPresent()) {
+      return Optional.empty();
     }
 
-    return Optional.empty();
+    long ts = changeTs.get();
+
+    IndexEvent event = new IndexEvent();
+    event.eventCreatedOn = ts;
+    try (Repository repo = gitRepoMgr.openRepository(changeNotes.get().getProjectName())) {
+      event.targetSha = getBranchTargetSha(repo);
+      event.metaSha = getMetaSha(repo);
+      return Optional.of(event);
+    } catch (IOException e) {
+      log.atSevere().withCause(e).log(
+          "Unable to create index event for project %s", changeNotes.get().getProjectName());
+      throw e;
+    }
   }
 
   @Override
@@ -101,13 +109,15 @@
     }
     try {
       if (indexEventOption.isPresent()) {
-        IndexEvent indexEvent = indexEventOption.get();
-        return (computedChangeTs.get() > indexEvent.eventCreatedOn)
-            || (computedChangeTs.get() == indexEvent.eventCreatedOn)
-                && (Objects.isNull(indexEvent.targetSha)
-                    || Objects.equals(getBranchTargetSha(), indexEvent.targetSha))
-                && (Objects.isNull(indexEvent.metaSha)
-                    || Objects.equals(getMetaSha(), indexEvent.metaSha));
+        try (Repository repo = gitRepoMgr.openRepository(changeNotes.get().getProjectName())) {
+          IndexEvent indexEvent = indexEventOption.get();
+          return (computedChangeTs.get() > indexEvent.eventCreatedOn)
+              || (computedChangeTs.get() == indexEvent.eventCreatedOn)
+                  && (Objects.isNull(indexEvent.targetSha)
+                      || Objects.equals(getBranchTargetSha(repo), indexEvent.targetSha))
+                  && (Objects.isNull(indexEvent.metaSha)
+                      || Objects.equals(getMetaSha(repo), indexEvent.metaSha));
+        }
       }
       return true;
 
@@ -127,23 +137,23 @@
 
   @Override
   public String toString() {
-    try {
+    try (Repository repo = gitRepoMgr.openRepository(changeNotes.get().getProjectName())) {
       return "change-id="
           + changeId
           + "@"
           + getComputedChangeTs().map(IndexEvent::format)
           + "/target:"
-          + getBranchTargetSha()
+          + getBranchTargetSha(repo)
           + "/meta:"
-          + getMetaSha();
+          + getMetaSha(repo);
     } catch (IOException | OrmException e) {
       log.atSevere().withCause(e).log("Unable to render change %s", changeId);
       return "change-id=" + changeId;
     }
   }
 
-  private String getBranchTargetSha() {
-    try (Repository repo = gitRepoMgr.openRepository(changeNotes.get().getProjectName())) {
+  private String getBranchTargetSha(Repository repo) {
+    try {
       String refName = changeNotes.get().getChange().getDest().get();
       Ref ref = repo.exactRef(refName);
       if (ref == null) {
@@ -158,17 +168,15 @@
     }
   }
 
-  private String getMetaSha() throws IOException {
+  private String getMetaSha(Repository repo) throws IOException {
     if (PrimaryStorage.NOTE_DB.equals(PrimaryStorage.of(changeNotes.get().getChange()))) {
-      try (Repository repo = gitRepoMgr.openRepository(changeNotes.get().getProjectName())) {
-        String refName = RefNames.changeMetaRef(changeNotes.get().getChange().getId());
-        Ref ref = repo.exactRef(refName);
-        if (ref == null) {
-          throw new IOException(
-              String.format("Unable to find meta ref %s for change %s", refName, changeId));
-        }
-        return ref.getTarget().getObjectId().getName();
+      String refName = RefNames.changeMetaRef(changeNotes.get().getChange().getId());
+      Ref ref = repo.exactRef(refName);
+      if (ref == null) {
+        throw new IOException(
+            String.format("Unable to find meta ref %s for change %s", refName, changeId));
       }
+      return ref.getTarget().getObjectId().getName();
     }
 
     return null;