honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed- PackedArrayIndexFieldData.chooseStorageFormat compared to Long.MAX_VALUE instead of Long.MIN_VALUE 

Also made the LongFieldDataTests.SINGLE_VALUED_SPARSE_RANDOM & LongFieldDataTests.MULTI_VALUED_SPARSE_RANDOM more sparse
This commit is contained in:
Boaz Leskes 2014-04-11 16:40:47 +02:00
parent 1d1ca3befc
commit f549472fea
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/elasticsearch/index/fielddata/plain/PackedArrayIndexFieldData.java
View File

@ -261,7 +261,7 @@ public class PackedArrayIndexFieldData extends AbstractIndexFieldData<AtomicNume
} }
if (pageIndex == pageSize - 1) { if (pageIndex == pageSize - 1) {
// end of page, we now know enough to estimate memory usage // end of page, we now know enough to estimate memory usage
if (pageMaxOrdinal == Long.MAX_VALUE) { if (pageMaxOrdinal == Long.MIN_VALUE) {
// empty page - will use the null reader which just stores size // empty page - will use the null reader which just stores size
pagedSingleValuesSize += RamUsageEstimator.alignObjectSize(RamUsageEstimator.NUM_BYTES_OBJECT_HEADER + RamUsageEstimator.NUM_BYTES_INT); pagedSingleValuesSize += RamUsageEstimator.alignObjectSize(RamUsageEstimator.NUM_BYTES_OBJECT_HEADER + RamUsageEstimator.NUM_BYTES_INT);
@ -288,7 +288,7 @@ public class PackedArrayIndexFieldData extends AbstractIndexFieldData<AtomicNume
if (pageIndex > 0) { if (pageIndex > 0) {
// last page estimation // last page estimation
pageIndex++; pageIndex++;
if (pageMaxOrdinal == Long.MAX_VALUE) { if (pageMaxOrdinal == Long.MIN_VALUE) {
// empty page - will use the null reader which just stores size // empty page - will use the null reader which just stores size
pagedSingleValuesSize += RamUsageEstimator.alignObjectSize(RamUsageEstimator.NUM_BYTES_OBJECT_HEADER + RamUsageEstimator.NUM_BYTES_INT); pagedSingleValuesSize += RamUsageEstimator.alignObjectSize(RamUsageEstimator.NUM_BYTES_OBJECT_HEADER + RamUsageEstimator.NUM_BYTES_INT);

4
src/test/java/org/elasticsearch/index/fielddata/LongFieldDataTests.java
View File

@ -281,7 +281,7 @@ public class LongFieldDataTests extends AbstractNumericFieldDataTests {
}, },
SINGLE_VALUED_SPARSE_RANDOM { SINGLE_VALUED_SPARSE_RANDOM {
public int numValues(Random r) { public int numValues(Random r) {
return r.nextFloat() < 0.1f ? 1 : 0; return r.nextFloat() < 0.01 ? 1 : 0;
} }
@Override @Override
@ -291,7 +291,7 @@ public class LongFieldDataTests extends AbstractNumericFieldDataTests {
}, },
MULTI_VALUED_SPARSE_RANDOM { MULTI_VALUED_SPARSE_RANDOM {
public int numValues(Random r) { public int numValues(Random r) {
return r.nextFloat() < 0.1f ? 1 + r.nextInt(5) : 0; return r.nextFloat() < 0.01f ? 1 + r.nextInt(5) : 0;
} }
@Override @Override