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/04 18:59:11 UTC
svn commit: r940952 - in /lucene/dev/branches/branch_3x/lucene: ./
backwards/src/ backwards/src/java/org/apache/lucene/search/
backwards/src/test/org/apache/lucene/analysis/
backwards/src/test/org/apache/lucene/document/
backwards/src/test/org/apache/l...
Author: mikemccand
Date: Tue May 4 16:59:10 2010
New Revision: 940952
URL: http://svn.apache.org/viewvc?rev=940952&view=rev
Log:
LUCENE-2329: merge rev 930201 from flex branch to 3x
Modified:
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/CHANGES.txt (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/ (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java (props changed)
lucene/dev/branches/branch_3x/lucene/build.xml (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/ParallelPostingsArray.java
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/TermVectorsTermsWriterPerField.java
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/TermsHashConsumerPerField.java
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/TermsHashPerField.java
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestDateTools.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestNumberTools.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java (props changed)
Propchange: lucene/dev/branches/branch_3x/lucene/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:59:10 2010
@@ -1,6 +1,6 @@
/lucene/dev/trunk:932749
/lucene/dev/trunk/lucene:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
-/lucene/java/branches/flex_1458:924791,924850
+/lucene/java/branches/flex_1458:924791,924850,930201
/lucene/java/branches/lucene_2_4:748824
/lucene/java/branches/lucene_2_9:817269-818600,825998,829134,829881,831036,896850,909334
/lucene/java/branches/lucene_2_9_back_compat_tests:818601-821336
Propchange: lucene/dev/branches/branch_3x/lucene/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:59:10 2010
@@ -1,4 +1,4 @@
/lucene/dev/trunk/lucene/CHANGES.txt:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
-/lucene/java/branches/flex_1458/CHANGES.txt:924791,924850
+/lucene/java/branches/flex_1458/CHANGES.txt:924791,924850,930201
/lucene/java/branches/lucene_2_9/CHANGES.txt:896850,909334
/lucene/java/trunk/CHANGES.txt:924483-925561
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:59:10 2010
@@ -1,3 +1,3 @@
/lucene/dev/trunk/lucene/backwards/src:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
-/lucene/java/branches/flex_1458/backwards/src:924850
+/lucene/java/branches/flex_1458/backwards/src:924850,930201
/lucene/java/trunk/backwards/src:924781
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:59:10 2010
@@ -1,5 +1,5 @@
/lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
-/lucene/java/branches/flex_1458/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:924791,924850
+/lucene/java/branches/flex_1458/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:748824
/lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:817269-818600,825998,829134,829881,831036
/lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:818601-821336
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:59:10 2010
@@ -1,5 +1,5 @@
/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
-/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:924791,924850
+/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:825998,829134,829881,831036
/lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:880754,880793,880823,881216,881317,881376,881473,881549,881820,882467,882890,883076,883080,912383
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:59:10 2010
@@ -1,5 +1,5 @@
/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
-/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/document/TestDateTools.java:924791,924850
+/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/document/TestDateTools.java:924791,924850,930201
/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:825998,829134,829881,831036
/lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/TestDateTools.java:880754,880793,880823,881216,881317,881376,881473,881549,881820,882467,882890,883076,883080,912383
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:59:10 2010
@@ -1,5 +1,5 @@
/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
-/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/document/TestNumberTools.java:924791,924850
+/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/document/TestNumberTools.java:924791,924850,930201
/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:825998,829134,829881,831036
/lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/TestNumberTools.java:880754,880793,880823,881216,881317,881376,881473,881549,881820,882467,882890,883076,883080,912383
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:59:10 2010
@@ -1,5 +1,5 @@
/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
-/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:924791,924850
+/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:924791,924850,930201
/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:825998,829134,829881,831036
/lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:880754,880793,880823,881216,881317,881376,881473,881549,881820,882467,882890,883076,883080,912383
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:59:10 2010
@@ -1,5 +1,5 @@
/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
-/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java:924791,924850
+/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/util/TestAttributeSource.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/util/TestAttributeSource.java:817269-818600,825998,829134,829881,831036
/lucene/java/branches/lucene_2_9_back_compat_tests/src/test/org/apache/lucene/util/TestAttributeSource.java:818601-821336
Propchange: lucene/dev/branches/branch_3x/lucene/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:59:10 2010
@@ -1,5 +1,5 @@
/lucene/dev/trunk/build.xml:932749
/lucene/dev/trunk/lucene/build.xml:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
-/lucene/java/branches/flex_1458/build.xml:924791,924850
+/lucene/java/branches/flex_1458/build.xml:924791,924850,930201
/lucene/java/branches/lucene_2_9/build.xml:896850,909334
/lucene/java/trunk/build.xml:924483-925561
Propchange: lucene/dev/branches/branch_3x/lucene/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:59:10 2010
@@ -1,5 +1,5 @@
/lucene/dev/trunk/lucene/contrib:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
-/lucene/java/branches/flex_1458/contrib:924791,924850
+/lucene/java/branches/flex_1458/contrib:924791,924850,930201
/lucene/java/branches/lucene_2_4/contrib:748824
/lucene/java/branches/lucene_2_9/contrib:817269-818600,825998,829134,829816,829881,831036,896850,909334
/lucene/java/branches/lucene_2_9_back_compat_tests/contrib:818601-821336
Propchange: lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:59:10 2010
@@ -1,5 +1,5 @@
/lucene/dev/trunk/lucene/contrib/CHANGES.txt:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
-/lucene/java/branches/flex_1458/contrib/CHANGES.txt:924791,924850
+/lucene/java/branches/flex_1458/contrib/CHANGES.txt:924791,924850,930201
/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,909334
/lucene/java/branches/lucene_2_9_back_compat_tests/contrib/CHANGES.txt:818601-821336
Propchange: lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:59:10 2010
@@ -1,5 +1,5 @@
/lucene/dev/trunk/lucene/contrib/highlighter/src/test:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
-/lucene/java/branches/flex_1458/contrib/highlighter/src/test:924791,924850
+/lucene/java/branches/flex_1458/contrib/highlighter/src/test:924791,924850,930201
/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
/lucene/java/branches/lucene_2_9_back_compat_tests/contrib/highlighter/src/test:818601-821336
Propchange: lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:59:10 2010
@@ -1,4 +1,4 @@
/lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
-/lucene/java/branches/flex_1458/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:924791,924850
+/lucene/java/branches/flex_1458/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:924791,924850,930201
/lucene/java/branches/lucene_2_9/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:896850,909334
/lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:924483-925561
Propchange: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:59:10 2010
@@ -1,4 +1,4 @@
/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
-/lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/Tokenizer.java:924791,924850
+/lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/Tokenizer.java:924791,924850,930201
/lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/Tokenizer.java:896850,909334
/lucene/java/trunk/src/java/org/apache/lucene/analysis/Tokenizer.java:924483-925561
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java?rev=940952&r1=940951&r2=940952&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java Tue May 4 16:59:10 2010
@@ -282,7 +282,6 @@ final class DocumentsWriter {
// If we've allocated 5% over our RAM budget, we then
// free down to 95%
- private long freeTrigger = (long) (IndexWriterConfig.DEFAULT_RAM_BUFFER_SIZE_MB*1024*1024*1.05);
private long freeLevel = (long) (IndexWriterConfig.DEFAULT_RAM_BUFFER_SIZE_MB*1024*1024*0.95);
// Flush @ this number of docs. If ramBufferSize is
@@ -353,7 +352,6 @@ final class DocumentsWriter {
ramBufferSize = (long) (mb*1024*1024);
waitQueuePauseBytes = (long) (ramBufferSize*0.1);
waitQueueResumeBytes = (long) (ramBufferSize*0.05);
- freeTrigger = (long) (1.05 * ramBufferSize);
freeLevel = (long) (0.95 * ramBufferSize);
}
}
@@ -550,7 +548,6 @@ final class DocumentsWriter {
flushPending = false;
for(int i=0;i<threadStates.length;i++)
threadStates[i].doAfterFlush();
- numBytesUsed = 0;
}
// Returns true if an abort is in progress
@@ -630,7 +627,7 @@ final class DocumentsWriter {
if (infoStream != null) {
SegmentInfo si = new SegmentInfo(flushState.segmentName, flushState.numDocs, directory);
final long newSegmentSize = si.sizeInBytes();
- String message = " oldRAMSize=" + numBytesUsed +
+ String message = " ramUsed=" + nf.format(((double) numBytesUsed)/1024./1024.) + " MB" +
" newFlushedSize=" + newSegmentSize +
" docs/MB=" + nf.format(numDocsInRAM/(newSegmentSize/1024./1024.)) +
" new/old=" + nf.format(100.0*newSegmentSize/numBytesUsed) + "%";
@@ -1118,7 +1115,7 @@ final class DocumentsWriter {
}
synchronized boolean doBalanceRAM() {
- return ramBufferSize != IndexWriterConfig.DISABLE_AUTO_FLUSH && !bufferIsFull && (numBytesUsed+deletesInRAM.bytesUsed+deletesFlushed.bytesUsed >= ramBufferSize || numBytesAlloc >= freeTrigger);
+ return ramBufferSize != IndexWriterConfig.DISABLE_AUTO_FLUSH && !bufferIsFull && (numBytesUsed+deletesInRAM.bytesUsed+deletesFlushed.bytesUsed >= ramBufferSize);
}
/** Does the synchronized work to finish/flush the
@@ -1201,7 +1198,6 @@ final class DocumentsWriter {
return numBytesUsed + deletesInRAM.bytesUsed + deletesFlushed.bytesUsed;
}
- long numBytesAlloc;
long numBytesUsed;
NumberFormat nf = NumberFormat.getInstance();
@@ -1259,19 +1255,16 @@ final class DocumentsWriter {
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).
- numBytesAlloc += blockSize;
- b = new byte[blockSize];
+ numBytesUsed += blockSize;
} else
b = freeByteBlocks.remove(size-1);
- if (trackAllocations)
- numBytesUsed += blockSize;
- assert numBytesUsed <= numBytesAlloc;
return b;
}
}
@@ -1308,30 +1301,21 @@ final class DocumentsWriter {
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).
- numBytesAlloc += INT_BLOCK_SIZE*INT_NUM_BYTE;
- b = new int[INT_BLOCK_SIZE];
+ numBytesUsed += INT_BLOCK_SIZE*INT_NUM_BYTE;
} else
b = freeIntBlocks.remove(size-1);
- if (trackAllocations)
- numBytesUsed += INT_BLOCK_SIZE*INT_NUM_BYTE;
- assert numBytesUsed <= numBytesAlloc;
return b;
}
- synchronized void bytesAllocated(long numBytes) {
- numBytesAlloc += numBytes;
- assert numBytesUsed <= numBytesAlloc;
- }
-
synchronized void bytesUsed(long numBytes) {
numBytesUsed += numBytes;
- assert numBytesUsed <= numBytesAlloc;
}
/* Return int[]s to the pool */
@@ -1362,7 +1346,7 @@ final class DocumentsWriter {
final int size = freeCharBlocks.size();
final char[] c;
if (0 == size) {
- numBytesAlloc += CHAR_BLOCK_SIZE * CHAR_NUM_BYTE;
+ numBytesUsed += CHAR_BLOCK_SIZE * CHAR_NUM_BYTE;
c = new char[CHAR_BLOCK_SIZE];
} else
c = freeCharBlocks.remove(size-1);
@@ -1371,7 +1355,6 @@ final class DocumentsWriter {
// (currently only term vectors) uses its own char
// blocks.
numBytesUsed += CHAR_BLOCK_SIZE * CHAR_NUM_BYTE;
- assert numBytesUsed <= numBytesAlloc;
return c;
}
@@ -1400,24 +1383,19 @@ final class DocumentsWriter {
* pools to match the current docs. */
void balanceRAM() {
- // We flush when we've used our target usage
- final long flushTrigger = ramBufferSize;
-
final long deletesRAMUsed = deletesInRAM.bytesUsed+deletesFlushed.bytesUsed;
- if (numBytesAlloc+deletesRAMUsed > freeTrigger) {
+ if (numBytesUsed+deletesRAMUsed > ramBufferSize) {
if (infoStream != null)
message(" RAM: now balance allocations: usedMB=" + toMB(numBytesUsed) +
- " vs trigger=" + toMB(flushTrigger) +
- " allocMB=" + toMB(numBytesAlloc) +
+ " vs trigger=" + toMB(ramBufferSize) +
" deletesMB=" + toMB(deletesRAMUsed) +
- " vs trigger=" + toMB(freeTrigger) +
" byteBlockFree=" + toMB(byteBlockAllocator.freeByteBlocks.size()*BYTE_BLOCK_SIZE) +
" perDocFree=" + toMB(perDocAllocator.freeByteBlocks.size()*PER_DOC_BLOCK_SIZE) +
" charBlockFree=" + toMB(freeCharBlocks.size()*CHAR_BLOCK_SIZE*CHAR_NUM_BYTE));
- final long startBytesAlloc = numBytesAlloc + deletesRAMUsed;
+ final long startBytesUsed = numBytesUsed + deletesRAMUsed;
int iter = 0;
@@ -1427,7 +1405,7 @@ final class DocumentsWriter {
boolean any = true;
- while(numBytesAlloc+deletesRAMUsed > freeLevel) {
+ while(numBytesUsed+deletesRAMUsed > freeLevel) {
synchronized(this) {
if (0 == perDocAllocator.freeByteBlocks.size()
@@ -1436,37 +1414,36 @@ final class DocumentsWriter {
&& 0 == freeIntBlocks.size()
&& !any) {
// Nothing else to free -- must flush now.
- bufferIsFull = numBytesUsed+deletesRAMUsed > flushTrigger;
+ bufferIsFull = numBytesUsed+deletesRAMUsed > ramBufferSize;
if (infoStream != null) {
- if (numBytesUsed > flushTrigger)
+ if (numBytesUsed+deletesRAMUsed > ramBufferSize)
message(" nothing to free; now set bufferIsFull");
else
message(" nothing to free");
}
- assert numBytesUsed <= numBytesAlloc;
break;
}
if ((0 == iter % 5) && byteBlockAllocator.freeByteBlocks.size() > 0) {
byteBlockAllocator.freeByteBlocks.remove(byteBlockAllocator.freeByteBlocks.size()-1);
- numBytesAlloc -= BYTE_BLOCK_SIZE;
+ numBytesUsed -= BYTE_BLOCK_SIZE;
}
if ((1 == iter % 5) && freeCharBlocks.size() > 0) {
freeCharBlocks.remove(freeCharBlocks.size()-1);
- numBytesAlloc -= CHAR_BLOCK_SIZE * CHAR_NUM_BYTE;
+ numBytesUsed -= CHAR_BLOCK_SIZE * CHAR_NUM_BYTE;
}
if ((2 == iter % 5) && freeIntBlocks.size() > 0) {
freeIntBlocks.remove(freeIntBlocks.size()-1);
- numBytesAlloc -= INT_BLOCK_SIZE * INT_NUM_BYTE;
+ numBytesUsed -= INT_BLOCK_SIZE * INT_NUM_BYTE;
}
if ((3 == iter % 5) && perDocAllocator.freeByteBlocks.size() > 0) {
// Remove upwards of 32 blocks (each block is 1K)
for (int i = 0; i < 32; ++i) {
perDocAllocator.freeByteBlocks.remove(perDocAllocator.freeByteBlocks.size() - 1);
- numBytesAlloc -= PER_DOC_BLOCK_SIZE;
+ numBytesUsed -= PER_DOC_BLOCK_SIZE;
if (perDocAllocator.freeByteBlocks.size() == 0) {
break;
}
@@ -1482,26 +1459,7 @@ final class DocumentsWriter {
}
if (infoStream != null)
- message(" after free: freedMB=" + nf.format((startBytesAlloc-numBytesAlloc-deletesRAMUsed)/1024./1024.) + " usedMB=" + nf.format((numBytesUsed+deletesRAMUsed)/1024./1024.) + " allocMB=" + nf.format(numBytesAlloc/1024./1024.));
-
- } else {
- // If we have not crossed the 100% mark, but have
- // crossed the 95% mark of RAM we are actually
- // using, go ahead and flush. This prevents
- // over-allocating and then freeing, with every
- // flush.
- synchronized(this) {
-
- if (numBytesUsed+deletesRAMUsed > flushTrigger) {
- if (infoStream != null)
- message(" RAM: now flush @ usedMB=" + nf.format(numBytesUsed/1024./1024.) +
- " allocMB=" + nf.format(numBytesAlloc/1024./1024.) +
- " deletesMB=" + nf.format(deletesRAMUsed/1024./1024.) +
- " triggerMB=" + nf.format(flushTrigger/1024./1024.));
-
- bufferIsFull = true;
- }
- }
+ message(" after free: freedMB=" + nf.format((startBytesUsed-numBytesUsed-deletesRAMUsed)/1024./1024.) + " usedMB=" + nf.format((numBytesUsed+deletesRAMUsed)/1024./1024.));
}
}
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java?rev=940952&r1=940951&r2=940952&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java Tue May 4 16:59:10 2010
@@ -185,27 +185,28 @@ final class FreqProxTermsWriterPerField
int lastDocIDs[]; // Last docID where this term occurred
int lastDocCodes[]; // Code for prior doc
int lastPositions[]; // Last position where this term occurred
-
+
@Override
- ParallelPostingsArray resize(int newSize) {
- FreqProxPostingsArray newArray = new FreqProxPostingsArray(newSize);
- copy(this, newArray);
- return newArray;
+ ParallelPostingsArray newInstance(int size) {
+ return new FreqProxPostingsArray(size);
}
-
- void copy(FreqProxPostingsArray fromArray, FreqProxPostingsArray toArray) {
- super.copy(fromArray, toArray);
- System.arraycopy(fromArray.docFreqs, 0, toArray.docFreqs, 0, fromArray.docFreqs.length);
- System.arraycopy(fromArray.lastDocIDs, 0, toArray.lastDocIDs, 0, fromArray.lastDocIDs.length);
- System.arraycopy(fromArray.lastDocCodes, 0, toArray.lastDocCodes, 0, fromArray.lastDocCodes.length);
- System.arraycopy(fromArray.lastPositions, 0, toArray.lastPositions, 0, fromArray.lastPositions.length);
+
+ void copyTo(ParallelPostingsArray toArray, int numToCopy) {
+ assert toArray instanceof FreqProxPostingsArray;
+ FreqProxPostingsArray to = (FreqProxPostingsArray) toArray;
+
+ super.copyTo(toArray, numToCopy);
+
+ System.arraycopy(docFreqs, 0, to.docFreqs, 0, numToCopy);
+ System.arraycopy(lastDocIDs, 0, to.lastDocIDs, 0, numToCopy);
+ System.arraycopy(lastDocCodes, 0, to.lastDocCodes, 0, numToCopy);
+ System.arraycopy(lastPositions, 0, to.lastPositions, 0, numToCopy);
+ }
+
+ @Override
+ int bytesPerPosting() {
+ return ParallelPostingsArray.BYTES_PER_POSTING + 4 * DocumentsWriter.INT_NUM_BYTE;
}
-
- }
-
- @Override
- int bytesPerPosting() {
- return ParallelPostingsArray.BYTES_PER_POSTING + 4 * DocumentsWriter.INT_NUM_BYTE;
}
public void abort() {}
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/ParallelPostingsArray.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/ParallelPostingsArray.java?rev=940952&r1=940951&r2=940952&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/ParallelPostingsArray.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/ParallelPostingsArray.java Tue May 4 16:59:10 2010
@@ -1,5 +1,7 @@
package org.apache.lucene.index;
+import org.apache.lucene.util.ArrayUtil;
+
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -21,25 +23,49 @@ package org.apache.lucene.index;
class ParallelPostingsArray {
final static int BYTES_PER_POSTING = 3 * DocumentsWriter.INT_NUM_BYTE;
+ final int size;
final int[] textStarts;
final int[] intStarts;
final int[] byteStarts;
-
- public ParallelPostingsArray(final int size) {
+
+ ParallelPostingsArray(final int size) {
+ this.size = size;
textStarts = new int[size];
intStarts = new int[size];
byteStarts = new int[size];
}
-
- ParallelPostingsArray resize(int newSize) {
- ParallelPostingsArray newArray = new ParallelPostingsArray(newSize);
- copy(this, newArray);
+
+ int bytesPerPosting() {
+ return BYTES_PER_POSTING;
+ }
+
+ ParallelPostingsArray newInstance(int size) {
+ return new ParallelPostingsArray(size);
+ }
+
+ final ParallelPostingsArray grow() {
+ int newSize = ArrayUtil.oversize(size + 1, bytesPerPosting());
+ ParallelPostingsArray newArray = newInstance(newSize);
+ copyTo(newArray, size);
return newArray;
}
-
- void copy(ParallelPostingsArray fromArray, ParallelPostingsArray toArray) {
- System.arraycopy(fromArray.textStarts, 0, toArray.textStarts, 0, fromArray.textStarts.length);
- System.arraycopy(fromArray.intStarts, 0, toArray.intStarts, 0, fromArray.intStarts.length);
- System.arraycopy(fromArray.byteStarts, 0, toArray.byteStarts, 0, fromArray.byteStarts.length);
+
+ 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);
+ System.arraycopy(byteStarts, 0, toArray.byteStarts, 0, numToCopy);
}
}
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/TermVectorsTermsWriterPerField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/TermVectorsTermsWriterPerField.java?rev=940952&r1=940951&r2=940952&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/TermVectorsTermsWriterPerField.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/TermVectorsTermsWriterPerField.java Tue May 4 16:59:10 2010
@@ -275,23 +275,25 @@ final class TermVectorsTermsWriterPerFie
int[] lastOffsets; // Last offset we saw
int[] lastPositions; // Last position where this term occurred
+ ParallelPostingsArray newInstance(int size) {
+ return new TermVectorsPostingsArray(size);
+ }
+
@Override
- ParallelPostingsArray resize(int newSize) {
- TermVectorsPostingsArray newArray = new TermVectorsPostingsArray(newSize);
- copy(this, newArray);
- return newArray;
+ void copyTo(ParallelPostingsArray toArray, int numToCopy) {
+ assert toArray instanceof TermVectorsPostingsArray;
+ TermVectorsPostingsArray to = (TermVectorsPostingsArray) toArray;
+
+ super.copyTo(toArray, numToCopy);
+
+ System.arraycopy(freqs, 0, to.freqs, 0, size);
+ System.arraycopy(lastOffsets, 0, to.lastOffsets, 0, size);
+ System.arraycopy(lastPositions, 0, to.lastPositions, 0, size);
}
-
- void copy(TermVectorsPostingsArray fromArray, TermVectorsPostingsArray toArray) {
- super.copy(fromArray, toArray);
- System.arraycopy(fromArray.freqs, 0, toArray.freqs, 0, fromArray.freqs.length);
- System.arraycopy(fromArray.lastOffsets, 0, toArray.lastOffsets, 0, fromArray.lastOffsets.length);
- System.arraycopy(fromArray.lastPositions, 0, toArray.lastPositions, 0, fromArray.lastPositions.length);
+
+ @Override
+ int bytesPerPosting() {
+ return super.bytesPerPosting() + 3 * DocumentsWriter.INT_NUM_BYTE;
}
}
-
- @Override
- int bytesPerPosting() {
- return ParallelPostingsArray.BYTES_PER_POSTING + 3 * DocumentsWriter.INT_NUM_BYTE;
- }
}
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/TermsHashConsumerPerField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/TermsHashConsumerPerField.java?rev=940952&r1=940951&r2=940952&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/TermsHashConsumerPerField.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/TermsHashConsumerPerField.java Tue May 4 16:59:10 2010
@@ -34,8 +34,6 @@ abstract class TermsHashConsumerPerField
abstract void newTerm(int termID) throws IOException;
abstract void addTerm(int termID) throws IOException;
abstract int getStreamCount();
-
- abstract ParallelPostingsArray createPostingsArray(int size);
- abstract int bytesPerPosting();
+ abstract ParallelPostingsArray createPostingsArray(int size);
}
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/TermsHashPerField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/TermsHashPerField.java?rev=940952&r1=940951&r2=940952&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/TermsHashPerField.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/TermsHashPerField.java Tue May 4 16:59:10 2010
@@ -23,6 +23,7 @@ import java.util.Arrays;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.document.Fieldable;
import org.apache.lucene.util.UnicodeUtil;
+import org.apache.lucene.util.RamUsageEstimator;
final class TermsHashPerField extends InvertedDocConsumerPerField {
@@ -53,18 +54,23 @@ final class TermsHashPerField extends In
ParallelPostingsArray postingsArray;
- private final int bytesPerPosting;
-
public TermsHashPerField(DocInverterPerField docInverterPerField, final TermsHashPerThread perThread, final TermsHashPerThread nextPerThread, final FieldInfo fieldInfo) {
this.perThread = perThread;
intPool = perThread.intPool;
charPool = perThread.charPool;
bytePool = perThread.bytePool;
docState = perThread.docState;
+
postingsHash = new int[postingsHashSize];
Arrays.fill(postingsHash, -1);
+ bytesUsed(postingsHashSize * RamUsageEstimator.NUM_BYTES_INT);
+
fieldState = docInverterPerField.fieldState;
this.consumer = perThread.consumer.addField(this, fieldInfo);
+
+ postingsArray = consumer.createPostingsArray(postingsHashSize/2);
+ bytesUsed(postingsArray.size * postingsArray.bytesPerPosting());
+
streamCount = consumer.getStreamCount();
numPostingInt = 2*streamCount;
this.fieldInfo = fieldInfo;
@@ -72,23 +78,15 @@ final class TermsHashPerField extends In
nextPerField = (TermsHashPerField) nextPerThread.addField(docInverterPerField, fieldInfo);
else
nextPerField = null;
-
- // +3: Posting is referenced by hash, which
- // targets 25-50% fill factor; approximate this
- // as 3X # pointers
- bytesPerPosting = consumer.bytesPerPosting() + 3*DocumentsWriter.INT_NUM_BYTE;
}
-
- void initPostingsArray() {
- assert postingsArray == null;
- postingsArray = consumer.createPostingsArray(postingsHashSize);
-
+ // sugar: just forwards to DW
+ private void bytesUsed(long size) {
if (perThread.termsHash.trackAllocations) {
- perThread.termsHash.docWriter.bytesAllocated(bytesPerPosting * postingsHashSize);
+ perThread.termsHash.docWriter.bytesUsed(size);
}
}
-
+
void shrinkHash(int targetSize) {
assert postingsCompacted || numPostings == 0;
@@ -100,13 +98,20 @@ final class TermsHashPerField extends In
}
if (newSize != postingsHash.length) {
+ final long previousSize = postingsHash.length;
postingsHash = new int[newSize];
+ bytesUsed((newSize-previousSize)*RamUsageEstimator.NUM_BYTES_INT);
Arrays.fill(postingsHash, -1);
- postingsArray = null;
postingsHashSize = newSize;
postingsHashHalfSize = newSize/2;
postingsHashMask = newSize-1;
}
+
+ if (postingsArray != null) {
+ final int startSize = postingsArray.size;
+ postingsArray = postingsArray.shrink(targetSize, false);
+ bytesUsed(postingsArray.bytesPerPosting() * (postingsArray.size - startSize));
+ }
}
public void reset() {
@@ -129,14 +134,10 @@ final class TermsHashPerField extends In
nextPerField.abort();
}
- private void growParallelPostingsArray() {
- int oldSize = postingsArray.byteStarts.length;
- int newSize = (int) (oldSize * 1.5);
- this.postingsArray = this.postingsArray.resize(newSize);
-
- if (perThread.termsHash.trackAllocations) {
- perThread.termsHash.docWriter.bytesAllocated(bytesPerPosting * (newSize - oldSize));
- }
+ private final void growParallelPostingsArray() {
+ int oldSize = postingsArray.size;
+ this.postingsArray = this.postingsArray.grow();
+ bytesUsed(postingsArray.bytesPerPosting() * (postingsArray.size - oldSize));
}
public void initReader(ByteSliceReader reader, int termID, int stream) {
@@ -288,9 +289,6 @@ final class TermsHashPerField extends In
@Override
void start(Fieldable f) {
- if (postingsArray == null) {
- initPostingsArray();
- }
termAtt = fieldState.attributeSource.addAttribute(CharTermAttribute.class);
consumer.start(f);
if (nextPerField != null) {
@@ -337,12 +335,9 @@ final class TermsHashPerField extends In
// New posting
termID = numPostings++;
- if (termID >= postingsArray.textStarts.length) {
+ if (termID >= postingsArray.size) {
growParallelPostingsArray();
}
- if (perThread.termsHash.trackAllocations) {
- perThread.termsHash.docWriter.bytesUsed(bytesPerPosting);
- }
assert termID >= 0;
@@ -468,12 +463,9 @@ final class TermsHashPerField extends In
// New posting
termID = numPostings++;
- if (termID >= postingsArray.textStarts.length) {
+ if (termID >= postingsArray.size) {
growParallelPostingsArray();
}
- if (perThread.termsHash.trackAllocations) {
- perThread.termsHash.docWriter.bytesUsed(bytesPerPosting);
- }
assert termID != -1;
@@ -487,8 +479,10 @@ final class TermsHashPerField extends In
assert postingsHash[hashPos] == -1;
postingsHash[hashPos] = termID;
- if (numPostings == postingsHashHalfSize)
+ if (numPostings == postingsHashHalfSize) {
rehashPostings(2*postingsHashSize);
+ bytesUsed(2*numPostings * RamUsageEstimator.NUM_BYTES_INT);
+ }
// Init stream slices
if (numPostingInt + intPool.intUpto > DocumentsWriter.INT_BLOCK_SIZE)
@@ -508,7 +502,7 @@ final class TermsHashPerField extends In
intUptos[intUptoStart+i] = upto + bytePool.byteOffset;
}
postingsArray.byteStarts[termID] = intUptos[intUptoStart];
-
+
consumer.newTerm(termID);
} else {
@@ -603,6 +597,7 @@ final class TermsHashPerField extends In
postingsHashMask = newMask;
postingsHash = newHash;
+
postingsHashSize = newSize;
postingsHashHalfSize = newSize >> 1;
}
Propchange: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:59:10 2010
@@ -1,4 +1,4 @@
/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
-/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:924791,924850
+/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:924791,924850,930201
/lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:896850,909334
/lucene/java/trunk/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:924483-925561
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:59:10 2010
@@ -1,5 +1,5 @@
/lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
-/lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:924791,924850
+/lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:825998,829134,829881,831036,896850,909334
/lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:880793,896906
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestDateTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:59:10 2010
@@ -1,5 +1,5 @@
/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDateTools.java:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
-/lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestDateTools.java:924791,924850
+/lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestDateTools.java:924791,924850,930201
/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:825998,829134,829881,831036,896850,909334
/lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/TestDateTools.java:880793,896906
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestNumberTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:59:10 2010
@@ -1,5 +1,5 @@
/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestNumberTools.java:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
-/lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestNumberTools.java:924791,924850
+/lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestNumberTools.java:924791,924850,930201
/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:825998,829134,829881,831036,896850,909334
/lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/TestNumberTools.java:880793,896906
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:59:10 2010
@@ -1,5 +1,5 @@
/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
-/lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:924791,924850
+/lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:924791,924850,930201
/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:825998,829134,829881,831036,896850,909334
/lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:880793,896906
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:59:10 2010
@@ -1,4 +1,4 @@
/lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
-/lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestAttributeSource.java:924791,924850
+/lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestAttributeSource.java:924791,924850,930201
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/util/TestAttributeSource.java:896850,909334
/lucene/java/trunk/src/test/org/apache/lucene/util/TestAttributeSource.java:924483-925561