From 1e0d651f26c945252f0fcb97ec49f299dd361b62 Mon Sep 17 00:00:00 2001
From: fickludd <johan.teleman@neotechnology.com>
Date: Thu, 17 May 2018 16:18:10 +0200
Subject: [PATCH] Misc fixes

---
 .../neo4j/kernel/impl/newapi/AllStoreHolder.java   |  3 ++-
 .../transaction/state/DefaultIndexProviderMap.java | 14 +++++++-------
 .../constraints/ConstraintIndexCreatorTest.java    |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/AllStoreHolder.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/AllStoreHolder.java
index 4d5cead8b0549..61fc8bae6cbc8 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/AllStoreHolder.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/AllStoreHolder.java
@@ -85,6 +85,7 @@
 import org.neo4j.storageengine.api.schema.IndexReader;
 import org.neo4j.storageengine.api.schema.LabelScanReader;
 import org.neo4j.storageengine.api.schema.PopulationProgress;
+import org.neo4j.storageengine.api.schema.SchemaRule;
 import org.neo4j.storageengine.api.txstate.ReadableDiffSets;
 import org.neo4j.string.UTF8;
 import org.neo4j.values.AnyValue;
@@ -454,7 +455,7 @@ public long indexGetCommittedId( IndexReference index ) throws SchemaRuleNotFoun
         }
         else
         {
-            return -1L;
+            throw new SchemaRuleNotFoundException( SchemaRule.Kind.INDEX_RULE, ((IndexDescriptor)index).schema() );
         }
     }
 
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/DefaultIndexProviderMap.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/DefaultIndexProviderMap.java
index 88f2f1199778c..a236a0e73d278 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/DefaultIndexProviderMap.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/DefaultIndexProviderMap.java
@@ -33,7 +33,7 @@
 public class DefaultIndexProviderMap implements IndexProviderMap
 {
     private final IndexProvider defaultIndexProvider;
-    private final Map<IndexProvider.Descriptor,IndexProvider> indexProviders = new HashMap<>();
+    private final Map<Descriptor,IndexProvider> indexProvidersByDescriptor = new HashMap<>();
     private final Map<String,IndexProvider> indexProvidersByName = new HashMap<>();
 
     public DefaultIndexProviderMap( IndexProvider defaultIndexProvider )
@@ -61,8 +61,8 @@ public DefaultIndexProviderMap( IndexProvider defaultIndexProvider,
 
     private IndexProvider put( Descriptor providerDescriptor, IndexProvider provider )
     {
-        IndexProvider existing = indexProviders.putIfAbsent( providerDescriptor, provider );
-        indexProvidersByName.put( providerDescriptor.name(), provider );
+        IndexProvider existing = indexProvidersByDescriptor.putIfAbsent( providerDescriptor, provider );
+        indexProvidersByName.putIfAbsent( providerDescriptor.name(), provider );
         return existing;
     }
 
@@ -73,9 +73,9 @@ public IndexProvider getDefaultProvider()
     }
 
     @Override
-    public IndexProvider lookup( IndexProvider.Descriptor providerDescriptor )
+    public IndexProvider lookup( Descriptor providerDescriptor )
     {
-        IndexProvider provider = indexProviders.get( providerDescriptor );
+        IndexProvider provider = indexProvidersByDescriptor.get( providerDescriptor );
         if ( provider != null )
         {
             return provider;
@@ -99,12 +99,12 @@ public IndexProvider lookup( String providerDescriptorName ) throws IndexProvide
     private IllegalArgumentException notFound( Object key )
     {
         return new IllegalArgumentException( "Tried to get index provider for an existing index with provider " + key +
-                " whereas available providers in this session being " + indexProviders + ", and default being " + defaultIndexProvider );
+                " whereas available providers in this session being " + indexProvidersByDescriptor + ", and default being " + defaultIndexProvider );
     }
 
     @Override
     public void accept( Consumer<IndexProvider> visitor )
     {
-        indexProviders.values().forEach( visitor );
+        indexProvidersByDescriptor.values().forEach( visitor );
     }
 }
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintIndexCreatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintIndexCreatorTest.java
index 8e0e556d54b39..95d6853db32aa 100644
--- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintIndexCreatorTest.java
+++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintIndexCreatorTest.java
@@ -398,7 +398,7 @@ private KernelTransactionImplementation createTransaction()
         }
         catch ( InvalidTransactionTypeKernelException e )
         {
-            e.printStackTrace();
+            fail( "Expected write transaction" );
         }
         return transaction;
     }