eliaporciani commented on code in PR #904:
URL: https://github.com/apache/solr/pull/904#discussion_r905114621
##########
solr/core/src/java/org/apache/solr/search/neural/KnnQParser.java:
##########
@@ -72,7 +81,49 @@ public Query parse() {
DenseVectorField denseVectorType = (DenseVectorField) fieldType;
float[] parsedVectorToSearch = parseVector(vectorToSearch,
denseVectorType.getDimension());
- return denseVectorType.getKnnVectorQuery(schemaField.getName(),
parsedVectorToSearch, topK);
+
+ return getFilterQuery()
+ .map(
+ filterQuery ->
+ denseVectorType.getKnnVectorQuery(
+ schemaField.getName(), parsedVectorToSearch, topK,
filterQuery))
+ .orElse(
+ denseVectorType.getKnnVectorQuery(schemaField.getName(),
parsedVectorToSearch, topK));
+ }
+
+ private Optional<? extends Query> getFilterQuery() throws SolrException {
+ if (!isFilter()) {
+ String[] filterQueries = req.getParams().getParams(CommonParams.FQ);
+ return ofNullable(filterQueries).filter(fq -> fq.length !=
0).map(this::computeFilterQuery);
+ }
+ return Optional.empty();
+ }
+
+ private Query computeFilterQuery(String[] filterQueries) throws
SolrException {
+
+ List<Query> filters = new ArrayList<>(filterQueries.length);
+
+ for (String filterQuery : filterQueries) {
+ if (filterQuery != null && filterQuery.trim().length() != 0) {
+ QParser filterParser;
+ try {
+ filterParser = QParser.getParser(filterQuery, super.getReq());
+ filterParser.setIsFilter(true);
+ filters.add(filterParser.getQuery());
+ } catch (SyntaxError e) {
+ throw new SolrException(
+ SolrException.ErrorCode.BAD_REQUEST,
+ "error in parsing filter queries:" + e.getMessage());
+ }
+ }
+ }
+
+ BooleanQuery.Builder builder = new BooleanQuery.Builder();
+ for (Query query : filters) {
+ builder.add(query, BooleanClause.Occur.FILTER);
+ }
+
+ return builder.build();
Review Comment:
Good point. I changed the code in order to return it direcly
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
