Skip to content
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.

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

Update to Apache Lucene 9.4.0 #4661

Merged
merged 1 commit into from
Oct 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- Relax visibility of the HTTP_CHANNEL_KEY and HTTP_SERVER_CHANNEL_KEY to make it possible for the plugins to access associated Netty4HttpChannel / Netty4HttpServerChannel instance ([#4638](https://github.com/opensearch-project/OpenSearch/pull/4638))
- Load the deprecated master role in a dedicated method instead of in setAdditionalRoles() ([#4582](https://github.com/opensearch-project/OpenSearch/pull/4582))
- Add APIs (GET/PUT) to decommission awareness attribute ([#4261](https://github.com/opensearch-project/OpenSearch/pull/4261))
- Update to Apache Lucene 9.4.0 ([#4661](https://github.com/opensearch-project/OpenSearch/pull/4661))

### Deprecated

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/version.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
opensearch = 3.0.0
lucene = 9.4.0-snapshot-ddf0d0a
lucene = 9.4.0

bundled_jdk_vendor = adoptium
bundled_jdk = 17.0.4+8
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
19749e264805171009836cbedecc5494b13cd920

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
aa0f250558375922f3091820361156e514fe1842

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
32eb1ad367ab1289804aeed95ea7216711a7764d

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
63661714be65f882a921d281965b0779fd487b90

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1034d876551fc21f7835b456dab01db21b9a4af6

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f704ee4b14e2fe2622bb983f04b36a32df8fd4a7

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a95ff17b51da6b3da641fa4053e5ee9ea2ff5daf

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
13e1ae2c760d8c0d7990ffe3296e46d9d8e6f842

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-analysis-common-9.4.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
02fbd4e87241411fcf5d34e92a50bee46ab164dc

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-backward-codecs-9.4.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
259863dfd107645de6146b3c87b4ecee66a4d43d

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-core-9.4.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cca1116f813c0f0c63acfac4c952baf29d46d76b

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-grouping-9.4.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
51bec1d5acc8ecaf9f50e047d3f86d60c7a958f4

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-highlighter-9.4.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c8cf8c9308d8fb18a927c7ed267a14ace3990a5f

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-join-9.4.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
99b2d3c8e137a6853a2503456897d47d4f18974b

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-memory-9.4.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
881cb214e79da14de35cb0e8e6779d2722828a96

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-misc-9.4.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a126123e482e6bf2e7aea670d221a2a39d3277dc

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-queries-9.4.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fe74dbfe9dba9ee9ee2cb80f151fde97fb4efd12

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-queryparser-9.4.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
13f108a8572fcf0670c7df3ba8dbe1076d0e0dbe

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-sandbox-9.4.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e7a676a12ea50dcbf64564f4e4022f939f0a627d

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-spatial-extras-9.4.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
84d956d1cb1458c51967af1c4acadd2a1f92634d

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-spatial3d-9.4.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
76887ca708f23b13613e45fb9e307c548b22c6da

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-suggest-9.4.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
406c9c539f262449d3b1e57e7bc4302efeecaf6c
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import org.apache.lucene.index.SortedSetDocValues;
import org.apache.lucene.index.StoredFieldVisitor;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.VectorEncoding;
import org.apache.lucene.index.VectorSimilarityFunction;
import org.apache.lucene.index.VectorValues;
import org.apache.lucene.search.TopDocs;
Expand Down Expand Up @@ -84,6 +85,7 @@ public final class TranslogLeafReader extends LeafReader {
0,
0,
0,
VectorEncoding.FLOAT32,
VectorSimilarityFunction.EUCLIDEAN,
false
);
Expand All @@ -101,6 +103,7 @@ public final class TranslogLeafReader extends LeafReader {
0,
0,
0,
VectorEncoding.FLOAT32,
VectorSimilarityFunction.EUCLIDEAN,
false
);
Expand All @@ -118,6 +121,7 @@ public final class TranslogLeafReader extends LeafReader {
0,
0,
0,
VectorEncoding.FLOAT32,
VectorSimilarityFunction.EUCLIDEAN,
false
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,13 @@ public FieldComparator<?> newComparator(String fieldname, int numHits, boolean e
final boolean sortMissingLast = sortMissingLast(missingValue) ^ reversed;
final BytesRef missingBytes = (BytesRef) missingObject(missingValue, reversed);
if (indexFieldData instanceof IndexOrdinalsFieldData) {
FieldComparator<?> cmp = new TermOrdValComparator(numHits, indexFieldData.getFieldName(), sortMissingLast, reversed) {
FieldComparator<?> cmp = new TermOrdValComparator(
numHits,
indexFieldData.getFieldName(),
sortMissingLast,
reversed,
enableSkipping
) {

@Override
protected SortedDocValues getSortedDocValues(LeafReaderContext context, String field) throws IOException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import org.apache.lucene.index.IndexableFieldType;
import org.apache.lucene.index.StoredFieldVisitor;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.VectorEncoding;
import org.apache.lucene.index.VectorSimilarityFunction;
import org.opensearch.OpenSearchException;
import org.opensearch.common.Nullable;
Expand Down Expand Up @@ -326,6 +327,7 @@ private GetResult innerGetLoadFromStoredFields(
0,
0,
0,
VectorEncoding.FLOAT32,
VectorSimilarityFunction.EUCLIDEAN,
false
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.apache.lucene.index.IndexOptions;
import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.StoredFieldVisitor;
import org.apache.lucene.index.VectorEncoding;
import org.apache.lucene.index.VectorSimilarityFunction;
import org.opensearch.index.mapper.MappedFieldType;
import org.opensearch.index.mapper.MapperService;
Expand Down Expand Up @@ -81,6 +82,7 @@ public void setUp() throws Exception {
0,
0,
0,
VectorEncoding.FLOAT32,
VectorSimilarityFunction.EUCLIDEAN,
false
);
Expand Down