Add isDateField to cache

gisaia · Jun 21, 2024 · a4dc62e · a4dc62e
1 parent 72fa2b0
commit a4dc62e
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 7 deletions.
diff --git a/arlas-core/src/main/java/io/arlas/server/core/impl/cache/HazelcastCacheManager.java b/arlas-core/src/main/java/io/arlas/server/core/impl/cache/HazelcastCacheManager.java
@@ -49,13 +49,15 @@ public void putCollectionReference(String ref, CollectionReference col) {
         putObject("collections", ref, col);
         LOGGER.debug("Clearing field types of collection '" + ref + "' from cache");
         this.instance.getReplicatedMap(ref).clear();
+        this.instance.getReplicatedMap(ref+"-datefield").clear();
     }
 
     @Override
     public void removeCollectionReference(String ref) {
         removeObject("collections", ref);
         LOGGER.debug("Clearing field types of collection '" + ref + "' from cache");
         this.instance.getReplicatedMap(ref).clear();
+        this.instance.getReplicatedMap(ref+"-datefield").clear();
     }
 
     @Override
@@ -68,6 +70,16 @@ public void putFieldType(String ref, String name, FieldType type) {
         putObject(ref, name, type);
     }
 
+    @Override
+    public Boolean getIsDateField(String ref, String name) {
+        return (Boolean) getObject(ref+"-datefield", name);
+    }
+
+    @Override
+    public void putIsDateField(String ref, String name, Boolean value) {
+        putObject(ref+"-datefield", name, value);
+    }
+
     @Override
     public void putMapping(String indexName, Map<String, Map<String, Object>> mapping) {
         putObject("mappings", indexName, mapping);

diff --git a/arlas-core/src/main/java/io/arlas/server/core/impl/cache/LocalCacheManager.java b/arlas-core/src/main/java/io/arlas/server/core/impl/cache/LocalCacheManager.java
@@ -50,13 +50,15 @@ public void putCollectionReference(String ref, CollectionReference col) {
         putObject("collections", ref, col);
         LOGGER.debug("Clearing field types of collection '" + ref + "' from cache");
         this.cache.computeIfAbsent(ref, k -> new SelfExpiringHashMap<>()).clear();
+        this.cache.computeIfAbsent(ref+"-datefield", k -> new SelfExpiringHashMap<>()).clear();
     }
 
     @Override
     public void removeCollectionReference(String ref) {
         removeObject("collections", ref);
         LOGGER.debug("Clearing field types of collection '" + ref + "' from cache");
         this.cache.computeIfAbsent(ref, k -> new SelfExpiringHashMap<>()).clear();
+        this.cache.computeIfAbsent(ref+"-datefield", k -> new SelfExpiringHashMap<>()).clear();
     }
 
     @Override
@@ -69,6 +71,16 @@ public void putFieldType(String ref, String name, FieldType type) {
         putObject(ref, name, type);
     }
 
+    @Override
+    public Boolean getIsDateField(String ref, String name) {
+        return (Boolean) getObject(ref+"-datefield", name);
+    }
+
+    @Override
+    public void putIsDateField(String ref, String name, Boolean value) {
+        putObject(ref+"-datefield", name, value);
+    }
+
     @Override
     public void putMapping(String indexName, Map<String, Map<String, Object>> mapping) {
         putObject("mappings", indexName, mapping);

diff --git a/arlas-core/src/main/java/io/arlas/server/core/impl/cache/NoCacheManager.java b/arlas-core/src/main/java/io/arlas/server/core/impl/cache/NoCacheManager.java
@@ -71,6 +71,16 @@ public FieldType getFieldType(String ref, String name) {
     public void putFieldType(String ref, String name, FieldType type) {
     }
 
+    @Override
+    public Boolean getIsDateField(String ref, String name) {
+        return null;
+    }
+
+    @Override
+    public void putIsDateField(String ref, String name, Boolean value) {
+
+    }
+
     @Override
     public void putMapping(String indexName, Map<String, Map<String, Object>> exists) {
     }

diff --git a/...in/java/io/arlas/server/core/impl/elastic/services/ElasticCollectionReferenceService.java b/...in/java/io/arlas/server/core/impl/elastic/services/ElasticCollectionReferenceService.java
@@ -157,7 +157,13 @@ protected void putCollectionReferenceWithDao(CollectionReference collectionRefer
     }
 
     @Override
-    public boolean isDateField(String field, String index) throws ArlasException {
-        return client.isDateField(field, index);
+    public boolean isDateField(String field, CollectionReference ref) throws ArlasException {
+        Boolean isDateField = cacheManager.getIsDateField(ref.collectionName, field);
+        if (isDateField == null) {
+            isDateField = client.isDateField(field, ref.params.indexName);
+            cacheManager.putIsDateField(ref.collectionName, field, isDateField);
+        }
+
+        return isDateField;
     }
 }
diff --git a/arlas-core/src/main/java/io/arlas/server/core/managers/CacheManager.java b/arlas-core/src/main/java/io/arlas/server/core/managers/CacheManager.java
@@ -35,6 +35,9 @@ public interface CacheManager extends BaseCacheManager {
     FieldType getFieldType(String ref, String name);
     void putFieldType(String ref, String name, FieldType type);
 
+    Boolean getIsDateField(String ref, String name);
+    void putIsDateField(String ref, String name, Boolean value);
+
     void putMapping(String indexName, Map<String, Map<String, Object>> exists);
     Map<String, Map<String, Object>> getMapping(String indexName);
     void removeMapping(String indexName);

diff --git a/arlas-core/src/main/java/io/arlas/server/core/services/CollectionReferenceService.java b/arlas-core/src/main/java/io/arlas/server/core/services/CollectionReferenceService.java
@@ -353,9 +353,10 @@ private FieldType getUnknownType(String parentField, String collectionName, bool
         }
     }
 
-    public boolean isDateField(String field, String index) throws ArlasException {
-        return getFieldType(field, index).isDateField();
+    public boolean isDateField(String field, CollectionReference ref) throws ArlasException {
+        return getFieldType(field, ref.params.indexName).isDateField();
     }
+
     public boolean isTextField(String field, String index) throws ArlasException {
         return getFieldType(field, index).isTextField();
     }

diff --git a/arlas-core/src/main/java/io/arlas/server/core/services/ExploreService.java b/arlas-core/src/main/java/io/arlas/server/core/services/ExploreService.java
@@ -170,7 +170,7 @@ private boolean filterFHasDateQuery(Filter filter, CollectionReference collectio
                             try {
                                 return collectionReferenceService.isDateField(
                                         ParamsParser.getFieldFromFieldAliases(expression.field, collectionReference),
-                                        collectionReference.params.indexName);
+                                        collectionReference);
                             } catch (ArlasException e) {
                                 throw new RuntimeException(e);
                             }

diff --git a/arlas-core/src/main/java/io/arlas/server/core/services/FluidSearchService.java b/arlas-core/src/main/java/io/arlas/server/core/services/FluidSearchService.java
@@ -20,7 +20,6 @@
 
 import io.arlas.commons.exceptions.ArlasException;
 import io.arlas.commons.utils.StringUtil;
-import io.arlas.server.core.app.ArlasServerConfiguration;
 import io.arlas.server.core.managers.CollectionReferenceManager;
 import io.arlas.server.core.model.CollectionReference;
 import io.arlas.server.core.model.enumerations.AggregationTypeEnum;
@@ -154,7 +153,7 @@ public FluidSearchService include(String include) {
     }
 
     public boolean isDateField(String field) throws ArlasException {
-        return collectionReferenceManager.getCollectionReferenceService().isDateField(field, collectionReference.params.indexName);
+        return collectionReferenceManager.getCollectionReferenceService().isDateField(field, collectionReference);
     }
 
     public boolean isTextField(String field) throws ArlasException {