diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchSourceBuilderFactory.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchSourceBuilderFactory.java index bfe0ec4945c..de8bcd9f61d 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchSourceBuilderFactory.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchSourceBuilderFactory.java @@ -291,18 +291,10 @@ public class ElasticSearchSourceBuilderFactory if (fvb.getModifier() != null) { switch (fvb.getModifier().value()) { case "log": - condition = - QueryBuilders.boolQuery() - .filter(condition) - .filter(QueryBuilders.rangeQuery(fvb.getField()).gt(0)); factorBuilder.modifier(FieldValueFactorFunction.Modifier.LOG); break; case "log1p": try { - condition = - QueryBuilders.boolQuery() - .filter(condition) - .filter(QueryBuilders.rangeQuery(fvb.getField()).gt(-1)); factorBuilder.modifier(FieldValueFactorFunction.Modifier.LOG1P); } catch (NoSuchFieldError e) { factorBuilder.modifier(FieldValueFactorFunction.Modifier.LOG); @@ -310,10 +302,6 @@ public class ElasticSearchSourceBuilderFactory break; case "sqrt": try { - condition = - QueryBuilders.boolQuery() - .filter(condition) - .filter(QueryBuilders.rangeQuery(fvb.getField()).gte(0)); factorBuilder.modifier(FieldValueFactorFunction.Modifier.SQRT); } catch (NoSuchFieldError ignored) { } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/SearchIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/SearchIndex.java index 3a77b931913..0c53fd617a6 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/SearchIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/SearchIndex.java @@ -100,11 +100,11 @@ public interface SearchIndex { map.put("owners", getEntitiesWithDisplayName(entity.getOwners())); map.put("domain", getEntityWithDisplayName(entity.getDomain())); map.put("followers", SearchIndexUtils.parseFollowers(entity.getFollowers())); - map.put( - "totalVotes", + int totalVotes = nullOrEmpty(entity.getVotes()) ? 0 - : entity.getVotes().getUpVotes() - entity.getVotes().getDownVotes()); + : Math.max(entity.getVotes().getUpVotes() - entity.getVotes().getDownVotes(), 0); + map.put("totalVotes", totalVotes); map.put("descriptionStatus", getDescriptionStatus(entity)); map.put("fqnParts", getFQNParts(entity.getFullyQualifiedName())); map.put("deleted", entity.getDeleted() != null && entity.getDeleted()); diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchSourceBuilderFactory.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchSourceBuilderFactory.java index 0752b6fafe5..2c8ed67c4a8 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchSourceBuilderFactory.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchSourceBuilderFactory.java @@ -291,18 +291,10 @@ public class OpenSearchSourceBuilderFactory if (fvb.getModifier() != null) { switch (fvb.getModifier().value()) { case "log": - condition = - QueryBuilders.boolQuery() - .filter(condition) - .filter(QueryBuilders.rangeQuery(fvb.getField()).gt(0)); factorBuilder.modifier(FieldValueFactorFunction.Modifier.LOG); break; case "log1p": try { - condition = - QueryBuilders.boolQuery() - .filter(condition) - .filter(QueryBuilders.rangeQuery(fvb.getField()).gt(-1)); factorBuilder.modifier(FieldValueFactorFunction.Modifier.LOG1P); } catch (NoSuchFieldError e) { factorBuilder.modifier(FieldValueFactorFunction.Modifier.LOG); @@ -310,10 +302,6 @@ public class OpenSearchSourceBuilderFactory break; case "sqrt": try { - condition = - QueryBuilders.boolQuery() - .filter(condition) - .filter(QueryBuilders.rangeQuery(fvb.getField()).gte(0)); factorBuilder.modifier(FieldValueFactorFunction.Modifier.SQRT); } catch (NoSuchFieldError ignored) { }