From 7a93ebf2b5e9cf28982e09f31a5b066c201f9e19 Mon Sep 17 00:00:00 2001
From: Chris Vest <mr.chrisvest@gmail.com>
Date: Fri, 6 Jul 2018 17:50:45 +0200
Subject: [PATCH] Make the fulltext index open index readers through the
 KernelTransaction APIs, in a hacky way, which will be cleaned up later.

---
 .../org/neo4j/kernel/impl/api/index/IndexProxyCreator.java   | 5 ++---
 .../java/org/neo4j/kernel/impl/newapi/AllStoreHolder.java    | 2 +-
 .../src/main/java/org/neo4j/kernel/impl/newapi/Read.java     | 2 +-
 3 files changed, 4 insertions(+), 5 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
index d08fbd56105f6..91ac083c50c23 100644
--- 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
@@ -81,9 +81,8 @@ IndexProxy createPopulatingIndexProxy( final StoreIndexDescriptor descriptor, fi
         flipper.setFlipTarget( () ->
         {
             monitor.populationCompleteOn( descriptor );
-            OnlineIndexProxy onlineProxy = new OnlineIndexProxy( capableIndexDescriptor, onlineAccessorFromProvider( descriptor, samplingConfig ),
-                            storeView,
-                            true );
+            IndexAccessor accessor = onlineAccessorFromProvider( descriptor, samplingConfig );
+            OnlineIndexProxy onlineProxy = new OnlineIndexProxy( capableIndexDescriptor, accessor, storeView, true );
             if ( flipToTentative )
             {
                 return new TentativeConstraintIndexProxy( flipper, onlineProxy );
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 55c7f9be53cd7..129aba7a79b35 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
@@ -234,7 +234,7 @@ long graphPropertiesReference()
     }
 
     @Override
-    IndexReader indexReader( IndexReference index, boolean fresh ) throws IndexNotFoundKernelException
+    public IndexReader indexReader( IndexReference index, boolean fresh ) throws IndexNotFoundKernelException
     {
         assertValidIndex( index );
         return fresh ? storageReader.getFreshIndexReader( (IndexDescriptor) index ) :
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Read.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Read.java
index 22736ae0d164b..eb352e608cbd9 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Read.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Read.java
@@ -470,7 +470,7 @@ public final void futureRelationshipPropertyReferenceRead( long reference )
         ktx.assertOpen();
     }
 
-    abstract IndexReader indexReader( IndexReference index, boolean fresh ) throws IndexNotFoundKernelException;
+    public abstract IndexReader indexReader( IndexReference index, boolean fresh ) throws IndexNotFoundKernelException;
 
     abstract LabelScanReader labelScanReader();