honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make RankEvalRequestTests work with transport client

This commit is contained in:
Christoph Büscher 2016-08-05 13:48:46 +02:00
parent 795017ddfa
commit 8856565b89
5 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RankEvalAction.java
View File

@ -22,8 +22,8 @@ package org.elasticsearch.index.rankeval;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
/**
* Action used to start precision at qa evaluations.
/**
* Action used to start precision at qa evaluations.
**/
public class RankEvalAction extends Action<RankEvalRequest, RankEvalResponse, RankEvalRequestBuilder> {

25
modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RankEvalResponse.java
View File

@ -51,12 +51,8 @@ public class RankEvalResponse extends ActionResponse implements ToXContent {
public RankEvalResponse() {
}
@SuppressWarnings("unchecked")
public RankEvalResponse(StreamInput in) throws IOException {
super.readFrom(in);
this.specId = in.readString();
this.qualityLevel = in.readDouble();
this.unknownDocs = (Map<String, Collection<RatedDocumentKey>>) in.readGenericValue();
this.readFrom(in);
}
public RankEvalResponse(String specId, double qualityLevel, Map<String, Collection<RatedDocumentKey>> unknownDocs) {
@ -65,7 +61,8 @@ public class RankEvalResponse extends ActionResponse implements ToXContent {
this.unknownDocs = unknownDocs;
}
public String getSpecId() {
public Object getSpecId() {
return specId;
}
@ -79,17 +76,26 @@ public class RankEvalResponse extends ActionResponse implements ToXContent {
@Override
public String toString() {
return "RankEvalResult, ID :[" + specId + "], quality: " + qualityLevel + ", unknown docs: " + unknownDocs;
return "RankEvalResponse, ID :[" + specId + "], quality: " + qualityLevel + ", unknown docs: " + unknownDocs;
}
@Override
public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out);
out.writeString(specId);
out.writeDouble(qualityLevel);
out.writeOptionalString(specId);
out.writeOptionalDouble(qualityLevel);
out.writeGenericValue(getUnknownDocs());
}
@Override
@SuppressWarnings("unchecked")
public void readFrom(StreamInput in) throws IOException {
super.readFrom(in);
this.specId = in.readOptionalString();
this.qualityLevel = in.readOptionalDouble();
this.unknownDocs = (Map<String, Collection<String>>) in.readGenericValue();
}
@Override
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
builder.startObject("rank_eval");
@ -105,5 +111,4 @@ public class RankEvalResponse extends ActionResponse implements ToXContent {
builder.endObject();
return builder;
}
}

2
modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RankEvalSpec.java
View File

@ -59,7 +59,7 @@ public class RankEvalSpec implements Writeable {
for (int i = 0; i < specSize; i++) {
specifications.add(new QuerySpec(in));
}
eval = in.readNamedWriteable(RankedListQualityMetric.class); // TODO add to registry
eval = in.readNamedWriteable(RankedListQualityMetric.class);
taskId = in.readString();
}

3
modules/rank-eval/src/test/java/org/elasticsearch/index/rankeval/RankEvalRequestTests.java
View File

@ -41,8 +41,7 @@ import java.util.List;
import java.util.Map.Entry;
import java.util.Set;
@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.SUITE, transportClientRatio = 0.0)
// NORELEASE need to fix transport client use case
@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.SUITE)
public class RankEvalRequestTests extends ESIntegTestCase {
@Override
protected Collection<Class<? extends Plugin>> transportClientPlugins() {

1
test/framework/src/main/java/org/elasticsearch/test/TestCluster.java
View File

@ -20,6 +20,7 @@
package org.elasticsearch.test;
import com.carrotsearch.hppc.ObjectArrayList;
import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse;
import org.elasticsearch.action.admin.indices.template.get.GetIndexTemplatesResponse;
import org.elasticsearch.client.Client;