Skip to content

Commit 4528fcc

Browse files
committed
Compare instead of grab
1 parent 1b0d589 commit 4528fcc

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

server/src/test/java/org/elasticsearch/index/mapper/blockloader/docvalues/MvMaxBytesRefsFromOrdsBlockLoaderTests.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.hamcrest.Matcher;
1717

1818
import java.io.IOException;
19+
import java.util.Comparator;
1920
import java.util.List;
2021

2122
import static org.hamcrest.Matchers.equalTo;
@@ -79,7 +80,9 @@ private void checkBlocks(TestBlock strings, TestBlock mvMin) {
7980
assertThat(mvMin.get(i), nullValue());
8081
continue;
8182
}
82-
BytesRef bytes = (BytesRef) (str instanceof List<?> l ? l.getLast() : str);
83+
BytesRef bytes = (BytesRef) (str instanceof List<?> l
84+
? l.stream().map(b -> (BytesRef) b).max(Comparator.naturalOrder()).get()
85+
: str);
8386
assertThat(mvMin.get(i), equalTo(bytes));
8487
}
8588
}

server/src/test/java/org/elasticsearch/index/mapper/blockloader/docvalues/MvMinBytesRefsFromOrdsBlockLoaderTests.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.hamcrest.Matcher;
1717

1818
import java.io.IOException;
19+
import java.util.Comparator;
1920
import java.util.List;
2021

2122
import static org.hamcrest.Matchers.equalTo;
@@ -79,7 +80,9 @@ private void checkBlocks(TestBlock strings, TestBlock mvMin) {
7980
assertThat(mvMin.get(i), nullValue());
8081
continue;
8182
}
82-
BytesRef bytes = (BytesRef) (str instanceof List<?> l ? l.getFirst() : str);
83+
BytesRef bytes = (BytesRef) (str instanceof List<?> l
84+
? l.stream().map(b -> (BytesRef) b).min(Comparator.naturalOrder()).get()
85+
: str);
8386
assertThat(mvMin.get(i), equalTo(bytes));
8487
}
8588
}

0 commit comments

Comments
 (0)