You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2010/05/11 17:11:17 UTC
svn commit: r943142 - in /lucene/dev/trunk/lucene: ./ contrib/
contrib/highlighter/src/test/
contrib/instantiated/src/test/org/apache/lucene/store/instantiated/
src/java/org/apache/lucene/analysis/ src/java/org/apache/lucene/index/
src/java/org/apache/...
Author: mikemccand
Date: Tue May 11 15:11:16 2010
New Revision: 943142
URL: http://svn.apache.org/viewvc?rev=943142&view=rev
Log:
LUCENE-2329: fix bug in mem tracking caused in merging back from trunk; clean up some dead code
Modified:
lucene/dev/trunk/lucene/ (props changed)
lucene/dev/trunk/lucene/build.xml (props changed)
lucene/dev/trunk/lucene/contrib/ (props changed)
lucene/dev/trunk/lucene/contrib/CHANGES.txt (props changed)
lucene/dev/trunk/lucene/contrib/highlighter/src/test/ (props changed)
lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java (props changed)
lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java (props changed)
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ByteBlockPool.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IntBlockPool.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ParallelPostingsArray.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermsHashPerField.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermsHashPerThread.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java (props changed)
lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDateTools.java (props changed)
lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestNumberTools.java (props changed)
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed)
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestByteSlices.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java (props changed)
Propchange: lucene/dev/trunk/lucene/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 11 15:11:16 2010
@@ -1,3 +1,4 @@
+/lucene/dev/branches/branch_3x/lucene:943137
/lucene/java/branches/flex_1458:824912-931101
/lucene/java/branches/lucene_2_4:748824
/lucene/java/branches/lucene_2_9:817269-818600,829134,829881,831036,896850,909334
Propchange: lucene/dev/trunk/lucene/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 11 15:11:16 2010
@@ -1,3 +1,4 @@
+/lucene/dev/branches/branch_3x/lucene/build.xml:943137
/lucene/java/branches/flex_1458/build.xml:824912-931101
/lucene/java/branches/lucene_2_9/build.xml:909334
/lucene/java/trunk/build.xml:924483-924731,924781,925176-925462
Propchange: lucene/dev/trunk/lucene/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 11 15:11:16 2010
@@ -1,3 +1,4 @@
+/lucene/dev/branches/branch_3x/lucene/contrib:943137
/lucene/java/branches/flex_1458/contrib:824912-931101
/lucene/java/branches/lucene_2_4/contrib:748824
/lucene/java/branches/lucene_2_9/contrib:817269-818600,825998,829134,829816,829881,831036,896850,909334
Propchange: lucene/dev/trunk/lucene/contrib/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 11 15:11:16 2010
@@ -1,3 +1,4 @@
+/lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt:943137
/lucene/java/branches/flex_1458/contrib/CHANGES.txt:824912-931101
/lucene/java/branches/lucene_2_4/contrib/CHANGES.txt:748824
/lucene/java/branches/lucene_2_9/contrib/CHANGES.txt:817269-818600,825998,826775,829134,829816,829881,831036,896850
Propchange: lucene/dev/trunk/lucene/contrib/highlighter/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 11 15:11:16 2010
@@ -1,3 +1,4 @@
+/lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test:943137
/lucene/java/branches/flex_1458/contrib/highlighter/src/test:824912-931101
/lucene/java/branches/lucene_2_4/contrib/highlighter/src/test:748824
/lucene/java/branches/lucene_2_9/contrib/highlighter/src/test:817269-818600,825998,826775,829134,829816,829881,831036,896850,909334
Propchange: lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 11 15:11:16 2010
@@ -1,3 +1,4 @@
+/lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:943137
/lucene/java/branches/flex_1458/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:824912-931101
/lucene/java/branches/lucene_2_9/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:909334
/lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:924483-924731,924781,925176-925462
Propchange: lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 11 15:11:16 2010
@@ -1,3 +1,4 @@
+/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java:943137
/lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/Tokenizer.java:824912-931101
/lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/Tokenizer.java:909334
/lucene/java/trunk/src/java/org/apache/lucene/analysis/Tokenizer.java:924483-924731,924781,925176-925462
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ByteBlockPool.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ByteBlockPool.java?rev=943142&r1=943141&r2=943142&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ByteBlockPool.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ByteBlockPool.java Tue May 11 15:11:16 2010
@@ -44,7 +44,7 @@ final class ByteBlockPool {
abstract static class Allocator {
abstract void recycleByteBlocks(byte[][] blocks, int start, int end);
abstract void recycleByteBlocks(List<byte[]> blocks);
- abstract byte[] getByteBlock(boolean trackAllocations);
+ abstract byte[] getByteBlock();
}
public byte[][] buffers = new byte[10][];
@@ -55,12 +55,10 @@ final class ByteBlockPool {
public byte[] buffer; // Current head buffer
public int byteOffset = -DocumentsWriter.BYTE_BLOCK_SIZE; // Current head offset
- private final boolean trackAllocations;
private final Allocator allocator;
- public ByteBlockPool(Allocator allocator, boolean trackAllocations) {
+ public ByteBlockPool(Allocator allocator) {
this.allocator = allocator;
- this.trackAllocations = trackAllocations;
}
public void reset() {
@@ -93,7 +91,7 @@ final class ByteBlockPool {
System.arraycopy(buffers, 0, newBuffers, 0, buffers.length);
buffers = newBuffers;
}
- buffer = buffers[1+bufferUpto] = allocator.getByteBlock(trackAllocations);
+ buffer = buffers[1+bufferUpto] = allocator.getByteBlock();
bufferUpto++;
byteUpto = 0;
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java?rev=943142&r1=943141&r2=943142&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java Tue May 11 15:11:16 2010
@@ -196,7 +196,7 @@ final class DocumentsWriter {
*/
protected byte[] newBuffer(int size) {
assert size == PER_DOC_BLOCK_SIZE;
- return perDocAllocator.getByteBlock(false);
+ return perDocAllocator.getByteBlock();
}
/**
@@ -1300,18 +1300,12 @@ final class DocumentsWriter {
/* Allocate another byte[] from the shared pool */
@Override
- byte[] getByteBlock(boolean trackAllocations) {
+ byte[] getByteBlock() {
synchronized(DocumentsWriter.this) {
final int size = freeByteBlocks.size();
final byte[] b;
if (0 == size) {
b = new byte[blockSize];
- // Always record a block allocated, even if
- // trackAllocations is false. This is necessary
- // because this block will be shared between
- // things that don't track allocations (term
- // vectors) and things that do (freq/prox
- // postings).
numBytesUsed += blockSize;
} else
b = freeByteBlocks.remove(size-1);
@@ -1347,17 +1341,11 @@ final class DocumentsWriter {
private ArrayList<int[]> freeIntBlocks = new ArrayList<int[]>();
/* Allocate another int[] from the shared pool */
- synchronized int[] getIntBlock(boolean trackAllocations) {
+ synchronized int[] getIntBlock() {
final int size = freeIntBlocks.size();
final int[] b;
if (0 == size) {
b = new int[INT_BLOCK_SIZE];
- // Always record a block allocated, even if
- // trackAllocations is false. This is necessary
- // because this block will be shared between
- // things that don't track allocations (term
- // vectors) and things that do (freq/prox
- // postings).
numBytesUsed += INT_BLOCK_SIZE*INT_NUM_BYTE;
} else
b = freeIntBlocks.remove(size-1);
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IntBlockPool.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IntBlockPool.java?rev=943142&r1=943141&r2=943142&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IntBlockPool.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IntBlockPool.java Tue May 11 15:11:16 2010
@@ -28,11 +28,9 @@ final class IntBlockPool {
public int intOffset = -DocumentsWriter.INT_BLOCK_SIZE; // Current head offset
final private DocumentsWriter docWriter;
- final boolean trackAllocations;
- public IntBlockPool(DocumentsWriter docWriter, boolean trackAllocations) {
+ public IntBlockPool(DocumentsWriter docWriter) {
this.docWriter = docWriter;
- this.trackAllocations = trackAllocations;
}
public void reset() {
@@ -55,7 +53,7 @@ final class IntBlockPool {
System.arraycopy(buffers, 0, newBuffers, 0, buffers.length);
buffers = newBuffers;
}
- buffer = buffers[1+bufferUpto] = docWriter.getIntBlock(trackAllocations);
+ buffer = buffers[1+bufferUpto] = docWriter.getIntBlock();
bufferUpto++;
intUpto = 0;
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ParallelPostingsArray.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ParallelPostingsArray.java?rev=943142&r1=943141&r2=943142&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ParallelPostingsArray.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ParallelPostingsArray.java Tue May 11 15:11:16 2010
@@ -50,19 +50,6 @@ class ParallelPostingsArray {
return newArray;
}
- final ParallelPostingsArray shrink(int targetSize, boolean doCopy) {
- int shrinkSize = ArrayUtil.getShrinkSize(size, targetSize, bytesPerPosting());
- if (shrinkSize != size) {
- ParallelPostingsArray newArray = newInstance(targetSize);
- if (doCopy) {
- copyTo(newArray, targetSize);
- }
- return newArray;
- } else {
- return this;
- }
- }
-
void copyTo(ParallelPostingsArray toArray, int numToCopy) {
System.arraycopy(textStarts, 0, toArray.textStarts, 0, numToCopy);
System.arraycopy(intStarts, 0, toArray.intStarts, 0, numToCopy);
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermsHashPerField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermsHashPerField.java?rev=943142&r1=943141&r2=943142&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermsHashPerField.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermsHashPerField.java Tue May 11 15:11:16 2010
@@ -72,7 +72,6 @@ final class TermsHashPerField extends In
fieldState = docInverterPerField.fieldState;
this.consumer = perThread.consumer.addField(this, fieldInfo);
initPostingsArray();
- bytesUsed(postingsArray.size * postingsArray.bytesPerPosting());
streamCount = consumer.getStreamCount();
numPostingInt = 2*streamCount;
@@ -86,6 +85,7 @@ final class TermsHashPerField extends In
private void initPostingsArray() {
postingsArray = consumer.createPostingsArray(2);
+ bytesUsed(postingsArray.size * postingsArray.bytesPerPosting());
}
// sugar: just forwards to DW
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermsHashPerThread.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermsHashPerThread.java?rev=943142&r1=943141&r2=943142&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermsHashPerThread.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermsHashPerThread.java Tue May 11 15:11:16 2010
@@ -66,8 +66,8 @@ final class TermsHashPerThread extends I
this.termsHash = termsHash;
this.consumer = termsHash.consumer.addThread(this);
- intPool = new IntBlockPool(termsHash.docWriter, termsHash.trackAllocations);
- bytePool = new ByteBlockPool(termsHash.docWriter.byteBlockAllocator, termsHash.trackAllocations);
+ intPool = new IntBlockPool(termsHash.docWriter);
+ bytePool = new ByteBlockPool(termsHash.docWriter.byteBlockAllocator);
if (nextTermsHash != null) {
// We are primary
Propchange: lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 11 15:11:16 2010
@@ -1,3 +1,4 @@
+/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:943137
/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:824912-931101
/lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:909334
/lucene/java/trunk/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:924483-924731,924781,925176-925462
Propchange: lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDateTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 11 15:11:16 2010
@@ -1,3 +1,4 @@
+/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestDateTools.java:943137
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestDateTools.java:824912-931101
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestDateTools.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestDateTools.java:829134,829881,831036,896850,909334
Propchange: lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestNumberTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 11 15:11:16 2010
@@ -1,3 +1,4 @@
+/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestNumberTools.java:943137
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestNumberTools.java:824912-931101
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestNumberTools.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestNumberTools.java:829134,829881,831036,896850,909334
Propchange: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 11 15:11:16 2010
@@ -1,3 +1,4 @@
+/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:943137
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:824912-931101
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:829134,829881,831036,896850,909334
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestByteSlices.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestByteSlices.java?rev=943142&r1=943141&r2=943142&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestByteSlices.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestByteSlices.java Tue May 11 15:11:16 2010
@@ -27,7 +27,7 @@ public class TestByteSlices extends Luce
/* Allocate another byte[] from the shared pool */
@Override
- synchronized byte[] getByteBlock(boolean trackAllocations) {
+ synchronized byte[] getByteBlock() {
final int size = freeByteBlocks.size();
final byte[] b;
if (0 == size)
@@ -53,7 +53,7 @@ public class TestByteSlices extends Luce
}
public void testBasic() throws Throwable {
- ByteBlockPool pool = new ByteBlockPool(new ByteBlockAllocator(), false);
+ ByteBlockPool pool = new ByteBlockPool(new ByteBlockAllocator());
final int NUM_STREAM = 25;
Propchange: lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 11 15:11:16 2010
@@ -1,3 +1,4 @@
+/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java:943137
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestAttributeSource.java:824912-931101
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/util/TestAttributeSource.java:909334
/lucene/java/trunk/src/test/org/apache/lucene/util/TestAttributeSource.java:924483-924731,924781,925176-925462