Remove in memory index implementation.

Completely remove in memory index implementation that was used in kernel to simulate testing of index related integration tests. Switch all tests to use real index providers instead.
neo4j · Jun 27, 2018 · 6faa71f · 6faa71f
1 parent aabec27
commit 6faa71f
Show file tree

Hide file tree

Showing 36 changed files with 391 additions and 1,851 deletions.
diff --git a/...nity/community-it/community-it/src/test/java/upgrade/StoreUpgraderInterruptionTestIT.java b/...nity/community-it/community-it/src/test/java/upgrade/StoreUpgraderInterruptionTestIT.java
@@ -39,10 +39,8 @@
 import org.neo4j.io.pagecache.PageCache;
 import org.neo4j.kernel.api.index.IndexProvider;
 import org.neo4j.kernel.configuration.Config;
-import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProvider;
 import org.neo4j.kernel.impl.logging.LogService;
 import org.neo4j.kernel.impl.logging.NullLogService;
-import org.neo4j.kernel.impl.logging.SimpleLogService;
 import org.neo4j.kernel.impl.store.format.standard.Standard;
 import org.neo4j.kernel.impl.store.format.standard.StandardV2_3;
 import org.neo4j.kernel.impl.storemigration.MigrationTestUtils;
@@ -60,7 +58,6 @@
 import org.neo4j.kernel.impl.util.monitoring.ProgressReporter;
 import org.neo4j.kernel.monitoring.Monitors;
 import org.neo4j.kernel.recovery.LogTailScanner;
-import org.neo4j.logging.AssertableLogProvider;
 import org.neo4j.logging.NullLogProvider;
 import org.neo4j.test.TestGraphDatabaseFactory;
 import org.neo4j.test.rule.PageCacheRule;
@@ -86,9 +83,6 @@ public class StoreUpgraderInterruptionTestIT
 
     @Parameterized.Parameter
     public String version;
-    private AssertableLogProvider logProvider = new AssertableLogProvider( true );
-    private SimpleLogService logService = new SimpleLogService( logProvider );
-    private final IndexProvider indexProvider = new InMemoryIndexProvider();
     private static final Config CONFIG = Config.defaults( GraphDatabaseSettings.pagecache_memory, "8m" );
 
     @Parameters( name = "{0}" )
@@ -167,7 +161,7 @@ private UpgradableDatabase getUpgradableDatabase( StoreVersionCheck check ) thro
 
     private SchemaIndexMigrator createIndexMigrator()
     {
-        return new SchemaIndexMigrator( fs, indexProvider );
+        return new SchemaIndexMigrator( fs, IndexProvider.EMPTY );
     }
 
     @Test

diff --git a/...community-it/index-it/src/test/java/org/neo4j/index/recovery/UniqueIndexRecoveryTest.java b/...community-it/index-it/src/test/java/org/neo4j/index/recovery/UniqueIndexRecoveryTest.java
@@ -43,7 +43,6 @@
 import org.neo4j.kernel.api.impl.schema.NativeLuceneFusionIndexProviderFactory10;
 import org.neo4j.kernel.api.impl.schema.NativeLuceneFusionIndexProviderFactory20;
 import org.neo4j.kernel.extension.KernelExtensionFactory;
-import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProviderFactory;
 import org.neo4j.kernel.impl.transaction.log.checkpoint.CheckPointer;
 import org.neo4j.kernel.impl.transaction.log.checkpoint.SimpleTriggerInfo;
 import org.neo4j.kernel.impl.transaction.log.rotation.LogRotation;
@@ -72,16 +71,12 @@ public class UniqueIndexRecoveryTest
     private GraphDatabaseAPI db;
 
     @Parameterized.Parameters( name = "{0}" )
-    public static Collection<Object[]> parameters()
+    public static Collection<KernelExtensionFactory> parameters()
     {
-        return asList(
-                new Object[]{new LuceneIndexProviderFactory()},
-                new Object[]{new NativeLuceneFusionIndexProviderFactory10()},
-                new Object[]{new NativeLuceneFusionIndexProviderFactory20()},
-                new Object[]{new InMemoryIndexProviderFactory()} );
+        return asList( new LuceneIndexProviderFactory(), new NativeLuceneFusionIndexProviderFactory10(), new NativeLuceneFusionIndexProviderFactory20() );
     }
 
-    @Parameterized.Parameter( 0 )
+    @Parameterized.Parameter
     public KernelExtensionFactory<?> kernelExtensionFactory;
 
     @Before

diff --git a/...src/test/java/org/neo4j/kernel/api/index/InMemoryIndexConstraintProviderApprovalTest.java b/...src/test/java/org/neo4j/kernel/api/index/InMemoryIndexConstraintProviderApprovalTest.java
diff --git a/...ndex-it/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java b/...ndex-it/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java
@@ -51,7 +51,6 @@
 import org.neo4j.kernel.api.schema.RelationTypeSchemaDescriptor;
 import org.neo4j.kernel.api.schema.index.TestIndexDescriptorFactory;
 import org.neo4j.kernel.extension.KernelExtensionFactory;
-import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProviderFactory;
 import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge;
 import org.neo4j.kernel.impl.store.UnderlyingStorageException;
 import org.neo4j.kernel.internal.GraphDatabaseAPI;
@@ -86,8 +85,7 @@ public static Collection<Object[]> parameters()
         return asList(
                 new Object[]{new LuceneIndexProviderFactory(), LuceneIndexProviderFactory.PROVIDER_DESCRIPTOR},
                 new Object[]{new NativeLuceneFusionIndexProviderFactory10(), NativeLuceneFusionIndexProviderFactory10.DESCRIPTOR},
-                new Object[]{new NativeLuceneFusionIndexProviderFactory20(), NativeLuceneFusionIndexProviderFactory20.DESCRIPTOR},
-                new Object[]{new InMemoryIndexProviderFactory(), InMemoryIndexProviderFactory.PROVIDER_DESCRIPTOR} );
+                new Object[]{new NativeLuceneFusionIndexProviderFactory20(), NativeLuceneFusionIndexProviderFactory20.DESCRIPTOR} );
     }
 
     @Parameterized.Parameter( 0 )

diff --git a/...y/community-it/index-it/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java b/...y/community-it/index-it/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java
@@ -73,7 +73,6 @@
 import org.neo4j.kernel.impl.api.index.IndexingServiceFactory;
 import org.neo4j.kernel.impl.api.index.MultipleIndexPopulator;
 import org.neo4j.kernel.impl.api.index.StoreScan;
-import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProviderFactory;
 import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge;
 import org.neo4j.kernel.impl.locking.LockService;
 import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine;
@@ -122,11 +121,10 @@ public static Collection<IndexProvider.Descriptor> parameters()
     {
         return asList( LuceneIndexProviderFactory.PROVIDER_DESCRIPTOR,
                 NativeLuceneFusionIndexProviderFactory10.DESCRIPTOR,
-                NativeLuceneFusionIndexProviderFactory20.DESCRIPTOR,
-                InMemoryIndexProviderFactory.PROVIDER_DESCRIPTOR );
+                NativeLuceneFusionIndexProviderFactory20.DESCRIPTOR );
     }
 
-    @Parameterized.Parameter( 0 )
+    @Parameterized.Parameter
     public IndexProvider.Descriptor indexDescriptor;
 
     private IndexingService indexService;

diff --git a/community/community-it/kernel-it/src/test/java/counts/RebuildCountsTest.java b/community/community-it/kernel-it/src/test/java/counts/RebuildCountsTest.java
@@ -36,8 +36,6 @@
 import org.neo4j.internal.kernel.api.Kernel;
 import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException;
 import org.neo4j.io.fs.FileSystemAbstraction;
-import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProvider;
-import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProviderFactory;
 import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge;
 import org.neo4j.kernel.impl.store.MetaDataStore;
 import org.neo4j.kernel.impl.store.StoreFactory;
@@ -49,7 +47,6 @@
 import org.neo4j.test.TestGraphDatabaseFactory;
 import org.neo4j.test.rule.fs.EphemeralFileSystemRule;
 
-import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.neo4j.graphdb.Label.label;
@@ -62,6 +59,31 @@
 
 public class RebuildCountsTest
 {
+    private static final int ALIENS = 16;
+    private static final int HUMANS = 16;
+    private static final Label ALIEN = label( "Alien" );
+    private static final Label HUMAN = label( "Human" );
+
+    @Rule
+    public final EphemeralFileSystemRule fsRule = new EphemeralFileSystemRule();
+    private final AssertableLogProvider userLogProvider = new AssertableLogProvider();
+    private final AssertableLogProvider internalLogProvider = new AssertableLogProvider();
+    private final File storeDir = new File( "store" ).getAbsoluteFile();
+
+    private GraphDatabaseService db;
+
+    @Before
+    public void before() throws IOException
+    {
+        restart( fsRule.get() );
+    }
+
+    @After
+    public void after()
+    {
+        doCleanShutdown();
+    }
+
     @Test
     public void shouldRebuildMissingCountsStoreOnStart() throws IOException, TransactionFailureException
     {
@@ -197,7 +219,6 @@ private void restart( FileSystemAbstraction fs ) throws IOException
         db = dbFactory.setUserLogProvider( userLogProvider )
                       .setInternalLogProvider( internalLogProvider )
                       .setFileSystem( new UncloseableDelegatingFileSystemAbstraction( fs ) )
-                      .setKernelExtensions( asList( new InMemoryIndexProviderFactory( indexProvider ) ) )
                       .newImpermanentDatabaseBuilder( storeDir )
                       .setConfig( index_background_sampling_enabled, "false" )
                       .newGraphDatabase();
@@ -214,30 +235,4 @@ private void doCleanShutdown()
             db = null;
         }
     }
-
-    private static final int ALIENS = 16;
-    private static final int HUMANS = 16;
-    private static final Label ALIEN = label( "Alien" );
-    private static final Label HUMAN = label( "Human" );
-
-    @Rule
-    public final EphemeralFileSystemRule fsRule = new EphemeralFileSystemRule();
-    private final InMemoryIndexProvider indexProvider = new InMemoryIndexProvider( 100 );
-    private final AssertableLogProvider userLogProvider = new AssertableLogProvider();
-    private final AssertableLogProvider internalLogProvider = new AssertableLogProvider();
-
-    private GraphDatabaseService db;
-    private final File storeDir = new File( "store" ).getAbsoluteFile();
-
-    @Before
-    public void before() throws IOException
-    {
-        restart( fsRule.get() );
-    }
-
-    @After
-    public void after()
-    {
-        doCleanShutdown();
-    }
 }