Skip to content

Commit a6d7742

Browse files
committed
Return 0 instead of -1 for unknown/non-exposed ramBytesUsed()
The accountable interface specifies that such values are illegal Fixes #8239
1 parent 8aff3b6 commit a6d7742

7 files changed

+9
-9
lines changed

src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVAtomicFieldData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void close() {
6363

6464
@Override
6565
public long ramBytesUsed() {
66-
return -1; // unknown
66+
return 0; // unknown
6767
}
6868

6969
}

src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVNumericIndexFieldData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public SortedNumericDoubleValues getDoubleValues() {
8484

8585
};
8686
} else {
87-
return new AtomicLongFieldData(-1) {
87+
return new AtomicLongFieldData(0) {
8888

8989
@Override
9090
public SortedNumericDocValues getLongValues() {

src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVAtomicFieldData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ final class BytesBinaryDVAtomicFieldData implements AtomicFieldData {
4242

4343
@Override
4444
public long ramBytesUsed() {
45-
return -1; // not exposed by Lucene
45+
return 0; // not exposed by Lucene
4646
}
4747

4848
@Override

src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointBinaryDVAtomicFieldData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ final class GeoPointBinaryDVAtomicFieldData extends AbstractAtomicGeoPointFieldD
4343

4444
@Override
4545
public long ramBytesUsed() {
46-
return -1; // not exposed by Lucene
46+
return 0; // not exposed by Lucene
4747
}
4848

4949
@Override

src/main/java/org/elasticsearch/index/fielddata/plain/NumericDVIndexFieldData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public NumericDVIndexFieldData(Index index, Names fieldNames, FieldDataType fiel
4242
public AtomicLongFieldData load(AtomicReaderContext context) {
4343
final AtomicReader reader = context.reader();
4444
final String field = fieldNames.indexName();
45-
return new AtomicLongFieldData(-1) {
45+
return new AtomicLongFieldData(0) {
4646
@Override
4747
public SortedNumericDocValues getLongValues() {
4848
try {

src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericDVIndexFieldData.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ static final class SortedNumericLongFieldData extends AtomicLongFieldData {
103103
final String field;
104104

105105
SortedNumericLongFieldData(AtomicReader reader, String field) {
106-
super(-1L);
106+
super(0L);
107107
this.reader = reader;
108108
this.field = field;
109109
}
@@ -140,7 +140,7 @@ static final class SortedNumericFloatFieldData extends AtomicDoubleFieldData {
140140
final String field;
141141

142142
SortedNumericFloatFieldData(AtomicReader reader, String field) {
143-
super(-1L);
143+
super(0L);
144144
this.reader = reader;
145145
this.field = field;
146146
}
@@ -226,7 +226,7 @@ static final class SortedNumericDoubleFieldData extends AtomicDoubleFieldData {
226226
final String field;
227227

228228
SortedNumericDoubleFieldData(AtomicReader reader, String field) {
229-
super(-1L);
229+
super(0L);
230230
this.reader = reader;
231231
this.field = field;
232232
}

src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVBytesAtomicFieldData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void close() {
5656

5757
@Override
5858
public long ramBytesUsed() {
59-
return -1; // unknown
59+
return 0; // unknown
6060
}
6161

6262
}

0 commit comments

Comments
 (0)