bruno-roustant commented on code in PR #13327:
URL: https://github.com/apache/lucene/pull/13327#discussion_r1585022423
##########
lucene/core/src/java/org/apache/lucene/index/FieldInfos.java:
##########
@@ -156,15 +139,17 @@ public FieldInfos(FieldInfo[] infos) {
this.softDeletesField = softDeletesField;
this.parentField = parentField;
- List<FieldInfo> valuesTemp = new ArrayList<>(infos.length);
- byNumber = new FieldInfo[size];
- for (int i = 0; i < size; i++) {
- byNumber[i] = byNumberTemp[i];
- if (byNumberTemp[i] != null) {
- valuesTemp.add(byNumberTemp[i]);
- }
- }
- values = Collections.unmodifiableCollection(valuesTemp);
+ FieldInfo[] sortedFieldInfos = ArrayUtil.copyOfSubArray(infos, 0,
infos.length);
+ Arrays.sort(sortedFieldInfos, (fi1, fi2) -> Integer.compare(fi1.number,
fi2.number));
+ int maxFieldNumber = infos.length == 0 ? -1 :
sortedFieldInfos[infos.length - 1].number;
+ // If there are many fields and the max field number is greater than twice
the number
+ // of fields, then a map structure is more compact to store the by-number
mapping.
+ byNumber =
+ maxFieldNumber >= 2 * infos.length && maxFieldNumber >= 32
+ ? new MapFieldInfoByNumber(infos)
+ : new ArrayFieldInfoByNumber(infos, maxFieldNumber);
+ // The iteration of FieldInfo is ordered by ascending field number.
+ values =
Collections.unmodifiableCollection(Arrays.asList(sortedFieldInfos));
Review Comment:
List.of() makes a copy as it considers the input as an "untrusted array".
Here we don't copy, just wrap. Actually we could keep just
Arrays.asList(sortedFieldInfos) since we own it privately, so we know we don't
modify it (only iterator()).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
