Move the logic for finding index rules by name, into SchemaStorage.

neo4j · Jan 10, 2019 · fd75d73 · fd75d73
1 parent 54da1b8
commit fd75d73
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/...g/neo4j/kernel/impl/storageengine/impl/recordstorage/TransactionToRecordStateVisitor.java b/...g/neo4j/kernel/impl/storageengine/impl/recordstorage/TransactionToRecordStateVisitor.java
@@ -173,16 +173,7 @@ public void visitRemovedIndex( IndexDescriptor index )
         if ( name.isPresent() )
         {
             String indexName = name.get();
-            Iterator<StoreIndexDescriptor> itr = schemaStorage.indexesGetAll();
-            while ( itr.hasNext() )
-            {
-                StoreIndexDescriptor sid = itr.next();
-                if ( sid.getUserSuppliedName().map( n -> n.equals( indexName ) ).orElse( false ) )
-                {
-                    rule = sid;
-                    break;
-                }
-            }
+            rule = schemaStorage.indexGetForName( indexName );
         }
         else
         {

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/SchemaStorage.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/SchemaStorage.java
@@ -74,6 +74,26 @@ public StoreIndexDescriptor indexGetForSchema( final IndexDescriptor descriptor
         return foundRule;
     }
 
+    /**
+     * Find the IndexRule that has the given user supplied name.
+     *
+     * @param indexName the user supplied index name to look for.
+     * @return the matching IndexRule, or null if no matching index rule was found.
+     */
+    public StoreIndexDescriptor indexGetForName( String indexName )
+    {
+        Iterator<StoreIndexDescriptor> itr = indexesGetAll();
+        while ( itr.hasNext() )
+        {
+            StoreIndexDescriptor sid = itr.next();
+            if ( sid.getUserSuppliedName().map( n -> n.equals( indexName ) ).orElse( false ) )
+            {
+                return sid;
+            }
+        }
+        return null;
+    }
+
     public Iterator<StoreIndexDescriptor> indexesGetAll()
     {
         return loadAllSchemaRules( Predicates.alwaysTrue(), StoreIndexDescriptor.class, false );