low-fi caching for globs matching engine, too.

commonhaus · Feb 5, 2024 · 395db39 · 395db39
1 parent a323477
commit 395db39
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/src/main/java/org/commonhaus/automation/github/QueryHelper.java b/src/main/java/org/commonhaus/automation/github/QueryHelper.java
@@ -48,7 +48,7 @@ public QueryContext newQueryContext(EventData eventData, GitHub github) {
         return newQueryContext(eventData).addExisting(github);
     }
 
-    static <T> T getCache(String itemId, String key, Class<T> type) {
+    public static <T> T getCache(String itemId, String key, Class<T> type) {
         String idx = itemId + ":" + key;
         T result = (T) cache.getIfPresent(idx);
         if (result != null) {
@@ -59,7 +59,7 @@ static <T> T getCache(String itemId, String key, Class<T> type) {
         return result;
     }
 
-    static void putCache(String itemId, String key, Object value) {
+    public static void putCache(String itemId, String key, Object value) {
         String idx = itemId + ":" + key;
         System.out.println(":: UPDATE :: " + idx + " ::: ");
         cache.put(idx, value);

diff --git a/src/main/java/org/commonhaus/automation/github/rules/MatchFilePath.java b/src/main/java/org/commonhaus/automation/github/rules/MatchFilePath.java
@@ -3,6 +3,7 @@
 import java.util.List;
 
 import org.commonhaus.automation.github.EventData;
+import org.commonhaus.automation.github.QueryHelper;
 import org.commonhaus.automation.github.QueryHelper.QueryContext;
 import org.commonhaus.automation.github.model.EventType;
 import org.kohsuke.github.GHEventPayload;
@@ -55,8 +56,12 @@ public boolean matches(QueryContext queryContext) {
         return false;
     }
 
-    //@CacheResult(cacheName = "glob-cache")
     MatchingEngine compileGlob(String filenamePattern) {
-        return GlobPattern.compile(filenamePattern);
+        MatchingEngine me = QueryHelper.getCache("GLOB", filenamePattern, MatchingEngine.class);
+        if (me == null) {
+            me = GlobPattern.compile(filenamePattern);
+            QueryHelper.putCache("GLOB", filenamePattern, me);
+        }
+        return me;
     }
 }
diff --git a/src/test/java/org/commonhaus/automation/github/NotifyLabelsTest.java b/src/test/java/org/commonhaus/automation/github/NotifyLabelsTest.java
@@ -33,6 +33,8 @@
 import org.kohsuke.github.PagedIterator;
 import org.mockito.Mockito;
 
+import com.hrakaroo.glob.MatchingEngine;
+
 import io.quarkiverse.githubapp.testing.GitHubAppTest;
 import io.quarkus.test.junit.QuarkusTest;
 import io.smallrye.graphql.client.Response;
@@ -246,6 +248,10 @@ void testRelevantPr() throws Exception {
                 });
 
         verifyLabelCache(prNodeId, 1, List.of("notice"));
+        Assertions.assertNotNull(QueryHelper.getCache("GLOB", "bylaws/*", Object.class),
+                "bylaws/* GLOB cache should exist");
+        Assertions.assertNull(QueryHelper.getCache("GLOB", "policy/*", Object.class),
+                "policy/* GLOB cache should not exist");
     }
 
     private void verifyLabelCache(String discussionId, int size, List<String> expectedLabels) {