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.

Sign up for GitHub

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

Fixes failing test case for TestOrdinalMap.testRamBytesUsed #13421

Merged
merged 4 commits into from
May 28, 2024
Merged

Fixes failing test case for TestOrdinalMap.testRamBytesUsed #13421

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7063ca3
Skip accumulation for PackedInts.NullReader for default instance
pseudo-nymous May 26, 2024
7036b97
Added to the change list
pseudo-nymous May 26, 2024
956a505
Corrected change list info
pseudo-nymous May 26, 2024
b0b4656
Refactored code
pseudo-nymous May 27, 2024
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
2 changes: 2 additions & 0 deletions lucene/CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,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
---------------------

Expand Down
2 changes: 1 addition & 1 deletion lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ public String toString() {
/** A {@link Reader} which has all its values equal to 0 (bitsPerValue = 0). */
public static final class NullReader extends Reader {

private static final NullReader DEFAULT_PACKED_LONG_VALUES_PAGE_SIZE =
public static final NullReader DEFAULT_PACKED_LONG_VALUES_PAGE_SIZE =
new NullReader(PackedLongValues.DEFAULT_PAGE_SIZE);

private final int valueCount;
Expand Down
5 changes: 4 additions & 1 deletion lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
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;

public class TestOrdinalMap extends LuceneTestCase {

Expand All @@ -52,7 +53,9 @@ public long accumulateObject(
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.DEFAULT_PACKED_LONG_VALUES_PAGE_SIZE) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Can you replace this with PackedInts.NullReader.forCount(PackedLongValues.DEFAULT_PAGE_SIZE) and make DEFAULT_PACKED_LONG_VALUES_PAGE_SIZE private again?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. Thanks for quick review.

return 0L;
}
if (o instanceof OrdinalMap) {
Expand Down