Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes failing test case for TestOrdinalMap.testRamBytesUsed (#13421)

This commit is contained in:
Amir Raza 2024-05-28 22:23:08 +05:30 committed by GitHub
parent 54d3ff64bc
commit ea0646d094
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lucene/CHANGES.txt
View File

@ -402,6 +402,8 @@ Bug Fixes
* GITHUB#13376: Fix integer overflow exception in postings encoding as group-varint. (Zhang Chao, Guo Feng)
* GITHUB#13421: Fixes TestOrdinalMap.testRamBytesUsed for multiple default PackedInts.NullReader instances. (Amir Raza)
Build
---------------------

2
lucene/core/src/java/org/apache/lucene/util/packed/PackedLongValues.java
View File

@ -29,7 +29,7 @@ public class PackedLongValues extends LongValues implements Accountable {
private static final long BASE_RAM_BYTES_USED =
RamUsageEstimator.shallowSizeOfInstance(PackedLongValues.class);
static final int DEFAULT_PAGE_SIZE = 256;
public static final int DEFAULT_PAGE_SIZE = 256;
static final int MIN_PAGE_SIZE = 64;
// More than 1M doesn't really makes sense with these appending buffers
// since their goal is to try to have small numbers of bits per value

6
lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java
View File

@ -30,6 +30,8 @@ import org.apache.lucene.tests.util.RamUsageTester;
import org.apache.lucene.tests.util.TestUtil;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LongValues;
import org.apache.lucene.util.packed.PackedInts;
import org.apache.lucene.util.packed.PackedLongValues;
public class TestOrdinalMap extends LuceneTestCase {
@ -52,7 +54,9 @@ public class TestOrdinalMap extends LuceneTestCase {
long shallowSize,
java.util.Map<Field, Object> fieldValues,
java.util.Collection<Object> queue) {
if (o == LongValues.ZEROES || o == LongValues.IDENTITY) {
if (o == LongValues.ZEROES
|| o == LongValues.IDENTITY
|| o == PackedInts.NullReader.forCount(PackedLongValues.DEFAULT_PAGE_SIZE)) {
return 0L;
}
if (o instanceof OrdinalMap) {