0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ltr support

Browse source
This commit is contained in:
Shinsuke Sugaya 2018-06-29 19:46:25 +09:00
parent 02cfe80b35
commit 463c53bf2a
3 changed files with 164 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/org/codelibs/fess/es/client/FessEsClient.java
View file

@ -982,6 +982,18 @@ public class FessEsClient implements Client {
this.searchRequestBuilder = searchRequestBuilder;
}
public Map<String, Object> condition() {
final Map<String, Object> params = new HashMap<>();
params.put("query", query);
params.put("responseFields", responseFields);
params.put("offset", offset);
params.put("size", size);
// params.put("geoInfo", geoInfo);
// params.put("facetInfo", facetInfo);
params.put("similarDocHash", similarDocHash);
return params;
}
public SearchConditionBuilder query(final String query) {
this.query = query;
return this;
@ -1067,7 +1079,7 @@ public class FessEsClient implements Client {
}
// rescorer
stream(queryHelper.getRescorers()).of(stream -> stream.forEach(searchRequestBuilder::addRescorer));
stream(queryHelper.getRescorers(condition())).of(stream -> stream.forEach(searchRequestBuilder::addRescorer));
// sort
queryContext.sortBuilders().forEach(sortBuilder -> searchRequestBuilder.addSort(sortBuilder));

147
src/main/java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java Normal file
View file

@ -0,0 +1,147 @@
package org.codelibs.fess.es.query;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import org.apache.lucene.search.Query;
import org.elasticsearch.Version;
import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.io.stream.NamedWriteable;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.xcontent.ObjectParser;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.query.AbstractQueryBuilder;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryShardContext;
public class StoredLtrQueryBuilder extends AbstractQueryBuilder<StoredLtrQueryBuilder> implements NamedWriteable {
public static final String NAME = "sltr";
public static final ParseField MODEL_NAME = new ParseField("model");
public static final ParseField FEATURESET_NAME = new ParseField("featureset");
public static final ParseField STORE_NAME = new ParseField("store");
public static final ParseField PARAMS = new ParseField("params");
public static final ParseField ACTIVE_FEATURES = new ParseField("active_features");
private static final ObjectParser<StoredLtrQueryBuilder, Void> PARSER;
static {
PARSER = new ObjectParser<>(NAME);
PARSER.declareString(StoredLtrQueryBuilder::modelName, MODEL_NAME);
PARSER.declareString(StoredLtrQueryBuilder::featureSetName, FEATURESET_NAME);
PARSER.declareString(StoredLtrQueryBuilder::storeName, STORE_NAME);
PARSER.declareField(StoredLtrQueryBuilder::params, XContentParser::map, PARAMS, ObjectParser.ValueType.OBJECT);
PARSER.declareStringArray(StoredLtrQueryBuilder::activeFeatures, ACTIVE_FEATURES);
PARSER.declareFloat(QueryBuilder::boost, AbstractQueryBuilder.BOOST_FIELD);
PARSER.declareString(QueryBuilder::queryName, AbstractQueryBuilder.NAME_FIELD);
}
private String modelName;
private String featureSetName;
private String storeName;
private Map<String, Object> params;
private List<String> activeFeatures;
@Override
public String getWriteableName() {
return NAME;
}
@Override
protected void doWriteTo(StreamOutput out) throws IOException {
out.writeOptionalString(modelName);
out.writeOptionalString(featureSetName);
out.writeMap(params);
if (out.getVersion().onOrAfter(Version.V_6_2_4)) {
out.writeOptionalStringArray(activeFeatures != null ? activeFeatures.toArray(new String[0]) : null);
}
out.writeOptionalString(storeName);
}
@Override
protected void doXContent(XContentBuilder builder, Params params) throws IOException {
builder.startObject(NAME);
if (modelName != null) {
builder.field(MODEL_NAME.getPreferredName(), modelName);
}
if (featureSetName != null) {
builder.field(FEATURESET_NAME.getPreferredName(), featureSetName);
}
if (storeName != null) {
builder.field(STORE_NAME.getPreferredName(), storeName);
}
if (this.params != null && !this.params.isEmpty()) {
builder.field(PARAMS.getPreferredName(), this.params);
}
if (this.activeFeatures != null && !this.activeFeatures.isEmpty()) {
builder.field(ACTIVE_FEATURES.getPreferredName(), this.activeFeatures);
}
printBoostAndQueryName(builder);
builder.endObject();
}
@Override
protected Query doToQuery(QueryShardContext context) throws IOException {
// TODO Auto-generated method stub
return null;
}
@Override
protected boolean doEquals(StoredLtrQueryBuilder other) {
return Objects.equals(modelName, other.modelName) && Objects.equals(featureSetName, other.featureSetName)
&& Objects.equals(storeName, other.storeName) && Objects.equals(params, other.params)
&& Objects.equals(activeFeatures, other.activeFeatures);
}
@Override
protected int doHashCode() {
return Objects.hash(modelName, featureSetName, storeName, params, activeFeatures);
}
public String modelName() {
return modelName;
}
public StoredLtrQueryBuilder modelName(String modelName) {
this.modelName = Objects.requireNonNull(modelName);
return this;
}
public String featureSetName() {
return featureSetName;
}
public StoredLtrQueryBuilder featureSetName(String featureSetName) {
this.featureSetName = featureSetName;
return this;
}
public String storeName() {
return storeName;
}
public StoredLtrQueryBuilder storeName(String storeName) {
this.storeName = storeName;
return this;
}
public Map<String, Object> params() {
return params;
}
public StoredLtrQueryBuilder params(Map<String, Object> params) {
this.params = Objects.requireNonNull(params);
return this;
}
public List<String> activeFeatures() {
return activeFeatures;
}
public StoredLtrQueryBuilder activeFeatures(List<String> activeFeatures) {
this.activeFeatures = Objects.requireNonNull(activeFeatures);
return this;
}
}

9
src/main/java/org/codelibs/fess/helper/QueryHelper.java
View file

@ -55,6 +55,7 @@ import org.codelibs.fess.entity.FacetInfo;
import org.codelibs.fess.entity.GeoInfo;
import org.codelibs.fess.entity.QueryContext;
import org.codelibs.fess.entity.SearchRequestParams.SearchRequestType;
import org.codelibs.fess.es.query.StoredLtrQueryBuilder;
import org.codelibs.fess.exception.InvalidQueryException;
import org.codelibs.fess.mylasta.action.FessUserBean;
import org.codelibs.fess.mylasta.direction.FessConfig;
@ -952,15 +953,13 @@ public class QueryHelper {
boostFunctionList.add(new FilterFunctionBuilder(filter, scoreFunction));
}
public RescorerBuilder<?>[] getRescorers() {
public RescorerBuilder<?>[] getRescorers(final Map<String, Object> params) {
rescorerList.clear();
rescorerList.add(new QueryRescorerBuilder(new StoredLtrQueryBuilder().modelName("model_6").params(params)).windowSize(100));
return rescorerList.toArray(new RescorerBuilder<?>[rescorerList.size()]);
}
public void addRescorer(final RescorerBuilder<?> rescorer) {
rescorerList.add(rescorer);
}
public void addRescorer(final String query, final int windowSize) {
rescorerList.add(new QueryRescorerBuilder(QueryBuilders.wrapperQuery(query)).windowSize(windowSize));
}
}