From d17e31794e2053fd49666941d9eb023a2e20c53f Mon Sep 17 00:00:00 2001
From: Mohit Yadav <105265192+mohityadav766@users.noreply.github.com>
Date: Thu, 22 May 2025 18:49:59 +0530
Subject: [PATCH] Revert: Filter for function score and add floor to totalVotes
 (#21371)

* Revert "OSS add guards for sqrt, log1p etc (#21358)"

This reverts commit 35d9f726ca91e974e09b24d67f633a38744fe191.

* Revert "Add Guards for function boost negative values (#21356)"

This reverts commit 8346303978e43046f5da7b094817a758308c7ec0.

* Add floor to totalVotes

* Fix total votes

(cherry picked from commit 8138a47b202c175ed654a39d3e2e7892ef8d7a23)
---
 .../ElasticSearchSourceBuilderFactory.java           | 12 ------------
 .../service/search/indexes/SearchIndex.java          |  6 +++---
 .../opensearch/OpenSearchSourceBuilderFactory.java   | 12 ------------
 3 files changed, 3 insertions(+), 27 deletions(-)

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) {
           }