You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2014/03/07 04:53:46 UTC
svn commit: r1575148 - in
/maven/indexer/branches/lucene-4.6/indexer-core/src:
main/java/org/apache/maven/index/context/
main/java/org/apache/maven/index/updater/
test/java/org/apache/maven/index/context/
Author: olamy
Date: Fri Mar 7 03:53:45 2014
New Revision: 1575148
URL: http://svn.apache.org/r1575148
Log:
Update API for Lucene 4
Modified:
maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/context/NexusIndexWriter.java
maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java
maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataWriter.java
maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/context/NexusAnalyzerTest.java
Modified: maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
URL: http://svn.apache.org/viewvc/maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java?rev=1575148&r1=1575147&r2=1575148&view=diff
==============================================================================
--- maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java (original)
+++ maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java Fri Mar 7 03:53:45 2014
@@ -335,13 +335,12 @@ public class DefaultIndexingContext
if ( names != null )
{
- IndexFileNameFilter filter = IndexFileNameFilter.getFilter();
- for ( int i = 0; i < names.length; i++ )
+ for (String name : names)
{
- if ( filter.accept( null, names[i] ) )
+ if (! (name.equals(INDEX_PACKER_PROPERTIES_FILE) || name.equals(INDEX_UPDATER_PROPERTIES_FILE) ))
{
- indexDirectory.deleteFile( names[i] );
+ indexDirectory.deleteFile(name);
}
}
}
Modified: maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/context/NexusIndexWriter.java
URL: http://svn.apache.org/viewvc/maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/context/NexusIndexWriter.java?rev=1575148&r1=1575147&r2=1575148&view=diff
==============================================================================
--- maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/context/NexusIndexWriter.java (original)
+++ maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/context/NexusIndexWriter.java Fri Mar 7 03:53:45 2014
@@ -58,7 +58,7 @@ public class NexusIndexWriter
public static IndexWriterConfig defaultConfig()
{
- final IndexWriterConfig config = new IndexWriterConfig( Version.LUCENE_36, new NexusAnalyzer() );
+ final IndexWriterConfig config = new IndexWriterConfig( Version.LUCENE_46, new NexusAnalyzer() );
// default open mode is CreateOrAppend which suits us
config.setRAMBufferSizeMB( 2.0 ); // old default
config.setMergeScheduler( new SerialMergeScheduler() ); // merging serially
Modified: maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java
URL: http://svn.apache.org/viewvc/maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java?rev=1575148&r1=1575147&r2=1575148&view=diff
==============================================================================
--- maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java (original)
+++ maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java Fri Mar 7 03:53:45 2014
@@ -44,11 +44,13 @@ import java.util.zip.ZipInputStream;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.CorruptIndexException;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
+import org.apache.lucene.store.IOContext;
import org.apache.lucene.store.IndexOutput;
import org.apache.lucene.store.LockObtainFailedException;
import org.apache.lucene.util.Bits;
@@ -312,7 +314,7 @@ public class DefaultIndexUpdater
continue;
}
- IndexOutput io = directory.createOutput( entry.getName() );
+ IndexOutput io = directory.createOutput( entry.getName(), IOContext.DEFAULT );
try
{
int n = 0;
@@ -372,7 +374,10 @@ public class DefaultIndexUpdater
try
{
// explicitly RW reader needed
- r = IndexReader.open( directory, false );
+ r = IndexReader.open( directory );
+
+ IndexWriter w = new IndexWriter(directory, NexusIndexWriter.defaultConfig());
+
Bits liveDocs = MultiFields.getLiveDocs(r);
int numDocs = r.maxDoc();
@@ -388,7 +393,8 @@ public class DefaultIndexUpdater
if ( !filter.accept( d ) )
{
- r.deleteDocument( i );
+ boolean success = w.tryDeleteDocument(r, i);
+ //FIXME handle deletion failure
}
}
}
Modified: maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataWriter.java
URL: http://svn.apache.org/viewvc/maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataWriter.java?rev=1575148&r1=1575147&r2=1575148&view=diff
==============================================================================
--- maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataWriter.java (original)
+++ maven/indexer/branches/lucene-4.6/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataWriter.java Fri Mar 7 03:53:45 2014
@@ -131,14 +131,14 @@ public class IndexDataWriter
throws IOException
{
{
- List<Field> allGroupsFields = new ArrayList<Field>( 2 );
+ List<IndexableField> allGroupsFields = new ArrayList<>( 2 );
allGroupsFields.add( new StringField( ArtifactInfo.ALL_GROUPS, ArtifactInfo.ALL_GROUPS_VALUE, Store.YES));
allGroupsFields.add( new StringField( ArtifactInfo.ALL_GROUPS_LIST, ArtifactInfo.lst2str( allGroups ), Store.YES) );
writeDocumentFields( allGroupsFields );
}
{
- List<Field> rootGroupsFields = new ArrayList<Field>( 2 );
+ List<IndexableField> rootGroupsFields = new ArrayList<>( 2 );
rootGroupsFields.add( new StringField( ArtifactInfo.ROOT_GROUPS, ArtifactInfo.ROOT_GROUPS_VALUE, Store.YES) );
rootGroupsFields.add( new StringField( ArtifactInfo.ROOT_GROUPS_LIST, ArtifactInfo.lst2str( rootGroups ), Store.YES ));
writeDocumentFields( rootGroupsFields );
@@ -186,9 +186,9 @@ public class IndexDataWriter
{
List<IndexableField> fields = document.getFields();
- List<Field> storedFields = new ArrayList<Field>( fields.size() );
+ List<IndexableField> storedFields = new ArrayList<>( fields.size() );
- for ( IndexableField field : fields )
+ for (IndexableField field : fields )
{
if ( DefaultIndexingContext.FLD_DESCRIPTOR.equals( field.name() ) )
{
@@ -237,18 +237,18 @@ public class IndexDataWriter
return true;
}
- public void writeDocumentFields( List<Field> fields )
+ public void writeDocumentFields( List<IndexableField> fields )
throws IOException
{
dos.writeInt( fields.size() );
- for ( Field field : fields )
+ for ( IndexableField field : fields )
{
writeField( field );
}
}
- public void writeField( Field field )
+ public void writeField( IndexableField field )
throws IOException
{
int flags = ( field.fieldType().indexed() ? F_INDEXED : 0 ) //
Modified: maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/context/NexusAnalyzerTest.java
URL: http://svn.apache.org/viewvc/maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/context/NexusAnalyzerTest.java?rev=1575148&r1=1575147&r2=1575148&view=diff
==============================================================================
--- maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/context/NexusAnalyzerTest.java (original)
+++ maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/context/NexusAnalyzerTest.java Fri Mar 7 03:53:45 2014
@@ -55,7 +55,7 @@ public class NexusAnalyzerTest
protected void runAndCompare( IndexerField indexerField, String text, String[] expected )
throws IOException
{
- Tokenizer ts = (Tokenizer) nexusAnalyzer.reusableTokenStream( indexerField.getKey(), new StringReader( text ) );
+ Tokenizer ts = (Tokenizer) nexusAnalyzer.createComponents(indexerField.getKey(), new StringReader( text ) ).getTokenizer();
ArrayList<String> tokenList = new ArrayList<String>();