Skip to content

Commit

Permalink
Code cleanup in fulltext addon
Browse files Browse the repository at this point in the history
  • Loading branch information
@ragadeeshu
ragadeeshu committed Sep 12, 2017
1 parent 2c47c0c commit 1c504a2
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 66 deletions.
6 changes: 2 additions & 4 deletions community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/IndexWriterConfigs.java
View file
Expand Up @@ -110,10 +110,8 @@ public PostingsFormat getPostingsFormatForField( String field )

public static IndexWriterConfig population()
{
IndexWriterConfig writerConfig = standard();
writerConfig.setMaxBufferedDocs( POPULATION_MAX_BUFFERED_DOCS );
writerConfig.setRAMBufferSizeMB( POPULATION_RAM_BUFFER_SIZE_MB );
return writerConfig;
Analyzer analyzer = LuceneDataSource.KEYWORD_ANALYZER;
return population( analyzer );
}

public static IndexWriterConfig population( Analyzer analyzer )
Expand Down
24 changes: 15 additions & 9 deletions ...ise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextProvider.java
View file
Expand Up @@ -20,11 +20,11 @@
package org.neo4j.kernel.api.impl.fulltext;

import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

import org.neo4j.graphdb.GraphDatabaseService;
import org.neo4j.kernel.impl.logging.LogService;
Expand All @@ -37,23 +37,27 @@ public class FulltextProvider implements AutoCloseable
{
private static FulltextProvider instance;
private final GraphDatabaseService db;
private Log log;
private final Log log;
private final FulltextTransactionEventUpdater fulltextTransactionEventUpdater;
private final Set<String> nodeProperties;
private final Set<String> relationshipProperties;
private final Set<WritableFulltext> writableNodeIndices;
private final Set<WritableFulltext> writableRelationshipIndices;
private final Map<String,LuceneFulltext> nodeIndices;
private final Map<String,LuceneFulltext> relationshipIndices;
private boolean closed;
private Set<String> nodeProperties;
private Set<String> relationshipProperties;
private Map<String,LuceneFulltext> nodeIndices;
private Map<String,LuceneFulltext> relationshipIndices;

private FulltextProvider( GraphDatabaseService db, Log log )
{
this.db = db;
this.log = log;
closed = false;
fulltextTransactionEventUpdater = new FulltextTransactionEventUpdater( this );
fulltextTransactionEventUpdater = new FulltextTransactionEventUpdater( this, log );
db.registerTransactionEventHandler( fulltextTransactionEventUpdater );
nodeProperties = new HashSet<>();
relationshipProperties = new HashSet<>();
writableNodeIndices = new HashSet<>();
writableRelationshipIndices = new HashSet<>();
nodeIndices = new HashMap<>();
relationshipIndices = new HashMap<>();
}
Expand Down Expand Up @@ -114,11 +118,13 @@ synchronized void register( LuceneFulltext fulltextIndex ) throws IOException
if ( fulltextIndex.getType() == FulltextIndexType.NODES )
{
nodeIndices.put( fulltextIndex.getIdentifier(), fulltextIndex );
writableNodeIndices.add( new WritableFulltext( (fulltextIndex) ) );
nodeProperties.addAll( fulltextIndex.getProperties() );
}
else
{
relationshipIndices.put( fulltextIndex.getIdentifier(), fulltextIndex );
writableRelationshipIndices.add( new WritableFulltext( (fulltextIndex) ) );
relationshipProperties.addAll( fulltextIndex.getProperties() );
}
}
Expand All @@ -135,12 +141,12 @@ String[] getRelationshipProperties()

Set<WritableFulltext> writableNodeIndices()
{
return nodeIndices.values().stream().map( WritableFulltext::new ).collect( Collectors.toSet() );
return Collections.unmodifiableSet( writableNodeIndices );
}

Set<WritableFulltext> writableRelationshipIndices()
{
return relationshipIndices.values().stream().map( WritableFulltext::new ).collect( Collectors.toSet() );
return Collections.unmodifiableSet( writableRelationshipIndices );
}

/**
Expand Down
13 changes: 8 additions & 5 deletions ...don/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextTransactionEventUpdater.java
View file
Expand Up @@ -33,15 +33,18 @@
import org.neo4j.graphdb.event.PropertyEntry;
import org.neo4j.graphdb.event.TransactionData;
import org.neo4j.graphdb.event.TransactionEventHandler;
import org.neo4j.logging.Log;

class FulltextTransactionEventUpdater implements TransactionEventHandler<Object>
{

private FulltextProvider fulltextProvider;
private final FulltextProvider fulltextProvider;
private final Log log;

FulltextTransactionEventUpdater( FulltextProvider fulltextProvider )
FulltextTransactionEventUpdater( FulltextProvider fulltextProvider, Log log )
{
this.fulltextProvider = fulltextProvider;
this.log = log;
}

@Override
Expand Down Expand Up @@ -105,7 +108,7 @@ public void afterCommit( TransactionData data, Object state )
}
catch ( IOException e )
{
throw new RuntimeException( "Unable to update fulltext index", e );
log.error( "Unable to update fulltext index", e );
}
}

Expand All @@ -119,7 +122,7 @@ private <E extends Entity> void updatePropertyData( Map<Long,Map<String,Object>>
long entityId = stateEntry.getKey();
Map<String,Object> allProperties =
stateEntry.getValue().entrySet().stream().filter( entry -> indexedProperties.contains( entry.getKey() ) ).collect(
Collectors.toMap( entry -> entry.getKey(), entry -> entry.getValue() ) );
Collectors.toMap( Map.Entry::getKey, Map.Entry::getValue ) );
if ( !allProperties.isEmpty() )
{
Document document = LuceneFulltextDocumentStructure.documentRepresentingProperties( entityId, allProperties );
Expand Down Expand Up @@ -154,7 +157,7 @@ private void refreshIndex( WritableFulltext index )
}
catch ( IOException e )
{
e.printStackTrace();
log.error( "Failed to refresh fulltext after updates", e );
}
}

Expand Down
5 changes: 2 additions & 3 deletions ...prise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/LuceneFulltext.java
View file
Expand Up @@ -25,6 +25,7 @@
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;

import org.neo4j.kernel.api.impl.index.AbstractLuceneIndex;
Expand Down Expand Up @@ -75,9 +76,7 @@ public boolean equals( Object o )
@Override
public int hashCode()
{
int result = identifier.hashCode();
result = 31 * result + type.hashCode();
return result;
return Objects.hash( identifier, type );
}

PartitionedIndexWriter getIndexWriter( WritableFulltext writableIndex ) throws IOException
Expand Down
2 changes: 1 addition & 1 deletion ...ext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/PartitionedFulltextReader.java
View file
Expand Up @@ -92,6 +92,6 @@ public void close()

private PrimitiveLongIterator partitionedOperation( Function<ReadOnlyFulltext,PrimitiveLongIterator> readerFunction )
{
return PrimitiveLongCollections.concat( indexReaders.parallelStream().map( readerFunction::apply ).collect( Collectors.toList() ) );
return PrimitiveLongCollections.concat( indexReaders.parallelStream().map( readerFunction ).collect( Collectors.toList() ) );
}
}
65 changes: 21 additions & 44 deletions ...fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/SimpleFulltextReader.java
View file
Expand Up @@ -23,14 +23,13 @@
import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;
import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.Sort;

import java.io.IOException;

import org.neo4j.collection.primitive.PrimitiveLongCollections;
import org.neo4j.collection.primitive.PrimitiveLongIterator;
import org.neo4j.kernel.api.impl.index.collector.DocValuesCollector;
import org.neo4j.kernel.api.impl.index.partition.PartitionSearcher;
Expand Down Expand Up @@ -59,70 +58,48 @@ class SimpleFulltextReader implements ReadOnlyFulltext
@Override
public PrimitiveLongIterator query( String... terms )
{
MultiFieldQueryParser multiFieldQueryParser = new MultiFieldQueryParser( properties, analyzer );
multiFieldQueryParser.setDefaultOperator( QueryParser.Operator.OR );
Query query;
try
{
query = multiFieldQueryParser.parse( String.join( " ", terms ) );
}
catch ( ParseException e )
{
query = parseFallbackBooleanQuery( multiFieldQueryParser, terms );
}
return query( query );
String concatenatedQuery = String.join( " ", terms );
return innerQuery( concatenatedQuery );
}

private Query parseFallbackBooleanQuery( MultiFieldQueryParser multiFieldQueryParser, String[] tokens )
@Override
public PrimitiveLongIterator fuzzyQuery( String... terms )
{
Query query;
BooleanQuery.Builder builder = new BooleanQuery.Builder();
for ( String s : tokens )
{
for ( String property : properties )
{
Query booleanQuery = multiFieldQueryParser.createBooleanQuery( property, s );
if ( booleanQuery != null )
{
builder.add( booleanQuery, BooleanClause.Occur.SHOULD );
}
}
}
query = builder.build();
return query;
String concatenatedQuery = String.join( "~ ", terms ) + "~";
return innerQuery( concatenatedQuery );
}

@Override
public PrimitiveLongIterator fuzzyQuery( String... terms )
public void close()
{
MultiFieldQueryParser multiFieldQueryParser = new MultiFieldQueryParser( properties, analyzer );
multiFieldQueryParser.setDefaultOperator( QueryParser.Operator.OR );
Query query;
try
{
query = multiFieldQueryParser.parse( String.join( "~ ", terms ) + "~" );
partitionSearcher.close();
}
catch ( ParseException e )
catch ( IOException e )
{
query = parseFallbackBooleanQuery( multiFieldQueryParser, terms );
throw new IndexReaderCloseException( e );
}
return query( query );
}

@Override
public void close()
private PrimitiveLongIterator innerQuery( String concatenatedQuery )
{
MultiFieldQueryParser multiFieldQueryParser = new MultiFieldQueryParser( properties, analyzer );
multiFieldQueryParser.setDefaultOperator( QueryParser.Operator.OR );
Query query;
try
{
partitionSearcher.close();
query = multiFieldQueryParser.parse( concatenatedQuery );
}
catch ( IOException e )
catch ( ParseException e )
{
throw new IndexReaderCloseException( e );
assert false;
return PrimitiveLongCollections.emptyIterator();
}
return indexQuery( query );
}

private PrimitiveLongIterator query( Query query )
private PrimitiveLongIterator indexQuery( Query query )
{
try
{
Expand Down

0 comments on commit 1c504a2

Please sign in to comment.