You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2014/02/13 16:45:02 UTC
svn commit: r1567954 - in /lucene/dev/trunk/lucene: CHANGES.txt
core/src/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java
Author: shaie
Date: Thu Feb 13 15:45:02 2014
New Revision: 1567954
URL: http://svn.apache.org/r1567954
Log:
LUCENE-5443: DocValuesProducer.ramBytesUsed throws ConcurrentModificationException
Modified:
lucene/dev/trunk/lucene/CHANGES.txt
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1567954&r1=1567953&r2=1567954&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Thu Feb 13 15:45:02 2014
@@ -263,6 +263,9 @@ Bug fixes
loop. ReferenceManager now throws IllegalStateException if currently managed
resources ref count is 0. (Simon Willnauer)
+* LUCENE-5443: Lucene45DocValuesProducer.ramBytesUsed() may throw
+ ConcurrentModificationException. (Shai Erera, Simon Willnauer)
+
API Changes
* LUCENE-5339: The facet module was simplified/reworked to make the
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java?rev=1567954&r1=1567953&r2=1567954&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java Thu Feb 13 15:45:02 2014
@@ -31,6 +31,7 @@ import java.io.Closeable; // javadocs
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.atomic.AtomicLong;
import org.apache.lucene.codecs.CodecUtil;
import org.apache.lucene.codecs.DocValuesProducer;
@@ -53,6 +54,7 @@ import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LongValues;
+import org.apache.lucene.util.RamUsageEstimator;
import org.apache.lucene.util.packed.BlockPackedReader;
import org.apache.lucene.util.packed.MonotonicBlockPackedReader;
import org.apache.lucene.util.packed.PackedInts;
@@ -64,6 +66,7 @@ public class Lucene45DocValuesProducer e
private final Map<Integer,SortedSetEntry> sortedSets;
private final Map<Integer,NumericEntry> ords;
private final Map<Integer,NumericEntry> ordIndexes;
+ private final AtomicLong ramBytesUsed;
private final IndexInput data;
private final int maxDoc;
private final int version;
@@ -116,6 +119,8 @@ public class Lucene45DocValuesProducer e
IOUtils.closeWhileHandlingException(this.data);
}
}
+
+ ramBytesUsed = new AtomicLong(RamUsageEstimator.shallowSizeOfInstance(getClass()));
}
private void readSortedField(int fieldNumber, IndexInput meta, FieldInfos infos) throws IOException {
@@ -286,14 +291,7 @@ public class Lucene45DocValuesProducer e
@Override
public long ramBytesUsed() {
- long sizeInBytes = 0;
- for(MonotonicBlockPackedReader monotonicBlockPackedReader: addressInstances.values()) {
- sizeInBytes += Integer.SIZE + monotonicBlockPackedReader.ramBytesUsed();
- }
- for(MonotonicBlockPackedReader monotonicBlockPackedReader: ordIndexInstances.values()) {
- sizeInBytes += Integer.SIZE + monotonicBlockPackedReader.ramBytesUsed();
- }
- return sizeInBytes;
+ return ramBytesUsed.get();
}
LongValues getNumeric(NumericEntry entry) throws IOException {
@@ -377,6 +375,7 @@ public class Lucene45DocValuesProducer e
data.seek(bytes.addressesOffset);
addrInstance = new MonotonicBlockPackedReader(data, bytes.packedIntsVersion, bytes.blockSize, bytes.count, false);
addressInstances.put(field.number, addrInstance);
+ ramBytesUsed.addAndGet(addrInstance.ramBytesUsed() + RamUsageEstimator.NUM_BYTES_INT);
}
addresses = addrInstance;
}
@@ -427,6 +426,7 @@ public class Lucene45DocValuesProducer e
}
addrInstance = new MonotonicBlockPackedReader(data, bytes.packedIntsVersion, bytes.blockSize, size, false);
addressInstances.put(field.number, addrInstance);
+ ramBytesUsed.addAndGet(addrInstance.ramBytesUsed() + RamUsageEstimator.NUM_BYTES_INT);
}
addresses = addrInstance;
}
@@ -498,6 +498,7 @@ public class Lucene45DocValuesProducer e
data.seek(entry.offset);
ordIndexInstance = new MonotonicBlockPackedReader(data, entry.packedIntsVersion, entry.blockSize, entry.count, false);
ordIndexInstances.put(field.number, ordIndexInstance);
+ ramBytesUsed.addAndGet(ordIndexInstance.ramBytesUsed() + RamUsageEstimator.NUM_BYTES_INT);
}
ordIndex = ordIndexInstance;
}