-
Notifications
You must be signed in to change notification settings - Fork 608
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
SOLR-17097: Upgrade Solr to use Lucene 9.9.2 #2176
Changes from 3 commits
35ca6aa
59bf17a
1cb331b
5f948ce
7fb3b41
6e4c2ed
db8cc69
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -97,7 +97,7 @@ public static LeafReader wrap(IndexReader reader) throws IOException { | |
in = reader; | ||
in.registerParentReader(this); | ||
if (reader.leaves().isEmpty()) { | ||
metaData = new LeafMetaData(Version.LATEST.major, Version.LATEST, null); | ||
metaData = new LeafMetaData(Version.LATEST.major, Version.LATEST, null, false); | ||
} else { | ||
Version minVersion = Version.LATEST; | ||
for (LeafReaderContext leafReaderContext : reader.leaves()) { | ||
|
@@ -109,9 +109,10 @@ public static LeafReader wrap(IndexReader reader) throws IOException { | |
minVersion = leafVersion; | ||
} | ||
} | ||
int createdVersionMajor = | ||
reader.leaves().get(0).reader().getMetaData().getCreatedVersionMajor(); | ||
metaData = new LeafMetaData(createdVersionMajor, minVersion, null); | ||
LeafMetaData leafMetaData = reader.leaves().get(0).reader().getMetaData(); | ||
metaData = | ||
new LeafMetaData( | ||
leafMetaData.getCreatedVersionMajor(), minVersion, null, leafMetaData.hasBlocks()); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Out of curiosity, why don't we also specify the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. good point, we could specify There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
I wonder if this might be because we don't yet have 'full' index sorting directly configurable in Solr -- https://issues.apache.org/jira/browse/SOLR-13681 exists for that -- i.e. commonly the
My preference would be to not change the parameter setting as part of the Lucene upgrade but to perhaps leave a note on SOLR-13681 or have a separate issue for that change. |
||
} | ||
fieldInfos = FieldInfos.getMergedFieldInfos(in); | ||
} | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -247,9 +247,16 @@ public void testSyntax() throws Exception { | |
SchemaField foo_dt = h.getCore().getLatestSchema().getField("foo_dt"); | ||
String expected = "foo_dt:2013-09-11T00:00:00Z"; | ||
if (foo_dt.getType().isPointField()) { | ||
expected = "(foo_dt:[1378857600000 TO 1378857600000])"; | ||
expected = "foo_dt:[1378857600000 TO 1378857600000]"; | ||
if (foo_dt.hasDocValues() && foo_dt.indexed()) { | ||
expected = "IndexOrDocValuesQuery" + expected; | ||
expected = | ||
"IndexOrDocValuesQuery(IndexOrDocValuesQuery(indexQuery=" | ||
+ expected | ||
+ ", dvQuery=" | ||
+ expected | ||
+ "))"; | ||
} else { | ||
expected = "(" + expected + ")"; | ||
Comment on lines
-250
to
+259
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
} | ||
} | ||
assertJQ( | ||
|
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
24c8401b530308f9568eb7b408c2029c63f564c6 |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
147cb42a90a29501d9ca6094ea0db1d213f3076a |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
b034dd3a975763e083c7e11b5d0f7d516ab72590 |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
8d9bce1ea51db279878c51091dd9aefc7b335da4 |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
c405f2f7d0fc127d88dfbadd753469b2028fdf52 |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
884144fe62a87e9e86125f95d970dfa7890bc4bc |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
970e5775876c2d7e1b9af7421a4b17d96f63faf4 |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
2421e5238e9b8484929291744d709dd743c01da1 |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
a23e7de4cd9ae7af285c89dc1c55e0ac3f157fd3 |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
11c46007366bb037be7d271ab0a5849b1d544662 |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
63b7a9a80b09d6bed0e61771dbe85be93f3cdf28 |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
b7f000f2b96745eb33c148f3cbdb0bd74d55f4bb |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
55249fa9a0ed321adcf8283c6f3b649a6812b0a9 |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
1782a69d0e83af9cc3c65db0dcd2e7e7c1e5f90e |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
2f2785e17c5c823cc8f41a7ddb4647aaca8ee773 |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
30928513461bf79a5cb057e84da7d34a1e53227d |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
b9c8cc99632280148f92b4c0a64111c482d5d0ac |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
49f820b1b321860fa42a4f7583e8ed8f77b9c1c2 |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
db7c30217602dfcda394a4d0f0a9e68140d385a6 |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
d157547bd24edc8e9d9d59c273107dc3ac5fde5e |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
12d844fe224f6f97c510ac20d68903ed7f626f6c |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
272e588fd3d8c0a401b28a1ac715f27044bf62ec |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
e066432e7ab02b2a4914f989bcd8c44adbf340ad |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
fa54c9b962778e28ebc0efb9f75297781350361a |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
9554de5b22ae7483b344b94a9a956960b7a5d49c |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
a7bb7d7c0bc9056f1f226e82754b9889366c394d |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ref: apache/lucene@2604381