-
Notifications
You must be signed in to change notification settings - Fork 24.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
serialize suggestion responses as named writeables (#30284)
Suggestion responses were previously serialized as streamables which made writing suggesters in plugins with custom suggestion response types impossible. This commit makes them serialized as named writeables and provides a facility for registering a reader for suggestion responses when registering a suggester. This also makes Suggestion responses abstract, requiring a suggester implementation to provide its own types. Suggesters which do not need anything additional to what is defined in Suggest.Suggestion should provide a minimal subclass. The existing plugin suggester integration tests are removed and replaced with an equivalent implementation as an example plugin.
- Loading branch information
1 parent
0b7fb4e
commit 8bfb0f3
Showing
30 changed files
with
1,269 additions
and
562 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
/* | ||
* Licensed to Elasticsearch under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch licenses this file to you under | ||
* the Apache License, Version 2.0 (the "License"); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
apply plugin: 'elasticsearch.esplugin' | ||
|
||
esplugin { | ||
name 'custom-suggester' | ||
description 'An example plugin showing how to write and register a custom suggester' | ||
classname 'org.elasticsearch.example.customsuggester.CustomSuggesterPlugin' | ||
} | ||
|
||
integTestCluster { | ||
numNodes = 2 | ||
} | ||
|
||
// this plugin has no unit tests, only rest tests | ||
tasks.test.enabled = false |
62 changes: 62 additions & 0 deletions
62
...om-suggester/src/main/java/org/elasticsearch/example/customsuggester/CustomSuggester.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,62 @@ | ||
/* | ||
* Licensed to Elasticsearch under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch licenses this file to you under | ||
* the Apache License, Version 2.0 (the "License"); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
package org.elasticsearch.example.customsuggester; | ||
|
||
import org.apache.lucene.search.IndexSearcher; | ||
import org.apache.lucene.util.CharsRefBuilder; | ||
import org.elasticsearch.common.text.Text; | ||
import org.elasticsearch.search.suggest.Suggest; | ||
import org.elasticsearch.search.suggest.Suggester; | ||
|
||
import java.util.Locale; | ||
|
||
public class CustomSuggester extends Suggester<CustomSuggestionContext> { | ||
|
||
// This is a pretty dumb implementation which returns the original text + fieldName + custom config option + 12 or 123 | ||
@Override | ||
public Suggest.Suggestion<? extends Suggest.Suggestion.Entry<? extends Suggest.Suggestion.Entry.Option>> innerExecute( | ||
String name, | ||
CustomSuggestionContext suggestion, | ||
IndexSearcher searcher, | ||
CharsRefBuilder spare) { | ||
|
||
// Get the suggestion context | ||
String text = suggestion.getText().utf8ToString(); | ||
|
||
// create two suggestions with 12 and 123 appended | ||
CustomSuggestion response = new CustomSuggestion(name, suggestion.getSize(), "suggestion-dummy-value"); | ||
|
||
CustomSuggestion.Entry entry = new CustomSuggestion.Entry(new Text(text), 0, text.length(), "entry-dummy-value"); | ||
|
||
String firstOption = | ||
String.format(Locale.ROOT, "%s-%s-%s-%s", text, suggestion.getField(), suggestion.options.get("suffix"), "12"); | ||
CustomSuggestion.Entry.Option option12 = new CustomSuggestion.Entry.Option(new Text(firstOption), 0.9f, "option-dummy-value-1"); | ||
entry.addOption(option12); | ||
|
||
String secondOption = | ||
String.format(Locale.ROOT, "%s-%s-%s-%s", text, suggestion.getField(), suggestion.options.get("suffix"), "123"); | ||
CustomSuggestion.Entry.Option option123 = new CustomSuggestion.Entry.Option(new Text(secondOption), 0.8f, "option-dummy-value-2"); | ||
entry.addOption(option123); | ||
|
||
response.addTerm(entry); | ||
|
||
return response; | ||
} | ||
} |
40 changes: 40 additions & 0 deletions
40
...gester/src/main/java/org/elasticsearch/example/customsuggester/CustomSuggesterPlugin.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,40 @@ | ||
/* | ||
* Licensed to Elasticsearch under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch licenses this file to you under | ||
* the Apache License, Version 2.0 (the "License"); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
package org.elasticsearch.example.customsuggester; | ||
|
||
import org.elasticsearch.plugins.Plugin; | ||
import org.elasticsearch.plugins.SearchPlugin; | ||
|
||
import java.util.Collections; | ||
import java.util.List; | ||
|
||
public class CustomSuggesterPlugin extends Plugin implements SearchPlugin { | ||
@Override | ||
public List<SearchPlugin.SuggesterSpec<?>> getSuggesters() { | ||
return Collections.singletonList( | ||
new SearchPlugin.SuggesterSpec<>( | ||
CustomSuggestionBuilder.SUGGESTION_NAME, | ||
CustomSuggestionBuilder::new, | ||
CustomSuggestionBuilder::fromXContent, | ||
CustomSuggestion::new | ||
) | ||
); | ||
} | ||
} |
Oops, something went wrong.