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

EQL: [Tests] Fix issues for SequenceSpecTests (#67104) (#67143) 

- Use `argumentFormatting` starting with 1 as 0 is problematic for Java 16
- Actually enable the tests since the listener that checks the results
  was not called and nothing was asserted.
- Disable one test that fails which is tracked with: #67102

Fixes: #66778
(cherry picked from commit a4199af58b8c5ab4757a45248672e0233978b208)
This commit is contained in:
Marios Trivyzas 2021-01-07 11:56:57 +01:00 committed by GitHub
parent 747e1cc71d
commit a2a389afdb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/execution/assembler/SequenceSpecTests.java
View File

@ -6,7 +6,19 @@
package org.elasticsearch.xpack.eql.execution.assembler;
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
import static java.util.Collections.emptyList;
import static java.util.Collections.emptyMap;
import static java.util.Collections.singletonList;
import static org.elasticsearch.action.ActionListener.wrap;
import static org.elasticsearch.common.logging.LoggerMessageFormat.format;
import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import org.apache.lucene.search.TotalHits;
import org.apache.lucene.search.TotalHits.Relation;
import org.elasticsearch.ExceptionsHelper;
@ -32,21 +44,13 @@ import org.elasticsearch.xpack.eql.session.Payload;
import org.elasticsearch.xpack.eql.session.Results;
import org.elasticsearch.xpack.ql.execution.search.extractor.HitExtractor;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import static java.util.Collections.emptyList;
import static java.util.Collections.emptyMap;
import static java.util.Collections.singletonList;
import static org.elasticsearch.action.ActionListener.wrap;
import static org.elasticsearch.common.logging.LoggerMessageFormat.format;
import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
public class SequenceSpecTests extends ESTestCase {
private static final String PARAM_FORMATTING = "%1$s";
private static final String QUERIES_FILENAME = "sequences.series-spec";
private final List<Map<Integer, Tuple<String, String>>> events;
private final List<List<String>> matches;
private final Map<Integer, String> allEvents;
@ -150,8 +154,8 @@ public class SequenceSpecTests extends ESTestCase {
for (Entry<Integer, Tuple<String, String>> entry : events.entrySet()) {
Tuple<String, String> value = entry.getValue();
// save the timestamp as docId (int) and the key as id (string)
SearchHit searchHit = new SearchHit(entry.getKey(), value.v1(), null, null, null);
// save the timestamp both as docId (int) and as id (string)
SearchHit searchHit = new SearchHit(entry.getKey(), entry.getKey().toString(), null, null, null);
hits.add(searchHit);
}
}
@ -186,6 +190,15 @@ public class SequenceSpecTests extends ESTestCase {
@Override
public void fetchHits(Iterable<List<HitReference>> refs, ActionListener<List<List<SearchHit>>> listener) {
List<List<SearchHit>> searchHits = new ArrayList<>();
for (List<HitReference> ref : refs) {
List<SearchHit> hits = new ArrayList<>(ref.size());
for (HitReference hitRef : ref) {
hits.add(new SearchHit(-1, hitRef.id(), null, null, null));
}
searchHits.add(hits);
}
listener.onResponse(searchHits);
}
}
@ -200,12 +213,12 @@ public class SequenceSpecTests extends ESTestCase {
this.tbExtractor = null;
}
@ParametersFactory(shuffle = false, argumentFormatting = "%0$s")
@ParametersFactory(shuffle = false, argumentFormatting = PARAM_FORMATTING)
public static Iterable<Object[]> parameters() throws Exception {
return SeriesUtils.readSpec("/sequences.series-spec");
return SeriesUtils.readSpec("/" + QUERIES_FILENAME);
}
public void test() {
public void test() throws Exception {
int stages = events.size();
List<Criterion<BoxedQueryRequest>> criteria = new ArrayList<>(stages);
// pass the items for each query through the Criterion

19
x-pack/plugin/eql/src/test/resources/sequences.series-spec
View File

@ -248,12 +248,13 @@ A4 B5 C7 D8
// https://eql.readthedocs.io/en/0.8/query-guide/implementation.html#sequences
exampleWithTwoStagesAndKeyFromTheDocs
r|W1 r|W2 u|W6 r|W7 x|X99
u|H3 r|H4 r|H5 u|H8
r|I9 u|I10 r|I11
;
r|W2 H4 I9
u|W6 H8 I10
;
// AwaitsFix: https://github.com/elastic/elasticsearch/issues/67102
//exampleWithTwoStagesAndKeyFromTheDocs
//
//r|W1 r|W2 u|W6 r|W7 x|X99
// u|H3 r|H4 r|H5 u|H8
// r|I9 u|I10 r|I11
//;
//r|W2 H4 I9
//u|W6 H8 I10
//;