From 5e70224a7d5636db63b110a6a754156d40c2ad74 Mon Sep 17 00:00:00 2001 From: lutovich Date: Wed, 20 Jan 2016 10:02:15 +0100 Subject: [PATCH] Better package structure in lucene-index module Currently all classes related to both schema indexes and label scan store are located in `org.neo4j.kernel.api.impl.index` package. This makes it quite a big and messy package. This commit keeps common components in `org.neo4j.kernel.api.impl.index`, moves classes related to schema indexes to `org.neo4j.kernel.api.impl.schema` and classes related to label scan store to `org.neo4j.kernel.api.impl.labelscan`. Same restructuring is done for tests. --- .../consistency/ConsistencyCheckService.java | 6 ++--- .../checking/GraphStoreFixture.java | 3 +-- .../report/ConsistencyReporterTest.java | 10 +------ .../consistency/ConsistencyCheckService.java | 2 +- .../checking/GraphStoreFixture.java | 3 +-- .../report/ConsistencyReporterTest.java | 6 ++--- .../api/schema/IndexSampler.java | 3 +++ .../index/impl/lucene/legacy/FullTxData.java | 2 +- .../legacy/LuceneBatchInserterIndex.java | 2 +- .../impl/lucene/legacy/LuceneLegacyIndex.java | 2 +- .../lucene/LuceneLabelScanStoreBuilder.java | 10 +++---- .../api/impl/index/AbstractLuceneIndex.java | 26 +++++++++---------- .../builder/AbstractLuceneIndexBuilder.java | 2 +- .../{ => collector}/DocValuesAccess.java | 4 +-- .../{ => collector}/DocValuesCollector.java | 4 +-- .../{ => collector}/FirstHitCollector.java | 2 +- .../LuceneLabelScanIndex.java | 8 +++++- .../LuceneLabelScanIndexBuilder.java | 6 ++--- .../LuceneLabelScanStore.java | 2 +- .../LuceneLabelScanStoreExtension.java | 6 ++--- .../LuceneNodeLabelRange.java | 2 +- .../{index => labelscan}/bitmaps/Bitmap.java | 2 +- .../bitmaps/BitmapExtractor.java | 2 +- .../bitmaps/BitmapFormat.java | 2 +- .../bitmaps/LongPageIterator.java | 2 +- .../LuceneAllEntriesLabelScanReader.java | 6 +++-- .../SimpleLuceneLabelScanStoreReader.java | 5 ++-- .../storestrategy}/BitmapDocumentFormat.java | 6 ++--- .../LabelScanStorageStrategy.java | 3 ++- ...RangeDocumentLabelScanStorageStrategy.java | 8 +++--- .../storestrategy}/PageOfRangesIterator.java | 8 +++--- .../PartitionedLuceneLabelScanWriter.java | 7 +++-- .../LuceneDocumentStructure.java | 2 +- .../LuceneIndexAccessor.java | 4 ++- ...LuceneIndexReaderAcquisitionException.java | 2 +- .../{index => schema}/LuceneSchemaIndex.java | 15 ++++++----- .../LuceneSchemaIndexBuilder.java | 4 +-- .../LuceneSchemaIndexProvider.java | 7 +++-- .../LuceneSchemaIndexProviderFactory.java | 2 +- ...erificationUniqueLuceneIndexPopulator.java | 6 ++--- .../populator/LuceneIndexPopulator.java | 6 ++--- .../NonUniqueLuceneIndexPopulator.java | 6 ++--- .../reader/IndexSearcherCloseException.java | 2 +- .../LuceneAllEntriesIndexAccessorReader.java | 4 +-- .../reader/PartitionedIndexReader.java | 2 +- .../reader/SimpleIndexReader.java | 12 ++++----- .../sampler/LuceneIndexSampler.java | 2 +- .../sampler/NonUniqueLuceneIndexSampler.java | 4 +-- .../NonUniquePartitionedIndexSampler.java | 4 +-- .../sampler/UniqueLuceneIndexSampler.java | 2 +- .../DuplicateCheckingCollector.java | 4 +-- .../PartitionedUniquenessVerifier.java | 2 +- .../SimpleUniquenessVerifier.java | 6 ++--- .../verification/UniquenessVerifier.java | 2 +- .../writer}/LuceneIndexWriter.java | 2 +- .../writer}/PartitionedIndexWriter.java | 3 ++- ...4j.kernel.extension.KernelExtensionFactory | 4 +-- .../graphdb/LuceneLabelScanStoreChaosIT.java | 2 +- .../lucene/legacy/NonUniqueIndexTests.java | 6 ++--- .../recovery/UniqueIndexRecoveryTests.java | 4 +-- .../DocValuesCollectorTest.java | 3 ++- .../LuceneLabelScanIndexIT.java | 6 ++--- .../LuceneLabelScanStoreTest.java | 5 ++-- .../LuceneLabelScanStoreWriterTest.java | 7 +++-- .../LuceneNodeLabelRangeTest.java | 3 +-- .../bitmaps/BitmapExtractorTest.java | 2 +- .../bitmaps/BitmapFormatTest.java | 6 ++--- .../bitmaps/LongPageIteratorTest.java | 7 +++-- ...eDocumentLabelScanStorageStrategyTest.java | 7 +++-- .../PageOfRangesIteratorTest.java | 9 +++---- .../AccessUniqueLuceneIndexTest.java | 3 +-- .../{index => schema}/AllNodesCollector.java | 2 +- ...icationUniqueLuceneIndexPopulatorTest.java | 8 +++--- .../{index => schema}/LongArrayMatcher.java | 2 +- .../LuceneDocumentStructureTest.java | 12 ++++----- .../LuceneIndexAccessorTest.java | 3 +-- .../LuceneIndexRecoveryIT.java | 2 +- .../LuceneSchemaIndexCorruptionTest.java | 2 +- .../LuceneSchemaIndexIT.java | 4 +-- .../LuceneSchemaIndexPopulatorTest.java | 2 +- .../LuceneSchemaIndexProviderTest.java | 2 +- .../LuceneSchemaIndexTest.java | 3 +-- .../SchemaIndexAcceptanceTest.java | 2 +- .../UniqueIndexApplicationIT.java | 2 +- .../reader/SimpleIndexReaderTest.java | 10 +++---- .../NonUniqueLuceneIndexSamplerTest.java | 4 +-- .../sampler/UniqueLuceneIndexSamplerTest.java | 4 +-- .../index/IndexingServiceIntegrationTest.java | 2 +- .../TestLuceneSchemaBatchInsertIT.java | 2 +- .../ccheck/ConsistencyPerformanceCheck.java | 4 +-- .../org/neo4j/kernel/api/SchemaIndexHaIT.java | 2 +- .../LabelScanStoreHaIT.java | 2 +- .../java/upgrade/StoreMigratorFrom20IT.java | 2 +- 93 files changed, 210 insertions(+), 209 deletions(-) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/{ => collector}/DocValuesAccess.java (93%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/{ => collector}/DocValuesCollector.java (99%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/{ => collector}/FirstHitCollector.java (97%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => labelscan}/LuceneLabelScanIndex.java (87%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index/builder => labelscan}/LuceneLabelScanIndexBuilder.java (91%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => labelscan}/LuceneLabelScanStore.java (99%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => labelscan}/LuceneLabelScanStoreExtension.java (93%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => labelscan}/LuceneNodeLabelRange.java (98%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => labelscan}/bitmaps/Bitmap.java (95%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => labelscan}/bitmaps/BitmapExtractor.java (96%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => labelscan}/bitmaps/BitmapFormat.java (97%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => labelscan}/bitmaps/LongPageIterator.java (96%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => labelscan/reader}/LuceneAllEntriesLabelScanReader.java (93%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => labelscan/reader}/SimpleLuceneLabelScanStoreReader.java (90%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => labelscan/storestrategy}/BitmapDocumentFormat.java (97%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => labelscan/storestrategy}/LabelScanStorageStrategy.java (91%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => labelscan/storestrategy}/NodeRangeDocumentLabelScanStorageStrategy.java (93%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => labelscan/storestrategy}/PageOfRangesIterator.java (91%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => labelscan/writer}/PartitionedLuceneLabelScanWriter.java (96%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => schema}/LuceneDocumentStructure.java (99%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => schema}/LuceneIndexAccessor.java (96%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => schema}/LuceneIndexReaderAcquisitionException.java (96%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => schema}/LuceneSchemaIndex.java (93%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index/builder => schema}/LuceneSchemaIndexBuilder.java (96%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => schema}/LuceneSchemaIndexProvider.java (95%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => schema}/LuceneSchemaIndexProviderFactory.java (98%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => schema}/populator/DeferredConstraintVerificationUniqueLuceneIndexPopulator.java (96%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => schema}/populator/LuceneIndexPopulator.java (91%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => schema}/populator/NonUniqueLuceneIndexPopulator.java (97%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => schema}/reader/IndexSearcherCloseException.java (96%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => schema/reader}/LuceneAllEntriesIndexAccessorReader.java (93%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => schema}/reader/PartitionedIndexReader.java (98%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => schema}/reader/SimpleIndexReader.java (92%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => schema}/sampler/LuceneIndexSampler.java (98%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => schema}/sampler/NonUniqueLuceneIndexSampler.java (96%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => schema}/sampler/NonUniquePartitionedIndexSampler.java (93%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => schema}/sampler/UniqueLuceneIndexSampler.java (97%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => schema}/verification/DuplicateCheckingCollector.java (97%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => schema}/verification/PartitionedUniquenessVerifier.java (97%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => schema}/verification/SimpleUniquenessVerifier.java (95%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => schema}/verification/UniquenessVerifier.java (96%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => schema/writer}/LuceneIndexWriter.java (96%) rename community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/{index => schema/writer}/PartitionedIndexWriter.java (97%) rename community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/{ => collector}/DocValuesCollectorTest.java (99%) rename community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/{index => labelscan}/LuceneLabelScanIndexIT.java (96%) rename community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/{index => labelscan}/LuceneLabelScanStoreTest.java (99%) rename community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/{index => labelscan}/LuceneLabelScanStoreWriterTest.java (97%) rename community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/{index => labelscan}/LuceneNodeLabelRangeTest.java (97%) rename community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/{index => labelscan}/bitmaps/BitmapExtractorTest.java (98%) rename community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/{index => labelscan}/bitmaps/BitmapFormatTest.java (98%) rename community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/{index => labelscan}/bitmaps/LongPageIteratorTest.java (97%) rename community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/{index => labelscan/storestrategy}/NodeRangeDocumentLabelScanStorageStrategyTest.java (97%) rename community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/{index => labelscan/storestrategy}/PageOfRangesIteratorTest.java (95%) rename community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/{index => schema}/AccessUniqueLuceneIndexTest.java (98%) rename community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/{index => schema}/AllNodesCollector.java (98%) rename community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/{index => schema}/DeferredConstraintVerificationUniqueLuceneIndexPopulatorTest.java (98%) rename community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/{index => schema}/LongArrayMatcher.java (98%) rename community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/{index => schema}/LuceneDocumentStructureTest.java (92%) rename community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/{index => schema}/LuceneIndexAccessorTest.java (99%) rename community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/{index => schema}/LuceneIndexRecoveryIT.java (99%) rename community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/{index => schema}/LuceneSchemaIndexCorruptionTest.java (99%) rename community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/{index => schema}/LuceneSchemaIndexIT.java (99%) rename community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/{index => schema}/LuceneSchemaIndexPopulatorTest.java (99%) rename community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/{index => schema}/LuceneSchemaIndexProviderTest.java (96%) rename community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/{index => schema}/LuceneSchemaIndexTest.java (97%) rename community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/{index => schema}/SchemaIndexAcceptanceTest.java (99%) rename community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/{index => schema}/UniqueIndexApplicationIT.java (99%) rename community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/{index => schema}/reader/SimpleIndexReaderTest.java (95%) rename community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/{index => schema}/sampler/NonUniqueLuceneIndexSamplerTest.java (98%) rename community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/{index => schema}/sampler/UniqueLuceneIndexSamplerTest.java (98%) rename enterprise/ha/src/test/java/org/neo4j/kernel/api/impl/{index => labelscan}/LabelScanStoreHaIT.java (99%) diff --git a/community/consistency-check-legacy/src/main/java/org/neo4j/legacy/consistency/ConsistencyCheckService.java b/community/consistency-check-legacy/src/main/java/org/neo4j/legacy/consistency/ConsistencyCheckService.java index 7b3467d3996e1..0128a1b5f0e52 100644 --- a/community/consistency-check-legacy/src/main/java/org/neo4j/legacy/consistency/ConsistencyCheckService.java +++ b/community/consistency-check-legacy/src/main/java/org/neo4j/legacy/consistency/ConsistencyCheckService.java @@ -27,25 +27,25 @@ import org.neo4j.function.Suppliers; import org.neo4j.graphdb.factory.GraphDatabaseSettings; -import org.neo4j.kernel.configuration.Settings; import org.neo4j.helpers.collection.MapUtil; import org.neo4j.helpers.progress.ProgressMonitorFactory; import org.neo4j.index.lucene.LuceneLabelScanStoreBuilder; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.io.pagecache.tracing.PageCacheTracer; -import org.neo4j.kernel.impl.store.id.DefaultIdGeneratorFactory; import org.neo4j.kernel.api.direct.DirectStoreAccess; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; -import org.neo4j.kernel.api.impl.index.LuceneSchemaIndexProvider; +import org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProvider; import org.neo4j.kernel.api.index.SchemaIndexProvider; import org.neo4j.kernel.api.labelscan.LabelScanStore; import org.neo4j.kernel.configuration.Config; +import org.neo4j.kernel.configuration.Settings; import org.neo4j.kernel.impl.locking.LockService; import org.neo4j.kernel.impl.pagecache.ConfiguringPageCacheFactory; import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.kernel.impl.store.StoreAccess; import org.neo4j.kernel.impl.store.StoreFactory; +import org.neo4j.kernel.impl.store.id.DefaultIdGeneratorFactory; import org.neo4j.kernel.impl.transaction.state.NeoStoreIndexStoreView; import org.neo4j.legacy.consistency.checking.full.ConsistencyCheckIncompleteException; import org.neo4j.legacy.consistency.checking.full.FullCheck; diff --git a/community/consistency-check-legacy/src/test/java/org/neo4j/legacy/consistency/checking/GraphStoreFixture.java b/community/consistency-check-legacy/src/test/java/org/neo4j/legacy/consistency/checking/GraphStoreFixture.java index 41851633269f7..16fb7175b50fd 100644 --- a/community/consistency-check-legacy/src/test/java/org/neo4j/legacy/consistency/checking/GraphStoreFixture.java +++ b/community/consistency-check-legacy/src/test/java/org/neo4j/legacy/consistency/checking/GraphStoreFixture.java @@ -38,7 +38,7 @@ import org.neo4j.kernel.api.direct.DirectStoreAccess; import org.neo4j.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; -import org.neo4j.kernel.api.impl.index.LuceneSchemaIndexProvider; +import org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProvider; import org.neo4j.kernel.api.index.SchemaIndexProvider; import org.neo4j.kernel.impl.api.TransactionRepresentationCommitProcess; import org.neo4j.kernel.impl.api.TransactionToApply; @@ -68,7 +68,6 @@ import org.neo4j.test.TestGraphDatabaseFactory; import static java.lang.System.currentTimeMillis; - import static org.neo4j.kernel.impl.api.scan.LabelScanStoreProvider.fullStoreLabelUpdateStream; public abstract class GraphStoreFixture extends PageCacheRule implements TestRule diff --git a/community/consistency-check-legacy/src/test/java/org/neo4j/legacy/consistency/report/ConsistencyReporterTest.java b/community/consistency-check-legacy/src/test/java/org/neo4j/legacy/consistency/report/ConsistencyReporterTest.java index 97694d7070011..58f5ce6cd73d3 100644 --- a/community/consistency-check-legacy/src/test/java/org/neo4j/legacy/consistency/report/ConsistencyReporterTest.java +++ b/community/consistency-check-legacy/src/test/java/org/neo4j/legacy/consistency/report/ConsistencyReporterTest.java @@ -39,7 +39,7 @@ import java.util.ArrayList; import java.util.List; -import org.neo4j.kernel.api.impl.index.LuceneNodeLabelRange; +import org.neo4j.kernel.api.impl.labelscan.LuceneNodeLabelRange; import org.neo4j.kernel.api.index.SchemaIndexProvider; import org.neo4j.kernel.impl.store.record.AbstractBaseRecord; import org.neo4j.kernel.impl.store.record.DynamicRecord; @@ -57,12 +57,6 @@ import org.neo4j.legacy.consistency.checking.CheckerEngine; import org.neo4j.legacy.consistency.checking.ComparativeRecordChecker; import org.neo4j.legacy.consistency.checking.RecordCheck; -import org.neo4j.legacy.consistency.report.ConsistencyReport; -import org.neo4j.legacy.consistency.report.ConsistencyReporter; -import org.neo4j.legacy.consistency.report.ConsistencySummaryStatistics; -import org.neo4j.legacy.consistency.report.InconsistencyLogger; -import org.neo4j.legacy.consistency.report.InconsistencyReport; -import org.neo4j.legacy.consistency.report.PendingReferenceCheck; import org.neo4j.legacy.consistency.store.DiffRecordAccess; import org.neo4j.legacy.consistency.store.RecordAccess; import org.neo4j.legacy.consistency.store.RecordReference; @@ -72,7 +66,6 @@ import org.neo4j.storageengine.api.schema.SchemaRule; import static java.lang.String.format; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.argThat; import static org.mockito.Mockito.doAnswer; @@ -80,7 +73,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; - import static org.neo4j.kernel.impl.store.counts.keys.CountsKeyFactory.nodeKey; @RunWith(Suite.class) diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckService.java b/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckService.java index 206d42a036555..691cdb10f8a1a 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckService.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckService.java @@ -43,8 +43,8 @@ import org.neo4j.io.pagecache.PageCache; import org.neo4j.io.pagecache.tracing.PageCacheTracer; import org.neo4j.kernel.api.direct.DirectStoreAccess; -import org.neo4j.kernel.api.impl.index.LuceneSchemaIndexProvider; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; +import org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProvider; import org.neo4j.kernel.api.index.SchemaIndexProvider; import org.neo4j.kernel.api.labelscan.LabelScanStore; import org.neo4j.kernel.configuration.Config; diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/GraphStoreFixture.java b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/GraphStoreFixture.java index dcdbf2f5444ee..76c945d40cc92 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/GraphStoreFixture.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/GraphStoreFixture.java @@ -43,7 +43,7 @@ import org.neo4j.kernel.api.direct.DirectStoreAccess; import org.neo4j.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; -import org.neo4j.kernel.api.impl.index.LuceneSchemaIndexProvider; +import org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProvider; import org.neo4j.kernel.api.index.SchemaIndexProvider; import org.neo4j.kernel.impl.api.TransactionRepresentationCommitProcess; import org.neo4j.kernel.impl.api.TransactionToApply; @@ -77,7 +77,6 @@ import org.neo4j.test.TestGraphDatabaseFactory; import static java.lang.System.currentTimeMillis; - import static org.neo4j.consistency.ConsistencyCheckService.defaultConsistencyCheckThreadsNumber; import static org.neo4j.kernel.impl.api.scan.LabelScanStoreProvider.fullStoreLabelUpdateStream; diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/report/ConsistencyReporterTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/report/ConsistencyReporterTest.java index 87315c3c6ffba..5d29eec4a3865 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/report/ConsistencyReporterTest.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/report/ConsistencyReporterTest.java @@ -48,7 +48,7 @@ import org.neo4j.consistency.store.synthetic.CountsEntry; import org.neo4j.consistency.store.synthetic.IndexEntry; import org.neo4j.consistency.store.synthetic.LabelScanDocument; -import org.neo4j.kernel.api.impl.index.LuceneNodeLabelRange; +import org.neo4j.kernel.api.impl.labelscan.LuceneNodeLabelRange; import org.neo4j.kernel.api.index.SchemaIndexProvider; import org.neo4j.kernel.impl.store.record.AbstractBaseRecord; import org.neo4j.kernel.impl.store.record.DynamicRecord; @@ -64,6 +64,7 @@ import org.neo4j.kernel.impl.store.record.RelationshipTypeTokenRecord; import org.neo4j.storageengine.api.schema.SchemaRule; +import static java.lang.String.format; import static org.mockito.Matchers.any; import static org.mockito.Matchers.argThat; import static org.mockito.Mockito.doAnswer; @@ -71,9 +72,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; - -import static java.lang.String.format; - import static org.neo4j.consistency.report.ConsistencyReporter.NO_MONITOR; import static org.neo4j.kernel.impl.store.counts.keys.CountsKeyFactory.nodeKey; diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/schema/IndexSampler.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/schema/IndexSampler.java index 800a41c479462..8598f52a19ccd 100644 --- a/community/kernel/src/main/java/org/neo4j/storageengine/api/schema/IndexSampler.java +++ b/community/kernel/src/main/java/org/neo4j/storageengine/api/schema/IndexSampler.java @@ -22,6 +22,9 @@ import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.register.Register; +/** + * Component able to sample schema index. + */ public interface IndexSampler { IndexSampler EMPTY = result -> { diff --git a/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/FullTxData.java b/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/FullTxData.java index 8a3e18c76977f..661205f17f97a 100644 --- a/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/FullTxData.java +++ b/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/FullTxData.java @@ -52,7 +52,7 @@ import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.index.lucene.QueryContext; -import org.neo4j.kernel.api.impl.index.DocValuesCollector; +import org.neo4j.kernel.api.impl.index.collector.DocValuesCollector; import static java.util.Collections.emptyList; import static org.neo4j.index.impl.lucene.legacy.LuceneLegacyIndex.KEY_DOC_ID; diff --git a/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneBatchInserterIndex.java b/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneBatchInserterIndex.java index 6735be2d993a0..2225dbc1f3f91 100644 --- a/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneBatchInserterIndex.java +++ b/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneBatchInserterIndex.java @@ -48,7 +48,7 @@ import org.neo4j.index.lucene.ValueContext; import org.neo4j.io.IOUtils; import org.neo4j.kernel.api.LegacyIndexHits; -import org.neo4j.kernel.api.impl.index.DocValuesCollector; +import org.neo4j.kernel.api.impl.index.collector.DocValuesCollector; import org.neo4j.kernel.impl.index.IndexEntityType; import org.neo4j.kernel.impl.util.IoPrimitiveUtils; import org.neo4j.unsafe.batchinsert.BatchInserterIndex; diff --git a/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneLegacyIndex.java b/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneLegacyIndex.java index b1ef5bab9acbf..9a3fe3dc8775a 100644 --- a/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneLegacyIndex.java +++ b/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneLegacyIndex.java @@ -50,7 +50,7 @@ import org.neo4j.index.lucene.ValueContext; import org.neo4j.kernel.api.LegacyIndex; import org.neo4j.kernel.api.LegacyIndexHits; -import org.neo4j.kernel.api.impl.index.DocValuesCollector; +import org.neo4j.kernel.api.impl.index.collector.DocValuesCollector; import org.neo4j.kernel.impl.util.IoPrimitiveUtils; import org.neo4j.kernel.spi.legacyindex.IndexCommandFactory; diff --git a/community/lucene-index/src/main/java/org/neo4j/index/lucene/LuceneLabelScanStoreBuilder.java b/community/lucene-index/src/main/java/org/neo4j/index/lucene/LuceneLabelScanStoreBuilder.java index 947dbd633c6ec..7a2e4bf631b00 100644 --- a/community/lucene-index/src/main/java/org/neo4j/index/lucene/LuceneLabelScanStoreBuilder.java +++ b/community/lucene-index/src/main/java/org/neo4j/index/lucene/LuceneLabelScanStoreBuilder.java @@ -23,18 +23,14 @@ import java.io.IOException; import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.kernel.api.impl.index.LuceneLabelScanIndex; -import org.neo4j.kernel.api.impl.index.LuceneLabelScanStore; -import org.neo4j.kernel.api.impl.index.builder.LuceneLabelScanIndexBuilder; -import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; -import org.neo4j.kernel.api.impl.index.storage.PartitionedIndexStorage; +import org.neo4j.kernel.api.impl.labelscan.LuceneLabelScanIndex; +import org.neo4j.kernel.api.impl.labelscan.LuceneLabelScanIndexBuilder; +import org.neo4j.kernel.api.impl.labelscan.LuceneLabelScanStore; import org.neo4j.kernel.api.labelscan.LabelScanStore; import org.neo4j.kernel.impl.api.scan.LabelScanStoreProvider; import org.neo4j.kernel.impl.api.scan.LabelScanStoreProvider.FullStoreChangeStream; import org.neo4j.logging.LogProvider; -import static org.neo4j.kernel.impl.api.scan.LabelScanStoreProvider.fullStoreLabelUpdateStream; - /** * Means of obtaining a {@link LabelScanStore}, independent of the {@link org.neo4j.kernel.extension.KernelExtensions} * mechanism, when you need to access the store without running a full database. This is used during consistency diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/AbstractLuceneIndex.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/AbstractLuceneIndex.java index ddd259df73064..9d7cbcd2f6f2a 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/AbstractLuceneIndex.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/AbstractLuceneIndex.java @@ -98,7 +98,7 @@ public void open() throws IOException open = true; } - boolean isOpen() + public boolean isOpen() { return open; } @@ -321,19 +321,29 @@ public void maybeRefreshBlocking() throws IOException } } - List getPartitions() + public List getPartitions() { ensureOpen(); return partitions; } + public boolean hasSinglePartition( List partitions ) + { + return partitions.size() == 1; + } + + public IndexPartition getFirstPartition( List partitions ) + { + return partitions.get( 0 ); + } + /** * Add new partition to the index. * * @return newly created partition * @throws IOException */ - IndexPartition addNewPartition() throws IOException + public IndexPartition addNewPartition() throws IOException { ensureOpen(); partitionsLock.lock(); @@ -368,16 +378,6 @@ protected void ensureNotOpen() } } - protected boolean hasSinglePartition( List partitions ) - { - return partitions.size() == 1; - } - - protected IndexPartition getFirstPartition( List partitions ) - { - return partitions.get( 0 ); - } - private boolean luceneDirectoryExists( File folder ) throws IOException { try ( Directory directory = indexStorage.openDirectory( folder ) ) diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/builder/AbstractLuceneIndexBuilder.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/builder/AbstractLuceneIndexBuilder.java index 5e8320e9242be..35973fc61379c 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/builder/AbstractLuceneIndexBuilder.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/builder/AbstractLuceneIndexBuilder.java @@ -30,7 +30,7 @@ * * @param actual index type */ -abstract class AbstractLuceneIndexBuilder> +public abstract class AbstractLuceneIndexBuilder> { protected LuceneIndexStorageBuilder storageBuilder = LuceneIndexStorageBuilder.create(); diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/DocValuesAccess.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/collector/DocValuesAccess.java similarity index 93% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/DocValuesAccess.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/collector/DocValuesAccess.java index cfdac36d2b422..9a7a0c3b0a0e3 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/DocValuesAccess.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/collector/DocValuesAccess.java @@ -17,13 +17,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.index.collector; /** * Represents a point-in-time view on a set of numeric values * that are read from a {@code NumericDocValues} field. */ -interface DocValuesAccess +public interface DocValuesAccess { /** * @return the current value of the main field that is driving the values. diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/DocValuesCollector.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/collector/DocValuesCollector.java similarity index 99% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/DocValuesCollector.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/collector/DocValuesCollector.java index 1b0b838b9cfe0..6ed2f0b22376a 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/DocValuesCollector.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/collector/DocValuesCollector.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.index.collector; import org.apache.lucene.document.Document; import org.apache.lucene.index.DocValuesType; @@ -199,7 +199,7 @@ public void setScorer( Scorer scorer ) throws IOException } @Override - protected void doSetNextReader( LeafReaderContext context ) throws IOException + public void doSetNextReader( LeafReaderContext context ) throws IOException { if ( docs != null && segmentHits > 0 ) { diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/FirstHitCollector.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/collector/FirstHitCollector.java similarity index 97% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/FirstHitCollector.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/collector/FirstHitCollector.java index 95de9b9a32b6d..884a5eb6af5ab 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/FirstHitCollector.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/collector/FirstHitCollector.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.index.collector; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.CollectionTerminatedException; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneLabelScanIndex.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanIndex.java similarity index 87% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneLabelScanIndex.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanIndex.java index d7a7ca930e86f..8b01b15b5ed4e 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneLabelScanIndex.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanIndex.java @@ -17,16 +17,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.labelscan; import java.io.IOException; import java.io.UncheckedIOException; import java.util.List; import java.util.concurrent.locks.Lock; +import org.neo4j.kernel.api.impl.index.AbstractLuceneIndex; import org.neo4j.kernel.api.impl.index.partition.IndexPartition; import org.neo4j.kernel.api.impl.index.partition.PartitionSearcher; import org.neo4j.kernel.api.impl.index.storage.PartitionedIndexStorage; +import org.neo4j.kernel.api.impl.labelscan.reader.SimpleLuceneLabelScanStoreReader; +import org.neo4j.kernel.api.impl.labelscan.storestrategy.BitmapDocumentFormat; +import org.neo4j.kernel.api.impl.labelscan.storestrategy.LabelScanStorageStrategy; +import org.neo4j.kernel.api.impl.labelscan.storestrategy.NodeRangeDocumentLabelScanStorageStrategy; +import org.neo4j.kernel.api.impl.labelscan.writer.PartitionedLuceneLabelScanWriter; import org.neo4j.kernel.api.labelscan.AllEntriesLabelScanReader; import org.neo4j.kernel.api.labelscan.LabelScanWriter; import org.neo4j.kernel.api.labelscan.NodeLabelRange; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/builder/LuceneLabelScanIndexBuilder.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanIndexBuilder.java similarity index 91% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/builder/LuceneLabelScanIndexBuilder.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanIndexBuilder.java index 92cf66b4b9ca1..be36543cf85b8 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/builder/LuceneLabelScanIndexBuilder.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanIndexBuilder.java @@ -17,10 +17,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index.builder; +package org.neo4j.kernel.api.impl.labelscan; -import org.neo4j.kernel.api.impl.index.BitmapDocumentFormat; -import org.neo4j.kernel.api.impl.index.LuceneLabelScanIndex; +import org.neo4j.kernel.api.impl.index.builder.AbstractLuceneIndexBuilder; +import org.neo4j.kernel.api.impl.labelscan.storestrategy.BitmapDocumentFormat; /** * Helper builder class to simplify construction and instantiation of lucene label scan indexes. diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneLabelScanStore.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanStore.java similarity index 99% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneLabelScanStore.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanStore.java index d3cd9d698c801..6b2a45d4496e5 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneLabelScanStore.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanStore.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.labelscan; import org.apache.lucene.store.LockObtainFailedException; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneLabelScanStoreExtension.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanStoreExtension.java similarity index 93% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneLabelScanStoreExtension.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanStoreExtension.java index 213a47e0df74c..cb337bbbfff20 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneLabelScanStoreExtension.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanStoreExtension.java @@ -17,16 +17,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.labelscan; import java.util.function.Supplier; import org.neo4j.helpers.Service; import org.neo4j.kernel.NeoStoreDataSource; -import org.neo4j.kernel.api.impl.index.LuceneLabelScanStore.Monitor; -import org.neo4j.kernel.api.impl.index.builder.LuceneLabelScanIndexBuilder; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; -import org.neo4j.kernel.api.impl.index.storage.PartitionedIndexStorage; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.api.index.IndexStoreView; @@ -37,6 +34,7 @@ import org.neo4j.kernel.lifecycle.Lifecycle; import static org.neo4j.kernel.api.impl.index.LuceneKernelExtensions.directoryFactory; +import static org.neo4j.kernel.api.impl.labelscan.LuceneLabelScanStore.Monitor; import static org.neo4j.kernel.impl.api.scan.LabelScanStoreProvider.fullStoreLabelUpdateStream; @Service.Implementation(KernelExtensionFactory.class) diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneNodeLabelRange.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/LuceneNodeLabelRange.java similarity index 98% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneNodeLabelRange.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/LuceneNodeLabelRange.java index 6ecf2e9973d8c..7406ed4d70d71 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneNodeLabelRange.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/LuceneNodeLabelRange.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.labelscan; import java.util.ArrayList; import java.util.HashMap; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/bitmaps/Bitmap.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/bitmaps/Bitmap.java similarity index 95% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/bitmaps/Bitmap.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/bitmaps/Bitmap.java index fac1a91f0497d..0d293fd6ed950 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/bitmaps/Bitmap.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/bitmaps/Bitmap.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index.bitmaps; +package org.neo4j.kernel.api.impl.labelscan.bitmaps; public class Bitmap { diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/bitmaps/BitmapExtractor.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/bitmaps/BitmapExtractor.java similarity index 96% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/bitmaps/BitmapExtractor.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/bitmaps/BitmapExtractor.java index e29822d4f7aa3..138e363c894e3 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/bitmaps/BitmapExtractor.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/bitmaps/BitmapExtractor.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index.bitmaps; +package org.neo4j.kernel.api.impl.labelscan.bitmaps; import org.neo4j.helpers.collection.PrefetchingIterator; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/bitmaps/BitmapFormat.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/bitmaps/BitmapFormat.java similarity index 97% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/bitmaps/BitmapFormat.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/bitmaps/BitmapFormat.java index d562d4ad9fe43..110cd51f738db 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/bitmaps/BitmapFormat.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/bitmaps/BitmapFormat.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index.bitmaps; +package org.neo4j.kernel.api.impl.labelscan.bitmaps; public enum BitmapFormat { diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/bitmaps/LongPageIterator.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/bitmaps/LongPageIterator.java similarity index 96% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/bitmaps/LongPageIterator.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/bitmaps/LongPageIterator.java index d97a2d123a923..bd0bc8c7206c2 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/bitmaps/LongPageIterator.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/bitmaps/LongPageIterator.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index.bitmaps; +package org.neo4j.kernel.api.impl.labelscan.bitmaps; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneAllEntriesLabelScanReader.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/reader/LuceneAllEntriesLabelScanReader.java similarity index 93% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneAllEntriesLabelScanReader.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/reader/LuceneAllEntriesLabelScanReader.java index 40e99eb2acb14..92136d2f681e5 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneAllEntriesLabelScanReader.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/reader/LuceneAllEntriesLabelScanReader.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.labelscan.reader; import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexableField; @@ -27,7 +27,9 @@ import java.util.List; import org.neo4j.helpers.collection.BoundedIterable; -import org.neo4j.kernel.api.impl.index.bitmaps.Bitmap; +import org.neo4j.kernel.api.impl.labelscan.LuceneNodeLabelRange; +import org.neo4j.kernel.api.impl.labelscan.bitmaps.Bitmap; +import org.neo4j.kernel.api.impl.labelscan.storestrategy.BitmapDocumentFormat; import org.neo4j.kernel.api.labelscan.AllEntriesLabelScanReader; import org.neo4j.kernel.api.labelscan.NodeLabelRange; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/SimpleLuceneLabelScanStoreReader.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/reader/SimpleLuceneLabelScanStoreReader.java similarity index 90% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/SimpleLuceneLabelScanStoreReader.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/reader/SimpleLuceneLabelScanStoreReader.java index b7fbf036abf7e..9882e3ecc1f20 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/SimpleLuceneLabelScanStoreReader.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/reader/SimpleLuceneLabelScanStoreReader.java @@ -17,14 +17,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.labelscan.reader; import java.io.IOException; import java.util.Iterator; import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.kernel.api.impl.index.partition.PartitionSearcher; -import org.neo4j.kernel.api.impl.index.reader.IndexSearcherCloseException; +import org.neo4j.kernel.api.impl.labelscan.storestrategy.LabelScanStorageStrategy; +import org.neo4j.kernel.api.impl.schema.reader.IndexSearcherCloseException; import org.neo4j.storageengine.api.schema.LabelScanReader; /** diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/BitmapDocumentFormat.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/storestrategy/BitmapDocumentFormat.java similarity index 97% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/BitmapDocumentFormat.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/storestrategy/BitmapDocumentFormat.java index e3880692a5d64..0461cf8d511f6 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/BitmapDocumentFormat.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/storestrategy/BitmapDocumentFormat.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.labelscan.storestrategy; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -30,8 +30,8 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; -import org.neo4j.kernel.api.impl.index.bitmaps.Bitmap; -import org.neo4j.kernel.api.impl.index.bitmaps.BitmapFormat; +import org.neo4j.kernel.api.impl.labelscan.bitmaps.Bitmap; +import org.neo4j.kernel.api.impl.labelscan.bitmaps.BitmapFormat; import static java.lang.String.format; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LabelScanStorageStrategy.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/storestrategy/LabelScanStorageStrategy.java similarity index 91% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LabelScanStorageStrategy.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/storestrategy/LabelScanStorageStrategy.java index 33de11086c500..c6c94cf8569db 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LabelScanStorageStrategy.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/storestrategy/LabelScanStorageStrategy.java @@ -17,13 +17,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.labelscan.storestrategy; import org.apache.lucene.search.IndexSearcher; import java.util.Iterator; import org.neo4j.collection.primitive.PrimitiveLongIterator; +import org.neo4j.kernel.api.impl.index.LuceneAllDocumentsReader; import org.neo4j.kernel.api.labelscan.AllEntriesLabelScanReader; public interface LabelScanStorageStrategy diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/NodeRangeDocumentLabelScanStorageStrategy.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/storestrategy/NodeRangeDocumentLabelScanStorageStrategy.java similarity index 93% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/NodeRangeDocumentLabelScanStorageStrategy.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/storestrategy/NodeRangeDocumentLabelScanStorageStrategy.java index 67804dd548cc1..fa48a9dcafabb 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/NodeRangeDocumentLabelScanStorageStrategy.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/storestrategy/NodeRangeDocumentLabelScanStorageStrategy.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.labelscan.storestrategy; import org.apache.lucene.index.IndexableField; import org.apache.lucene.search.IndexSearcher; @@ -29,7 +29,9 @@ import java.util.List; import org.neo4j.collection.primitive.PrimitiveLongIterator; -import org.neo4j.kernel.api.impl.index.bitmaps.BitmapFormat; +import org.neo4j.kernel.api.impl.index.LuceneAllDocumentsReader; +import org.neo4j.kernel.api.impl.labelscan.bitmaps.BitmapFormat; +import org.neo4j.kernel.api.impl.labelscan.reader.LuceneAllEntriesLabelScanReader; import org.neo4j.kernel.api.labelscan.AllEntriesLabelScanReader; import static org.neo4j.collection.primitive.PrimitiveLongCollections.concat; @@ -64,7 +66,7 @@ public class NodeRangeDocumentLabelScanStorageStrategy implements LabelScanStora private static final int RANGES_PER_PAGE = 4096; private final BitmapDocumentFormat format; - NodeRangeDocumentLabelScanStorageStrategy( BitmapDocumentFormat format ) + public NodeRangeDocumentLabelScanStorageStrategy( BitmapDocumentFormat format ) { this.format = format; } diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/PageOfRangesIterator.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/storestrategy/PageOfRangesIterator.java similarity index 91% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/PageOfRangesIterator.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/storestrategy/PageOfRangesIterator.java index 36b9467ecbd39..7434507c86660 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/PageOfRangesIterator.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/storestrategy/PageOfRangesIterator.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.labelscan.storestrategy; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; @@ -26,8 +26,10 @@ import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.helpers.collection.PrefetchingIterator; -import org.neo4j.kernel.api.impl.index.bitmaps.BitmapExtractor; -import org.neo4j.kernel.api.impl.index.bitmaps.LongPageIterator; +import org.neo4j.kernel.api.impl.index.collector.DocValuesAccess; +import org.neo4j.kernel.api.impl.index.collector.DocValuesCollector; +import org.neo4j.kernel.api.impl.labelscan.bitmaps.BitmapExtractor; +import org.neo4j.kernel.api.impl.labelscan.bitmaps.LongPageIterator; class PageOfRangesIterator extends PrefetchingIterator { diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/PartitionedLuceneLabelScanWriter.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/writer/PartitionedLuceneLabelScanWriter.java similarity index 96% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/PartitionedLuceneLabelScanWriter.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/writer/PartitionedLuceneLabelScanWriter.java index 483e637454565..ac72d13264775 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/PartitionedLuceneLabelScanWriter.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/labelscan/writer/PartitionedLuceneLabelScanWriter.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.labelscan.writer; import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexWriter; @@ -33,9 +33,12 @@ import java.util.Map; import java.util.concurrent.locks.Lock; -import org.neo4j.kernel.api.impl.index.bitmaps.Bitmap; +import org.neo4j.kernel.api.impl.index.collector.FirstHitCollector; import org.neo4j.kernel.api.impl.index.partition.IndexPartition; import org.neo4j.kernel.api.impl.index.partition.PartitionSearcher; +import org.neo4j.kernel.api.impl.labelscan.LuceneLabelScanIndex; +import org.neo4j.kernel.api.impl.labelscan.bitmaps.Bitmap; +import org.neo4j.kernel.api.impl.labelscan.storestrategy.BitmapDocumentFormat; import org.neo4j.kernel.api.labelscan.LabelScanWriter; import org.neo4j.kernel.api.labelscan.NodeLabelUpdate; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneDocumentStructure.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneDocumentStructure.java similarity index 99% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneDocumentStructure.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneDocumentStructure.java index f7766b2000258..a8176d6a8c0d1 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneDocumentStructure.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneDocumentStructure.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.schema; import org.apache.commons.lang3.StringUtils; import org.apache.lucene.document.Document; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneIndexAccessor.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexAccessor.java similarity index 96% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneIndexAccessor.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexAccessor.java index 46aaad7653600..3522ed93532a1 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneIndexAccessor.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexAccessor.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.schema; import java.io.File; import java.io.IOException; @@ -26,6 +26,8 @@ import org.neo4j.graphdb.ResourceIterator; import org.neo4j.helpers.collection.BoundedIterable; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; +import org.neo4j.kernel.api.impl.schema.reader.LuceneAllEntriesIndexAccessorReader; +import org.neo4j.kernel.api.impl.schema.writer.LuceneIndexWriter; import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.NodePropertyUpdate; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneIndexReaderAcquisitionException.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexReaderAcquisitionException.java similarity index 96% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneIndexReaderAcquisitionException.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexReaderAcquisitionException.java index a5d6b26a68c47..0a46f4b1e6e06 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneIndexReaderAcquisitionException.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexReaderAcquisitionException.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.schema; import java.io.IOException; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndex.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndex.java similarity index 93% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndex.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndex.java index be7e3e7b2486f..054f6c30dda9e 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndex.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndex.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.schema; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexWriter; @@ -31,14 +31,17 @@ import org.neo4j.helpers.TaskCoordinator; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; +import org.neo4j.kernel.api.impl.index.AbstractLuceneIndex; import org.neo4j.kernel.api.impl.index.partition.IndexPartition; import org.neo4j.kernel.api.impl.index.partition.PartitionSearcher; -import org.neo4j.kernel.api.impl.index.reader.PartitionedIndexReader; -import org.neo4j.kernel.api.impl.index.reader.SimpleIndexReader; import org.neo4j.kernel.api.impl.index.storage.PartitionedIndexStorage; -import org.neo4j.kernel.api.impl.index.verification.PartitionedUniquenessVerifier; -import org.neo4j.kernel.api.impl.index.verification.SimpleUniquenessVerifier; -import org.neo4j.kernel.api.impl.index.verification.UniquenessVerifier; +import org.neo4j.kernel.api.impl.schema.reader.PartitionedIndexReader; +import org.neo4j.kernel.api.impl.schema.reader.SimpleIndexReader; +import org.neo4j.kernel.api.impl.schema.verification.PartitionedUniquenessVerifier; +import org.neo4j.kernel.api.impl.schema.verification.SimpleUniquenessVerifier; +import org.neo4j.kernel.api.impl.schema.verification.UniquenessVerifier; +import org.neo4j.kernel.api.impl.schema.writer.LuceneIndexWriter; +import org.neo4j.kernel.api.impl.schema.writer.PartitionedIndexWriter; import org.neo4j.kernel.api.index.IndexConfiguration; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/builder/LuceneSchemaIndexBuilder.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexBuilder.java similarity index 96% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/builder/LuceneSchemaIndexBuilder.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexBuilder.java index 179ea6f200bcd..14a606b882691 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/builder/LuceneSchemaIndexBuilder.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexBuilder.java @@ -17,12 +17,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index.builder; +package org.neo4j.kernel.api.impl.schema; import java.util.Map; import org.neo4j.graphdb.factory.GraphDatabaseSettings; -import org.neo4j.kernel.api.impl.index.LuceneSchemaIndex; +import org.neo4j.kernel.api.impl.index.builder.AbstractLuceneIndexBuilder; import org.neo4j.kernel.api.index.IndexConfiguration; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexProvider.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexProvider.java similarity index 95% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexProvider.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexProvider.java index 418d85b94c34e..dcf3690177f86 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexProvider.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexProvider.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.schema; import org.apache.lucene.index.CorruptIndexException; @@ -30,12 +30,11 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; -import org.neo4j.kernel.api.impl.index.builder.LuceneSchemaIndexBuilder; -import org.neo4j.kernel.api.impl.index.populator.DeferredConstraintVerificationUniqueLuceneIndexPopulator; -import org.neo4j.kernel.api.impl.index.populator.NonUniqueLuceneIndexPopulator; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; import org.neo4j.kernel.api.impl.index.storage.IndexStorageFactory; import org.neo4j.kernel.api.impl.index.storage.PartitionedIndexStorage; +import org.neo4j.kernel.api.impl.schema.populator.DeferredConstraintVerificationUniqueLuceneIndexPopulator; +import org.neo4j.kernel.api.impl.schema.populator.NonUniqueLuceneIndexPopulator; import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexConfiguration; import org.neo4j.kernel.api.index.IndexDescriptor; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexProviderFactory.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexProviderFactory.java similarity index 98% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexProviderFactory.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexProviderFactory.java index 00b809f553115..d6f8b68634d1d 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexProviderFactory.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexProviderFactory.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.schema; import org.neo4j.helpers.Service; import org.neo4j.io.fs.FileSystemAbstraction; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/populator/DeferredConstraintVerificationUniqueLuceneIndexPopulator.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/populator/DeferredConstraintVerificationUniqueLuceneIndexPopulator.java similarity index 96% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/populator/DeferredConstraintVerificationUniqueLuceneIndexPopulator.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/populator/DeferredConstraintVerificationUniqueLuceneIndexPopulator.java index 1c4a1c0dff846..3fbad0f8d2899 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/populator/DeferredConstraintVerificationUniqueLuceneIndexPopulator.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/populator/DeferredConstraintVerificationUniqueLuceneIndexPopulator.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index.populator; +package org.neo4j.kernel.api.impl.schema.populator; import org.apache.lucene.document.Document; @@ -27,8 +27,8 @@ import org.neo4j.collection.primitive.PrimitiveLongSet; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; -import org.neo4j.kernel.api.impl.index.LuceneDocumentStructure; -import org.neo4j.kernel.api.impl.index.LuceneSchemaIndex; +import org.neo4j.kernel.api.impl.schema.LuceneDocumentStructure; +import org.neo4j.kernel.api.impl.schema.LuceneSchemaIndex; import org.neo4j.kernel.api.index.IndexDescriptor; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.NodePropertyUpdate; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/populator/LuceneIndexPopulator.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/populator/LuceneIndexPopulator.java similarity index 91% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/populator/LuceneIndexPopulator.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/populator/LuceneIndexPopulator.java index cf727fceb5888..141e4c241816d 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/populator/LuceneIndexPopulator.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/populator/LuceneIndexPopulator.java @@ -17,12 +17,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index.populator; +package org.neo4j.kernel.api.impl.schema.populator; import java.io.IOException; -import org.neo4j.kernel.api.impl.index.LuceneIndexWriter; -import org.neo4j.kernel.api.impl.index.LuceneSchemaIndex; +import org.neo4j.kernel.api.impl.schema.LuceneSchemaIndex; +import org.neo4j.kernel.api.impl.schema.writer.LuceneIndexWriter; import org.neo4j.kernel.api.index.IndexPopulator; public abstract class LuceneIndexPopulator implements IndexPopulator diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/populator/NonUniqueLuceneIndexPopulator.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/populator/NonUniqueLuceneIndexPopulator.java similarity index 97% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/populator/NonUniqueLuceneIndexPopulator.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/populator/NonUniqueLuceneIndexPopulator.java index 39e45700b5591..515237a6cf503 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/populator/NonUniqueLuceneIndexPopulator.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/populator/NonUniqueLuceneIndexPopulator.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index.populator; +package org.neo4j.kernel.api.impl.schema.populator; import java.io.IOException; import java.util.ArrayList; @@ -25,8 +25,8 @@ import org.neo4j.collection.primitive.PrimitiveLongSet; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; -import org.neo4j.kernel.api.impl.index.LuceneDocumentStructure; -import org.neo4j.kernel.api.impl.index.LuceneSchemaIndex; +import org.neo4j.kernel.api.impl.schema.LuceneDocumentStructure; +import org.neo4j.kernel.api.impl.schema.LuceneSchemaIndex; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.NodePropertyUpdate; import org.neo4j.kernel.api.index.PropertyAccessor; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/reader/IndexSearcherCloseException.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/reader/IndexSearcherCloseException.java similarity index 96% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/reader/IndexSearcherCloseException.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/reader/IndexSearcherCloseException.java index 08d1ce7bab113..0a61286f98d88 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/reader/IndexSearcherCloseException.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/reader/IndexSearcherCloseException.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index.reader; +package org.neo4j.kernel.api.impl.schema.reader; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneAllEntriesIndexAccessorReader.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/reader/LuceneAllEntriesIndexAccessorReader.java similarity index 93% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneAllEntriesIndexAccessorReader.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/reader/LuceneAllEntriesIndexAccessorReader.java index 6c2811e6915f4..b71045e0a2b43 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneAllEntriesIndexAccessorReader.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/reader/LuceneAllEntriesIndexAccessorReader.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.schema.reader; import org.apache.lucene.document.Document; @@ -25,7 +25,7 @@ import org.neo4j.helpers.collection.BoundedIterable; -import static org.neo4j.kernel.api.impl.index.LuceneDocumentStructure.getNodeId; +import static org.neo4j.kernel.api.impl.schema.LuceneDocumentStructure.getNodeId; public class LuceneAllEntriesIndexAccessorReader implements BoundedIterable { diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/reader/PartitionedIndexReader.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/reader/PartitionedIndexReader.java similarity index 98% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/reader/PartitionedIndexReader.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/reader/PartitionedIndexReader.java index c05d107110702..db79c2f960260 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/reader/PartitionedIndexReader.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/reader/PartitionedIndexReader.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index.reader; +package org.neo4j.kernel.api.impl.schema.reader; import org.apache.lucene.search.IndexSearcher; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/reader/SimpleIndexReader.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/reader/SimpleIndexReader.java similarity index 92% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/reader/SimpleIndexReader.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/reader/SimpleIndexReader.java index 89a8a6d6a8896..b5d338438e195 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/reader/SimpleIndexReader.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/reader/SimpleIndexReader.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index.reader; +package org.neo4j.kernel.api.impl.schema.reader; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; @@ -31,17 +31,17 @@ import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.helpers.TaskControl; import org.neo4j.helpers.TaskCoordinator; -import org.neo4j.kernel.api.impl.index.DocValuesCollector; -import org.neo4j.kernel.api.impl.index.LuceneDocumentStructure; +import org.neo4j.kernel.api.impl.index.collector.DocValuesCollector; import org.neo4j.kernel.api.impl.index.partition.PartitionSearcher; -import org.neo4j.kernel.api.impl.index.sampler.NonUniqueLuceneIndexSampler; -import org.neo4j.kernel.api.impl.index.sampler.UniqueLuceneIndexSampler; +import org.neo4j.kernel.api.impl.schema.LuceneDocumentStructure; +import org.neo4j.kernel.api.impl.schema.sampler.NonUniqueLuceneIndexSampler; +import org.neo4j.kernel.api.impl.schema.sampler.UniqueLuceneIndexSampler; import org.neo4j.kernel.api.index.IndexConfiguration; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.IndexSampler; -import static org.neo4j.kernel.api.impl.index.LuceneDocumentStructure.NODE_ID_KEY; +import static org.neo4j.kernel.api.impl.schema.LuceneDocumentStructure.NODE_ID_KEY; /** * Schema index reader that is able to read/sample a single partition of a partitioned Lucene index. diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/sampler/LuceneIndexSampler.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/sampler/LuceneIndexSampler.java similarity index 98% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/sampler/LuceneIndexSampler.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/sampler/LuceneIndexSampler.java index 097db974db1e3..e02467a6cd2cc 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/sampler/LuceneIndexSampler.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/sampler/LuceneIndexSampler.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index.sampler; +package org.neo4j.kernel.api.impl.schema.sampler; import org.neo4j.helpers.TaskControl; import org.neo4j.helpers.TaskCoordinator; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/sampler/NonUniqueLuceneIndexSampler.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/sampler/NonUniqueLuceneIndexSampler.java similarity index 96% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/sampler/NonUniqueLuceneIndexSampler.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/sampler/NonUniqueLuceneIndexSampler.java index 6df4fe1e849d1..ac62106d55cb4 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/sampler/NonUniqueLuceneIndexSampler.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/sampler/NonUniqueLuceneIndexSampler.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index.sampler; +package org.neo4j.kernel.api.impl.schema.sampler; import org.apache.lucene.index.Fields; import org.apache.lucene.index.LeafReaderContext; @@ -36,7 +36,7 @@ import org.neo4j.kernel.impl.api.index.sampling.NonUniqueIndexSampler; import org.neo4j.register.Register; -import static org.neo4j.kernel.api.impl.index.LuceneDocumentStructure.NODE_ID_KEY; +import static org.neo4j.kernel.api.impl.schema.LuceneDocumentStructure.NODE_ID_KEY; /** * Sampler for non-unique Lucene schema index. diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/sampler/NonUniquePartitionedIndexSampler.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/sampler/NonUniquePartitionedIndexSampler.java similarity index 93% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/sampler/NonUniquePartitionedIndexSampler.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/sampler/NonUniquePartitionedIndexSampler.java index d7f6013845f7e..3d9af08181667 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/sampler/NonUniquePartitionedIndexSampler.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/sampler/NonUniquePartitionedIndexSampler.java @@ -17,11 +17,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index.sampler; +package org.neo4j.kernel.api.impl.schema.sampler; import org.neo4j.helpers.TaskControl; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; -import org.neo4j.kernel.api.impl.index.reader.PartitionedIndexReader; +import org.neo4j.kernel.api.impl.schema.reader.PartitionedIndexReader; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.register.Register; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/sampler/UniqueLuceneIndexSampler.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/sampler/UniqueLuceneIndexSampler.java similarity index 97% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/sampler/UniqueLuceneIndexSampler.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/sampler/UniqueLuceneIndexSampler.java index d1bb2586a6d47..3ea7b9087b90b 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/sampler/UniqueLuceneIndexSampler.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/sampler/UniqueLuceneIndexSampler.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index.sampler; +package org.neo4j.kernel.api.impl.schema.sampler; import org.apache.lucene.search.IndexSearcher; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/verification/DuplicateCheckingCollector.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/verification/DuplicateCheckingCollector.java similarity index 97% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/verification/DuplicateCheckingCollector.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/verification/DuplicateCheckingCollector.java index a79533f06c6af..a38414cc6efed 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/verification/DuplicateCheckingCollector.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/verification/DuplicateCheckingCollector.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index.verification; +package org.neo4j.kernel.api.impl.schema.verification; import org.apache.lucene.document.Document; import org.apache.lucene.index.LeafReader; @@ -29,7 +29,7 @@ import org.neo4j.kernel.api.StatementConstants; import org.neo4j.kernel.api.exceptions.KernelException; -import org.neo4j.kernel.api.impl.index.LuceneDocumentStructure; +import org.neo4j.kernel.api.impl.schema.LuceneDocumentStructure; import org.neo4j.kernel.api.index.PreexistingIndexEntryConflictException; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.properties.Property; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/verification/PartitionedUniquenessVerifier.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/verification/PartitionedUniquenessVerifier.java similarity index 97% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/verification/PartitionedUniquenessVerifier.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/verification/PartitionedUniquenessVerifier.java index 07ee18c517a19..80268a98b60d5 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/verification/PartitionedUniquenessVerifier.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/verification/PartitionedUniquenessVerifier.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index.verification; +package org.neo4j.kernel.api.impl.schema.verification; import java.io.IOException; import java.util.List; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/verification/SimpleUniquenessVerifier.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/verification/SimpleUniquenessVerifier.java similarity index 95% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/verification/SimpleUniquenessVerifier.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/verification/SimpleUniquenessVerifier.java index c8073877aafd7..bc405d421efac 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/verification/SimpleUniquenessVerifier.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/verification/SimpleUniquenessVerifier.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index.verification; +package org.neo4j.kernel.api.impl.schema.verification; import org.apache.lucene.index.Fields; import org.apache.lucene.index.LeafReaderContext; @@ -32,11 +32,11 @@ import java.util.List; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; -import org.neo4j.kernel.api.impl.index.LuceneDocumentStructure; import org.neo4j.kernel.api.impl.index.partition.PartitionSearcher; +import org.neo4j.kernel.api.impl.schema.LuceneDocumentStructure; import org.neo4j.kernel.api.index.PropertyAccessor; -import static org.neo4j.kernel.api.impl.index.LuceneDocumentStructure.NODE_ID_KEY; +import static org.neo4j.kernel.api.impl.schema.LuceneDocumentStructure.NODE_ID_KEY; public class SimpleUniquenessVerifier implements UniquenessVerifier { diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/verification/UniquenessVerifier.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/verification/UniquenessVerifier.java similarity index 96% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/verification/UniquenessVerifier.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/verification/UniquenessVerifier.java index 2d45b1e6cfc4e..5dc70cc9fe321 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/verification/UniquenessVerifier.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/verification/UniquenessVerifier.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index.verification; +package org.neo4j.kernel.api.impl.schema.verification; import java.io.Closeable; import java.io.IOException; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneIndexWriter.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/writer/LuceneIndexWriter.java similarity index 96% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneIndexWriter.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/writer/LuceneIndexWriter.java index 9ab8882443a0e..19179c77ac310 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneIndexWriter.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/writer/LuceneIndexWriter.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.schema.writer; import org.apache.lucene.document.Document; import org.apache.lucene.index.Term; diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/PartitionedIndexWriter.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/writer/PartitionedIndexWriter.java similarity index 97% rename from community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/PartitionedIndexWriter.java rename to community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/writer/PartitionedIndexWriter.java index 765ce5cd4a0fb..17c1a3efca8bd 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/PartitionedIndexWriter.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/writer/PartitionedIndexWriter.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.schema.writer; import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexWriter; @@ -29,6 +29,7 @@ import java.util.Optional; import org.neo4j.kernel.api.impl.index.partition.IndexPartition; +import org.neo4j.kernel.api.impl.schema.LuceneSchemaIndex; /** * Schema Lucene index writer implementation that supports writing into multiple partitions and creates partitions diff --git a/community/lucene-index/src/main/resources/META-INF/services/org.neo4j.kernel.extension.KernelExtensionFactory b/community/lucene-index/src/main/resources/META-INF/services/org.neo4j.kernel.extension.KernelExtensionFactory index a879f431d6042..1ae2ce9d50b8b 100644 --- a/community/lucene-index/src/main/resources/META-INF/services/org.neo4j.kernel.extension.KernelExtensionFactory +++ b/community/lucene-index/src/main/resources/META-INF/services/org.neo4j.kernel.extension.KernelExtensionFactory @@ -1,3 +1,3 @@ org.neo4j.index.lucene.LuceneKernelExtensionFactory -org.neo4j.kernel.api.impl.index.LuceneLabelScanStoreExtension -org.neo4j.kernel.api.impl.index.LuceneSchemaIndexProviderFactory + org.neo4j.kernel.api.impl.labelscan.LuceneLabelScanStoreExtension +org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProviderFactory diff --git a/community/lucene-index/src/test/java/org/neo4j/graphdb/LuceneLabelScanStoreChaosIT.java b/community/lucene-index/src/test/java/org/neo4j/graphdb/LuceneLabelScanStoreChaosIT.java index 19d896837327b..9534c3f5e4e1c 100644 --- a/community/lucene-index/src/test/java/org/neo4j/graphdb/LuceneLabelScanStoreChaosIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/graphdb/LuceneLabelScanStoreChaosIT.java @@ -33,7 +33,7 @@ import java.util.Set; import java.util.stream.Stream; -import org.neo4j.kernel.api.impl.index.builder.LuceneLabelScanIndexBuilder; +import org.neo4j.kernel.api.impl.labelscan.LuceneLabelScanIndexBuilder; import org.neo4j.test.DatabaseRule; import org.neo4j.test.DatabaseRule.RestartAction; import org.neo4j.test.EmbeddedDatabaseRule; diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/NonUniqueIndexTests.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/NonUniqueIndexTests.java index 2e272a18d1312..69799785c6a3d 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/NonUniqueIndexTests.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/NonUniqueIndexTests.java @@ -35,7 +35,7 @@ import org.neo4j.helpers.collection.IteratorUtil; import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; -import org.neo4j.kernel.api.impl.index.LuceneSchemaIndexProvider; +import org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProvider; import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexConfiguration; import org.neo4j.kernel.api.index.SchemaIndexProvider; @@ -51,11 +51,9 @@ import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.test.TargetDirectory; +import static java.util.Collections.singletonList; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; - -import static java.util.Collections.singletonList; - import static org.neo4j.graphdb.Label.label; import static org.neo4j.helpers.collection.MapUtil.stringMap; diff --git a/community/lucene-index/src/test/java/org/neo4j/index/recovery/UniqueIndexRecoveryTests.java b/community/lucene-index/src/test/java/org/neo4j/index/recovery/UniqueIndexRecoveryTests.java index 5c4fe7513681c..a24cd959e88eb 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/recovery/UniqueIndexRecoveryTests.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/recovery/UniqueIndexRecoveryTests.java @@ -40,8 +40,8 @@ import org.neo4j.graphdb.schema.ConstraintDefinition; import org.neo4j.io.fs.FileUtils; import org.neo4j.kernel.GraphDatabaseAPI; -import org.neo4j.kernel.api.impl.index.LuceneLabelScanStoreExtension; -import org.neo4j.kernel.api.impl.index.LuceneSchemaIndexProviderFactory; +import org.neo4j.kernel.api.impl.labelscan.LuceneLabelScanStoreExtension; +import org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProviderFactory; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProviderFactory; import org.neo4j.kernel.impl.transaction.log.checkpoint.CheckPointer; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/DocValuesCollectorTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/collector/DocValuesCollectorTest.java similarity index 99% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/DocValuesCollectorTest.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/collector/DocValuesCollectorTest.java index 6eecb4b19d75b..e877ab646e7e3 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/DocValuesCollectorTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/collector/DocValuesCollectorTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.index.collector; import org.apache.lucene.document.Document; import org.apache.lucene.index.NumericDocValues; @@ -33,6 +33,7 @@ import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.graphdb.index.IndexHits; +import org.neo4j.kernel.api.impl.index.IndexReaderStub; import static java.util.Collections.emptyList; import static org.junit.Assert.assertArrayEquals; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneLabelScanIndexIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanIndexIT.java similarity index 96% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneLabelScanIndexIT.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanIndexIT.java index b016adf1134b7..8d557fb940338 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneLabelScanIndexIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanIndexIT.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.labelscan; import org.junit.After; import org.junit.Before; @@ -29,9 +29,7 @@ import java.util.concurrent.locks.ReentrantLock; import org.neo4j.collection.primitive.PrimitiveLongCollections; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.helpers.collection.Iterables; -import org.neo4j.kernel.api.impl.index.builder.LuceneLabelScanIndexBuilder; import org.neo4j.kernel.api.labelscan.LabelScanWriter; import org.neo4j.kernel.api.labelscan.NodeLabelUpdate; import org.neo4j.storageengine.api.schema.LabelScanReader; @@ -121,4 +119,4 @@ private void generateLabelChanges( LuceneLabelScanIndex labelScanIndex, int numb generateLabelChanges( scanWriter, numberOfUpdates ); } } -} \ No newline at end of file +} diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneLabelScanStoreTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanStoreTest.java similarity index 99% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneLabelScanStoreTest.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanStoreTest.java index 9cb36bfe0a4c5..59143d21768c7 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneLabelScanStoreTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanStoreTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.labelscan; import org.apache.lucene.store.LockObtainFailedException; import org.junit.After; @@ -41,14 +41,15 @@ import java.util.Random; import java.util.Set; import java.util.TreeSet; + import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.helpers.collection.BoundedIterable; import org.neo4j.helpers.collection.IteratorUtil; import org.neo4j.helpers.collection.PrefetchingIterator; import org.neo4j.io.fs.DefaultFileSystemAbstraction; -import org.neo4j.kernel.api.impl.index.builder.LuceneLabelScanIndexBuilder; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; import org.neo4j.kernel.api.impl.index.storage.PartitionedIndexStorage; +import org.neo4j.kernel.api.impl.labelscan.storestrategy.BitmapDocumentFormat; import org.neo4j.kernel.api.labelscan.LabelScanWriter; import org.neo4j.kernel.api.labelscan.NodeLabelRange; import org.neo4j.kernel.api.labelscan.NodeLabelUpdate; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneLabelScanStoreWriterTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanStoreWriterTest.java similarity index 97% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneLabelScanStoreWriterTest.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanStoreWriterTest.java index 1a7bf1d61494e..61c92750954ab 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneLabelScanStoreWriterTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/LuceneLabelScanStoreWriterTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.labelscan; import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexWriter; @@ -54,9 +54,12 @@ import java.util.concurrent.locks.Lock; import java.util.stream.Stream; +import org.neo4j.kernel.api.impl.index.IndexReaderStub; import org.neo4j.kernel.api.impl.index.partition.IndexPartition; import org.neo4j.kernel.api.impl.index.partition.PartitionSearcher; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; +import org.neo4j.kernel.api.impl.labelscan.storestrategy.BitmapDocumentFormat; +import org.neo4j.kernel.api.impl.labelscan.writer.PartitionedLuceneLabelScanWriter; import org.neo4j.kernel.api.labelscan.NodeLabelUpdate; import org.neo4j.test.TargetDirectory; @@ -73,7 +76,7 @@ import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.neo4j.kernel.api.impl.index.BitmapDocumentFormat.RANGE; +import static org.neo4j.kernel.api.impl.labelscan.storestrategy.BitmapDocumentFormat.RANGE; @RunWith( Parameterized.class ) public class LuceneLabelScanStoreWriterTest diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneNodeLabelRangeTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/LuceneNodeLabelRangeTest.java similarity index 97% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneNodeLabelRangeTest.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/LuceneNodeLabelRangeTest.java index 9e1a178763263..94d79c42b6cea 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneNodeLabelRangeTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/LuceneNodeLabelRangeTest.java @@ -17,13 +17,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.labelscan; import org.junit.Test; import static org.hamcrest.CoreMatchers.hasItems; import static org.junit.Assert.assertThat; - import static org.neo4j.helpers.collection.IteratorUtil.asIterable; public class LuceneNodeLabelRangeTest diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/bitmaps/BitmapExtractorTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/bitmaps/BitmapExtractorTest.java similarity index 98% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/bitmaps/BitmapExtractorTest.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/bitmaps/BitmapExtractorTest.java index afa8bc76f9dfc..9f9f81ccd74b5 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/bitmaps/BitmapExtractorTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/bitmaps/BitmapExtractorTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index.bitmaps; +package org.neo4j.kernel.api.impl.labelscan.bitmaps; import org.junit.Test; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/bitmaps/BitmapFormatTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/bitmaps/BitmapFormatTest.java similarity index 98% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/bitmaps/BitmapFormatTest.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/bitmaps/BitmapFormatTest.java index fd4d252b081ea..612f37eda5919 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/bitmaps/BitmapFormatTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/bitmaps/BitmapFormatTest.java @@ -17,13 +17,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index.bitmaps; +package org.neo4j.kernel.api.impl.labelscan.bitmaps; + +import org.junit.Test; import java.util.HashSet; import java.util.Set; -import org.junit.Test; - import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/bitmaps/LongPageIteratorTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/bitmaps/LongPageIteratorTest.java similarity index 97% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/bitmaps/LongPageIteratorTest.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/bitmaps/LongPageIteratorTest.java index 2358f5a97da92..3f69181461542 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/bitmaps/LongPageIteratorTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/bitmaps/LongPageIteratorTest.java @@ -17,14 +17,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index.bitmaps; - -import java.util.Collections; +package org.neo4j.kernel.api.impl.labelscan.bitmaps; import org.junit.Test; -import static java.util.Arrays.asList; +import java.util.Collections; +import static java.util.Arrays.asList; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/NodeRangeDocumentLabelScanStorageStrategyTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/storestrategy/NodeRangeDocumentLabelScanStorageStrategyTest.java similarity index 97% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/NodeRangeDocumentLabelScanStorageStrategyTest.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/storestrategy/NodeRangeDocumentLabelScanStorageStrategyTest.java index e63306f944065..ec34317bf8895 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/NodeRangeDocumentLabelScanStorageStrategyTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/storestrategy/NodeRangeDocumentLabelScanStorageStrategyTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.labelscan.storestrategy; import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexWriter; @@ -41,9 +41,12 @@ import java.util.concurrent.locks.Lock; import java.util.stream.Stream; -import org.neo4j.kernel.api.impl.index.bitmaps.Bitmap; +import org.neo4j.kernel.api.impl.index.collector.FirstHitCollector; import org.neo4j.kernel.api.impl.index.partition.IndexPartition; import org.neo4j.kernel.api.impl.index.partition.PartitionSearcher; +import org.neo4j.kernel.api.impl.labelscan.LuceneLabelScanIndex; +import org.neo4j.kernel.api.impl.labelscan.bitmaps.Bitmap; +import org.neo4j.kernel.api.impl.labelscan.writer.PartitionedLuceneLabelScanWriter; import org.neo4j.kernel.api.labelscan.LabelScanWriter; import static java.util.stream.Collectors.toList; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/PageOfRangesIteratorTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/storestrategy/PageOfRangesIteratorTest.java similarity index 95% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/PageOfRangesIteratorTest.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/storestrategy/PageOfRangesIteratorTest.java index 704d50df0645c..43712f0c17486 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/PageOfRangesIteratorTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/labelscan/storestrategy/PageOfRangesIteratorTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.labelscan.storestrategy; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.NumericDocValues; @@ -34,6 +34,8 @@ import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.helpers.collection.MapUtil; +import org.neo4j.kernel.api.impl.index.IndexReaderStub; +import org.neo4j.kernel.api.impl.index.collector.DocValuesCollector; import static java.util.Arrays.asList; import static java.util.stream.Collectors.toList; @@ -51,11 +53,6 @@ import static org.neo4j.collection.primitive.PrimitiveLongCollections.concat; import static org.neo4j.helpers.collection.IteratorUtil.primitivesList; -/** - * Tests for reading through a {@link NodeRangeDocumentLabelScanStorageStrategy}. - * - * @see NodeRangeDocumentLabelScanStorageStrategyTest for tests for writing. - */ @RunWith( Parameterized.class ) public class PageOfRangesIteratorTest { diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/AccessUniqueLuceneIndexTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/AccessUniqueLuceneIndexTest.java similarity index 98% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/AccessUniqueLuceneIndexTest.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/AccessUniqueLuceneIndexTest.java index 1744747bdb4a1..4576abd618dbc 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/AccessUniqueLuceneIndexTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/AccessUniqueLuceneIndexTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.schema; import org.junit.Test; @@ -27,7 +27,6 @@ import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; -import org.neo4j.kernel.api.impl.index.builder.LuceneSchemaIndexBuilder; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; import org.neo4j.kernel.api.impl.index.storage.IndexStorageFactory; import org.neo4j.kernel.api.impl.index.storage.PartitionedIndexStorage; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/AllNodesCollector.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/AllNodesCollector.java similarity index 98% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/AllNodesCollector.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/AllNodesCollector.java index 2159622adc680..900a686db5c86 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/AllNodesCollector.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/AllNodesCollector.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.schema; import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.LeafReaderContext; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/DeferredConstraintVerificationUniqueLuceneIndexPopulatorTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/DeferredConstraintVerificationUniqueLuceneIndexPopulatorTest.java similarity index 98% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/DeferredConstraintVerificationUniqueLuceneIndexPopulatorTest.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/DeferredConstraintVerificationUniqueLuceneIndexPopulatorTest.java index 3aad5a82a4524..14f68485f7ad5 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/DeferredConstraintVerificationUniqueLuceneIndexPopulatorTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/DeferredConstraintVerificationUniqueLuceneIndexPopulatorTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.schema; import org.apache.lucene.store.Directory; import org.junit.Rule; @@ -27,12 +27,10 @@ import java.io.IOException; import java.util.Collections; -import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; import org.neo4j.io.fs.DefaultFileSystemAbstraction; -import org.neo4j.kernel.api.impl.index.builder.LuceneSchemaIndexBuilder; -import org.neo4j.kernel.api.impl.index.populator.DeferredConstraintVerificationUniqueLuceneIndexPopulator; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; import org.neo4j.kernel.api.impl.index.storage.PartitionedIndexStorage; +import org.neo4j.kernel.api.impl.schema.populator.DeferredConstraintVerificationUniqueLuceneIndexPopulator; import org.neo4j.kernel.api.index.IndexDescriptor; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.NodePropertyUpdate; @@ -49,7 +47,7 @@ import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.neo4j.kernel.api.impl.index.AllNodesCollector.getAllNodes; +import static org.neo4j.kernel.api.impl.schema.AllNodesCollector.getAllNodes; import static org.neo4j.kernel.api.properties.Property.intProperty; import static org.neo4j.kernel.api.properties.Property.longProperty; import static org.neo4j.kernel.api.properties.Property.stringProperty; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LongArrayMatcher.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LongArrayMatcher.java similarity index 98% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LongArrayMatcher.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LongArrayMatcher.java index a2e7e1b435999..0204c4a7bcb83 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LongArrayMatcher.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LongArrayMatcher.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.schema; import org.hamcrest.Description; import org.hamcrest.TypeSafeDiagnosingMatcher; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneDocumentStructureTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneDocumentStructureTest.java similarity index 92% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneDocumentStructureTest.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneDocumentStructureTest.java index 542e2e2d68a0e..352bd8a198df5 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneDocumentStructureTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneDocumentStructureTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.schema; import org.apache.commons.lang3.RandomStringUtils; import org.apache.lucene.document.Document; @@ -30,11 +30,11 @@ import static junit.framework.Assert.assertNull; import static junit.framework.TestCase.assertEquals; -import static org.neo4j.kernel.api.impl.index.LuceneDocumentStructure.NODE_ID_KEY; -import static org.neo4j.kernel.api.impl.index.LuceneDocumentStructure.ValueEncoding.Array; -import static org.neo4j.kernel.api.impl.index.LuceneDocumentStructure.ValueEncoding.Bool; -import static org.neo4j.kernel.api.impl.index.LuceneDocumentStructure.ValueEncoding.Number; -import static org.neo4j.kernel.api.impl.index.LuceneDocumentStructure.ValueEncoding.String; +import static org.neo4j.kernel.api.impl.schema.LuceneDocumentStructure.NODE_ID_KEY; +import static org.neo4j.kernel.api.impl.schema.LuceneDocumentStructure.ValueEncoding.Array; +import static org.neo4j.kernel.api.impl.schema.LuceneDocumentStructure.ValueEncoding.Bool; +import static org.neo4j.kernel.api.impl.schema.LuceneDocumentStructure.ValueEncoding.Number; +import static org.neo4j.kernel.api.impl.schema.LuceneDocumentStructure.ValueEncoding.String; public class LuceneDocumentStructureTest { 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/schema/LuceneIndexAccessorTest.java similarity index 99% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneIndexAccessorTest.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexAccessorTest.java index 0246007b50bf2..f224a5e2fd104 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/schema/LuceneIndexAccessorTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.schema; import org.junit.After; import org.junit.Before; @@ -40,7 +40,6 @@ import org.neo4j.helpers.TaskCoordinator; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; -import org.neo4j.kernel.api.impl.index.builder.LuceneSchemaIndexBuilder; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.NodePropertyUpdate; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneIndexRecoveryIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java similarity index 99% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneIndexRecoveryIT.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java index 7c30f439e6b71..d93c080476426 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneIndexRecoveryIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.schema; import org.junit.After; import org.junit.Before; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexCorruptionTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexCorruptionTest.java similarity index 99% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexCorruptionTest.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexCorruptionTest.java index 172301a8416d1..97d5603e0f863 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexCorruptionTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexCorruptionTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.schema; import org.apache.lucene.index.CorruptIndexException; import org.junit.Rule; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexIT.java similarity index 99% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexIT.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexIT.java index 9dff440a2a4f2..12d7fe9c48517 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexIT.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.schema; import org.apache.lucene.document.Document; import org.junit.After; @@ -38,7 +38,7 @@ import org.neo4j.collection.primitive.PrimitiveLongCollections; import org.neo4j.graphdb.ResourceIterator; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; -import org.neo4j.kernel.api.impl.index.builder.LuceneSchemaIndexBuilder; +import org.neo4j.kernel.api.impl.index.LuceneAllDocumentsReader; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.NodePropertyUpdate; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexPopulatorTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexPopulatorTest.java similarity index 99% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexPopulatorTest.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexPopulatorTest.java index 059c666f9e729..ed8141ef78848 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexPopulatorTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexPopulatorTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.schema; import org.apache.lucene.document.Document; import org.apache.lucene.index.DirectoryReader; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexProviderTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexProviderTest.java similarity index 96% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexProviderTest.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexProviderTest.java index 9b7e2f63ebbc9..1c0e6b2a2916d 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexProviderTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexProviderTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.schema; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; import org.neo4j.kernel.api.index.IndexProviderCompatibilityTestSuite; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexTest.java similarity index 97% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexTest.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexTest.java index 760b42b9e9c07..e3c555a89b1e9 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/LuceneSchemaIndexTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.schema; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -30,7 +30,6 @@ import java.util.UUID; import org.neo4j.io.IOUtils; -import org.neo4j.kernel.api.impl.index.builder.LuceneSchemaIndexBuilder; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; import org.neo4j.test.DefaultFileSystemRule; import org.neo4j.test.TargetDirectory; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/SchemaIndexAcceptanceTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/SchemaIndexAcceptanceTest.java similarity index 99% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/SchemaIndexAcceptanceTest.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/SchemaIndexAcceptanceTest.java index a45ee4cb6232d..41526b41cbddb 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/SchemaIndexAcceptanceTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/SchemaIndexAcceptanceTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.schema; import org.junit.After; import org.junit.Before; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/UniqueIndexApplicationIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/UniqueIndexApplicationIT.java similarity index 99% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/UniqueIndexApplicationIT.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/UniqueIndexApplicationIT.java index 642bf9fe8c52b..194e46122e2f7 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/UniqueIndexApplicationIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/UniqueIndexApplicationIT.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.schema; import org.hamcrest.Description; import org.hamcrest.Matcher; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/reader/SimpleIndexReaderTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/reader/SimpleIndexReaderTest.java similarity index 95% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/reader/SimpleIndexReaderTest.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/reader/SimpleIndexReaderTest.java index 7af09a25617f6..86234d5531ea1 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/reader/SimpleIndexReaderTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/reader/SimpleIndexReaderTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index.reader; +package org.neo4j.kernel.api.impl.schema.reader; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.IndexSearcher; @@ -33,10 +33,10 @@ import java.util.concurrent.TimeUnit; import org.neo4j.helpers.TaskCoordinator; -import org.neo4j.kernel.api.impl.index.DocValuesCollector; +import org.neo4j.kernel.api.impl.index.collector.DocValuesCollector; import org.neo4j.kernel.api.impl.index.partition.PartitionSearcher; -import org.neo4j.kernel.api.impl.index.sampler.NonUniqueLuceneIndexSampler; -import org.neo4j.kernel.api.impl.index.sampler.UniqueLuceneIndexSampler; +import org.neo4j.kernel.api.impl.schema.sampler.NonUniqueLuceneIndexSampler; +import org.neo4j.kernel.api.impl.schema.sampler.UniqueLuceneIndexSampler; import org.neo4j.kernel.api.index.IndexConfiguration; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; @@ -154,4 +154,4 @@ private SimpleIndexReader getUniqueSimpleReader() { return new SimpleIndexReader( partitionSearcher, IndexConfiguration.UNIQUE, samplingConfig, taskCoordinator ); } -} \ No newline at end of file +} diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/sampler/NonUniqueLuceneIndexSamplerTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/sampler/NonUniqueLuceneIndexSamplerTest.java similarity index 98% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/sampler/NonUniqueLuceneIndexSamplerTest.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/sampler/NonUniqueLuceneIndexSamplerTest.java index d36051292dca6..e2baefc8191d8 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/sampler/NonUniqueLuceneIndexSamplerTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/sampler/NonUniqueLuceneIndexSamplerTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index.sampler; +package org.neo4j.kernel.api.impl.schema.sampler; import org.apache.lucene.index.Fields; import org.apache.lucene.index.Terms; @@ -137,4 +137,4 @@ public int size() } } -} \ No newline at end of file +} diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/sampler/UniqueLuceneIndexSamplerTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/sampler/UniqueLuceneIndexSamplerTest.java similarity index 98% rename from community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/sampler/UniqueLuceneIndexSamplerTest.java rename to community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/sampler/UniqueLuceneIndexSamplerTest.java index d6c8eab92c163..e91e9f966d672 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/sampler/UniqueLuceneIndexSamplerTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/sampler/UniqueLuceneIndexSamplerTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index.sampler; +package org.neo4j.kernel.api.impl.schema.sampler; import org.apache.lucene.search.IndexSearcher; import org.junit.Rule; @@ -68,4 +68,4 @@ public void uniqueSamplingCancel() throws IndexNotFoundKernelException luceneIndexSampler.sampleIndex( Registers.newDoubleLongRegister() ); } -} \ No newline at end of file +} diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java index 869afd26c9fac..cd416e684942e 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java @@ -34,7 +34,7 @@ import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; import org.neo4j.kernel.GraphDatabaseAPI; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; -import org.neo4j.kernel.api.impl.index.LuceneSchemaIndexProviderFactory; +import org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProviderFactory; import org.neo4j.kernel.api.index.IndexDescriptor; import org.neo4j.kernel.api.index.InternalIndexState; import org.neo4j.kernel.api.index.SchemaIndexProvider; diff --git a/community/lucene-index/src/test/java/org/neo4j/unsafe/batchinsert/TestLuceneSchemaBatchInsertIT.java b/community/lucene-index/src/test/java/org/neo4j/unsafe/batchinsert/TestLuceneSchemaBatchInsertIT.java index ad69f70df1cbf..f14d451293ff8 100644 --- a/community/lucene-index/src/test/java/org/neo4j/unsafe/batchinsert/TestLuceneSchemaBatchInsertIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/unsafe/batchinsert/TestLuceneSchemaBatchInsertIT.java @@ -31,7 +31,7 @@ import org.neo4j.graphdb.schema.IndexDefinition; import org.neo4j.graphdb.schema.Schema; import org.neo4j.kernel.GraphDatabaseAPI; -import org.neo4j.kernel.api.impl.index.LuceneSchemaIndexProvider; +import org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProvider; import org.neo4j.kernel.api.index.SchemaIndexProvider; import org.neo4j.kernel.extension.dependency.HighestSelectionStrategy; import org.neo4j.test.TargetDirectory; diff --git a/enterprise/enterprise-performance-tests/src/main/java/org/neo4j/perftest/enterprise/ccheck/ConsistencyPerformanceCheck.java b/enterprise/enterprise-performance-tests/src/main/java/org/neo4j/perftest/enterprise/ccheck/ConsistencyPerformanceCheck.java index 2d1a116e2d59b..94a12236d7ed9 100644 --- a/enterprise/enterprise-performance-tests/src/main/java/org/neo4j/perftest/enterprise/ccheck/ConsistencyPerformanceCheck.java +++ b/enterprise/enterprise-performance-tests/src/main/java/org/neo4j/perftest/enterprise/ccheck/ConsistencyPerformanceCheck.java @@ -31,16 +31,16 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.io.pagecache.tracing.PageCacheTracer; -import org.neo4j.kernel.impl.store.id.DefaultIdGeneratorFactory; import org.neo4j.kernel.api.direct.DirectStoreAccess; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; -import org.neo4j.kernel.api.impl.index.LuceneSchemaIndexProvider; +import org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProvider; import org.neo4j.kernel.api.index.SchemaIndexProvider; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.pagecache.ConfiguringPageCacheFactory; import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.kernel.impl.store.StoreAccess; import org.neo4j.kernel.impl.store.StoreFactory; +import org.neo4j.kernel.impl.store.id.DefaultIdGeneratorFactory; import org.neo4j.logging.NullLog; import org.neo4j.logging.NullLogProvider; import org.neo4j.perftest.enterprise.generator.DataGenerator; diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/api/SchemaIndexHaIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/api/SchemaIndexHaIT.java index d603e0cfec41b..8a3165b66ae84 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/api/SchemaIndexHaIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/api/SchemaIndexHaIT.java @@ -46,8 +46,8 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; -import org.neo4j.kernel.api.impl.index.LuceneSchemaIndexProvider; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; +import org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProvider; import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexConfiguration; import org.neo4j.kernel.api.index.IndexDescriptor; diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/api/impl/index/LabelScanStoreHaIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/api/impl/labelscan/LabelScanStoreHaIT.java similarity index 99% rename from enterprise/ha/src/test/java/org/neo4j/kernel/api/impl/index/LabelScanStoreHaIT.java rename to enterprise/ha/src/test/java/org/neo4j/kernel/api/impl/labelscan/LabelScanStoreHaIT.java index df0c613817ca5..bd6a942372449 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/api/impl/index/LabelScanStoreHaIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/api/impl/labelscan/LabelScanStoreHaIT.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.index; +package org.neo4j.kernel.api.impl.labelscan; import org.apache.lucene.store.LockObtainFailedException; import org.junit.After; diff --git a/enterprise/neo4j-enterprise/src/test/java/upgrade/StoreMigratorFrom20IT.java b/enterprise/neo4j-enterprise/src/test/java/upgrade/StoreMigratorFrom20IT.java index e8aa6d962e73a..26bbcfafef9bc 100644 --- a/enterprise/neo4j-enterprise/src/test/java/upgrade/StoreMigratorFrom20IT.java +++ b/enterprise/neo4j-enterprise/src/test/java/upgrade/StoreMigratorFrom20IT.java @@ -35,8 +35,8 @@ import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; -import org.neo4j.kernel.api.impl.index.LuceneSchemaIndexProvider; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; +import org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProvider; import org.neo4j.kernel.api.index.SchemaIndexProvider; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.ha.HighlyAvailableGraphDatabase;