From 3fb4c38847a3e71fa3447fa9a40d6ec5ada8fa2e Mon Sep 17 00:00:00 2001 From: Mikhaylo Demianenko Date: Mon, 21 Dec 2015 11:11:03 +0100 Subject: [PATCH] Use shard as a name of lucene index part Update storage layout name to reuse agreed terminology. --- .../kernel/api/impl/index/storage/IndexStorageFactory.java | 2 +- ...PartitionedIndexStorage.java => ShardedIndexStorage.java} | 5 ++--- .../org/neo4j/index/lucene/ConstraintIndexFailureIT.java | 4 ++-- .../index/LuceneIndexAccessorSearcherManagerRefreshTest.java | 5 ++--- .../neo4j/kernel/api/impl/index/LuceneIndexAccessorTest.java | 4 ++-- .../java/org/neo4j/kernel/api/impl/index/LuceneIndexIT.java | 5 ++--- 6 files changed, 11 insertions(+), 14 deletions(-) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/storage/{PartitionedIndexStorage.java => ShardedIndexStorage.java} (93%) diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/storage/IndexStorageFactory.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/storage/IndexStorageFactory.java index c95a9bed0e84e..266295233de6b 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/storage/IndexStorageFactory.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/storage/IndexStorageFactory.java @@ -41,7 +41,7 @@ public IndexStorageFactory( DirectoryFactory directoryFactory, FileSystemAbstrac public IndexStorage indexStorageOf(long indexId) { - return new PartitionedIndexStorage( directoryFactory, fileSystem, indexRootFolder, indexId ); + return new ShardedIndexStorage( directoryFactory, fileSystem, indexRootFolder, indexId ); } public IndexStorage labelScanStorage() diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/storage/PartitionedIndexStorage.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/storage/ShardedIndexStorage.java similarity index 93% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/storage/PartitionedIndexStorage.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/storage/ShardedIndexStorage.java index 3b720d350598f..50515581cb297 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/storage/PartitionedIndexStorage.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/storage/ShardedIndexStorage.java @@ -19,7 +19,6 @@ */ package org.neo4j.kernel.api.impl.index.storage; -import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; @@ -31,12 +30,12 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.kernel.api.impl.index.storage.layout.IndexFolderLayout; -public class PartitionedIndexStorage extends IndexStorage +public class ShardedIndexStorage extends IndexStorage { private static final int partitions = 1; private List partitionDirectories = new ArrayList<>(); - public PartitionedIndexStorage( DirectoryFactory directoryFactory, FileSystemAbstraction fileSystem, + public ShardedIndexStorage( DirectoryFactory directoryFactory, FileSystemAbstraction fileSystem, File schemaIndexRootFolder, long indexId ) { super( directoryFactory, fileSystem, new IndexFolderLayout( schemaIndexRootFolder, indexId ) ); diff --git a/community/lucene-index/src/test/java/org/neo4j/index/lucene/ConstraintIndexFailureIT.java b/community/lucene-index/src/test/java/org/neo4j/index/lucene/ConstraintIndexFailureIT.java index edfa6ca6b0cf3..0c0da02f8da6a 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/lucene/ConstraintIndexFailureIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/lucene/ConstraintIndexFailureIT.java @@ -32,7 +32,7 @@ import org.neo4j.kernel.api.exceptions.schema.UnableToValidateConstraintKernelException; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; import org.neo4j.kernel.api.impl.index.storage.IndexStorage; -import org.neo4j.kernel.api.impl.index.storage.PartitionedIndexStorage; +import org.neo4j.kernel.api.impl.index.storage.ShardedIndexStorage; import org.neo4j.test.TargetDirectory; import org.neo4j.test.TestGraphDatabaseFactory; @@ -104,7 +104,7 @@ private void dbWithConstraint() private void storeIndexFailure( String failure ) throws IOException { File luceneRootDirectory = new File( storeDir.directory(), "schema/index/lucene" ); - IndexStorage indexStorage = new PartitionedIndexStorage( DirectoryFactory.PERSISTENT, new + IndexStorage indexStorage = new ShardedIndexStorage( DirectoryFactory.PERSISTENT, new DefaultFileSystemAbstraction(), luceneRootDirectory, 1 ); indexStorage.storeIndexFailure( failure ); } diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneIndexAccessorSearcherManagerRefreshTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneIndexAccessorSearcherManagerRefreshTest.java index 51810c05d8f38..33f750742e4ec 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneIndexAccessorSearcherManagerRefreshTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneIndexAccessorSearcherManagerRefreshTest.java @@ -20,7 +20,6 @@ package org.neo4j.kernel.api.impl.index; import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.store.Directory; import org.junit.Test; import java.io.File; @@ -32,7 +31,7 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; import org.neo4j.kernel.api.impl.index.storage.IndexStorage; -import org.neo4j.kernel.api.impl.index.storage.PartitionedIndexStorage; +import org.neo4j.kernel.api.impl.index.storage.ShardedIndexStorage; import org.neo4j.kernel.api.index.IndexUpdater; import static org.junit.Assert.assertEquals; @@ -197,7 +196,7 @@ public void run() private LuceneIndexAccessor createAccessor( LuceneIndexAccessor.LuceneReferenceManager manager ) { IndexStorage indexStorage = - new PartitionedIndexStorage( mock( DirectoryFactory.class ), mock( FileSystemAbstraction.class ), dir, 1 ); + new ShardedIndexStorage( mock( DirectoryFactory.class ), mock( FileSystemAbstraction.class ), dir, 1 ); return new LuceneIndexAccessor( structure, writer, manager, indexStorage, 42 ) { }; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneIndexAccessorTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneIndexAccessorTest.java index d64cdc35002c2..511bdc4c9433c 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneIndexAccessorTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneIndexAccessorTest.java @@ -42,7 +42,7 @@ import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; import org.neo4j.kernel.api.impl.index.storage.IndexStorage; -import org.neo4j.kernel.api.impl.index.storage.PartitionedIndexStorage; +import org.neo4j.kernel.api.impl.index.storage.ShardedIndexStorage; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.NodePropertyUpdate; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; @@ -120,7 +120,7 @@ public String toString() private static IndexStorage getIndexStorage( DirectoryFactory dirFactory, File dir ) throws IOException { - IndexStorage indexStorage = new PartitionedIndexStorage( dirFactory, new EphemeralFileSystemAbstraction(), dir, 1 ); + IndexStorage indexStorage = new ShardedIndexStorage( dirFactory, new EphemeralFileSystemAbstraction(), dir, 1 ); indexStorage.prepareIndexStorage(); return indexStorage; } diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneIndexIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneIndexIT.java index 15cfdfc5af144..466fb854bac91 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneIndexIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneIndexIT.java @@ -35,7 +35,7 @@ import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; import org.neo4j.kernel.api.impl.index.storage.IndexStorage; -import org.neo4j.kernel.api.impl.index.storage.PartitionedIndexStorage; +import org.neo4j.kernel.api.impl.index.storage.ShardedIndexStorage; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.NodePropertyUpdate; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; @@ -63,8 +63,7 @@ public class LuceneIndexIT @Before public void before() throws Exception { - - indexStorage = new PartitionedIndexStorage( DirectoryFactory.PERSISTENT, new DefaultFileSystemAbstraction(), + indexStorage = new ShardedIndexStorage( DirectoryFactory.PERSISTENT, new DefaultFileSystemAbstraction(), testDir.directory(), 1 ); indexStorage.prepareIndexStorage(); accessor = new NonUniqueLuceneIndexAccessor( documentLogic, standard(), indexStorage, 100_000 );