Remove DefaultIndexReference

community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/AllStoreHolder.java

@@ -57,6 +57,7 @@
 import org.neo4j.kernel.api.schema.SchemaDescriptorFactory;
 import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory;
 import org.neo4j.kernel.api.schema.index.IndexDescriptor;
+import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor;
 import org.neo4j.kernel.api.txstate.TransactionCountingStateVisitor;
 import org.neo4j.kernel.api.txstate.TransactionState;
 import org.neo4j.kernel.impl.api.ClockContext;
@@ -404,7 +405,7 @@ public InternalIndexState indexGetState( IndexReference index ) throws IndexNotF
         assertValidIndex( index );
         sharedOptimisticLock( ResourceTypes.LABEL, index.label() );
         ktx.assertOpen();
-        return indexGetState( indexDescriptor( index ) );
+        return indexGetState( (IndexDescriptor) index );
     }
 
     @Override
@@ -413,7 +414,7 @@ public PopulationProgress indexGetPopulationProgress( IndexReference index )
     {
         sharedOptimisticLock( ResourceTypes.LABEL, index.label() );
         ktx.assertOpen();
-        IndexDescriptor descriptor = indexDescriptor( index );
+        IndexDescriptor descriptor = (IndexDescriptor) index;
 
         if ( ktx.hasTxStateWithChanges() )
         {
@@ -432,26 +433,28 @@ public Long indexGetOwningUniquenessConstraintId( IndexReference index )
     {
         sharedOptimisticLock( ResourceTypes.LABEL, index.label() );
         ktx.assertOpen();
-        return indexGetOwningUniquenessConstraintId( indexDescriptor( index ) );
+        if ( index instanceof StoreIndexDescriptor )
+        {
+            return ((StoreIndexDescriptor) index).getOwningConstraint();
+        }
+        else
+        {
+            return null;
+        }
     }
 
     @Override
     public long indexGetCommittedId( IndexReference index ) throws SchemaRuleNotFoundException
     {
         sharedOptimisticLock( ResourceTypes.LABEL, index.label() );
         ktx.assertOpen();
-        return storageReader.indexGetCommittedId( indexDescriptor( index ) );
-    }
-
-    IndexDescriptor indexDescriptor( IndexReference index )
-    {
-        if ( index.isUnique() )
+        if ( index instanceof StoreIndexDescriptor )
         {
-            return IndexDescriptorFactory.uniqueForLabel( index.label(), index.properties() );
+            return ((StoreIndexDescriptor) index).getId();
         }
         else
         {
-            return IndexDescriptorFactory.forLabel( index.label(), index.properties() );
+            return -1L;
         }
     }
 

community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Operations.java

@@ -899,35 +899,35 @@ public IndexReference indexCreate( SchemaDescriptor descriptor,
     }
 
     @Override
-    public void indexDrop( IndexReference index ) throws SchemaKernelException
+    public void indexDrop( IndexReference indexReference ) throws SchemaKernelException
     {
+        IndexDescriptor index = (IndexDescriptor) indexReference;
         assertValidIndex( index );
 
-        acquireExclusiveLabelLock( index.label() );
+        acquireExclusiveLabelLock( indexReference.label() );
         ktx.assertOpen();
-        org.neo4j.kernel.api.schema.LabelSchemaDescriptor descriptor = labelDescriptor( index );
         try
         {
-            IndexDescriptor existingIndex = allStoreHolder.indexGetForSchema( descriptor );
+            IndexDescriptor existingIndex = allStoreHolder.indexGetForSchema( index.schema() );
 
             if ( existingIndex == null )
             {
-                throw new NoSuchIndexException( descriptor );
+                throw new NoSuchIndexException( index.schema() );
             }
 
             if ( existingIndex.type() == UNIQUE )
             {
                 if ( allStoreHolder.indexGetOwningUniquenessConstraintId( existingIndex ) != null )
                 {
-                    throw new IndexBelongsToConstraintException( descriptor );
+                    throw new IndexBelongsToConstraintException( index.schema() );
                 }
             }
         }
         catch ( IndexBelongsToConstraintException | NoSuchIndexException e )
         {
-            throw new DropIndexFailureException( descriptor, e );
+            throw new DropIndexFailureException( index.schema(), e );
         }
-        ktx.txState().indexDoDrop( allStoreHolder.indexDescriptor( index ) );
+        ktx.txState().indexDoDrop( index );
     }
 
     @Override
@@ -1245,11 +1245,11 @@ private void indexBackedConstraintCreate( IndexBackedConstraintDescriptor constr
         }
     }
 
-    private void assertValidIndex( IndexReference index ) throws NoSuchIndexException
+    private void assertValidIndex( IndexDescriptor index ) throws NoSuchIndexException
     {
         if ( index == CapableIndexReference.NO_INDEX )
         {
-            throw new NoSuchIndexException( SchemaDescriptorFactory.forLabel( index.label(), index.properties() ) );
+            throw new NoSuchIndexException( index.schema() );
         }
     }
 }