Skip to content

FIX BytesRefsCollectionBuilderTests.testBuildSortedNotSorted; Followup for #17714: Remove redundant tests #17902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 11, 2025
Merged

FIX BytesRefsCollectionBuilderTests.testBuildSortedNotSorted; Followup for #17714: Remove redundant tests #17902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc44995
Remove redundant tests
mkhludnev Apr 11, 2025
584643a
Fix empty collection test
mkhludnev Apr 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions server/src/test/java/org/opensearch/index/mapper/BytesRefsCollectionBuilderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@ public void testBuildSortedNotSorted() {
Collection<BytesRef> sortedSet = assertCollectionBuilt(sortedBytesRefs);
assertCollectionBuilt(bytesRefList);

assertTrue(sortedSet instanceof SortedSet<BytesRef>);
assertNull(((SortedSet<BytesRef>) sortedSet).comparator());
assertTrue(sortedSet.isEmpty() || sortedSet instanceof SortedSet<BytesRef>);
if (!sortedSet.isEmpty()) {
assertNull(((SortedSet<BytesRef>) sortedSet).comparator());
}
}

public void testBuildFooBar() {
Expand Down
62 changes: 0 additions & 62 deletions server/src/test/java/org/opensearch/index/mapper/KeywordFieldTypeTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@

import com.carrotsearch.randomizedtesting.generators.RandomStrings;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.LowerCaseFilter;
import org.apache.lucene.analysis.TokenFilter;
Expand Down Expand Up @@ -79,18 +77,9 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.SortedSet;
import java.util.stream.Stream;

import org.mockito.MockedConstruction;
import org.mockito.stubbing.Answer;

import static org.mockito.Mockito.mockConstructionWithAnswer;

public class KeywordFieldTypeTests extends FieldTypeTestCase {

Expand Down Expand Up @@ -229,57 +218,6 @@ public void testTermsSortedQuery() {
assertEquals(expectedDocValues, onlyDocValues.termsQuery(sortedStrings, null));
}

@AwaitsFix(bugUrl = "no commit")
public void testMockTermsSortedQuery() {
String[] seedStrings = generateRandomStringArray(10, 10, false, false);
if (seedStrings.length == 1) {
seedStrings = Stream.concat(Arrays.stream(seedStrings), Arrays.stream(generateRandomStringArray(10, 10, false, false)))
.toArray(String[]::new);
}
List<BytesRef> bytesRefList = Arrays.stream(seedStrings).map(BytesRef::new).toList();
List<String> sortedStrings = bytesRefList.stream().sorted().map(BytesRef::utf8ToString).toList();
Answer asseretSortedSetArg = invocationOnMock -> {
Object[] args = invocationOnMock.getArguments();
for (int i = 0; i < args.length; i++) {
if (args[i] instanceof Collection<?>) {
assertTrue(args[i] instanceof SortedSet<?>);
return invocationOnMock.callRealMethod();
}
}
fail();
return null;
};
try (MockedConstruction<TermInSetQuery> ignored = mockConstructionWithAnswer(TermInSetQuery.class, asseretSortedSetArg)) {
MappedFieldType ft = new KeywordFieldType("field");
assertNotNull(ft.termsQuery(sortedStrings, MOCK_QSC_ENABLE_INDEX_DOC_VALUES));
MappedFieldType onlyIndexed = new KeywordFieldType("field", true, false, Collections.emptyMap());
assertNotNull(onlyIndexed.termsQuery(sortedStrings, null));
MappedFieldType onlyDocValues = new KeywordFieldType("field", false, true, Collections.emptyMap());
assertNotNull(onlyDocValues.termsQuery(sortedStrings, null));
}
}

@AwaitsFix(bugUrl = "no commit")
public void testHeavyWeight() {
int arraySize = 10000000;
BytesRef[] array = new BytesRef[arraySize];
Random random = random();
for (int i = 0; i < arraySize; i++) {
String str = RandomStrings.randomAsciiOfLength(random, 10);
array[i] = new BytesRef(str);
}
BytesRefsCollectionBuilder outofOrder = new BytesRefsCollectionBuilder(arraySize);
BytesRefsCollectionBuilder inOrder = new BytesRefsCollectionBuilder(arraySize);
Arrays.stream(array).forEach(outofOrder);
Arrays.stream(array).sorted().forEachOrdered(inOrder);
Logger logger = LogManager.getLogger(KeywordFieldTypeTests.class);
long start = System.currentTimeMillis(), intermid;
new TermInSetQuery("foo", outofOrder.get());
logger.info("out of order {} ms", (intermid = System.currentTimeMillis()) - start);
new TermInSetQuery("foo", inOrder.get());
logger.info("in order{} ms", System.currentTimeMillis() - intermid);
}

public void testExistsQuery() {
{
KeywordFieldType ft = new KeywordFieldType("field");
Expand Down
Loading