forked from opensearch-project/sql
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/dev-simple_query_string-#192-imp…
…l' into dev-simple_query_string-#192-sql-simple-max_ast
- Loading branch information
Showing
6 changed files
with
169 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
123 changes: 123 additions & 0 deletions
123
...g/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/SimpleQueryString.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| /* | ||
| * Copyright OpenSearch Contributors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package org.opensearch.sql.opensearch.storage.script.filter.lucene.relevance; | ||
|
|
||
| import com.google.common.collect.ImmutableList; | ||
| import com.google.common.collect.ImmutableMap; | ||
| import org.json.JSONArray; | ||
| import org.json.JSONObject; | ||
| import org.json.JSONString; | ||
| import org.opensearch.index.query.Operator; | ||
| import org.opensearch.index.query.QueryBuilder; | ||
| import org.opensearch.index.query.QueryBuilders; | ||
| import org.opensearch.index.query.SimpleQueryStringBuilder; | ||
| import org.opensearch.index.query.SimpleQueryStringFlag; | ||
| import org.opensearch.sql.data.model.ExprValue; | ||
| import org.opensearch.sql.exception.SemanticCheckException; | ||
| import org.opensearch.sql.expression.Expression; | ||
| import org.opensearch.sql.expression.FunctionExpression; | ||
| import org.opensearch.sql.expression.NamedArgumentExpression; | ||
| import org.opensearch.sql.opensearch.storage.script.filter.lucene.LuceneQuery; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.HashMap; | ||
| import java.util.Iterator; | ||
| import java.util.Map; | ||
| import java.util.function.BiFunction; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| public class SimpleQueryString extends LuceneQuery { | ||
| private final BiFunction<SimpleQueryStringBuilder, ExprValue, SimpleQueryStringBuilder> analyzeWildcard = | ||
| (b, v) -> b.analyzeWildcard(Boolean.parseBoolean(v.stringValue())); | ||
| private final BiFunction<SimpleQueryStringBuilder, ExprValue, SimpleQueryStringBuilder> analyzer = | ||
| (b, v) -> b.analyzer(v.stringValue()); | ||
| private final BiFunction<SimpleQueryStringBuilder, ExprValue, SimpleQueryStringBuilder> autoGenerateSynonymsPhraseQuery = | ||
| (b, v) -> b.autoGenerateSynonymsPhraseQuery(Boolean.parseBoolean(v.stringValue())); | ||
| private final BiFunction<SimpleQueryStringBuilder, ExprValue, SimpleQueryStringBuilder> defaultOperator = | ||
| (b, v) -> b.defaultOperator(Operator.fromString(v.stringValue())); | ||
| private final BiFunction<SimpleQueryStringBuilder, ExprValue, SimpleQueryStringBuilder> flags = | ||
| (b, v) -> b.flags(SimpleQueryStringFlag.valueOf(v.stringValue())); | ||
| private final BiFunction<SimpleQueryStringBuilder, ExprValue, SimpleQueryStringBuilder> fuzzyMaxExpansions = | ||
| (b, v) -> b.fuzzyMaxExpansions(Integer.parseInt(v.stringValue())); | ||
| private final BiFunction<SimpleQueryStringBuilder, ExprValue, SimpleQueryStringBuilder> fuzzyPrefixLength = | ||
| (b, v) -> b.fuzzyPrefixLength(Integer.parseInt(v.stringValue())); | ||
| private final BiFunction<SimpleQueryStringBuilder, ExprValue, SimpleQueryStringBuilder> fuzzyTranspositions = | ||
| (b, v) -> b.fuzzyTranspositions(Boolean.parseBoolean(v.stringValue())); | ||
| private final BiFunction<SimpleQueryStringBuilder, ExprValue, SimpleQueryStringBuilder> lenient = | ||
| (b, v) -> b.lenient(Boolean.parseBoolean(v.stringValue())); | ||
| private final BiFunction<SimpleQueryStringBuilder, ExprValue, SimpleQueryStringBuilder> minimumShouldMatch = | ||
| (b, v) -> b.minimumShouldMatch(v.stringValue()); | ||
| private final BiFunction<SimpleQueryStringBuilder, ExprValue, SimpleQueryStringBuilder> quoteFieldSuffix = | ||
| (b, v) -> b.quoteFieldSuffix(v.stringValue()); | ||
| private final BiFunction<SimpleQueryStringBuilder, ExprValue, SimpleQueryStringBuilder> boost = | ||
| (b, v) -> b.boost(Float.parseFloat(v.stringValue())); | ||
|
|
||
| ImmutableMap<Object, Object> argAction = ImmutableMap.builder() | ||
| .put("analyze_wildcard", analyzeWildcard) | ||
| .put("analyzer", analyzer) | ||
| .put("auto_generate_synonyms_phrase_query", autoGenerateSynonymsPhraseQuery) | ||
| .put("flags", flags) | ||
| .put("fuzzy_max_expansions", fuzzyMaxExpansions) | ||
| .put("fuzzy_prefix_length", fuzzyPrefixLength) | ||
| .put("fuzzy_transpositions", fuzzyTranspositions) | ||
| .put("lenient", lenient) | ||
| .put("default_operator", defaultOperator) | ||
| .put("minimum_should_match", minimumShouldMatch) | ||
| .put("quote_field_suffix", quoteFieldSuffix) | ||
| .put("boost", boost) | ||
| .build(); | ||
|
|
||
| @Override | ||
| public QueryBuilder build(FunctionExpression func) { | ||
| Iterator<Expression> iterator = func.getArguments().iterator(); | ||
| NamedArgumentExpression fields = (NamedArgumentExpression) iterator.next(); | ||
| NamedArgumentExpression query = (NamedArgumentExpression) iterator.next(); | ||
| SimpleQueryStringBuilder queryBuilder = QueryBuilders.simpleQueryStringQuery( | ||
| query.getValue().valueOf(null).stringValue()); | ||
| queryBuilder.fields(parseFields(fields.getValue().valueOf(null).stringValue())); | ||
| while (iterator.hasNext()) { | ||
| NamedArgumentExpression arg = (NamedArgumentExpression) iterator.next(); | ||
| if (!argAction.containsKey(arg.getArgName())) { | ||
| throw new SemanticCheckException(String | ||
| .format("Parameter %s is invalid for simple_query_string function.", arg.getArgName())); | ||
| } | ||
| ((BiFunction<SimpleQueryStringBuilder, ExprValue, SimpleQueryStringBuilder>) argAction | ||
| .get(arg.getArgName())) | ||
| .apply(queryBuilder, arg.getValue().valueOf(null)); | ||
| } | ||
| return queryBuilder; | ||
| } | ||
|
|
||
| private Map<String, Float> parseFields(String fields) { | ||
| try { | ||
| // TODO support elements wrapped by single quotes | ||
| var arr = new JSONArray(fields); | ||
| if (!arr.toList().stream().allMatch(s -> s instanceof String)) | ||
| throw new Exception("All listed elements should be strings."); | ||
|
|
||
| var lst = arr.toList().stream().map(String::valueOf).collect(Collectors.toList()); | ||
| var res = new HashMap<String, Float>(); | ||
| //var builder = ImmutableMap.builder(); | ||
| for (var elem : lst) { | ||
| if (!elem.contains("^")) { | ||
| res.put(elem, 1F); | ||
| continue; | ||
| } | ||
|
|
||
| var parts = elem.split("\\^"); | ||
| var weight = Float.parseFloat(parts[parts.length - 1]); | ||
| var field = Arrays.stream(parts).limit(parts.length - 1).collect(Collectors.joining("^")); | ||
| res.put(field, weight); | ||
| } | ||
| return res; | ||
| } | ||
| catch (Exception e) { | ||
| throw new SemanticCheckException(String.format( | ||
| "%s: Incorrect value '%s' specified for 'fields' argument of 'simple_query_string' function." | ||
| + "The format is: '[\"field1\", \"field2\", ...]'.", e.getMessage(), fields)); | ||
| } | ||
| } | ||
| } |