Fixing distinct lookup when cottontail returns null (#321)

vitrivr · Jul 6, 2022 · 01738de · 01738de
1 parent 51d5ec6
commit 01738de
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/...trivr/cineast/api/rest/handlers/actions/bool/FindDistinctElementsByColumnPostHandler.java b/...trivr/cineast/api/rest/handlers/actions/bool/FindDistinctElementsByColumnPostHandler.java
@@ -16,6 +16,7 @@
 import org.vitrivr.cineast.api.messages.result.DistinctElementsResult;
 import org.vitrivr.cineast.api.rest.handlers.interfaces.ParsingPostRestHandler;
 import org.vitrivr.cineast.core.data.providers.primitive.PrimitiveTypeProvider;
+import org.vitrivr.cineast.core.data.providers.primitive.ProviderDataType;
 import org.vitrivr.cineast.core.db.DBSelector;
 import org.vitrivr.cineast.standalone.config.Config;
 
@@ -48,7 +49,7 @@ public DistinctElementsResult performPost(ColumnSpecification specification, Con
     }
     StopWatch watch = StopWatch.createStarted();
     selector.open(specification.table());
-    distinct = selector.getUniqueValues(specification.column()).stream().map(PrimitiveTypeProvider::getString).collect(Collectors.toList());
+    distinct = selector.getUniqueValues(specification.column()).stream().filter(p -> p.getType() != ProviderDataType.UNKNOWN).map(PrimitiveTypeProvider::getString).collect(Collectors.toList());
     cache.put(specification.table() + specification.column(), distinct);
     LOGGER.trace("Retrieved unique values for {} in {} ms", specification.table() + "." + specification.column(), watch.getTime(TimeUnit.MILLISECONDS));
     return new DistinctElementsResult("", distinct);

diff --git a/...core/src/main/java/org/vitrivr/cineast/core/data/providers/primitive/NothingProvider.java b/...core/src/main/java/org/vitrivr/cineast/core/data/providers/primitive/NothingProvider.java
@@ -14,4 +14,4 @@ public String toString() {
     return "NothingProvider";
   }
 
-}
+}
diff --git a/...-core/src/main/java/org/vitrivr/cineast/core/data/providers/primitive/StringProvider.java b/...-core/src/main/java/org/vitrivr/cineast/core/data/providers/primitive/StringProvider.java
@@ -3,7 +3,7 @@
 public interface StringProvider {
 
   default String getString() {
-    throw new UnsupportedOperationException("No string value specified");
+    throw new UnsupportedOperationException("No string value specified: " + this);
   }
 
 }
diff --git a/cineast-core/src/main/java/org/vitrivr/cineast/core/features/abstracts/BooleanRetriever.java b/cineast-core/src/main/java/org/vitrivr/cineast/core/features/abstracts/BooleanRetriever.java
@@ -89,6 +89,7 @@ public List<ScoreElement> getSimilar(SegmentContainer sc, ReadableQueryConfig qc
 
     if (relevantExpressions.isEmpty()) {
       LOGGER.debug("No relevant expressions in {} for query {}", this.getClass().getSimpleName(), sc.toString());
+      LOGGER.debug("In this class: {}, {}", this.getSupportedOperators(), this.getAttributes());
       return Collections.emptyList();
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,4 +14,4 @@ public String toString() { @@
         return "NothingProvider";
       }
-    }
+    }