Cleanup of LuceneDocumentStructure

neo4j · Feb 27, 2017 · 132c81b · 132c81b
1 parent 3cdb074
commit 132c81b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/.../lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneDocumentStructure.java b/.../lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneDocumentStructure.java
@@ -49,6 +49,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.EnumMap;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
@@ -255,8 +256,7 @@ private static class DocWithId
         private final Field idField;
         private final Field idValueField;
 
-        private final Map<ValueEncoding,Field> valueFields = new EnumMap<>( ValueEncoding.class );
+        private final Map<String,Field> valueFields = new HashMap<>();
-        private final ArrayList<Map<ValueEncoding,Field>> compositeValueFields = new ArrayList<>();
 
         private DocWithId() {
             idField = new StringField( NODE_ID_KEY, "", YES );
@@ -297,23 +297,14 @@ private void removeAllValueFields()
             }
         }
 
-        private Map<ValueEncoding,Field> getValueFields( int compositeKey )
-        {
-            while ( compositeValueFields.size() <= compositeKey )
-            {
-                compositeValueFields.add( new EnumMap<>( ValueEncoding.class ) );
-            }
-            return compositeValueFields.get( compositeKey );
-        }
-
         private Field getFieldWithValue( int propertyNumber, ValueEncoding encoding, Object value )
         {
-            Map<ValueEncoding,Field> compositeValueField = getValueFields( propertyNumber );
+            String key = encoding.key( propertyNumber );
-            Field reusableField = compositeValueField.get( encoding );
+            Field reusableField = valueFields.get( key );
             if ( reusableField == null )
             {
-                reusableField = encoding.encodeField( encoding.key( propertyNumber ), value );
+                reusableField = encoding.encodeField( key, value );
-                compositeValueField.put( encoding, reusableField );
+                valueFields.put( key, reusableField );
             }
             else
             {

diff --git a/.../test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexUniquenessVerificationIT.java b/.../test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexUniquenessVerificationIT.java
@@ -297,7 +297,7 @@ private void insert( Collection<PropertyValue> data ) throws IOException
         PropertyValue[] dataArray = data.toArray( new PropertyValue[data.size()] );
         for ( int i = 0; i < dataArray.length; i++ )
         {
-            Document doc = LuceneDocumentStructure.documentRepresentingProperties( (long) i, dataArray[i].value );
+            Document doc = LuceneDocumentStructure.documentRepresentingProperties( i, dataArray[i].value );
             index.getIndexWriter().addDocument( doc );
         }
         index.maybeRefreshBlocking();

diff --git a/.../test/java/org/neo4j/kernel/api/impl/index/verification/SimpleUniquenessVerifierTest.java b/.../test/java/org/neo4j/kernel/api/impl/index/verification/SimpleUniquenessVerifierTest.java
@@ -277,7 +277,7 @@ private void insert( List<Object> data ) throws IOException
     {
         for ( int i = 0; i < data.size(); i++ )
         {
-            Document doc = LuceneDocumentStructure.documentRepresentingProperties( (long) i, data.get( i ) );
+            Document doc = LuceneDocumentStructure.documentRepresentingProperties( i, data.get( i ) );
             writer.addDocument( doc );
         }
         searcherManager.maybeRefreshBlocking();