Reuse document instances

neo4j · Dec 5, 2015 · 0c4a9f3 · 0c4a9f3
1 parent 74681cb
commit 0c4a9f3
Show file tree

Hide file tree

Showing 9 changed files with 259 additions and 166 deletions.
diff --git a/...neo4j/kernel/api/impl/index/DeferredConstraintVerificationUniqueLuceneIndexPopulator.java b/...neo4j/kernel/api/impl/index/DeferredConstraintVerificationUniqueLuceneIndexPopulator.java
@@ -21,7 +21,6 @@
 
 import org.apache.lucene.document.Document;
 import org.apache.lucene.index.Fields;
-import org.apache.lucene.index.IndexableField;
 import org.apache.lucene.index.LeafReader;
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.Term;
@@ -113,8 +112,7 @@ public void add( long nodeId, Object propertyValue )
             throws IndexEntryConflictException, IOException, IndexCapacityExceededException
     {
         sampler.increment( 1 );
-        IndexableField encodedValue = documentStructure.encodeAsFieldable( propertyValue );
+        Document doc = documentStructure.documentRepresentingProperty( nodeId, propertyValue );
-        Document doc = documentStructure.newDocumentRepresentingProperty( nodeId, encodedValue );
         writer.addDocument( doc );
     }
 
@@ -194,9 +192,8 @@ public void process( NodePropertyUpdate update )
                         sampler.increment( 1 ); // add new value
 
                         // We don't look at the "before" value, so adding and changing idempotently is done the same way.
-                        IndexableField encodedValue = documentStructure.encodeAsFieldable( update.getValueAfter() );
                         writer.updateDocument( documentStructure.newTermForChangeOrRemove( nodeId ),
-                                documentStructure.newDocumentRepresentingProperty( nodeId, encodedValue ) );
+                                documentStructure.documentRepresentingProperty( nodeId, update.getValueAfter() ) );
                         updatedPropertyValues.add( update.getValueAfter() );
                         break;
                     case CHANGED:
@@ -205,9 +202,8 @@ public void process( NodePropertyUpdate update )
                         // sampler.increment( 1 ); // add new value
 
                         // We don't look at the "before" value, so adding and changing idempotently is done the same way.
-                        IndexableField encodedValueAfter = documentStructure.encodeAsFieldable( update.getValueAfter() );
                         writer.updateDocument( documentStructure.newTermForChangeOrRemove( nodeId ),
-                                documentStructure.newDocumentRepresentingProperty( nodeId, encodedValueAfter ) );
+                                documentStructure.documentRepresentingProperty( nodeId, update.getValueAfter() ) );
                         updatedPropertyValues.add( update.getValueAfter() );
                         break;
                     case REMOVED: