Minor cleanups

neo4j · May 21, 2018 · 58c04f3 · 58c04f3
1 parent aa7ef22
commit 58c04f3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexProxyCreator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexProxyCreator.java
@@ -63,7 +63,7 @@ IndexProxy createPopulatingIndexProxy( final StoreIndexDescriptor descriptor, fi
 
         final String indexUserDescription = indexUserDescription( descriptor );
         IndexPopulator populator = populatorFromProvider( descriptor, samplingConfig );
-        CapableIndexDescriptor capableIndexDescriptor = indexMetaFromProvider( descriptor );
+        CapableIndexDescriptor capableIndexDescriptor = descriptor.withCapabilities( providerMap );
 
         FailedIndexProxyFactory failureDelegateFactory = new FailedPopulatingIndexProxyFactory( capableIndexDescriptor,
                 populator,
@@ -96,7 +96,7 @@ IndexProxy createPopulatingIndexProxy( final StoreIndexDescriptor descriptor, fi
 
     IndexProxy createRecoveringIndexProxy( StoreIndexDescriptor descriptor )
     {
-        CapableIndexDescriptor capableIndexDescriptor = indexMetaFromProvider( descriptor );
+        CapableIndexDescriptor capableIndexDescriptor = descriptor.withCapabilities( providerMap );
         IndexProxy proxy = new RecoveringIndexProxy( capableIndexDescriptor );
         return new ContractCheckingIndexProxy( proxy, true );
     }
@@ -106,7 +106,7 @@ IndexProxy createOnlineIndexProxy( StoreIndexDescriptor descriptor )
         try
         {
             IndexAccessor onlineAccessor = onlineAccessorFromProvider( descriptor, samplingConfig );
-            CapableIndexDescriptor capableIndexDescriptor = indexMetaFromProvider( descriptor );
+            CapableIndexDescriptor capableIndexDescriptor = descriptor.withCapabilities( providerMap );
             IndexProxy proxy;
             proxy = new OnlineIndexProxy( capableIndexDescriptor, onlineAccessor, storeView, false );
             proxy = new ContractCheckingIndexProxy( proxy, true );
@@ -124,7 +124,7 @@ IndexProxy createOnlineIndexProxy( StoreIndexDescriptor descriptor )
     IndexProxy createFailedIndexProxy( StoreIndexDescriptor descriptor, IndexPopulationFailure populationFailure )
     {
         IndexPopulator indexPopulator = populatorFromProvider( descriptor, samplingConfig );
-        CapableIndexDescriptor capableIndexDescriptor = indexMetaFromProvider( descriptor );
+        CapableIndexDescriptor capableIndexDescriptor = descriptor.withCapabilities( providerMap );
         String indexUserDescription = indexUserDescription( descriptor );
         IndexProxy proxy;
         proxy = new FailedIndexProxy( capableIndexDescriptor,
@@ -154,9 +154,4 @@ private IndexAccessor onlineAccessorFromProvider( StoreIndexDescriptor descripto
         IndexProvider indexProvider = providerMap.lookup( descriptor.providerDescriptor() );
         return indexProvider.getOnlineAccessor( descriptor, samplingConfig );
     }
-
-    private CapableIndexDescriptor indexMetaFromProvider( StoreIndexDescriptor indexDescriptor )
-    {
-        return indexDescriptor.withCapabilities( providerMap );
-    }
 }
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/ConstraintIndexCreator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/ConstraintIndexCreator.java
@@ -259,9 +259,7 @@ private IndexReference getOrCreateUniquenessConstraintIndex( SchemaRead schemaRe
     public IndexDescriptor createConstraintIndex( final SchemaDescriptor schema, Optional<String> provider )
     {
         try ( Session session = kernelSupplier.get().beginSession( AUTH_DISABLED );
-              Transaction transaction = session.beginTransaction( Transaction.Type.implicit );
-              //TODO remove statement?
-              Statement ignore = ((KernelTransaction)transaction).acquireStatement() )
+              Transaction transaction = session.beginTransaction( Transaction.Type.implicit ) )
         {
             IndexDescriptor index = ((KernelTransaction) transaction).indexUniqueCreate( schema, provider );
             transaction.success();