From 5fbd4a12a0f4e8e4f314b1ae60dff9a776be62d5 Mon Sep 17 00:00:00 2001 From: Shay Banon Date: Fri, 12 Apr 2013 08:38:52 -0700 Subject: [PATCH] fix memory computation for int field data --- .../index/fielddata/plain/IntArrayAtomicFieldData.java | 4 ++-- .../index/fielddata/plain/LongArrayAtomicFieldData.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/IntArrayAtomicFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/IntArrayAtomicFieldData.java index d9ff0570f48..9a3337154f8 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/plain/IntArrayAtomicFieldData.java +++ b/src/main/java/org/elasticsearch/index/fielddata/plain/IntArrayAtomicFieldData.java @@ -188,7 +188,7 @@ public abstract class IntArrayAtomicFieldData extends AtomicNumericFieldData { @Override public long getMemorySizeInBytes() { if (size == -1) { - size = RamUsage.NUM_BYTES_ARRAY_HEADER + (values.length * RamUsage.NUM_BYTES_DOUBLE) + (set.getBits().length * RamUsage.NUM_BYTES_LONG); + size = RamUsage.NUM_BYTES_ARRAY_HEADER + (values.length * RamUsage.NUM_BYTES_INT) + (set.getBits().length * RamUsage.NUM_BYTES_LONG); } return size; } @@ -275,7 +275,7 @@ public abstract class IntArrayAtomicFieldData extends AtomicNumericFieldData { @Override public long getMemorySizeInBytes() { if (size == -1) { - size = RamUsage.NUM_BYTES_ARRAY_HEADER + (values.length * RamUsage.NUM_BYTES_DOUBLE); + size = RamUsage.NUM_BYTES_ARRAY_HEADER + (values.length * RamUsage.NUM_BYTES_INT); } return size; } diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/LongArrayAtomicFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/LongArrayAtomicFieldData.java index 869914f6c19..950c5ed5426 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/plain/LongArrayAtomicFieldData.java +++ b/src/main/java/org/elasticsearch/index/fielddata/plain/LongArrayAtomicFieldData.java @@ -114,7 +114,7 @@ public abstract class LongArrayAtomicFieldData extends AtomicNumericFieldData { @Override public long getMemorySizeInBytes() { if (size == -1) { - size = RamUsage.NUM_BYTES_INT/*size*/ + RamUsage.NUM_BYTES_INT/*numDocs*/ + +RamUsage.NUM_BYTES_ARRAY_HEADER + (values.length * RamUsage.NUM_BYTES_DOUBLE) + ordinals.getMemorySizeInBytes(); + size = RamUsage.NUM_BYTES_INT/*size*/ + RamUsage.NUM_BYTES_INT/*numDocs*/ + +RamUsage.NUM_BYTES_ARRAY_HEADER + (values.length * RamUsage.NUM_BYTES_LONG) + ordinals.getMemorySizeInBytes(); } return size; } @@ -275,7 +275,7 @@ public abstract class LongArrayAtomicFieldData extends AtomicNumericFieldData { @Override public long getMemorySizeInBytes() { if (size == -1) { - size = RamUsage.NUM_BYTES_ARRAY_HEADER + (values.length * RamUsage.NUM_BYTES_DOUBLE); + size = RamUsage.NUM_BYTES_ARRAY_HEADER + (values.length * RamUsage.NUM_BYTES_LONG); } return size; }