Skip to content

Commit

Permalink
fix failing test suites (#114)
Browse files Browse the repository at this point in the history 
Signed-off-by: Poojita Raj <poojiraj@amazon.com>
  • Loading branch information
@Poojita-Raj
Poojita-Raj committed Apr 13, 2023
1 parent ac2a74c commit d49f330
Show file tree
Hide file tree
Showing 8 changed files with 239 additions and 171 deletions.
114 changes: 62 additions & 52 deletions server/src/internalClusterTest/java/org/opensearch/action/termvectors/GetTermVectorsIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,13 @@ public void testExistingFieldButNotInDocNPE() throws Exception {
);

// lets see if the null term vectors are caught...
TermVectorsResponse actionGet = termVectors.actionGet();
assertThat(actionGet, notNullValue());
assertThat(actionGet.isExists(), equalTo(true));
assertThat(actionGet.getIndex(), equalTo("test"));
assertThat(actionGet.getFields().terms("existingfield"), nullValue());
assertBusy(() -> {
TermVectorsResponse actionGet = termVectors.actionGet();
assertThat(actionGet, notNullValue());
assertThat(actionGet.isExists(), equalTo(true));
assertThat(actionGet.getIndex(), equalTo("test"));
assertThat(actionGet.getFields().terms("existingfield"), nullValue());
});
}

public void testNotIndexedField() throws Exception {
Expand Down Expand Up @@ -546,7 +548,7 @@ private void checkBrownFoxTermVector(Fields fields, String fieldName, boolean wi
assertThat(iterator.next(), nullValue());
}

public void testDuelWithAndWithoutTermVectors() throws IOException, ExecutionException, InterruptedException {
public void testDuelWithAndWithoutTermVectors() throws Exception {
// setup indices
String[] indexNames = new String[] { "with_tv", "without_tv" };
assertAcked(prepareCreate(indexNames[0]).setMapping("field1", "type=text,term_vector=with_positions_offsets,analyzer=keyword"));
Expand All @@ -572,19 +574,21 @@ public void testDuelWithAndWithoutTermVectors() throws IOException, ExecutionExc
indexRandom(true, indexBuilders);

// request tvs and compare from each index
for (int id = 0; id < content.length; id++) {
Fields[] fields = new Fields[2];
for (int j = 0; j < indexNames.length; j++) {
TermVectorsResponse resp = client().prepareTermVectors(indexNames[j], String.valueOf(id))
.setOffsets(true)
.setPositions(true)
.setSelectedFields("field1")
.get();
assertThat("doc with index: " + indexNames[j] + ", type1 and id: " + id, resp.isExists(), equalTo(true));
fields[j] = resp.getFields();
assertBusy(() -> {
for (int id = 0; id < content.length; id++) {
Fields[] fields = new Fields[2];
for (int j = 0; j < indexNames.length; j++) {
TermVectorsResponse resp = client().prepareTermVectors(indexNames[j], String.valueOf(id))
.setOffsets(true)
.setPositions(true)
.setSelectedFields("field1")
.get();
assertThat("doc with index: " + indexNames[j] + ", type1 and id: " + id, resp.isExists(), equalTo(true));
fields[j] = resp.getFields();
}
compareTermVectors("field1", fields[0], fields[1]);
}
compareTermVectors("field1", fields[0], fields[1]);
}
});
}

private void compareTermVectors(String fieldName, Fields fields0, Fields fields1) throws IOException {
Expand Down Expand Up @@ -628,7 +632,7 @@ private void compareTermVectors(String fieldName, Fields fields0, Fields fields1
assertThat(iter1.next(), nullValue());
}

public void testSimpleWildCards() throws IOException {
public void testSimpleWildCards() throws Exception {
int numFields = 25;

XContentBuilder mapping = jsonBuilder().startObject().startObject("properties");
Expand All @@ -646,13 +650,15 @@ public void testSimpleWildCards() throws IOException {
client().prepareIndex("test").setId("0").setSource(source).get();
refresh();

TermVectorsResponse response = client().prepareTermVectors(indexOrAlias(), "0").setSelectedFields("field*").get();
assertThat("Doc doesn't exists but should", response.isExists(), equalTo(true));
assertThat(response.getIndex(), equalTo("test"));
assertThat("All term vectors should have been generated", response.getFields().size(), equalTo(numFields));
assertBusy(() -> {
TermVectorsResponse response = client().prepareTermVectors(indexOrAlias(), "0").setSelectedFields("field*").get();
assertThat("Doc doesn't exists but should", response.isExists(), equalTo(true));
assertThat(response.getIndex(), equalTo("test"));
assertThat("All term vectors should have been generated", response.getFields().size(), equalTo(numFields));
});
}

public void testArtificialVsExisting() throws ExecutionException, InterruptedException, IOException {
public void testArtificialVsExisting() throws Exception {
// setup indices
Settings.Builder settings = Settings.builder().put(indexSettings()).put("index.analysis.analyzer", "standard");
assertAcked(prepareCreate("test").setSettings(settings).setMapping("field1", "type=text,term_vector=with_positions_offsets"));
Expand All @@ -671,31 +677,33 @@ public void testArtificialVsExisting() throws ExecutionException, InterruptedExc
}
indexRandom(true, indexBuilders);

for (int i = 0; i < content.length; i++) {
// request tvs from existing document
TermVectorsResponse respExisting = client().prepareTermVectors("test", String.valueOf(i))
.setOffsets(true)
.setPositions(true)
.setFieldStatistics(true)
.setTermStatistics(true)
.get();
assertThat("doc with index: test, type1 and id: existing", respExisting.isExists(), equalTo(true));
assertBusy(() -> {
for (int i = 0; i < content.length; i++) {
// request tvs from existing document
TermVectorsResponse respExisting = client().prepareTermVectors("test", String.valueOf(i))
.setOffsets(true)
.setPositions(true)
.setFieldStatistics(true)
.setTermStatistics(true)
.get();

// request tvs from artificial document
TermVectorsResponse respArtificial = client().prepareTermVectors()
.setIndex("test")
.setRouting(String.valueOf(i)) // ensure we get the stats from the same shard as existing doc
.setDoc(jsonBuilder().startObject().field("field1", content[i]).endObject())
.setOffsets(true)
.setPositions(true)
.setFieldStatistics(true)
.setTermStatistics(true)
.get();
assertThat("doc with index: test, type1 and id: " + String.valueOf(i), respArtificial.isExists(), equalTo(true));
assertThat("doc with index: test, type1 and id: existing", respExisting.isExists(), equalTo(true));
// request tvs from artificial document
TermVectorsResponse respArtificial = client().prepareTermVectors()
.setIndex("test")
.setRouting(String.valueOf(i)) // ensure we get the stats from the same shard as existing doc
.setDoc(jsonBuilder().startObject().field("field1", content[i]).endObject())
.setOffsets(true)
.setPositions(true)
.setFieldStatistics(true)
.setTermStatistics(true)
.get();
assertThat("doc with index: test, type1 and id: " + String.valueOf(i), respArtificial.isExists(), equalTo(true));

// compare existing tvs with artificial
compareTermVectors("field1", respExisting.getFields(), respArtificial.getFields());
}
// compare existing tvs with artificial
compareTermVectors("field1", respExisting.getFields(), respArtificial.getFields());
}
});
}

public void testArtificialNoDoc() throws IOException {
Expand Down Expand Up @@ -821,7 +829,7 @@ private static String indexOrAlias() {
return randomBoolean() ? "test" : "alias";
}

public void testTermVectorsWithVersion() {
public void testTermVectorsWithVersion() throws Exception {
assertAcked(prepareCreate("test").addAlias(new Alias("alias")).setSettings(Settings.builder().put("index.refresh_interval", -1)));
ensureGreen();

Expand All @@ -834,10 +842,12 @@ public void testTermVectorsWithVersion() {
// From translog:

// version 0 means ignore version, which is the default
response = client().prepareTermVectors(indexOrAlias(), "1").setVersion(Versions.MATCH_ANY).get();
assertThat(response.isExists(), equalTo(true));
assertThat(response.getId(), equalTo("1"));
assertThat(response.getVersion(), equalTo(1L));
assertBusy(() -> {
TermVectorsResponse finalResponse = client().prepareTermVectors(indexOrAlias(), "1").setVersion(Versions.MATCH_ANY).get();
assertThat(finalResponse.isExists(), equalTo(true));
assertThat(finalResponse.getId(), equalTo("1"));
assertThat(finalResponse.getVersion(), equalTo(1L));
});

response = client().prepareTermVectors(indexOrAlias(), "1").setVersion(1).get();
assertThat(response.isExists(), equalTo(true));
Expand Down
6 changes: 4 additions & 2 deletions server/src/internalClusterTest/java/org/opensearch/blocks/SimpleBlocksIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,10 @@ public void testAddIndexBlock() throws Exception {
disableIndexBlock(indexName, block);
}

client().admin().indices().prepareRefresh(indexName).get();
assertHitCount(client().prepareSearch(indexName).setSize(0).get(), nbDocs);
assertBusy(() -> {
client().admin().indices().prepareRefresh(indexName).get();
assertHitCount(client().prepareSearch(indexName).setSize(0).get(), nbDocs);
});
}

public void testSameBlockTwice() throws Exception {
Expand Down

0 comments on commit d49f330

Please sign in to comment.