yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-06-27 04:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert: Filter for function score and add floor to totalVotes (#21371)

Browse Source 
* 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
This commit is contained in:
Mohit Yadav 2025-05-22 18:49:59 +05:30 committed by GitHub
parent 6f4204731f
commit 8138a47b20
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchSourceBuilderFactory.java
View File

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

6
openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/SearchIndex.java
View File

@ -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());

12
openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchSourceBuilderFactory.java
View File

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