Skip to content

Commit

Permalink
avniproject/avni-webapp#763 - find distinct only when required. loggi…
Browse files Browse the repository at this point in the history 
…ng enhancements in cache. removed update check for ehcache.
  • Loading branch information
@petmongrels
petmongrels committed Jun 27, 2024
1 parent 5e02a82 commit 813146b
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 20 deletions.
10 changes: 6 additions & 4 deletions avni-server-api/src/main/java/org/avni/server/AvniSpringConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,14 +116,16 @@ protected Cache createConcurrentMapCache(final String name) {

private ConcurrentMapCache getConcurrentMapCacheWithWeightedCapacityForAddressesConfig(String name) {
return new ConcurrentMapCache(name, CacheBuilder.newBuilder().expireAfterWrite(timeToLiveInSeconds,
TimeUnit.SECONDS).maximumWeight(cacheMaxWeight)
.weigher((key, value) -> value == null ? 0 : (((List<VirtualCatchmentProjection>)value).size() / 100)+1)
TimeUnit.SECONDS).maximumWeight(cacheMaxWeight)
.weigher((key, value) -> value == null ? 0 : (((List<VirtualCatchmentProjection>) value).size() / 100) + 1)
.build().asMap(), DISALLOW_NULL_VALUES);
}

private ConcurrentMapCache getConcurrentMapCacheWithMaxEntriesConfig(String name) {
return new ConcurrentMapCache(name, CacheBuilder.newBuilder().expireAfterWrite(timeToLiveInSeconds,
TimeUnit.SECONDS).maximumSize(maxEntriesToCache).build().asMap(), DISALLOW_NULL_VALUES);
return new ConcurrentMapCache(name, CacheBuilder.newBuilder()
.expireAfterWrite(timeToLiveInSeconds, TimeUnit.SECONDS)
.maximumSize(maxEntriesToCache)
.build().asMap(), DISALLOW_NULL_VALUES);
}
};
}
Expand Down
15 changes: 9 additions & 6 deletions avni-server-api/src/main/java/org/avni/server/dao/search/BaseSubjectSearchQueryBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public class BaseSubjectSearchQueryBuilder<T> {
private final Set<String> joinClauses = new LinkedHashSet<>();
private final Map<String, Object> parameters = new HashMap<>();
private boolean forCount;
private boolean findDistinctOnly;
private final Set<String> customFields = new HashSet<>();

public BaseSubjectSearchQueryBuilder() {
Expand Down Expand Up @@ -70,7 +71,7 @@ public SqlQuery buildUsingBaseQuery(String baseQuery, String groupByClause) {
.toString();
}
String customFieldString = customFields.isEmpty() ? "" : ",\n".concat(String.join(",\n", customFields));
String queryWithCustomFields = finalQuery.replace(" $CUSTOM_FIELDS", customFieldString);
String queryWithCustomFields = finalQuery.replace(" $CUSTOM_FIELDS", customFieldString).replace("$DISTINCT", findDistinctOnly ? "distinct" : "");
logger.trace(parameters.toString());
return new SqlQuery(queryWithCustomFields, parameters);
}
Expand Down Expand Up @@ -232,6 +233,7 @@ public T withSearchAll(String searchString) {
whereClauses.add("(cast(i.observations as text) ilike :searchAll\n" +
" or cast(penr.observations as text) ilike :searchAll)");
joinClauses.add(PROGRAM_ENROLMENT_JOIN);
this.findDistinctOnly = true;
return (T) this;
}

Expand All @@ -253,14 +255,14 @@ public T withConceptsFilter(List<Concept> concept) {
addParameter(conceptUuidParam, c.getUuid());
String tableAlias = aliasMap.get(c.getSearchScope().toUpperCase());
if (c.getSearchScope().equalsIgnoreCase("encounter")) {
joinClauses.add(ENCOUNTER_JOIN);
withJoin(ENCOUNTER_JOIN, true);
}
if (c.getSearchScope().equalsIgnoreCase("programEnrolment")) {
joinClauses.add(PROGRAM_ENROLMENT_JOIN);
withJoin(PROGRAM_ENROLMENT_JOIN, true);
}
if (c.getSearchScope().equalsIgnoreCase("programEncounter")) {
joinClauses.add(PROGRAM_ENROLMENT_JOIN);
joinClauses.add(PROGRAM_ENCOUNTER_JOIN);
withJoin(PROGRAM_ENROLMENT_JOIN, true);
withJoin(PROGRAM_ENCOUNTER_JOIN, true);
}

if (c.getDataType().equalsIgnoreCase("CODED")) {
Expand Down Expand Up @@ -335,8 +337,9 @@ public T withConceptsFilter(List<Concept> concept) {
return (T) this;
}

protected T withJoin(String joinClause) {
protected T withJoin(String joinClause, boolean findDistinctOnly) {
joinClauses.add(joinClause);
this.findDistinctOnly = findDistinctOnly || this.findDistinctOnly;
return (T) this;
}

Expand Down
10 changes: 5 additions & 5 deletions avni-server-api/src/main/java/org/avni/server/dao/search/SubjectSearchQueryBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
public class SubjectSearchQueryBuilder extends BaseSubjectSearchQueryBuilder<SubjectSearchQueryBuilder> implements SearchBuilder {

public SqlQuery build() {
String baseQuery = "select distinct i.id as \"id\",\n" +
String baseQuery = "select $DISTINCT i.id as \"id\",\n" +
" i.first_name as \"firstName\",\n" +
" i.last_name as \"lastName\",\n" +
" i.profile_picture as \"profilePicture\",\n" +
Expand Down Expand Up @@ -43,7 +43,7 @@ public SubjectSearchQueryBuilder withSubjectSearchFilter(SubjectSearchRequest re

public SubjectSearchQueryBuilder withEncounterDateFilter(DateRange encounterDateRange) {
if (encounterDateRange == null || encounterDateRange.isEmpty()) return this;
return withJoin(ENCOUNTER_JOIN)
return withJoin(ENCOUNTER_JOIN, true)
.withRangeFilter(encounterDateRange,
"encounterDate",
"e.encounter_date_time >= cast(:rangeParam as date)",
Expand All @@ -52,8 +52,8 @@ public SubjectSearchQueryBuilder withEncounterDateFilter(DateRange encounterDate

public SubjectSearchQueryBuilder withProgramEncounterDateFilter(DateRange dateRange) {
if (dateRange == null || dateRange.isEmpty()) return this;
return withJoin(PROGRAM_ENROLMENT_JOIN)
.withJoin(PROGRAM_ENCOUNTER_JOIN)
return withJoin(PROGRAM_ENROLMENT_JOIN, true)
.withJoin(PROGRAM_ENCOUNTER_JOIN, true)
.withRangeFilter(dateRange,
"programEncounterDate",
"pe.encounter_date_time >= cast(:rangeParam as date)",
Expand All @@ -62,7 +62,7 @@ public SubjectSearchQueryBuilder withProgramEncounterDateFilter(DateRange dateRa

public SubjectSearchQueryBuilder withProgramEnrolmentDateFilter(DateRange dateRange) {
if (dateRange == null || dateRange.isEmpty()) return this;
return withJoin(PROGRAM_ENROLMENT_JOIN)
return withJoin(PROGRAM_ENROLMENT_JOIN, true)
.withRangeFilter(dateRange,
"programEnrolmentDate",
"penr.enrolment_date_time >= cast(trim(:rangeParam) as date)",
Expand Down
25 changes: 21 additions & 4 deletions avni-server-api/src/main/java/org/avni/server/framework/hibernate/CacheEventLogger.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,32 +10,48 @@
public class CacheEventLogger implements CacheEventListener {
private static final org.slf4j.Logger logger = LoggerFactory.getLogger(CacheEventLogger.class);

private String getCacheInfo(Ehcache ehcache) {
return String.format("Cache name: %s, Cache size: %d", ehcache.getName(), ehcache.getSize());
}

private String getElementInfo(Element element) {
return String.format("Element: %s", element.getObjectKey().toString());
}

private void log(String action, Ehcache cache, Element element) {
if (logger.isTraceEnabled()) {
logger.trace("{} -> {}, {}, User: {}", action, getCacheInfo(cache), getElementInfo(element), UserContextHolder.getUserName());
}
}

@Override
public void notifyElementRemoved(Ehcache cache, Element element) throws CacheException {
// logger.debug("Element added in {} : {}", cache.getName(), element);
this.log("Removed", cache, element);
}

@Override
public void notifyElementPut(Ehcache cache, Element element) throws CacheException {
logger.info("Element added in {}: {} by {}", cache.getName(), element, UserContextHolder.getUserName());
this.log("Put", cache, element);
}

@Override
public void notifyElementUpdated(Ehcache cache, Element element) throws CacheException {
this.log("Updated", cache, element);
}

@Override
public void notifyElementExpired(Ehcache cache, Element element) {
// logger.debug("Element expired in {}: {}", cache.getName(), element);
this.log("Expired", cache, element);
}

@Override
public void notifyElementEvicted(Ehcache cache, Element element) {
// logger.debug("Element evicted in {}: {}", cache.getName(), element);
logger.debug("Evicted -> {}, {}, User: {}", getCacheInfo(cache), getElementInfo(element), UserContextHolder.getUserName());
}

@Override
public void notifyRemoveAll(Ehcache cache) {
logger.debug("All removed. {}", getCacheInfo(cache));
}

@Override
Expand All @@ -45,5 +61,6 @@ public Object clone() {

@Override
public void dispose() {
logger.info("Dispose called.");
}
}
2 changes: 1 addition & 1 deletion avni-server-api/src/main/resources/ehcache.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
- Separate caches are defined so that they can be evicted selectively. These can be
-->
<ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="ehcache.xsd"
updateCheck="true" monitoring="autodetect" dynamicConfig="true"
updateCheck="false" monitoring="autodetect" dynamicConfig="true"
maxBytesLocalHeap="500M" statistics="true">
<diskStore path="user.home/.ehcache"/>
<cache name="org.avni.server.domain.Concept" eternal="false" timeToIdleSeconds="300" timeToLiveSeconds="600" statistics="true">
Expand Down

0 comments on commit 813146b

Please sign in to comment.