From 5aee19c76a5bd8f20ab0e9b9e521f98f8072553f Mon Sep 17 00:00:00 2001 From: fickludd Date: Tue, 8 May 2018 14:59:32 +0200 Subject: [PATCH] Rename IndexDescriptor => StoreIndexDescriptor --- .../checking/SchemaRecordCheck.java | 12 +- .../checking/full/ConsistencyCheckTasks.java | 6 +- .../consistency/checking/full/IndexCheck.java | 6 +- .../full/PropertyAndNodeIndexedCheck.java | 8 +- .../checking/index/IndexAccessors.java | 20 +-- .../consistency/report/ConsistencyReport.java | 8 +- .../store/synthetic/IndexRecord.java | 6 +- .../checking/SchemaRecordCheckTest.java | 22 +-- .../consistency/checking/SchemaRuleUtil.java | 24 ++-- .../full/FullCheckIntegrationTest.java | 36 ++--- .../report/ConsistencyReporterTest.java | 8 +- .../neo4j/kernel/api/index/IndexProvider.java | 30 ++--- .../kernel/api/index/LoggingMonitor.java | 4 +- ...criptor.java => StoreIndexDescriptor.java} | 40 +++--- .../api/index/CapableIndexDescriptor.java | 6 +- .../neo4j/kernel/impl/api/index/IndexMap.java | 4 +- .../impl/api/index/IndexProxyCreator.java | 20 +-- .../impl/api/index/IndexingService.java | 38 +++--- .../api/index/IndexingServiceFactory.java | 4 +- .../api/index/RebuildingIndexDescriptor.java | 8 +- .../kernel/impl/api/store/SchemaCache.java | 6 +- .../index/schema/NativeIndexProvider.java | 16 +-- .../impl/index/schema/NativeSchemaIndex.java | 4 +- .../schema/NativeSchemaIndexAccessor.java | 5 +- .../schema/NativeSchemaIndexPopulator.java | 4 +- .../index/schema/NumberIndexProvider.java | 8 +- .../schema/NumberSchemaIndexAccessor.java | 4 +- .../schema/NumberSchemaIndexPopulator.java | 4 +- .../index/schema/SpatialIndexAccessor.java | 14 +- .../index/schema/SpatialIndexPopulator.java | 14 +- .../index/schema/SpatialIndexProvider.java | 10 +- .../index/schema/StringIndexProvider.java | 8 +- .../schema/StringSchemaIndexAccessor.java | 4 +- .../schema/StringSchemaIndexPopulator.java | 4 +- .../index/schema/TemporalIndexAccessor.java | 12 +- .../impl/index/schema/TemporalIndexFiles.java | 4 +- .../index/schema/TemporalIndexPopulator.java | 12 +- .../index/schema/TemporalIndexProvider.java | 10 +- .../schema/fusion/FusionIndexAccessor.java | 6 +- .../schema/fusion/FusionIndexProvider.java | 12 +- .../recordstorage/RecordStorageReader.java | 10 +- .../TransactionToRecordStateVisitor.java | 10 +- .../kernel/impl/store/SchemaStorage.java | 14 +- .../SchemaRuleDeserializer2_0to3_1.java | 6 +- .../store/record/SchemaRuleSerialization.java | 16 +-- .../command/IndexBatchTransactionApplier.java | 14 +- .../state/TransactionRecordState.java | 6 +- .../internal/BatchInserterImpl.java | 20 +-- .../DropBrokenUniquenessConstraintIT.java | 16 +-- .../IndexProviderCompatibilityTestSuite.java | 6 +- .../BatchingMultipleIndexPopulatorTest.java | 6 +- .../ControlledPopulationIndexProvider.java | 10 +- .../impl/api/index/FailedIndexProxyTest.java | 10 +- .../kernel/impl/api/index/IndexCRUDIT.java | 6 +- .../impl/api/index/IndexMapReferenceTest.java | 4 +- .../api/index/IndexPopulationJobTest.java | 7 +- .../impl/api/index/IndexPopulationTest.java | 6 +- .../impl/api/index/IndexRecoveryIT.java | 43 +++--- .../impl/api/index/IndexStatisticsTest.java | 4 +- .../impl/api/index/IndexUpdaterMapTest.java | 2 +- .../impl/api/index/IndexingServiceTest.java | 126 +++++++++--------- .../api/index/MultipleIndexPopulatorTest.java | 11 +- .../MultipleIndexPopulatorUpdatesTest.java | 9 +- .../impl/api/index/OnlineIndexProxyTest.java | 4 +- .../index/inmemory/InMemoryIndexProvider.java | 10 +- .../UpdateCapturingIndexProvider.java | 10 +- .../sampling/IndexSamplingControllerTest.java | 2 +- .../sampling/OnlineIndexSamplingJobTest.java | 4 +- .../impl/api/store/SchemaCacheTest.java | 10 +- .../schema/IndexPopulationStressTest.java | 5 +- .../impl/index/schema/LayoutTestUtil.java | 8 +- .../index/schema/LocalTimeLayoutTestUtil.java | 4 +- .../index/schema/NativeIndexProviderTest.java | 14 +- .../schema/NativeSchemaIndexTestUtil.java | 4 +- .../index/schema/NumberLayoutTestUtil.java | 4 +- .../index/schema/SpatialLayoutTestUtil.java | 4 +- .../impl/index/schema/TimeLayoutTestUtil.java | 4 +- .../fusion/FusionIndexAccessorTest.java | 4 +- .../fusion/FusionIndexProviderTest.java | 26 ++-- .../impl/newapi/OperationsLockTest.java | 4 +- .../kernel/impl/store/SchemaStorageTest.java | 28 ++-- .../kernel/impl/store/SchemaStoreTest.java | 34 ++--- .../impl/store/record/IndexRuleTest.java | 14 +- .../record/SchemaRuleSerializationTest.java | 106 +++++++-------- .../impl/transaction/command/Commands.java | 4 +- .../NeoStoreTransactionApplierTest.java | 30 ++--- .../NeoTransactionIndexApplierTest.java | 10 +- .../transaction/state/LogTruncationTest.java | 6 +- .../state/SchemaRuleCommandTest.java | 8 +- .../state/TransactionRecordStateTest.java | 2 +- .../batchinsert/internal/BatchInsertTest.java | 24 ++-- .../api/impl/schema/LuceneIndexProvider.java | 10 +- .../lucene/explicit/NonUniqueIndexTest.java | 4 +- .../impl/schema/LuceneIndexProviderTest.java | 5 +- .../impl/schema/LuceneIndexRecoveryIT.java | 4 +- .../LuceneSchemaIndexCorruptionTest.java | 11 +- .../LuceneSchemaIndexPopulatorTest.java | 6 +- .../index/IndexingServiceIntegrationTest.java | 4 +- ...StartOldDbOn3_4AndCreateFusionIndexIT.java | 4 +- ...ltiIndexPopulationConcurrentUpdatesIT.java | 18 +-- .../org/neo4j/kernel/api/SchemaIndexHaIT.java | 10 +- .../UniquenessConstraintCreationIT.java | 5 +- .../org/neo4j/tools/dump/DumpCountsStore.java | 6 +- .../neo4j/tools/dump/DumpCountsStoreTest.java | 6 +- .../dump/InconsistencyReportReaderTest.java | 6 +- 105 files changed, 667 insertions(+), 652 deletions(-) rename community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/{IndexDescriptor.java => StoreIndexDescriptor.java} (70%) diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/SchemaRecordCheck.java b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/SchemaRecordCheck.java index db9b5a4d23106..f07b285daf6ee 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/SchemaRecordCheck.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/SchemaRecordCheck.java @@ -32,7 +32,7 @@ import org.neo4j.kernel.impl.store.SchemaRuleAccess; import org.neo4j.kernel.impl.store.record.ConstraintRule; import org.neo4j.kernel.impl.store.record.DynamicRecord; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.store.record.LabelTokenRecord; import org.neo4j.kernel.impl.store.record.PropertyKeyTokenRecord; import org.neo4j.kernel.impl.store.record.RelationshipTypeTokenRecord; @@ -107,9 +107,9 @@ public void check( DynamicRecord record, return; } - if ( rule instanceof IndexDescriptor ) + if ( rule instanceof StoreIndexDescriptor ) { - strategy.checkIndexRule( (IndexDescriptor)rule, record, records, engine ); + strategy.checkIndexRule( (StoreIndexDescriptor)rule, record, records, engine ); } else if ( rule instanceof ConstraintRule ) { @@ -124,7 +124,7 @@ else if ( rule instanceof ConstraintRule ) private interface CheckStrategy { - void checkIndexRule( IndexDescriptor rule, DynamicRecord record, RecordAccess records, + void checkIndexRule( StoreIndexDescriptor rule, DynamicRecord record, RecordAccess records, CheckerEngine engine ); void checkConstraintRule( ConstraintRule rule, DynamicRecord record, @@ -138,7 +138,7 @@ void checkConstraintRule( ConstraintRule rule, DynamicRecord record, private class RulesCheckStrategy implements CheckStrategy { @Override - public void checkIndexRule( IndexDescriptor rule, DynamicRecord record, RecordAccess records, + public void checkIndexRule( StoreIndexDescriptor rule, DynamicRecord record, RecordAccess records, CheckerEngine engine ) { checkSchema( rule, record, records, engine ); @@ -176,7 +176,7 @@ public void checkConstraintRule( ConstraintRule rule, DynamicRecord record, private class ObligationsCheckStrategy implements CheckStrategy { @Override - public void checkIndexRule( IndexDescriptor rule, DynamicRecord record, RecordAccess records, + public void checkIndexRule( StoreIndexDescriptor rule, DynamicRecord record, RecordAccess records, CheckerEngine engine ) { if ( rule.canSupportUniqueConstraint() ) diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/ConsistencyCheckTasks.java b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/ConsistencyCheckTasks.java index d46b10b7a1c50..9b279ebd240c9 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/ConsistencyCheckTasks.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/ConsistencyCheckTasks.java @@ -48,7 +48,7 @@ import org.neo4j.kernel.impl.store.SchemaStorage; import org.neo4j.kernel.impl.store.StoreAccess; import org.neo4j.kernel.impl.store.record.AbstractBaseRecord; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import static java.lang.String.format; import static org.neo4j.consistency.checking.full.MultiPassStore.ARRAYS; @@ -190,7 +190,7 @@ public List createTasksForFullCheck( boolean checkLabelS if ( checkIndexes ) { tasks.add( new IndexDirtyCheckTask() ); - for ( IndexDescriptor indexRule : indexes.onlineRules() ) + for ( StoreIndexDescriptor indexRule : indexes.onlineRules() ) { tasks.add( recordScanner( format( "Index_%d", indexRule.getId() ), new IndexIterator( indexes.accessorFor( indexRule ) ), @@ -258,7 +258,7 @@ private class IndexDirtyCheckTask extends ConsistencyCheckerTask @Override public void run() { - for ( IndexDescriptor indexRule : indexes.onlineRules() ) + for ( StoreIndexDescriptor indexRule : indexes.onlineRules() ) { if ( indexes.accessorFor( indexRule ).isDirty() ) { diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/IndexCheck.java b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/IndexCheck.java index 032ae4f1d91af..23a610b7d9933 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/IndexCheck.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/IndexCheck.java @@ -24,13 +24,13 @@ import org.neo4j.consistency.report.ConsistencyReport; import org.neo4j.consistency.store.RecordAccess; import org.neo4j.consistency.store.synthetic.IndexEntry; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; public class IndexCheck implements RecordCheck { - private final IndexDescriptor indexRule; + private final StoreIndexDescriptor indexRule; - public IndexCheck( IndexDescriptor indexRule ) + public IndexCheck( StoreIndexDescriptor indexRule ) { this.indexRule = indexRule; } diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/PropertyAndNodeIndexedCheck.java b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/PropertyAndNodeIndexedCheck.java index 507acd8d935d7..36554dac218f9 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/PropertyAndNodeIndexedCheck.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/PropertyAndNodeIndexedCheck.java @@ -42,7 +42,7 @@ import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException; import org.neo4j.kernel.impl.api.LookupFilter; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.kernel.impl.store.record.PropertyBlock; import org.neo4j.kernel.impl.store.record.PropertyRecord; @@ -95,7 +95,7 @@ private void matchIndexesToNode( { Set labels = NodeLabelReader.getListOfLabels( record, records, engine ); IntObjectMap nodePropertyMap = null; - for ( IndexDescriptor indexRule : indexes.onlineRules() ) + for ( StoreIndexDescriptor indexRule : indexes.onlineRules() ) { long labelId = indexRule.schema().keyId(); if ( labels.contains( labelId ) ) @@ -129,7 +129,7 @@ private void matchIndexesToNode( } private void verifyNodeCorrectlyIndexedUniquely( long nodeId, Value[] propertyValues, - CheckerEngine engine, IndexDescriptor indexRule, + CheckerEngine engine, StoreIndexDescriptor indexRule, IndexReader reader ) { IndexQuery[] query = seek( indexRule.schema(), propertyValues ); @@ -156,7 +156,7 @@ private void verifyNodeCorrectlyIndexedUniquely( long nodeId, Value[] propertyVa private void reportIncorrectIndexCount( Value[] propertyValues, CheckerEngine engine, - IndexDescriptor indexRule, + StoreIndexDescriptor indexRule, long count ) { if ( count == 0 ) diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/index/IndexAccessors.java b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/index/IndexAccessors.java index 8ec12e044795e..e5817867464f8 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/index/IndexAccessors.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/index/IndexAccessors.java @@ -37,19 +37,19 @@ import org.neo4j.kernel.impl.store.RecordStore; import org.neo4j.kernel.impl.store.SchemaStorage; import org.neo4j.kernel.impl.store.record.DynamicRecord; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; public class IndexAccessors implements Closeable { private final MutableLongObjectMap accessors = new LongObjectHashMap<>(); - private final List onlineIndexRules = new ArrayList<>(); - private final List notOnlineIndexRules = new ArrayList<>(); + private final List onlineIndexRules = new ArrayList<>(); + private final List notOnlineIndexRules = new ArrayList<>(); public IndexAccessors( IndexProviderMap providers, RecordStore schemaStore, IndexSamplingConfig samplingConfig ) throws IOException { - Iterator indexes = new SchemaStorage( schemaStore ).indexesGetAll(); + Iterator indexes = new SchemaStorage( schemaStore ).indexesGetAll(); for (; ; ) { try @@ -59,7 +59,7 @@ public IndexAccessors( IndexProviderMap providers, // we intentionally only check indexes that are online since // - populating indexes will be rebuilt on next startup // - failed indexes have to be dropped by the user anyways - IndexDescriptor indexDescriptor = indexes.next(); + StoreIndexDescriptor indexDescriptor = indexes.next(); if ( indexDescriptor.isIndexWithoutOwningConstraint() ) { notOnlineIndexRules.add( indexDescriptor ); @@ -88,7 +88,7 @@ public IndexAccessors( IndexProviderMap providers, } } - for ( IndexDescriptor indexRule : onlineIndexRules ) + for ( StoreIndexDescriptor indexRule : onlineIndexRules ) { long indexId = indexRule.getId(); accessors.put( indexId, provider( providers, indexRule ) @@ -96,22 +96,22 @@ public IndexAccessors( IndexProviderMap providers, } } - private IndexProvider provider( IndexProviderMap providers, IndexDescriptor indexRule ) + private IndexProvider provider( IndexProviderMap providers, StoreIndexDescriptor indexRule ) { return providers.apply( indexRule.providerDescriptor() ); } - public Collection notOnlineRules() + public Collection notOnlineRules() { return notOnlineIndexRules; } - public IndexAccessor accessorFor( IndexDescriptor indexRule ) + public IndexAccessor accessorFor( StoreIndexDescriptor indexRule ) { return accessors.get( indexRule.getId() ); } - public Iterable onlineRules() + public Iterable onlineRules() { return onlineIndexRules; } diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/report/ConsistencyReport.java b/community/consistency-check/src/main/java/org/neo4j/consistency/report/ConsistencyReport.java index dea64f8329c79..1d66f41e6ce0b 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/report/ConsistencyReport.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/report/ConsistencyReport.java @@ -31,7 +31,7 @@ import org.neo4j.consistency.store.synthetic.LabelScanDocument; import org.neo4j.kernel.impl.annotations.Documented; import org.neo4j.kernel.impl.store.record.DynamicRecord; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.store.record.LabelTokenRecord; import org.neo4j.kernel.impl.store.record.NeoStoreRecord; import org.neo4j.kernel.impl.store.record.NodeRecord; @@ -194,13 +194,13 @@ interface NodeConsistencyReport extends PrimitiveConsistencyReport void dynamicRecordChainCycle( DynamicRecord nextRecord ); @Documented( "This node was not found in the expected index." ) - void notIndexed( IndexDescriptor index, Object[] propertyValues ); + void notIndexed( StoreIndexDescriptor index, Object[] propertyValues ); @Documented( "This node was found in the expected index, although multiple times" ) - void indexedMultipleTimes( IndexDescriptor index, Object[] propertyValues, long count ); + void indexedMultipleTimes( StoreIndexDescriptor index, Object[] propertyValues, long count ); @Documented( "There is another node in the unique index with the same property value(s)." ) - void uniqueIndexNotUnique( IndexDescriptor index, Object[] propertyValues, long duplicateNodeId ); + void uniqueIndexNotUnique( StoreIndexDescriptor index, Object[] propertyValues, long duplicateNodeId ); @Documented( "The referenced relationship group record is not in use." ) void relationshipGroupNotInUse( RelationshipGroupRecord group ); diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/store/synthetic/IndexRecord.java b/community/consistency-check/src/main/java/org/neo4j/consistency/store/synthetic/IndexRecord.java index 59c7a0b96f33b..c7fc00bd24a4b 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/store/synthetic/IndexRecord.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/store/synthetic/IndexRecord.java @@ -20,13 +20,13 @@ package org.neo4j.consistency.store.synthetic; import org.neo4j.kernel.impl.store.record.AbstractBaseRecord; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; public class IndexRecord extends AbstractBaseRecord { - private final IndexDescriptor indexRule; + private final StoreIndexDescriptor indexRule; - public IndexRecord( IndexDescriptor indexRule ) + public IndexRecord( StoreIndexDescriptor indexRule ) { super( indexRule.getId() ); this.indexRule = indexRule; diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/SchemaRecordCheckTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/SchemaRecordCheckTest.java index 0757146b7bcd0..7c356e0cba720 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/SchemaRecordCheckTest.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/SchemaRecordCheckTest.java @@ -29,7 +29,7 @@ import org.neo4j.kernel.impl.store.SchemaStorage; import org.neo4j.kernel.impl.store.record.ConstraintRule; import org.neo4j.kernel.impl.store.record.DynamicRecord; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.store.record.LabelTokenRecord; import org.neo4j.kernel.impl.store.record.PropertyKeyTokenRecord; import org.neo4j.storageengine.api.schema.SchemaRule; @@ -88,7 +88,7 @@ public void shouldReportInvalidLabelReferences() throws Exception DynamicRecord record = inUse( dynamicRecord( schemaRuleId ) ); IndexProvider.Descriptor providerDescriptor = new IndexProvider.Descriptor( "in-memory", "1.0" ); - IndexDescriptor rule = indexRule( schemaRuleId, labelId, propertyKeyId, providerDescriptor ); + StoreIndexDescriptor rule = indexRule( schemaRuleId, labelId, propertyKeyId, providerDescriptor ); when( checker().ruleAccess.loadSingleSchemaRule( schemaRuleId ) ).thenReturn( rule ); LabelTokenRecord labelTokenRecord = add( notInUse( new LabelTokenRecord( labelId ) ) ); @@ -109,7 +109,7 @@ public void shouldReportInvalidPropertyReferenceFromIndexRule() throws Exception DynamicRecord record = inUse( dynamicRecord( schemaRuleId ) ); IndexProvider.Descriptor providerDescriptor = new IndexProvider.Descriptor( "in-memory", "1.0" ); - IndexDescriptor rule = indexRule( schemaRuleId, labelId, propertyKeyId, providerDescriptor ); + StoreIndexDescriptor rule = indexRule( schemaRuleId, labelId, propertyKeyId, providerDescriptor ); when( checker().ruleAccess.loadSingleSchemaRule( schemaRuleId ) ).thenReturn( rule ); add( inUse( new LabelTokenRecord( labelId ) ) ); @@ -157,7 +157,7 @@ public void shouldReportUniquenessConstraintNotReferencingBack() throws Exceptio IndexProvider.Descriptor providerDescriptor = new IndexProvider.Descriptor( "in-memory", "1.0" ); - IndexDescriptor rule1 = constraintIndexRule( ruleId1, labelId, propertyKeyId, providerDescriptor, (long) ruleId2 ); + StoreIndexDescriptor rule1 = constraintIndexRule( ruleId1, labelId, propertyKeyId, providerDescriptor, (long) ruleId2 ); ConstraintRule rule2 = uniquenessConstraintRule( ruleId2, labelId, propertyKeyId, ruleId2 ); when( checker().ruleAccess.loadSingleSchemaRule( ruleId1 ) ).thenReturn( rule1 ); @@ -187,7 +187,7 @@ public void shouldNotReportConstraintIndexRuleWithoutBackReference() throws Exce IndexProvider.Descriptor providerDescriptor = new IndexProvider.Descriptor( "in-memory", "1.0" ); - IndexDescriptor rule = constraintIndexRule( ruleId, labelId, propertyKeyId, providerDescriptor ); + StoreIndexDescriptor rule = constraintIndexRule( ruleId, labelId, propertyKeyId, providerDescriptor ); when( checker().ruleAccess.loadSingleSchemaRule( ruleId ) ).thenReturn( rule ); @@ -266,7 +266,7 @@ public void shouldReportConstraintIndexNotReferencingBack() throws Exception IndexProvider.Descriptor providerDescriptor = new IndexProvider.Descriptor( "in-memory", "1.0" ); - IndexDescriptor rule1 = constraintIndexRule( ruleId1, labelId, propertyKeyId, providerDescriptor, (long) ruleId1 ); + StoreIndexDescriptor rule1 = constraintIndexRule( ruleId1, labelId, propertyKeyId, providerDescriptor, (long) ruleId1 ); ConstraintRule rule2 = uniquenessConstraintRule( ruleId2, labelId, propertyKeyId, ruleId1 ); when( checker().ruleAccess.loadSingleSchemaRule( ruleId1 ) ).thenReturn( rule1 ); @@ -298,8 +298,8 @@ public void shouldReportTwoConstraintIndexesReferencingSameConstraint() throws E IndexProvider.Descriptor providerDescriptor = new IndexProvider.Descriptor( "in-memory", "1.0" ); - IndexDescriptor rule1 = constraintIndexRule( ruleId1, labelId, propertyKeyId, providerDescriptor, (long) ruleId1 ); - IndexDescriptor rule2 = constraintIndexRule( ruleId2, labelId, propertyKeyId, providerDescriptor, (long) ruleId1 ); + StoreIndexDescriptor rule1 = constraintIndexRule( ruleId1, labelId, propertyKeyId, providerDescriptor, (long) ruleId1 ); + StoreIndexDescriptor rule2 = constraintIndexRule( ruleId2, labelId, propertyKeyId, providerDescriptor, (long) ruleId1 ); when( checker().ruleAccess.loadSingleSchemaRule( ruleId1 ) ).thenReturn( rule1 ); when( checker().ruleAccess.loadSingleSchemaRule( ruleId2 ) ).thenReturn( rule2 ); @@ -325,7 +325,7 @@ public void shouldReportUnreferencedConstraintIndex() throws Exception IndexProvider.Descriptor providerDescriptor = new IndexProvider.Descriptor( "in-memory", "1.0" ); - IndexDescriptor rule = constraintIndexRule( ruleId, labelId, propertyKeyId, providerDescriptor, (long) ruleId ); + StoreIndexDescriptor rule = constraintIndexRule( ruleId, labelId, propertyKeyId, providerDescriptor, (long) ruleId ); when( checker().ruleAccess.loadSingleSchemaRule( ruleId ) ).thenReturn( rule ); @@ -353,8 +353,8 @@ public void shouldReportTwoIndexRulesWithDuplicateContent() throws Exception IndexProvider.Descriptor providerDescriptor = new IndexProvider.Descriptor( "in-memory", "1.0" ); - IndexDescriptor rule1 = constraintIndexRule( ruleId1, labelId, propertyKeyId, providerDescriptor, (long) ruleId1 ); - IndexDescriptor rule2 = constraintIndexRule( ruleId2, labelId, propertyKeyId, providerDescriptor, (long) ruleId2 ); + StoreIndexDescriptor rule1 = constraintIndexRule( ruleId1, labelId, propertyKeyId, providerDescriptor, (long) ruleId1 ); + StoreIndexDescriptor rule2 = constraintIndexRule( ruleId2, labelId, propertyKeyId, providerDescriptor, (long) ruleId2 ); when( checker().ruleAccess.loadSingleSchemaRule( ruleId1 ) ).thenReturn( rule1 ); when( checker().ruleAccess.loadSingleSchemaRule( ruleId2 ) ).thenReturn( rule2 ); diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/SchemaRuleUtil.java b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/SchemaRuleUtil.java index 61ac93d13e5c8..f610b7d5664dd 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/SchemaRuleUtil.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/SchemaRuleUtil.java @@ -23,7 +23,7 @@ import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.store.record.ConstraintRule; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; public class SchemaRuleUtil { @@ -49,23 +49,25 @@ public static ConstraintRule relPropertyExistenceConstraintRule( long ruleId, in ConstraintDescriptorFactory.existsForRelType( labelId, propertyId ) ); } - public static IndexDescriptor indexRule( long ruleId, int labelId, int propertyId, IndexProvider.Descriptor + public static StoreIndexDescriptor indexRule( long ruleId, int labelId, int propertyId, IndexProvider.Descriptor descriptor ) { - return IndexDescriptor.indexRule( ruleId, IndexDescriptorFactory.forLabel( labelId, propertyId ), descriptor ); + return StoreIndexDescriptor + .indexRule( ruleId, IndexDescriptorFactory.forLabel( labelId, propertyId ), descriptor ); } - public static IndexDescriptor constraintIndexRule( long ruleId, int labelId, int propertyId, - IndexProvider.Descriptor descriptor, long constraintId ) + public static StoreIndexDescriptor constraintIndexRule( long ruleId, int labelId, int propertyId, + IndexProvider.Descriptor descriptor, long constraintId ) { - return IndexDescriptor.constraintIndexRule( ruleId, IndexDescriptorFactory.uniqueForLabel( labelId, propertyId ), - descriptor, constraintId ); + return StoreIndexDescriptor + .constraintIndexRule( ruleId, IndexDescriptorFactory.uniqueForLabel( labelId, propertyId ), + descriptor, constraintId ); } - public static IndexDescriptor constraintIndexRule( long ruleId, int labelId, int propertyId, - IndexProvider.Descriptor descriptor ) + public static StoreIndexDescriptor constraintIndexRule( long ruleId, int labelId, int propertyId, + IndexProvider.Descriptor descriptor ) { - return IndexDescriptor.indexRule( ruleId, IndexDescriptorFactory.uniqueForLabel( labelId, propertyId ), - descriptor ); + return StoreIndexDescriptor.indexRule( ruleId, IndexDescriptorFactory.uniqueForLabel( labelId, propertyId ), + descriptor ); } } diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java index 44aa09726d8df..5de3738189043 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java @@ -75,7 +75,6 @@ import org.neo4j.kernel.api.labelscan.NodeLabelUpdate; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.annotations.Documented; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; @@ -95,7 +94,7 @@ import org.neo4j.kernel.impl.store.allocator.ReusableRecordsCompositeAllocator; import org.neo4j.kernel.impl.store.record.ConstraintRule; import org.neo4j.kernel.impl.store.record.DynamicRecord; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.store.record.LabelTokenRecord; import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.kernel.impl.store.record.PropertyBlock; @@ -449,10 +448,10 @@ public void shouldNotReportIndexInconsistenciesIfIndexIsFailed() throws Exceptio DirectStoreAccess storeAccess = fixture.directStoreAccess(); // fail all indexes - Iterator rules = new SchemaStorage( storeAccess.nativeStores().getSchemaStore() ).indexesGetAll(); + Iterator rules = new SchemaStorage( storeAccess.nativeStores().getSchemaStore() ).indexesGetAll(); while ( rules.hasNext() ) { - IndexDescriptor rule = rules.next(); + StoreIndexDescriptor rule = rules.next(); IndexSamplingConfig samplingConfig = new IndexSamplingConfig( Config.defaults() ); IndexPopulator populator = storeAccess.indexes().apply( rule.providerDescriptor() ) .getPopulator( rule, samplingConfig ); @@ -556,13 +555,13 @@ public void shouldReportNodesThatAreNotIndexed() throws Exception { // given IndexSamplingConfig samplingConfig = new IndexSamplingConfig( Config.defaults() ); - Iterator indexDescriptorIterator = + Iterator indexDescriptorIterator = new SchemaStorage( fixture.directStoreAccess().nativeStores().getSchemaStore() ).indexesGetAll(); NeoStoreIndexStoreView storeView = new NeoStoreIndexStoreView( LockService.NO_LOCK_SERVICE, fixture.directStoreAccess().nativeStores().getRawNeoStores() ); while ( indexDescriptorIterator.hasNext() ) { - IndexDescriptor indexDescriptor = indexDescriptorIterator.next(); + StoreIndexDescriptor indexDescriptor = indexDescriptorIterator.next(); IndexAccessor accessor = fixture.directStoreAccess().indexes(). apply( indexDescriptor.providerDescriptor() ).getOnlineAccessor( indexDescriptor, samplingConfig ); try ( IndexUpdater updater = accessor.newUpdater( IndexUpdateMode.ONLINE ) ) @@ -593,11 +592,11 @@ public void shouldReportNodesWithDuplicatePropertyValueInUniqueIndex() throws Ex { // given IndexSamplingConfig samplingConfig = new IndexSamplingConfig( Config.defaults() ); - Iterator indexRuleIterator = + Iterator indexRuleIterator = new SchemaStorage( fixture.directStoreAccess().nativeStores().getSchemaStore() ).indexesGetAll(); while ( indexRuleIterator.hasNext() ) { - IndexDescriptor indexRule = indexRuleIterator.next(); + StoreIndexDescriptor indexRule = indexRuleIterator.next(); IndexAccessor accessor = fixture.directStoreAccess().indexes().apply( indexRule.providerDescriptor() ) .getOnlineAccessor( indexRule, samplingConfig ); IndexUpdater updater = accessor.newUpdater( IndexUpdateMode.ONLINE ); @@ -616,7 +615,7 @@ public void shouldReportNodesWithDuplicatePropertyValueInUniqueIndex() throws Ex .andThatsAllFolks(); } - private Value[] values( IndexDescriptor indexRule ) + private Value[] values( StoreIndexDescriptor indexRule ) { switch ( indexRule.schema().getPropertyIds().length ) { @@ -1015,7 +1014,7 @@ protected void transactionData( GraphStoreFixture.TransactionDataBuilder tx, DynamicRecord schemaBefore = schema.clone(); schema.setNextBlock( next.schema() ); // Point to a record that isn't in use. - IndexDescriptor rule = indexRule( schema.getId(), label1, key1, DESCRIPTOR ); + StoreIndexDescriptor rule = indexRule( schema.getId(), label1, key1, DESCRIPTOR ); schema.setData( SchemaRuleSerialization.serialize( rule ) ); tx.createSchema( asList( schemaBefore ), asList( schema ), rule ); @@ -1050,8 +1049,8 @@ protected void transactionData( GraphStoreFixture.TransactionDataBuilder tx, DynamicRecord record1Before = record1.clone(); DynamicRecord record2Before = record2.clone(); - IndexDescriptor rule1 = constraintIndexRule( ruleId1, labelId, propertyKeyId, DESCRIPTOR, ruleId1 ); - IndexDescriptor rule2 = constraintIndexRule( ruleId2, labelId, propertyKeyId, DESCRIPTOR, ruleId1 ); + StoreIndexDescriptor rule1 = constraintIndexRule( ruleId1, labelId, propertyKeyId, DESCRIPTOR, ruleId1 ); + StoreIndexDescriptor rule2 = constraintIndexRule( ruleId2, labelId, propertyKeyId, DESCRIPTOR, ruleId1 ); Collection records1 = serializeRule( rule1, record1 ); Collection records2 = serializeRule( rule2, record2 ); @@ -1095,7 +1094,7 @@ protected void transactionData( GraphStoreFixture.TransactionDataBuilder tx, DynamicRecord record1Before = record1.clone(); DynamicRecord record2Before = record2.clone(); - IndexDescriptor rule1 = constraintIndexRule( ruleId1, labelId, propertyKeyId, DESCRIPTOR, ruleId2 ); + StoreIndexDescriptor rule1 = constraintIndexRule( ruleId1, labelId, propertyKeyId, DESCRIPTOR, ruleId2 ); ConstraintRule rule2 = uniquenessConstraintRule( ruleId2, labelId, propertyKeyId, ruleId2 ); Collection records1 = serializeRule( rule1, record1 ); @@ -2251,7 +2250,8 @@ protected void transactionData( GraphStoreFixture.TransactionDataBuilder tx, DynamicRecord recordBefore = new DynamicRecord( id ); DynamicRecord recordAfter = recordBefore.clone(); - IndexDescriptor rule = IndexDescriptor.indexRule( id, forLabel( labelId, propertyKeyIds ), DESCRIPTOR ); + StoreIndexDescriptor + rule = StoreIndexDescriptor.indexRule( id, forLabel( labelId, propertyKeyIds ), DESCRIPTOR ); Collection records = serializeRule( rule, recordAfter ); tx.createSchema( singleton( recordBefore ), records, rule ); @@ -2266,8 +2266,8 @@ private void createUniquenessConstraintRule( final int labelId, final int... pro long ruleId1 = schemaStore.nextId(); long ruleId2 = schemaStore.nextId(); - IndexDescriptor indexRule = IndexDescriptor.constraintIndexRule( ruleId1, - uniqueForLabel( labelId, propertyKeyIds ), DESCRIPTOR, ruleId2 ); + StoreIndexDescriptor indexRule = StoreIndexDescriptor.constraintIndexRule( ruleId1, + uniqueForLabel( labelId, propertyKeyIds ), DESCRIPTOR, ruleId2 ); ConstraintRule uniqueRule = ConstraintRule.constraintRule( ruleId2, ConstraintDescriptorFactory.uniqueForLabel( labelId, propertyKeyIds ), ruleId1 ); @@ -2282,8 +2282,8 @@ private void createNodeKeyConstraintRule( final int labelId, final int... proper long ruleId1 = schemaStore.nextId(); long ruleId2 = schemaStore.nextId(); - IndexDescriptor indexRule = IndexDescriptor.constraintIndexRule( ruleId1, - uniqueForLabel( labelId, propertyKeyIds ), DESCRIPTOR, ruleId2 ); + StoreIndexDescriptor indexRule = StoreIndexDescriptor.constraintIndexRule( ruleId1, + uniqueForLabel( labelId, propertyKeyIds ), DESCRIPTOR, ruleId2 ); ConstraintRule nodeKeyRule = ConstraintRule.constraintRule( ruleId2, ConstraintDescriptorFactory.nodeKeyForLabel( labelId, propertyKeyIds ), ruleId1 ); 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 4f112c2f60b8b..6498f22d2af05 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 @@ -58,7 +58,7 @@ import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.store.record.AbstractBaseRecord; import org.neo4j.kernel.impl.store.record.DynamicRecord; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.store.record.LabelTokenRecord; import org.neo4j.kernel.impl.store.record.NeoStoreRecord; import org.neo4j.kernel.impl.store.record.NodeRecord; @@ -387,10 +387,10 @@ private Object parameter( Class type ) { return SchemaRule.Kind.INDEX_RULE; } - if ( type == IndexDescriptor.class ) + if ( type == StoreIndexDescriptor.class ) { - return IndexDescriptor.indexRule( 1, IndexDescriptorFactory.forLabel( 2, 3 ), - new IndexProvider.Descriptor( "provider", "version" ) ); + return StoreIndexDescriptor.indexRule( 1, IndexDescriptorFactory.forLabel( 2, 3 ), + new IndexProvider.Descriptor( "provider", "version" ) ); } if ( type == SchemaRule.class ) { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexProvider.java index 745aaf133a4fd..ed2c4e5b1f9a3 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexProvider.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexProvider.java @@ -26,7 +26,7 @@ import org.neo4j.internal.kernel.api.InternalIndexState; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexingService; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; @@ -43,7 +43,7 @@ * * When an index rule is added, the {@link IndexingService} is notified. It will, in turn, ask * your {@link IndexProvider} for a - * {@link #getPopulator(IndexDescriptor, IndexSamplingConfig) batch index writer}. + * {@link #getPopulator(StoreIndexDescriptor, IndexSamplingConfig) batch index writer}. * * A background index job is triggered, and all existing data that applies to the new rule, as well as new data * from the "outside", will be inserted using the writer. You are guaranteed that usage of this writer, @@ -88,7 +88,7 @@ *

Online operation

* * Once the index is online, the database will move to using the - * {@link #getOnlineAccessor(IndexDescriptor, IndexSamplingConfig) online accessor} to + * {@link #getOnlineAccessor(StoreIndexDescriptor, IndexSamplingConfig) online accessor} to * write to the index. */ public abstract class IndexProvider extends LifecycleAdapter implements Comparable @@ -100,7 +100,7 @@ public interface Monitor class Adaptor implements Monitor { @Override - public void failedToOpenIndex( IndexDescriptor schemaIndexDescriptor, String action, Exception cause ) + public void failedToOpenIndex( StoreIndexDescriptor schemaIndexDescriptor, String action, Exception cause ) { // no-op } @@ -110,7 +110,7 @@ public void recoveryCompleted( PendingIndexDescriptor schemaIndexDescriptor, Str } } - void failedToOpenIndex( IndexDescriptor schemaIndexDescriptor, String action, Exception cause ); + void failedToOpenIndex( StoreIndexDescriptor schemaIndexDescriptor, String action, Exception cause ); void recoveryCompleted( PendingIndexDescriptor schemaIndexDescriptor, String indexFile, Map data ); } @@ -122,19 +122,19 @@ public void recoveryCompleted( PendingIndexDescriptor schemaIndexDescriptor, Str private final IndexPopulator singlePopulator = IndexPopulator.EMPTY; @Override - public IndexAccessor getOnlineAccessor( IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) + public IndexAccessor getOnlineAccessor( StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { return singleWriter; } @Override - public IndexPopulator getPopulator( IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) + public IndexPopulator getPopulator( StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { return singlePopulator; } @Override - public InternalIndexState getInitialState( IndexDescriptor descriptor ) + public InternalIndexState getInitialState( StoreIndexDescriptor descriptor ) { return InternalIndexState.ONLINE; } @@ -153,7 +153,7 @@ public StoreMigrationParticipant storeMigrationParticipant( FileSystemAbstractio } @Override - public String getPopulationFailure( IndexDescriptor descriptor ) throws IllegalStateException + public String getPopulationFailure( StoreIndexDescriptor descriptor ) throws IllegalStateException { throw new IllegalStateException(); } @@ -188,30 +188,30 @@ protected IndexProvider( Descriptor descriptor, int priority, /** * Used for initially populating a created index, using batch insertion. */ - public abstract IndexPopulator getPopulator( IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ); + public abstract IndexPopulator getPopulator( StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ); /** * Used for updating an index once initial population has completed. */ - public abstract IndexAccessor getOnlineAccessor( IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException; + public abstract IndexAccessor getOnlineAccessor( StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException; /** * Returns a failure previously gotten from {@link IndexPopulator#markAsFailed(String)} * * Implementations are expected to persist this failure - * @param descriptor {@link IndexDescriptor} of the index. + * @param descriptor {@link StoreIndexDescriptor} of the index. * @return failure, in the form of a stack trace, that happened during population. * @throws IllegalStateException If there was no failure during population. */ - public abstract String getPopulationFailure( IndexDescriptor descriptor ) throws IllegalStateException; + public abstract String getPopulationFailure( StoreIndexDescriptor descriptor ) throws IllegalStateException; /** * Called during startup to find out which state an index is in. If {@link InternalIndexState#FAILED} - * is returned then a further call to {@link #getPopulationFailure(IndexDescriptor)} is expected and should return + * is returned then a further call to {@link #getPopulationFailure(StoreIndexDescriptor)} is expected and should return * the failure accepted by any call to {@link IndexPopulator#markAsFailed(String)} call at the time * of failure. */ - public abstract InternalIndexState getInitialState( IndexDescriptor descriptor ); + public abstract InternalIndexState getInitialState( StoreIndexDescriptor descriptor ); /** * Return {@link IndexCapability} for this index provider. diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/index/LoggingMonitor.java b/community/kernel/src/main/java/org/neo4j/kernel/api/index/LoggingMonitor.java index 8c6b5396ccc94..8f573d3bbd6b0 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/index/LoggingMonitor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/index/LoggingMonitor.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.StringJoiner; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; import org.neo4j.logging.Log; @@ -38,7 +38,7 @@ public LoggingMonitor( Log log ) } @Override - public void failedToOpenIndex( IndexDescriptor descriptor, String action, Exception cause ) + public void failedToOpenIndex( StoreIndexDescriptor descriptor, String action, Exception cause ) { log.error( "Failed to open index:" + descriptor.getId() + ". " + action, cause ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptor.java b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/StoreIndexDescriptor.java similarity index 70% rename from community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptor.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/StoreIndexDescriptor.java index 1c1ef3e44d497..5ed06bb576a44 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/StoreIndexDescriptor.java @@ -33,45 +33,45 @@ /** * A {@link Label} can have zero or more index rules which will have data specified in the rules indexed. */ -public class IndexDescriptor extends PendingIndexDescriptor implements SchemaRule +public class StoreIndexDescriptor extends PendingIndexDescriptor implements SchemaRule { private final long id; private final Long owningConstraintId; - public static IndexDescriptor indexRule( long id, PendingIndexDescriptor descriptor, - IndexProvider.Descriptor providerDescriptor ) + public static StoreIndexDescriptor indexRule( long id, PendingIndexDescriptor descriptor, + IndexProvider.Descriptor providerDescriptor ) { - return new IndexDescriptor( id, providerDescriptor, descriptor, null ); + return new StoreIndexDescriptor( id, providerDescriptor, descriptor, null ); } - public static IndexDescriptor constraintIndexRule( long id, PendingIndexDescriptor descriptor, - IndexProvider.Descriptor providerDescriptor, - Long owningConstraint ) + public static StoreIndexDescriptor constraintIndexRule( long id, PendingIndexDescriptor descriptor, + IndexProvider.Descriptor providerDescriptor, + Long owningConstraint ) { - return new IndexDescriptor( id, providerDescriptor, descriptor, owningConstraint ); + return new StoreIndexDescriptor( id, providerDescriptor, descriptor, owningConstraint ); } - public static IndexDescriptor indexRule( long id, PendingIndexDescriptor descriptor, - IndexProvider.Descriptor providerDescriptor, String name ) + public static StoreIndexDescriptor indexRule( long id, PendingIndexDescriptor descriptor, + IndexProvider.Descriptor providerDescriptor, String name ) { - return new IndexDescriptor( id, providerDescriptor, descriptor, null, name ); + return new StoreIndexDescriptor( id, providerDescriptor, descriptor, null, name ); } - public static IndexDescriptor constraintIndexRule( long id, PendingIndexDescriptor descriptor, - IndexProvider.Descriptor providerDescriptor, - Long owningConstraint, String name ) + public static StoreIndexDescriptor constraintIndexRule( long id, PendingIndexDescriptor descriptor, + IndexProvider.Descriptor providerDescriptor, + Long owningConstraint, String name ) { - return new IndexDescriptor( id, providerDescriptor, descriptor, owningConstraint, name ); + return new StoreIndexDescriptor( id, providerDescriptor, descriptor, owningConstraint, name ); } - protected IndexDescriptor( long id, IndexProvider.Descriptor providerDescriptor, - PendingIndexDescriptor descriptor, Long owningConstraintId ) + protected StoreIndexDescriptor( long id, IndexProvider.Descriptor providerDescriptor, + PendingIndexDescriptor descriptor, Long owningConstraintId ) { this( id, providerDescriptor, descriptor, owningConstraintId, null ); } - protected IndexDescriptor( long id, IndexProvider.Descriptor providerDescriptor, - PendingIndexDescriptor descriptor, Long owningConstraintId, String name ) + protected StoreIndexDescriptor( long id, IndexProvider.Descriptor providerDescriptor, + PendingIndexDescriptor descriptor, Long owningConstraintId, String name ) { super( descriptor.schema(), descriptor.type(), @@ -120,7 +120,7 @@ public boolean isIndexWithoutOwningConstraint() return canSupportUniqueConstraint() && getOwningConstraint() == null; } - public IndexDescriptor withOwningConstraint( long constraintId ) + public StoreIndexDescriptor withOwningConstraint( long constraintId ) { if ( !canSupportUniqueConstraint() ) { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/CapableIndexDescriptor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/CapableIndexDescriptor.java index a72d6d40e9fb8..2fd6995351fd3 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/CapableIndexDescriptor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/CapableIndexDescriptor.java @@ -23,11 +23,11 @@ import org.neo4j.internal.kernel.api.IndexOrder; import org.neo4j.internal.kernel.api.IndexValueCapability; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; import org.neo4j.values.storable.ValueCategory; -public class CapableIndexDescriptor extends IndexDescriptor +public class CapableIndexDescriptor extends StoreIndexDescriptor { private final IndexCapability indexCapability; @@ -41,7 +41,7 @@ public CapableIndexDescriptor( long id, this.indexCapability = indexCapability; } - public CapableIndexDescriptor( IndexDescriptor indexDescriptor, IndexCapability indexCapability ) + public CapableIndexDescriptor( StoreIndexDescriptor indexDescriptor, IndexCapability indexCapability ) { super( indexDescriptor.getId(), indexDescriptor.providerDescriptor(), indexDescriptor, indexDescriptor.getOwningConstraint() ); this.indexCapability = indexCapability; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMap.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMap.java index 567b3011b6809..6ac314a6402f9 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMap.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMap.java @@ -40,7 +40,7 @@ import java.util.Set; import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; /** * Bundles various mappings to IndexProxy. Used by IndexingService via IndexMapReference. @@ -99,7 +99,7 @@ public long getIndexId( SchemaDescriptor descriptor ) public void putIndexProxy( IndexProxy indexProxy ) { - IndexDescriptor descriptor = indexProxy.getDescriptor(); + StoreIndexDescriptor descriptor = indexProxy.getDescriptor(); SchemaDescriptor schema = descriptor.schema(); indexesById.put( descriptor.getId(), indexProxy ); indexesByDescriptor.put( schema, indexProxy ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexProxyCreator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexProxyCreator.java index b860e0b31a739..c69a73fd00613 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexProxyCreator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexProxyCreator.java @@ -26,7 +26,7 @@ import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.logging.LogProvider; @@ -56,8 +56,8 @@ class IndexProxyCreator this.logProvider = logProvider; } - IndexProxy createPopulatingIndexProxy( final IndexDescriptor descriptor, final boolean flipToTentative, final IndexingService.Monitor monitor, - final IndexPopulationJob populationJob ) + IndexProxy createPopulatingIndexProxy( final StoreIndexDescriptor descriptor, final boolean flipToTentative, final IndexingService.Monitor monitor, + final IndexPopulationJob populationJob ) { final FlippableIndexProxy flipper = new FlippableIndexProxy(); @@ -94,14 +94,14 @@ IndexProxy createPopulatingIndexProxy( final IndexDescriptor descriptor, final b return new ContractCheckingIndexProxy( flipper, false ); } - IndexProxy createRecoveringIndexProxy( IndexDescriptor descriptor ) + IndexProxy createRecoveringIndexProxy( StoreIndexDescriptor descriptor ) { CapableIndexDescriptor capableIndexDescriptor = indexMetaFromProvider( descriptor ); IndexProxy proxy = new RecoveringIndexProxy( capableIndexDescriptor ); return new ContractCheckingIndexProxy( proxy, true ); } - IndexProxy createOnlineIndexProxy( IndexDescriptor descriptor ) + IndexProxy createOnlineIndexProxy( StoreIndexDescriptor descriptor ) { try { @@ -121,7 +121,7 @@ IndexProxy createOnlineIndexProxy( IndexDescriptor descriptor ) } } - IndexProxy createFailedIndexProxy( IndexDescriptor descriptor, IndexPopulationFailure populationFailure ) + IndexProxy createFailedIndexProxy( StoreIndexDescriptor descriptor, IndexPopulationFailure populationFailure ) { IndexPopulator indexPopulator = populatorFromProvider( descriptor, samplingConfig ); CapableIndexDescriptor capableIndexDescriptor = indexMetaFromProvider( descriptor ); @@ -137,25 +137,25 @@ IndexProxy createFailedIndexProxy( IndexDescriptor descriptor, IndexPopulationFa return proxy; } - private String indexUserDescription( final IndexDescriptor descriptor ) + private String indexUserDescription( final StoreIndexDescriptor descriptor ) { return format( "%s [provider: %s]", descriptor.schema().userDescription( tokenNameLookup ), descriptor.providerDescriptor().toString() ); } - private IndexPopulator populatorFromProvider( IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) + private IndexPopulator populatorFromProvider( StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { IndexProvider indexProvider = providerMap.apply( descriptor.providerDescriptor() ); return indexProvider.getPopulator( descriptor, samplingConfig ); } - private IndexAccessor onlineAccessorFromProvider( IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException + private IndexAccessor onlineAccessorFromProvider( StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException { IndexProvider indexProvider = providerMap.apply( descriptor.providerDescriptor() ); return indexProvider.getOnlineAccessor( descriptor, samplingConfig ); } - private CapableIndexDescriptor indexMetaFromProvider( IndexDescriptor indexDescriptor ) + private CapableIndexDescriptor indexMetaFromProvider( StoreIndexDescriptor indexDescriptor ) { IndexCapability indexCapability = providerMap.apply( indexDescriptor.providerDescriptor() ).getCapability(); return new CapableIndexDescriptor( indexDescriptor, indexCapability ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexingService.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexingService.java index 6afd54ccbb248..8050027aa9e36 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexingService.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexingService.java @@ -58,7 +58,7 @@ import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingController; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingMode; import org.neo4j.kernel.impl.store.UnderlyingStorageException; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.transaction.state.IndexUpdates; import org.neo4j.kernel.lifecycle.LifecycleAdapter; import org.neo4j.logging.Log; @@ -77,7 +77,7 @@ /** * Manages the indexes that were introduced in 2.0. These indexes depend on the normal neo4j logical log for - * transactionality. Each index has an {@link IndexDescriptor}, which it uses to filter + * transactionality. Each index has an {@link StoreIndexDescriptor}, which it uses to filter * changes that come into the database. Changes that apply to the the rule are indexed. This way, "normal" changes to * the database can be replayed to perform recovery after a crash. *

@@ -97,7 +97,7 @@ public class IndexingService extends LifecycleAdapter implements IndexingUpdateS private final IndexStoreView storeView; private final IndexProviderMap providerMap; private final IndexMapReference indexMapRef; - private final Iterable indexDescriptors; + private final Iterable indexDescriptors; private final Log log; private final TokenNameLookup tokenNameLookup; private final MultiPopulatorFactory multiPopulatorFactory; @@ -117,9 +117,9 @@ enum State public interface Monitor { - void initialState( IndexDescriptor descriptor, InternalIndexState state ); + void initialState( StoreIndexDescriptor descriptor, InternalIndexState state ); - void populationCompleteOn( IndexDescriptor descriptor ); + void populationCompleteOn( StoreIndexDescriptor descriptor ); void indexPopulationScanStarting(); @@ -131,12 +131,12 @@ public interface Monitor public static class MonitorAdapter implements Monitor { @Override - public void initialState( IndexDescriptor descriptor, InternalIndexState state ) + public void initialState( StoreIndexDescriptor descriptor, InternalIndexState state ) { // Do nothing } @Override - public void populationCompleteOn( IndexDescriptor descriptor ) + public void populationCompleteOn( StoreIndexDescriptor descriptor ) { // Do nothing } @@ -164,7 +164,7 @@ public void awaitingPopulationOfRecoveredIndex( long indexId, PendingIndexDescri IndexProviderMap providerMap, IndexMapReference indexMapRef, IndexStoreView storeView, - Iterable indexDescriptors, + Iterable indexDescriptors, IndexSamplingController samplingController, TokenNameLookup tokenNameLookup, JobScheduler scheduler, @@ -197,7 +197,7 @@ public void init() indexMapRef.modify( indexMap -> { Map> indexStates = new EnumMap<>( InternalIndexState.class ); - for ( IndexDescriptor indexDescriptor : indexDescriptors ) + for ( StoreIndexDescriptor indexDescriptor : indexDescriptors ) { IndexProxy indexProxy; @@ -257,7 +257,7 @@ public void start() indexMap.forEachIndexProxy( ( indexId, proxy ) -> { InternalIndexState state = proxy.getState(); - IndexDescriptor descriptor = proxy.getDescriptor(); + StoreIndexDescriptor descriptor = proxy.getDescriptor(); indexStates.computeIfAbsent( state, internalIndexState -> new ArrayList<>() ) .add( new IndexLogRecord( descriptor ) ); log.debug( indexStateInfo( "start", state, descriptor ) ); @@ -497,7 +497,7 @@ public Iterable> convertToIndexUpdates( NodeU * it is *vital* that it is stable, and handles errors very well. Failing here means that the entire db * will shut down. */ - public void createIndexes( IndexDescriptor... rules ) throws IOException + public void createIndexes( StoreIndexDescriptor... rules ) throws IOException { IndexPopulationStarter populationStarter = new IndexPopulationStarter( rules ); indexMapRef.modify( populationStarter ); @@ -514,7 +514,7 @@ private void processUpdate( IndexUpdaterMap updaterMap, IndexEntryUpdate { @@ -682,7 +682,7 @@ private void startIndexPopulation( IndexPopulationJob job ) populationJobController.startIndexPopulation( job ); } - private String indexStateInfo( String tag, InternalIndexState state, IndexDescriptor descriptor ) + private String indexStateInfo( String tag, InternalIndexState state, StoreIndexDescriptor descriptor ) { return format( "IndexingService.%s: index %d on %s is %s", tag, descriptor.getId(), descriptor.schema().userDescription( tokenNameLookup ), state.name() ); @@ -719,10 +719,10 @@ private void logIndexStateSummary( String method, Map { - private final IndexDescriptor[] descriptors; + private final StoreIndexDescriptor[] descriptors; private IndexPopulationJob populationJob; - IndexPopulationStarter( IndexDescriptor[] descriptors ) + IndexPopulationStarter( StoreIndexDescriptor[] descriptors ) { this.descriptors = descriptors; } @@ -730,7 +730,7 @@ private final class IndexPopulationStarter implements ThrowingFunction indexRules, + Iterable indexRules, LogProvider logProvider, IndexingService.Monitor monitor, SchemaState schemaState ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/RebuildingIndexDescriptor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/RebuildingIndexDescriptor.java index 385e2cabfb710..a7914b4d37c30 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/RebuildingIndexDescriptor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/RebuildingIndexDescriptor.java @@ -19,21 +19,21 @@ */ package org.neo4j.kernel.impl.api.index; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; /** * Small class for holding a bunch of information about an index that we need to rebuild during recovery. */ public class RebuildingIndexDescriptor { - private final IndexDescriptor schemaIndexDescriptor; + private final StoreIndexDescriptor schemaIndexDescriptor; - RebuildingIndexDescriptor( IndexDescriptor schemaIndexDescriptor ) + RebuildingIndexDescriptor( StoreIndexDescriptor schemaIndexDescriptor ) { this.schemaIndexDescriptor = schemaIndexDescriptor; } - public IndexDescriptor getIndexDescriptor() + public StoreIndexDescriptor getIndexDescriptor() { return schemaIndexDescriptor; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/SchemaCache.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/SchemaCache.java index 997916d09fd55..5acc8c9bc6569 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/SchemaCache.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/SchemaCache.java @@ -40,7 +40,7 @@ import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.internal.kernel.api.schema.SchemaDescriptorPredicates; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.CapableIndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexProviderMap; import org.neo4j.kernel.impl.constraints.ConstraintSemantics; @@ -288,9 +288,9 @@ void addSchemaRule( SchemaRule rule ) constraintRuleById.put( constraintRule.getId(), constraintRule ); constraints.add( constraintSemantics.readConstraint( constraintRule ) ); } - else if ( rule instanceof IndexDescriptor ) + else if ( rule instanceof StoreIndexDescriptor ) { - CapableIndexDescriptor index = ((IndexDescriptor) rule).withCapabilities( indexProviderMap ); + CapableIndexDescriptor index = ((StoreIndexDescriptor) rule).withCapabilities( indexProviderMap ); indexRuleById.put( index.getId(), index ); SchemaDescriptor schemaDescriptor = index.schema(); indexDescriptors.put( schemaDescriptor, index ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndexProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndexProvider.java index ed47ca146ddf6..4a2cf1fd2e70c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndexProvider.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeIndexProvider.java @@ -33,7 +33,7 @@ import org.neo4j.kernel.api.index.IndexDirectoryStructure.Factory; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.storemigration.StoreMigrationParticipant; @@ -62,10 +62,10 @@ protected NativeIndexProvider( Descriptor descriptor, int priority, Factory dire this.readOnly = readOnly; } - abstract Layout layout( IndexDescriptor descriptor ); + abstract Layout layout( StoreIndexDescriptor descriptor ); @Override - public IndexPopulator getPopulator( IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) + public IndexPopulator getPopulator( StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { if ( readOnly ) { @@ -76,19 +76,19 @@ public IndexPopulator getPopulator( IndexDescriptor descriptor, IndexSamplingCon return newIndexPopulator( storeFile, layout( descriptor ), descriptor, samplingConfig ); } - protected abstract IndexPopulator newIndexPopulator( File storeFile, Layout layout, IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ); + protected abstract IndexPopulator newIndexPopulator( File storeFile, Layout layout, StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ); @Override - public IndexAccessor getOnlineAccessor( IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException + public IndexAccessor getOnlineAccessor( StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException { File storeFile = nativeIndexFileFromIndexId( descriptor.getId() ); return newIndexAccessor( storeFile, layout( descriptor ), descriptor, samplingConfig ); } - protected abstract IndexAccessor newIndexAccessor( File storeFile, Layout layout, IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException; + protected abstract IndexAccessor newIndexAccessor( File storeFile, Layout layout, StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException; @Override - public String getPopulationFailure( IndexDescriptor descriptor ) throws IllegalStateException + public String getPopulationFailure( StoreIndexDescriptor descriptor ) throws IllegalStateException { try { @@ -106,7 +106,7 @@ public String getPopulationFailure( IndexDescriptor descriptor ) throws IllegalS } @Override - public InternalIndexState getInitialState( IndexDescriptor descriptor ) + public InternalIndexState getInitialState( StoreIndexDescriptor descriptor ) { try { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndex.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndex.java index 73a5347950c64..bfcb2e5fd6875 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndex.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndex.java @@ -31,7 +31,7 @@ import org.neo4j.io.pagecache.PageCache; import org.neo4j.io.pagecache.PageCursor; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; import static org.neo4j.helpers.Format.duration; @@ -50,7 +50,7 @@ abstract class NativeSchemaIndex, VALUE extends protected GBPTree tree; NativeSchemaIndex( PageCache pageCache, FileSystemAbstraction fs, File storeFile, Layout layout, IndexProvider.Monitor monitor, - IndexDescriptor descriptor ) + StoreIndexDescriptor descriptor ) { this.pageCache = pageCache; this.storeFile = storeFile; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexAccessor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexAccessor.java index d241c70483e6f..f79b8304b727c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexAccessor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexAccessor.java @@ -33,8 +33,7 @@ import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; @@ -50,7 +49,7 @@ public abstract class NativeSchemaIndexAccessor final IndexSamplingConfig samplingConfig; NativeSchemaIndexAccessor( PageCache pageCache, FileSystemAbstraction fs, File storeFile, Layout layout, - RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, IndexProvider.Monitor monitor, IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException + RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, IndexProvider.Monitor monitor, StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException { super( pageCache, fs, storeFile, layout, monitor, descriptor ); singleUpdater = new NativeSchemaIndexUpdater<>( layout.newKey(), layout.newValue() ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexPopulator.java index 9bfc9bf39a5e9..ba52e1b5bcdae 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexPopulator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexPopulator.java @@ -43,7 +43,7 @@ import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.DefaultNonUniqueIndexSampler; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.api.index.sampling.NonUniqueIndexSampler; @@ -84,7 +84,7 @@ public abstract class NativeSchemaIndexPopulator layout, IndexProvider.Monitor monitor, - IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) + StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { super( pageCache, fs, storeFile, layout, monitor, descriptor ); this.treeKey = layout.newKey(); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberIndexProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberIndexProvider.java index 2a784ec9fed1a..e686b5f7232d1 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberIndexProvider.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberIndexProvider.java @@ -33,7 +33,7 @@ import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexDirectoryStructure; import org.neo4j.kernel.api.index.IndexPopulator; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.values.storable.ValueCategory; @@ -54,7 +54,7 @@ public NumberIndexProvider( PageCache pageCache, FileSystemAbstraction fs, } @Override - Layout layout( IndexDescriptor descriptor ) + Layout layout( StoreIndexDescriptor descriptor ) { // split like this due to legacy reasons, there are old stores out there with these different identifiers switch ( descriptor.type() ) @@ -69,14 +69,14 @@ Layout layout( IndexDescriptor descriptor ) } @Override - protected IndexPopulator newIndexPopulator( File storeFile, Layout layout, IndexDescriptor descriptor, + protected IndexPopulator newIndexPopulator( File storeFile, Layout layout, StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { return new NumberSchemaIndexPopulator( pageCache, fs, storeFile, layout, monitor, descriptor, samplingConfig ); } @Override - protected IndexAccessor newIndexAccessor( File storeFile, Layout layout, IndexDescriptor descriptor, + protected IndexAccessor newIndexAccessor( File storeFile, Layout layout, StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException { return new NumberSchemaIndexAccessor( pageCache, fs, storeFile, layout, recoveryCleanupWorkCollector, monitor, descriptor, diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexAccessor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexAccessor.java index 1d7030c45e01e..68fa5fc2a1e75 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexAccessor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexAccessor.java @@ -27,14 +27,14 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; public class NumberSchemaIndexAccessor extends NativeSchemaIndexAccessor { NumberSchemaIndexAccessor( PageCache pageCache, FileSystemAbstraction fs, File storeFile, Layout layout, - RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, IndexProvider.Monitor monitor, IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException + RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, IndexProvider.Monitor monitor, StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException { super( pageCache, fs, storeFile, layout, recoveryCleanupWorkCollector, monitor, descriptor, samplingConfig ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexPopulator.java index 668bd1a8c730d..f48bd82ae2005 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexPopulator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NumberSchemaIndexPopulator.java @@ -25,13 +25,13 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; class NumberSchemaIndexPopulator extends NativeSchemaIndexPopulator { - NumberSchemaIndexPopulator( PageCache pageCache, FileSystemAbstraction fs, File storeFile, Layout layout, IndexProvider.Monitor monitor, IndexDescriptor descriptor, + NumberSchemaIndexPopulator( PageCache pageCache, FileSystemAbstraction fs, File storeFile, Layout layout, IndexProvider.Monitor monitor, StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { super( pageCache, fs, storeFile, layout, monitor, descriptor, samplingConfig ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexAccessor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexAccessor.java index dee6462e53264..a2b77eb645de4 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexAccessor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexAccessor.java @@ -40,7 +40,7 @@ import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; @@ -51,9 +51,9 @@ class SpatialIndexAccessor extends SpatialIndexCache implements IndexAccessor { - private final IndexDescriptor descriptor; + private final StoreIndexDescriptor descriptor; - SpatialIndexAccessor( IndexDescriptor descriptor, + SpatialIndexAccessor( StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig, PageCache pageCache, FileSystemAbstraction fs, @@ -181,12 +181,12 @@ public boolean isDirty() static class PartAccessor extends NativeSchemaIndexAccessor { private final Layout layout; - private final IndexDescriptor descriptor; + private final StoreIndexDescriptor descriptor; private final IndexSamplingConfig samplingConfig; private final SpaceFillingCurveConfiguration searchConfiguration; PartAccessor( PageCache pageCache, FileSystemAbstraction fs, SpatialIndexFiles.SpatialFileLayout fileLayout, RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, - IndexProvider.Monitor monitor, IndexDescriptor descriptor, IndexSamplingConfig samplingConfig, SpaceFillingCurveConfiguration searchConfiguration ) throws IOException + IndexProvider.Monitor monitor, StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig, SpaceFillingCurveConfiguration searchConfiguration ) throws IOException { super( pageCache, fs, fileLayout.indexFile, fileLayout.layout, recoveryCleanupWorkCollector, monitor, descriptor, samplingConfig ); this.layout = fileLayout.layout; @@ -209,7 +209,7 @@ static class PartFactory implements Factory private final FileSystemAbstraction fs; private final RecoveryCleanupWorkCollector recoveryCleanupWorkCollector; private final IndexProvider.Monitor monitor; - private final IndexDescriptor descriptor; + private final StoreIndexDescriptor descriptor; private final IndexSamplingConfig samplingConfig; private final SpatialIndexFiles spatialIndexFiles; private final SpaceFillingCurveConfiguration searchConfiguration; @@ -218,7 +218,7 @@ static class PartFactory implements Factory FileSystemAbstraction fs, RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, IndexProvider.Monitor monitor, - IndexDescriptor descriptor, + StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig, SpatialIndexFiles spatialIndexFiles, SpaceFillingCurveConfiguration searchConfiguration ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexPopulator.java index bf506c3d61ff2..f8d8808f3b071 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexPopulator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexPopulator.java @@ -37,7 +37,7 @@ import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.index.schema.config.SpaceFillingCurveSettings; import org.neo4j.storageengine.api.schema.IndexReader; @@ -51,8 +51,8 @@ class SpatialIndexPopulator extends SpatialIndexCache implements IndexPopulator { - SpatialIndexPopulator( IndexDescriptor descriptor, IndexSamplingConfig samplingConfig, SpatialIndexFiles spatialIndexFiles, PageCache pageCache, - FileSystemAbstraction fs, IndexProvider.Monitor monitor, SpaceFillingCurveConfiguration configuration ) + SpatialIndexPopulator( StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig, SpatialIndexFiles spatialIndexFiles, PageCache pageCache, + FileSystemAbstraction fs, IndexProvider.Monitor monitor, SpaceFillingCurveConfiguration configuration ) { super( new PartFactory( pageCache, fs, spatialIndexFiles, descriptor, monitor, samplingConfig, configuration ) ); } @@ -148,7 +148,7 @@ static class PartPopulator extends NativeSchemaIndexPopulator private final PageCache pageCache; private final FileSystemAbstraction fs; private final SpatialIndexFiles spatialIndexFiles; - private final IndexDescriptor descriptor; + private final StoreIndexDescriptor descriptor; private final IndexProvider.Monitor monitor; private final IndexSamplingConfig samplingConfig; private final SpaceFillingCurveConfiguration configuration; - PartFactory( PageCache pageCache, FileSystemAbstraction fs, SpatialIndexFiles spatialIndexFiles, IndexDescriptor descriptor, IndexProvider.Monitor monitor, IndexSamplingConfig samplingConfig, - SpaceFillingCurveConfiguration configuration ) + PartFactory( PageCache pageCache, FileSystemAbstraction fs, SpatialIndexFiles spatialIndexFiles, StoreIndexDescriptor descriptor, IndexProvider.Monitor monitor, IndexSamplingConfig samplingConfig, + SpaceFillingCurveConfiguration configuration ) { this.pageCache = pageCache; this.fs = fs; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexProvider.java index 4de7c81094d2d..41a6a61e8bd9f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexProvider.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexProvider.java @@ -36,7 +36,7 @@ import org.neo4j.kernel.api.index.IndexDirectoryStructure; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.index.schema.config.SpaceFillingCurveSettingsFactory; @@ -94,7 +94,7 @@ private static SpaceFillingCurveConfiguration getConfiguredSpaceFillingCurveConf } @Override - public IndexPopulator getPopulator( IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) + public IndexPopulator getPopulator( StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { if ( readOnly ) { @@ -105,14 +105,14 @@ public IndexPopulator getPopulator( IndexDescriptor descriptor, IndexSamplingCon } @Override - public IndexAccessor getOnlineAccessor( IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException + public IndexAccessor getOnlineAccessor( StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException { SpatialIndexFiles files = new SpatialIndexFiles( directoryStructure(), descriptor.getId(), fs, settingsFactory ); return new SpatialIndexAccessor( descriptor, samplingConfig, pageCache, fs, recoveryCleanupWorkCollector, monitor, files, configuration ); } @Override - public String getPopulationFailure( IndexDescriptor descriptor ) throws IllegalStateException + public String getPopulationFailure( StoreIndexDescriptor descriptor ) throws IllegalStateException { SpatialIndexFiles spatialIndexFiles = new SpatialIndexFiles( directoryStructure(), descriptor.getId(), fs, settingsFactory ); @@ -135,7 +135,7 @@ public String getPopulationFailure( IndexDescriptor descriptor ) throws IllegalS } @Override - public InternalIndexState getInitialState( IndexDescriptor descriptor ) + public InternalIndexState getInitialState( StoreIndexDescriptor descriptor ) { SpatialIndexFiles spatialIndexFiles = new SpatialIndexFiles( directoryStructure(), descriptor.getId(), fs, settingsFactory ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexProvider.java index 50ea524af638f..a84bd08208b98 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexProvider.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringIndexProvider.java @@ -33,7 +33,7 @@ import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexDirectoryStructure; import org.neo4j.kernel.api.index.IndexPopulator; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.values.storable.ValueCategory; @@ -54,20 +54,20 @@ public StringIndexProvider( PageCache pageCache, FileSystemAbstraction fs, } @Override - Layout layout( IndexDescriptor descriptor ) + Layout layout( StoreIndexDescriptor descriptor ) { return new StringLayout(); } @Override - protected IndexPopulator newIndexPopulator( File storeFile, Layout layout, IndexDescriptor descriptor, + protected IndexPopulator newIndexPopulator( File storeFile, Layout layout, StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { return new StringSchemaIndexPopulator( pageCache, fs, storeFile, layout, monitor, descriptor, samplingConfig ); } @Override - protected IndexAccessor newIndexAccessor( File storeFile, Layout layout, IndexDescriptor descriptor, + protected IndexAccessor newIndexAccessor( File storeFile, Layout layout, StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException { return new StringSchemaIndexAccessor( pageCache, fs, storeFile, layout, recoveryCleanupWorkCollector, monitor, descriptor, samplingConfig ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexAccessor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexAccessor.java index 3f519373b28ee..9ce51160a13d8 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexAccessor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexAccessor.java @@ -29,7 +29,7 @@ import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.IndexTextValueLengthValidator; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.util.Validator; @@ -44,7 +44,7 @@ public class StringSchemaIndexAccessor extends NativeSchemaIndexAccessor VALIDATOR = new IndexTextValueLengthValidator( TreeNodeDynamicSize.MAX_KEY_SIZE ); StringSchemaIndexAccessor( PageCache pageCache, FileSystemAbstraction fs, File storeFile, Layout layout, - RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, IndexProvider.Monitor monitor, IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException + RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, IndexProvider.Monitor monitor, StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException { super( pageCache, fs, storeFile, layout, recoveryCleanupWorkCollector, monitor, descriptor, samplingConfig ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexPopulator.java index 28ce8a10135be..12df92049ad0b 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexPopulator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringSchemaIndexPopulator.java @@ -25,13 +25,13 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; public class StringSchemaIndexPopulator extends NativeSchemaIndexPopulator { - StringSchemaIndexPopulator( PageCache pageCache, FileSystemAbstraction fs, File storeFile, Layout layout, IndexProvider.Monitor monitor, IndexDescriptor descriptor, + StringSchemaIndexPopulator( PageCache pageCache, FileSystemAbstraction fs, File storeFile, Layout layout, IndexProvider.Monitor monitor, StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { super( pageCache, fs, storeFile, layout, monitor, descriptor, samplingConfig ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexAccessor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexAccessor.java index a3a1f3b6685b5..8cd16e5537332 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexAccessor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexAccessor.java @@ -39,7 +39,7 @@ import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; @@ -52,8 +52,8 @@ class TemporalIndexAccessor extends TemporalIndexCache> extends NativeSchema private final IndexSamplingConfig samplingConfig; PartAccessor( PageCache pageCache, FileSystemAbstraction fs, TemporalIndexFiles.FileLayout fileLayout, RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, - IndexProvider.Monitor monitor, IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException + IndexProvider.Monitor monitor, StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException { super( pageCache, fs, fileLayout.indexFile, fileLayout.layout, recoveryCleanupWorkCollector, monitor, descriptor, samplingConfig ); this.layout = fileLayout.layout; @@ -194,12 +194,12 @@ static class PartFactory implements TemporalIndexCache.Factory> private final FileSystemAbstraction fs; private final RecoveryCleanupWorkCollector recoveryCleanupWorkCollector; private final IndexProvider.Monitor monitor; - private final IndexDescriptor descriptor; + private final StoreIndexDescriptor descriptor; private final IndexSamplingConfig samplingConfig; private final TemporalIndexFiles temporalIndexFiles; PartFactory( PageCache pageCache, FileSystemAbstraction fs, RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, IndexProvider.Monitor monitor, - IndexDescriptor descriptor, IndexSamplingConfig samplingConfig, TemporalIndexFiles temporalIndexFiles ) + StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig, TemporalIndexFiles temporalIndexFiles ) { this.pageCache = pageCache; this.fs = fs; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexFiles.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexFiles.java index b16c11fab2407..7983d5c94e9c5 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexFiles.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexFiles.java @@ -27,7 +27,7 @@ import org.neo4j.index.internal.gbptree.Layout; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.kernel.api.index.IndexDirectoryStructure; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.values.storable.ValueGroup; class TemporalIndexFiles @@ -40,7 +40,7 @@ class TemporalIndexFiles private FileLayout zonedTime; private FileLayout duration; - TemporalIndexFiles( IndexDirectoryStructure directoryStructure, IndexDescriptor descriptor, FileSystemAbstraction fs ) + TemporalIndexFiles( IndexDirectoryStructure directoryStructure, StoreIndexDescriptor descriptor, FileSystemAbstraction fs ) { this.fs = fs; File indexDirectory = directoryStructure.directoryForIndex( descriptor.getId() ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexPopulator.java index dc4b650ab66fc..b3b169850a48b 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexPopulator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexPopulator.java @@ -35,7 +35,7 @@ import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.IndexSample; @@ -47,8 +47,8 @@ class TemporalIndexPopulator extends TemporalIndexCache> implements IndexPopulator { - TemporalIndexPopulator( IndexDescriptor descriptor, IndexSamplingConfig samplingConfig, TemporalIndexFiles temporalIndexFiles, PageCache pageCache, - FileSystemAbstraction fs, IndexProvider.Monitor monitor ) + TemporalIndexPopulator( StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig, TemporalIndexFiles temporalIndexFiles, PageCache pageCache, + FileSystemAbstraction fs, IndexProvider.Monitor monitor ) { super( new PartFactory( pageCache, fs, temporalIndexFiles, descriptor, samplingConfig, monitor ) ); } @@ -140,7 +140,7 @@ public IndexSample sampleResult() static class PartPopulator> extends NativeSchemaIndexPopulator { PartPopulator( PageCache pageCache, FileSystemAbstraction fs, TemporalIndexFiles.FileLayout fileLayout, IndexProvider.Monitor monitor, - IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) + StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { super( pageCache, fs, fileLayout.indexFile, fileLayout.layout, monitor, descriptor, samplingConfig ); } @@ -157,11 +157,11 @@ static class PartFactory implements TemporalIndexCache.Factory> private final PageCache pageCache; private final FileSystemAbstraction fs; private final TemporalIndexFiles temporalIndexFiles; - private final IndexDescriptor descriptor; + private final StoreIndexDescriptor descriptor; private final IndexSamplingConfig samplingConfig; private final IndexProvider.Monitor monitor; - PartFactory( PageCache pageCache, FileSystemAbstraction fs, TemporalIndexFiles temporalIndexFiles, IndexDescriptor descriptor, + PartFactory( PageCache pageCache, FileSystemAbstraction fs, TemporalIndexFiles temporalIndexFiles, StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig, IndexProvider.Monitor monitor ) { this.pageCache = pageCache; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexProvider.java index 3eccfa84fe780..4ebd68b8a4584 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexProvider.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexProvider.java @@ -33,7 +33,7 @@ import org.neo4j.kernel.api.index.IndexDirectoryStructure; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.storemigration.StoreMigrationParticipant; import org.neo4j.values.storable.ValueCategory; @@ -63,7 +63,7 @@ public TemporalIndexProvider( PageCache pageCache, FileSystemAbstraction fs, } @Override - public IndexPopulator getPopulator( IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) + public IndexPopulator getPopulator( StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { if ( readOnly ) { @@ -74,14 +74,14 @@ public IndexPopulator getPopulator( IndexDescriptor descriptor, IndexSamplingCon } @Override - public IndexAccessor getOnlineAccessor( IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException + public IndexAccessor getOnlineAccessor( StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException { TemporalIndexFiles files = new TemporalIndexFiles( directoryStructure(), descriptor, fs ); return new TemporalIndexAccessor( descriptor, samplingConfig, pageCache, fs, recoveryCleanupWorkCollector, monitor, files ); } @Override - public String getPopulationFailure( IndexDescriptor descriptor ) throws IllegalStateException + public String getPopulationFailure( StoreIndexDescriptor descriptor ) throws IllegalStateException { TemporalIndexFiles temporalIndexFiles = new TemporalIndexFiles( directoryStructure(), descriptor, fs ); @@ -104,7 +104,7 @@ public String getPopulationFailure( IndexDescriptor descriptor ) throws IllegalS } @Override - public InternalIndexState getInitialState( IndexDescriptor descriptor ) + public InternalIndexState getInitialState( StoreIndexDescriptor descriptor ) { TemporalIndexFiles temporalIndexFiles = new TemporalIndexFiles( directoryStructure(), descriptor, fs ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexAccessor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexAccessor.java index 702d941bfa7e9..90de692b90d3e 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexAccessor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexAccessor.java @@ -31,7 +31,7 @@ import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.kernel.impl.index.schema.fusion.FusionIndexProvider.DropAction; import org.neo4j.storageengine.api.schema.IndexReader; @@ -43,12 +43,12 @@ class FusionIndexAccessor extends FusionIndexBase implements IndexAccessor { - private final IndexDescriptor descriptor; + private final StoreIndexDescriptor descriptor; private final DropAction dropAction; FusionIndexAccessor( SlotSelector slotSelector, InstanceSelector instanceSelector, - IndexDescriptor descriptor, + StoreIndexDescriptor descriptor, DropAction dropAction ) { super( slotSelector, instanceSelector ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexProvider.java index 50fb4dfb05fb0..de88869036c43 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexProvider.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexProvider.java @@ -36,7 +36,7 @@ import org.neo4j.kernel.api.index.IndexDirectoryStructure; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.newapi.UnionIndexCapability; import org.neo4j.kernel.impl.storemigration.StoreMigrationParticipant; @@ -98,7 +98,7 @@ private void fillProvidersArray( IndexProvider[] providers, } @Override - public IndexPopulator getPopulator( IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) + public IndexPopulator getPopulator( StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { IndexPopulator[] populators = providers.instancesAs( new IndexPopulator[INSTANCE_COUNT], provider -> provider.getPopulator( descriptor, samplingConfig ) ); @@ -106,7 +106,7 @@ public IndexPopulator getPopulator( IndexDescriptor descriptor, IndexSamplingCon } @Override - public IndexAccessor getOnlineAccessor( IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException + public IndexAccessor getOnlineAccessor( StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException { IndexAccessor[] accessors = providers.instancesAs( new IndexAccessor[INSTANCE_COUNT], provider -> provider.getOnlineAccessor( descriptor, samplingConfig ) ); @@ -114,7 +114,7 @@ public IndexAccessor getOnlineAccessor( IndexDescriptor descriptor, IndexSamplin } @Override - public String getPopulationFailure( IndexDescriptor descriptor ) throws IllegalStateException + public String getPopulationFailure( StoreIndexDescriptor descriptor ) throws IllegalStateException { StringBuilder builder = new StringBuilder(); providers.forAll( p -> writeFailure( p.getClass().getSimpleName(), builder, p, descriptor ) ); @@ -126,7 +126,7 @@ public String getPopulationFailure( IndexDescriptor descriptor ) throws IllegalS throw new IllegalStateException( "None of the indexes were in a failed state" ); } - private void writeFailure( String indexName, StringBuilder builder, IndexProvider provider, IndexDescriptor descriptor ) + private void writeFailure( String indexName, StringBuilder builder, IndexProvider provider, StoreIndexDescriptor descriptor ) { try { @@ -142,7 +142,7 @@ private void writeFailure( String indexName, StringBuilder builder, IndexProvide } @Override - public InternalIndexState getInitialState( IndexDescriptor descriptor ) + public InternalIndexState getInitialState( StoreIndexDescriptor descriptor ) { InternalIndexState[] states = providers.instancesAs( new InternalIndexState[INSTANCE_COUNT], p -> p.getInitialState( descriptor ) ); if ( Arrays.stream( states ).anyMatch( state -> state == FAILED ) ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageReader.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageReader.java index 4b0fd210cb1fa..027555d3080e1 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageReader.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageReader.java @@ -47,7 +47,7 @@ import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; import org.neo4j.kernel.api.properties.PropertyKeyIdIterator; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; import org.neo4j.kernel.impl.api.DegreeVisitor; import org.neo4j.kernel.impl.api.IndexReaderFactory; @@ -297,7 +297,7 @@ public Iterator indexesGetRelatedToProperty( int propert @Override public Long indexGetOwningUniquenessConstraintId( PendingIndexDescriptor index ) { - IndexDescriptor rule = indexRule( index ); + StoreIndexDescriptor rule = indexRule( index ); if ( rule != null ) { // Think of the index as being orphaned if the owning constraint is missing or broken. @@ -311,7 +311,7 @@ public Long indexGetOwningUniquenessConstraintId( PendingIndexDescriptor index ) public long indexGetCommittedId( PendingIndexDescriptor index ) throws SchemaRuleNotFoundException { - IndexDescriptor rule = indexRule( index ); + StoreIndexDescriptor rule = indexRule( index ); if ( rule == null ) { throw new SchemaRuleNotFoundException( SchemaRule.Kind.INDEX_RULE, index.schema() ); @@ -671,9 +671,9 @@ public void degrees( NodeItem nodeItem, DegreeVisitor visitor ) } } - private IndexDescriptor indexRule( PendingIndexDescriptor index ) + private StoreIndexDescriptor indexRule( PendingIndexDescriptor index ) { - for ( IndexDescriptor rule : schemaCache.indexRules() ) + for ( StoreIndexDescriptor rule : schemaCache.indexRules() ) { if ( rule.equals( index ) ) { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/TransactionToRecordStateVisitor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/TransactionToRecordStateVisitor.java index bc396081de4fb..a2d3aef4fbad7 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/TransactionToRecordStateVisitor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/TransactionToRecordStateVisitor.java @@ -37,7 +37,7 @@ import org.neo4j.kernel.impl.api.index.IndexProviderMap; import org.neo4j.kernel.impl.constraints.ConstraintSemantics; import org.neo4j.kernel.impl.store.SchemaStorage; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.transaction.state.TransactionRecordState; import org.neo4j.storageengine.api.StorageProperty; import org.neo4j.storageengine.api.txstate.TxStateVisitor; @@ -168,14 +168,14 @@ public void visitAddedIndex( PendingIndexDescriptor index ) { IndexProvider.Descriptor providerDescriptor = indexProviderMap.getDefaultProvider().getProviderDescriptor(); - IndexDescriptor rule = IndexDescriptor.indexRule( schemaStorage.newRuleId(), index, providerDescriptor ); + StoreIndexDescriptor rule = StoreIndexDescriptor.indexRule( schemaStorage.newRuleId(), index, providerDescriptor ); recordState.createSchemaRule( rule ); } @Override public void visitRemovedIndex( PendingIndexDescriptor index ) { - IndexDescriptor rule = schemaStorage.indexGetForSchema( index ); + StoreIndexDescriptor rule = schemaStorage.indexGetForSchema( index ); if ( rule != null ) { recordState.dropSchemaRule( rule ); @@ -210,7 +210,7 @@ public void visitAddedConstraint( ConstraintDescriptor constraint ) throws Creat private void visitAddedUniquenessConstraint( UniquenessConstraintDescriptor uniqueConstraint, long constraintId ) { - IndexDescriptor indexRule = schemaStorage.indexGetForSchema( uniqueConstraint.ownedIndexDescriptor() ); + StoreIndexDescriptor indexRule = schemaStorage.indexGetForSchema( uniqueConstraint.ownedIndexDescriptor() ); recordState.createSchemaRule( constraintSemantics.createUniquenessConstraintRule( constraintId, uniqueConstraint, indexRule.getId() ) ); recordState.setConstraintIndexOwner( indexRule, constraintId ); @@ -219,7 +219,7 @@ private void visitAddedUniquenessConstraint( UniquenessConstraintDescriptor uniq private void visitAddedNodeKeyConstraint( NodeKeyConstraintDescriptor uniqueConstraint, long constraintId ) throws CreateConstraintFailureException { - IndexDescriptor indexRule = schemaStorage.indexGetForSchema( uniqueConstraint.ownedIndexDescriptor() ); + StoreIndexDescriptor indexRule = schemaStorage.indexGetForSchema( uniqueConstraint.ownedIndexDescriptor() ); recordState.createSchemaRule( constraintSemantics.createNodeKeyConstraintRule( constraintId, uniqueConstraint, indexRule.getId() ) ); recordState.setConstraintIndexOwner( indexRule, constraintId ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/SchemaStorage.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/SchemaStorage.java index f4a4003d5e0a8..533a9f9883485 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/SchemaStorage.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/SchemaStorage.java @@ -34,7 +34,7 @@ import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; import org.neo4j.kernel.impl.store.record.ConstraintRule; import org.neo4j.kernel.impl.store.record.DynamicRecord; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.store.record.RecordLoad; import org.neo4j.storageengine.api.schema.SchemaRule; @@ -54,15 +54,15 @@ public SchemaStorage( RecordStore schemaStore ) * @throws IllegalStateException if more than one matching rule. * @param descriptor the target IndexDescriptor */ - public IndexDescriptor indexGetForSchema( final PendingIndexDescriptor descriptor ) + public StoreIndexDescriptor indexGetForSchema( final PendingIndexDescriptor descriptor ) { - Iterator rules = loadAllSchemaRules( descriptor::equals, IndexDescriptor.class, false ); + Iterator rules = loadAllSchemaRules( descriptor::equals, StoreIndexDescriptor.class, false ); - IndexDescriptor foundRule = null; + StoreIndexDescriptor foundRule = null; while ( rules.hasNext() ) { - IndexDescriptor candidate = rules.next(); + StoreIndexDescriptor candidate = rules.next(); if ( foundRule != null ) { throw new IllegalStateException( String.format( @@ -74,9 +74,9 @@ public IndexDescriptor indexGetForSchema( final PendingIndexDescriptor descripto return foundRule; } - public Iterator indexesGetAll() + public Iterator indexesGetAll() { - return loadAllSchemaRules( Predicates.alwaysTrue(), IndexDescriptor.class, false ); + return loadAllSchemaRules( Predicates.alwaysTrue(), StoreIndexDescriptor.class, false ); } public Iterator constraintsGetAll() diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleDeserializer2_0to3_1.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleDeserializer2_0to3_1.java index c4b790de15d78..a0b333e221d87 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleDeserializer2_0to3_1.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleDeserializer2_0to3_1.java @@ -24,7 +24,7 @@ import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.storageengine.api.schema.SchemaRule; @@ -92,7 +92,7 @@ private static SchemaRule newRule( Kind kind, long id, int labelId, ByteBuffer b // === INDEX RULES === - private static IndexDescriptor readIndexRule( long id, boolean constraintIndex, int label, ByteBuffer serialized ) + private static StoreIndexDescriptor readIndexRule( long id, boolean constraintIndex, int label, ByteBuffer serialized ) { IndexProvider.Descriptor providerDescriptor = readIndexProviderDescriptor( serialized ); int[] propertyKeyIds = readIndexPropertyKeys( serialized ); @@ -100,7 +100,7 @@ private static IndexDescriptor readIndexRule( long id, boolean constraintIndex, IndexDescriptorFactory.uniqueForLabel( label, propertyKeyIds ) : IndexDescriptorFactory.forLabel( label, propertyKeyIds ); long owningConstraint = constraintIndex ? readOwningConstraint( serialized ) : NO_OWNING_CONSTRAINT; - return IndexDescriptor.constraintIndexRule( id, descriptor, providerDescriptor, owningConstraint ); + return StoreIndexDescriptor.constraintIndexRule( id, descriptor, providerDescriptor, owningConstraint ); } private static IndexProvider.Descriptor readIndexProviderDescriptor( ByteBuffer serialized ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerialization.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerialization.java index 8513cd74a06ef..af8f76d43e739 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerialization.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerialization.java @@ -33,7 +33,7 @@ import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.storageengine.api.schema.SchemaRule; @@ -78,9 +78,9 @@ private SchemaRuleSerialization() */ public static byte[] serialize( SchemaRule schemaRule ) { - if ( schemaRule instanceof IndexDescriptor ) + if ( schemaRule instanceof StoreIndexDescriptor ) { - return serialize( (IndexDescriptor)schemaRule ); + return serialize( (StoreIndexDescriptor)schemaRule ); } else if ( schemaRule instanceof ConstraintRule ) { @@ -123,7 +123,7 @@ public static SchemaRule deserialize( long id, ByteBuffer source ) throws Malfor * @param indexRule the IndexRule to serialize * @throws IllegalStateException if the IndexRule is of type unique, but the owning constrain has not been set */ - public static byte[] serialize( IndexDescriptor indexRule ) + public static byte[] serialize( StoreIndexDescriptor indexRule ) { ByteBuffer target = ByteBuffer.allocate( lengthOf( indexRule ) ); target.putInt( LEGACY_LABEL_OR_REL_TYPE_ID ); @@ -201,7 +201,7 @@ public static byte[] serialize( ConstraintRule constraintRule ) * @param indexRule the IndexRule * @return the byte size of indexRule */ - public static int lengthOf( IndexDescriptor indexRule ) + public static int lengthOf( StoreIndexDescriptor indexRule ) { int length = 4; // legacy label or relType id length += 1; // schema rule type @@ -248,7 +248,7 @@ public static int lengthOf( ConstraintRule constraintRule ) // READ INDEX - private static IndexDescriptor readIndexRule( long id, ByteBuffer source ) throws MalformedSchemaRuleException + private static StoreIndexDescriptor readIndexRule( long id, ByteBuffer source ) throws MalformedSchemaRuleException { IndexProvider.Descriptor indexProvider = readIndexProviderDescriptor( source ); LabelSchemaDescriptor schema; @@ -259,14 +259,14 @@ private static IndexDescriptor readIndexRule( long id, ByteBuffer source ) throw case GENERAL_INDEX: schema = readLabelSchema( source ); name = readRuleName( source ); - return IndexDescriptor.indexRule( id, IndexDescriptorFactory.forSchema( schema ), indexProvider, name ); + return StoreIndexDescriptor.indexRule( id, IndexDescriptorFactory.forSchema( schema ), indexProvider, name ); case UNIQUE_INDEX: long owningConstraint = source.getLong(); schema = readLabelSchema( source ); PendingIndexDescriptor descriptor = IndexDescriptorFactory.uniqueForSchema( schema ); name = readRuleName( source ); - return IndexDescriptor.constraintIndexRule( id, descriptor, indexProvider, + return StoreIndexDescriptor.constraintIndexRule( id, descriptor, indexProvider, owningConstraint == NO_OWNING_CONSTRAINT_YET ? null : owningConstraint, name ); default: diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/IndexBatchTransactionApplier.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/IndexBatchTransactionApplier.java index 8a3fab444dfe7..79e60d194f1bc 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/IndexBatchTransactionApplier.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/IndexBatchTransactionApplier.java @@ -38,7 +38,7 @@ import org.neo4j.kernel.impl.api.index.PropertyPhysicalToLogicalConverter; import org.neo4j.kernel.impl.store.NodeLabels; import org.neo4j.kernel.impl.store.NodeStore; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.kernel.impl.transaction.command.Command.PropertyCommand; import org.neo4j.kernel.impl.transaction.state.IndexUpdates; @@ -134,7 +134,7 @@ private class SingleTransactionApplier extends TransactionApplier.Adapter { private final NodeStore nodeStore; private final NodePropertyCommandsExtractor indexUpdatesExtractor = new NodePropertyCommandsExtractor(); - private List createdIndexes; + private List createdIndexes; SingleTransactionApplier( NodeStore nodeStore ) { @@ -156,7 +156,7 @@ public void close() throws Exception // Created pending indexes if ( createdIndexes != null ) { - indexingService.createIndexes( createdIndexes.toArray( new IndexDescriptor[createdIndexes.size()] ) ); + indexingService.createIndexes( createdIndexes.toArray( new StoreIndexDescriptor[createdIndexes.size()] ) ); createdIndexes = null; } } @@ -207,7 +207,7 @@ public boolean visitPropertyCommand( PropertyCommand command ) @Override public boolean visitSchemaRuleCommand( Command.SchemaRuleCommand command ) throws IOException { - if ( command.getSchemaRule() instanceof IndexDescriptor ) + if ( command.getSchemaRule() instanceof StoreIndexDescriptor ) { // Why apply index updates here? Here's the thing... this is a batch applier, which means that // index updates are gathered throughout the batch and applied in the end of the batch. @@ -223,7 +223,7 @@ public boolean visitSchemaRuleCommand( Command.SchemaRuleCommand command ) throw case UPDATE: // Shouldn't we be more clear about that we are waiting for an index to come online here? // right now we just assume that an update to index records means wait for it to be online. - if ( ((IndexDescriptor) command.getSchemaRule()).canSupportUniqueConstraint() ) + if ( ((StoreIndexDescriptor) command.getSchemaRule()).canSupportUniqueConstraint() ) { try { @@ -240,10 +240,10 @@ public boolean visitSchemaRuleCommand( Command.SchemaRuleCommand command ) throw case CREATE: // Add to list so that all these indexes will be created in one call later createdIndexes = createdIndexes == null ? new ArrayList<>() : createdIndexes; - createdIndexes.add( (IndexDescriptor) command.getSchemaRule() ); + createdIndexes.add( (StoreIndexDescriptor) command.getSchemaRule() ); break; case DELETE: - indexingService.dropIndex( (IndexDescriptor) command.getSchemaRule() ); + indexingService.dropIndex( (StoreIndexDescriptor) command.getSchemaRule() ); break; default: throw new IllegalStateException( command.getMode().name() ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordState.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordState.java index f2f1d5818c012..80f2aea92c929 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordState.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordState.java @@ -35,7 +35,7 @@ import org.neo4j.kernel.impl.store.SchemaStore; import org.neo4j.kernel.impl.store.record.AbstractBaseRecord; import org.neo4j.kernel.impl.store.record.DynamicRecord; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.store.record.LabelTokenRecord; import org.neo4j.kernel.impl.store.record.NeoStoreRecord; import org.neo4j.kernel.impl.store.record.NodeRecord; @@ -619,9 +619,9 @@ public void removeLabelFromNode( long labelId, long nodeId ) parseLabelsField( nodeRecord ).remove( labelId, nodeStore ); } - public void setConstraintIndexOwner( IndexDescriptor indexRule, long constraintId ) + public void setConstraintIndexOwner( StoreIndexDescriptor indexRule, long constraintId ) { - IndexDescriptor updatedIndexRule = indexRule.withOwningConstraint( constraintId ); + StoreIndexDescriptor updatedIndexRule = indexRule.withOwningConstraint( constraintId ); changeSchemaRule( indexRule, updatedIndexRule ); } diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java b/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java index d8c2dea96f95a..ebc7f9f3d0a02 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java @@ -127,7 +127,7 @@ import org.neo4j.kernel.impl.store.id.validation.IdValidator; import org.neo4j.kernel.impl.store.record.ConstraintRule; import org.neo4j.kernel.impl.store.record.DynamicRecord; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.store.record.LabelTokenRecord; import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.kernel.impl.store.record.PrimitiveRecord; @@ -467,7 +467,7 @@ private void validateRelationshipConstraintCanBeCreated( int relTypeId, int prop private void createIndexRule( int labelId, int[] propertyKeyIds ) { - IndexDescriptor schemaRule = IndexDescriptor.indexRule( + StoreIndexDescriptor schemaRule = StoreIndexDescriptor.indexRule( schemaStore.nextId(), IndexDescriptorFactory.forLabel( labelId, propertyKeyIds ), indexProviderMap.getDefaultProvider().getProviderDescriptor() ); @@ -488,14 +488,14 @@ private void repopulateAllIndexes() throws IOException, IndexEntryConflictExcept return; } - final IndexDescriptor[] indexDescriptors = getIndexesNeedingPopulation(); + final StoreIndexDescriptor[] indexDescriptors = getIndexesNeedingPopulation(); final List populators = new ArrayList<>( indexDescriptors.length ); final SchemaDescriptor[] descriptors = new LabelSchemaDescriptor[indexDescriptors.length]; for ( int i = 0; i < indexDescriptors.length; i++ ) { - IndexDescriptor index = indexDescriptors[i]; + StoreIndexDescriptor index = indexDescriptors[i]; descriptors[i] = index.schema(); IndexPopulator populator = indexProviderMap.apply( index.providerDescriptor() ) .getPopulator( index, new IndexSamplingConfig( config ) ); @@ -579,10 +579,10 @@ public void close() throws IOException } } - private IndexDescriptor[] getIndexesNeedingPopulation() + private StoreIndexDescriptor[] getIndexesNeedingPopulation() { - List indexesNeedingPopulation = new ArrayList<>(); - for ( IndexDescriptor rule : schemaCache.indexRules() ) + List indexesNeedingPopulation = new ArrayList<>(); + for ( StoreIndexDescriptor rule : schemaCache.indexRules() ) { IndexProvider provider = indexProviderMap.apply( rule.providerDescriptor() ); if ( provider.getInitialState( rule ) != InternalIndexState.FAILED ) @@ -590,7 +590,7 @@ private IndexDescriptor[] getIndexesNeedingPopulation() indexesNeedingPopulation.add( rule ); } } - return indexesNeedingPopulation.toArray( new IndexDescriptor[indexesNeedingPopulation.size()] ); + return indexesNeedingPopulation.toArray( new StoreIndexDescriptor[indexesNeedingPopulation.size()] ); } @Override @@ -607,8 +607,8 @@ private void createUniqueIndexAndOwningConstraint( PendingIndexDescriptor schema long indexRuleId = schemaStore.nextId(); long constraintRuleId = schemaStore.nextId(); - IndexDescriptor indexRule = - IndexDescriptor.constraintIndexRule( + StoreIndexDescriptor indexRule = + StoreIndexDescriptor.constraintIndexRule( indexRuleId, schemaIndexDescriptor, this.indexProviderMap.getDefaultProvider().getProviderDescriptor(), diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/schema/DropBrokenUniquenessConstraintIT.java b/community/kernel/src/test/java/org/neo4j/graphdb/schema/DropBrokenUniquenessConstraintIT.java index 8f2da92ee6491..f1b1da4907667 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/schema/DropBrokenUniquenessConstraintIT.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/schema/DropBrokenUniquenessConstraintIT.java @@ -30,7 +30,7 @@ import org.neo4j.kernel.impl.store.SchemaStore; import org.neo4j.kernel.impl.store.record.ConstraintRule; import org.neo4j.kernel.impl.store.record.DynamicRecord; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.storageengine.api.schema.SchemaRule; import org.neo4j.test.rule.DatabaseRule; import org.neo4j.test.rule.EmbeddedDatabaseRule; @@ -38,7 +38,7 @@ import static org.junit.Assert.assertFalse; import static org.neo4j.helpers.collection.Iterators.filter; import static org.neo4j.helpers.collection.Iterators.single; -import static org.neo4j.kernel.api.schema.index.IndexDescriptor.constraintIndexRule; +import static org.neo4j.kernel.api.schema.index.StoreIndexDescriptor.constraintIndexRule; public class DropBrokenUniquenessConstraintIT { @@ -61,7 +61,7 @@ public void shouldDropUniquenessConstraintWithBackingIndexNotInUse() // when intentionally breaking the schema by setting the backing index rule to unused RecordStorageEngine storageEngine = db.getDependencyResolver().resolveDependency( RecordStorageEngine.class ); SchemaStore schemaStore = storageEngine.testAccessNeoStores().getSchemaStore(); - SchemaRule indexRule = single( filter( rule -> rule instanceof IndexDescriptor, schemaStore.loadAllSchemaRules() ) ); + SchemaRule indexRule = single( filter( rule -> rule instanceof StoreIndexDescriptor, schemaStore.loadAllSchemaRules() ) ); setSchemaRecordNotInUse( schemaStore, indexRule.getId() ); // At this point the SchemaCache doesn't know about this change so we have to reload it storageEngine.loadSchemaCache(); @@ -92,8 +92,8 @@ public void shouldDropUniquenessConstraintWithBackingIndexHavingNoOwner() throws // when intentionally breaking the schema by setting the backing index rule to unused RecordStorageEngine storageEngine = db.getDependencyResolver().resolveDependency( RecordStorageEngine.class ); SchemaStore schemaStore = storageEngine.testAccessNeoStores().getSchemaStore(); - SchemaRule indexRule = single( filter( rule -> rule instanceof IndexDescriptor, schemaStore.loadAllSchemaRules() ) ); - setOwnerNull( schemaStore, (IndexDescriptor) indexRule ); + SchemaRule indexRule = single( filter( rule -> rule instanceof StoreIndexDescriptor, schemaStore.loadAllSchemaRules() ) ); + setOwnerNull( schemaStore, (StoreIndexDescriptor) indexRule ); // At this point the SchemaCache doesn't know about this change so we have to reload it storageEngine.loadSchemaCache(); try ( Transaction tx = db.beginTx() ) @@ -158,8 +158,8 @@ public void shouldDropUniquenessConstraintWhereConstraintRecordIsMissingAndIndex SchemaStore schemaStore = storageEngine.testAccessNeoStores().getSchemaStore(); SchemaRule constraintRule = single( filter( rule -> rule instanceof ConstraintRule, schemaStore.loadAllSchemaRules() ) ); setSchemaRecordNotInUse( schemaStore, constraintRule.getId() ); - SchemaRule indexRule = single( filter( rule -> rule instanceof IndexDescriptor, schemaStore.loadAllSchemaRules() ) ); - setOwnerNull( schemaStore, (IndexDescriptor) indexRule ); + SchemaRule indexRule = single( filter( rule -> rule instanceof StoreIndexDescriptor, schemaStore.loadAllSchemaRules() ) ); + setOwnerNull( schemaStore, (StoreIndexDescriptor) indexRule ); // At this point the SchemaCache doesn't know about this change so we have to reload it storageEngine.loadSchemaCache(); try ( Transaction tx = db.beginTx() ) @@ -178,7 +178,7 @@ public void shouldDropUniquenessConstraintWhereConstraintRecordIsMissingAndIndex } } - private void setOwnerNull( SchemaStore schemaStore, IndexDescriptor rule ) + private void setOwnerNull( SchemaStore schemaStore, StoreIndexDescriptor rule ) { rule = constraintIndexRule( rule.getId(), rule, rule.providerDescriptor(), null ); List dynamicRecords = schemaStore.allocateFrom( rule ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexProviderCompatibilityTestSuite.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexProviderCompatibilityTestSuite.java index d916547f65368..4a5e4e6127350 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexProviderCompatibilityTestSuite.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexProviderCompatibilityTestSuite.java @@ -33,7 +33,7 @@ import org.neo4j.function.ThrowingConsumer; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; import org.neo4j.test.rule.PageCacheAndDependenciesRule; import org.neo4j.test.rule.fs.DefaultFileSystemRule; @@ -76,7 +76,7 @@ public abstract static class Compatibility protected File graphDbDir; protected FileSystemAbstraction fs; protected IndexProvider indexProvider; - protected IndexDescriptor descriptor; + protected StoreIndexDescriptor descriptor; final IndexProviderCompatibilityTestSuite testSuite; final List valueSet1; final List valueSet2; @@ -93,7 +93,7 @@ public void setup() public Compatibility( IndexProviderCompatibilityTestSuite testSuite, PendingIndexDescriptor descriptor ) { this.testSuite = testSuite; - this.descriptor = IndexDescriptor.indexRule( 17, descriptor, indexProvider.getProviderDescriptor() ); + this.descriptor = StoreIndexDescriptor.indexRule( 17, descriptor, indexProvider.getProviderDescriptor() ); this.valueSet1 = allValues( testSuite.supportsSpatial(), testSuite.supportsTemporal(), diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/BatchingMultipleIndexPopulatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/BatchingMultipleIndexPopulatorTest.java index e591c37d9306c..935dab152d085 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/BatchingMultipleIndexPopulatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/BatchingMultipleIndexPopulatorTest.java @@ -35,7 +35,7 @@ import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.index.IndexUpdater; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; import org.neo4j.kernel.impl.locking.LockService; @@ -350,8 +350,8 @@ private static IndexPopulator addPopulator( BatchingMultipleIndexPopulator batch flipper.setFlipTarget( indexProxyFactory ); batchingPopulator.addPopulator( populator, - new CapableIndexDescriptor( IndexDescriptor.indexRule( 1, descriptor, new IndexProvider.Descriptor( "foo", "1" ) ), NO_CAPABILITY ), flipper, - failedIndexProxyFactory, "testIndex" ); + new CapableIndexDescriptor( StoreIndexDescriptor.indexRule( 1, descriptor, new IndexProvider.Descriptor( "foo", "1" ) ), NO_CAPABILITY ), flipper, + failedIndexProxyFactory, "testIndex" ); return populator; } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/ControlledPopulationIndexProvider.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/ControlledPopulationIndexProvider.java index 28959634968fb..336285e608e80 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/ControlledPopulationIndexProvider.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/ControlledPopulationIndexProvider.java @@ -31,7 +31,7 @@ import org.neo4j.kernel.api.index.IndexDirectoryStructure; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.storemigration.StoreMigrationParticipant; import org.neo4j.storageengine.api.schema.IndexReader; @@ -89,14 +89,14 @@ public void awaitFullyPopulated() } @Override - public IndexPopulator getPopulator( IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) + public IndexPopulator getPopulator( StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { populatorCallCount.incrementAndGet(); return mockedPopulator; } @Override - public IndexAccessor getOnlineAccessor( IndexDescriptor indexConfig, IndexSamplingConfig samplingConfig ) + public IndexAccessor getOnlineAccessor( StoreIndexDescriptor indexConfig, IndexSamplingConfig samplingConfig ) { writerCallCount.incrementAndGet(); writerLatch.countDown(); @@ -104,7 +104,7 @@ public IndexAccessor getOnlineAccessor( IndexDescriptor indexConfig, IndexSampli } @Override - public InternalIndexState getInitialState( IndexDescriptor descriptor ) + public InternalIndexState getInitialState( StoreIndexDescriptor descriptor ) { return initialIndexState; } @@ -121,7 +121,7 @@ public void setInitialIndexState( InternalIndexState initialIndexState ) } @Override - public String getPopulationFailure( IndexDescriptor descriptor ) throws IllegalStateException + public String getPopulationFailure( StoreIndexDescriptor descriptor ) throws IllegalStateException { throw new IllegalStateException(); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/FailedIndexProxyTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/FailedIndexProxyTest.java index 53f7edb20e908..392298de39ba7 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/FailedIndexProxyTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/FailedIndexProxyTest.java @@ -26,7 +26,7 @@ import org.neo4j.internal.kernel.api.IndexCapability; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.logging.AssertableLogProvider; import org.neo4j.logging.NullLogProvider; @@ -50,7 +50,8 @@ public void shouldRemoveIndexCountsWhenTheIndexItselfIsDropped() throws IOExcept // given String userDescription = "description"; FailedIndexProxy index = - new FailedIndexProxy( indexMeta( IndexDescriptor.indexRule( 1, IndexDescriptorFactory.forLabel( 1, 2 ), IndexProvider.UNDECIDED ) ), + new FailedIndexProxy( indexMeta( StoreIndexDescriptor + .indexRule( 1, IndexDescriptorFactory.forLabel( 1, 2 ), IndexProvider.UNDECIDED ) ), userDescription, indexPopulator, indexPopulationFailure, indexCountsRemover, NullLogProvider.getInstance() ); // when @@ -69,7 +70,8 @@ public void shouldLogReasonForDroppingIndex() throws IOException AssertableLogProvider logProvider = new AssertableLogProvider(); // when - new FailedIndexProxy( indexMeta( IndexDescriptor.indexRule( 1, IndexDescriptorFactory.forLabel( 0, 0 ), IndexProvider.UNDECIDED ) ), + new FailedIndexProxy( indexMeta( StoreIndexDescriptor + .indexRule( 1, IndexDescriptorFactory.forLabel( 0, 0 ), IndexProvider.UNDECIDED ) ), "foo", mock( IndexPopulator.class ), IndexPopulationFailure.failure( "it broke" ), indexCountsRemover, logProvider ).drop(); @@ -79,7 +81,7 @@ public void shouldLogReasonForDroppingIndex() throws IOException ); } - private CapableIndexDescriptor indexMeta( IndexDescriptor descriptor ) + private CapableIndexDescriptor indexMeta( StoreIndexDescriptor descriptor ) { return new CapableIndexDescriptor( descriptor, indexCapability ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java index 3fc4301ae6597..962cc13e7a256 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java @@ -47,7 +47,7 @@ import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; @@ -182,9 +182,9 @@ public void before() private GatheringIndexWriter newWriter() throws IOException { GatheringIndexWriter writer = new GatheringIndexWriter(); - when( mockedIndexProvider.getPopulator( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) + when( mockedIndexProvider.getPopulator( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ).thenReturn( writer ); - when( mockedIndexProvider.getOnlineAccessor( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) + when( mockedIndexProvider.getOnlineAccessor( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ).thenReturn( writer ); when( mockedIndexProvider.compareTo( any( IndexProvider.class ) ) ) .thenReturn( 1 ); // always pretend to have highest priority diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexMapReferenceTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexMapReferenceTest.java index bc98138600f57..30ce050d9b302 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexMapReferenceTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexMapReferenceTest.java @@ -21,15 +21,13 @@ import org.junit.Test; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.test.Race; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.neo4j.kernel.api.schema.index.IndexDescriptor.indexRule; +import static org.neo4j.kernel.api.schema.index.StoreIndexDescriptor.indexRule; import static org.neo4j.kernel.api.schema.index.IndexDescriptorFactory.forLabel; import static org.neo4j.kernel.impl.api.index.TestIndexProviderDescriptor.PROVIDER_DESCRIPTOR; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java index 3a3ee4627605d..24747bb3d3817 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java @@ -53,7 +53,7 @@ import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.labelscan.NodeLabelUpdate; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; import org.neo4j.kernel.configuration.Config; @@ -586,7 +586,8 @@ private IndexPopulator inMemoryPopulator( boolean constraint ) { IndexSamplingConfig samplingConfig = new IndexSamplingConfig( Config.defaults() ); PendingIndexDescriptor descriptor = indexDescriptor( FIRST, name, constraint ); - return new InMemoryIndexProvider().getPopulator( IndexDescriptor.indexRule( 21, descriptor, PROVIDER_DESCRIPTOR ), samplingConfig ); + return new InMemoryIndexProvider().getPopulator( StoreIndexDescriptor + .indexRule( 21, descriptor, PROVIDER_DESCRIPTOR ), samplingConfig ); } private IndexPopulationJob newIndexPopulationJob( IndexPopulator populator, @@ -619,7 +620,7 @@ private IndexPopulationJob newIndexPopulationJob( FailedIndexProxyFactory failur MultipleIndexPopulator multiPopulator = new MultipleIndexPopulator( storeView, logProvider ); IndexPopulationJob job = new IndexPopulationJob( multiPopulator, NO_MONITOR, stateHolder ); - job.addPopulator( populator, new CapableIndexDescriptor( IndexDescriptor.indexRule( indexId, descriptor, PROVIDER_DESCRIPTOR ), NO_CAPABILITY ), + job.addPopulator( populator, new CapableIndexDescriptor( StoreIndexDescriptor.indexRule( indexId, descriptor, PROVIDER_DESCRIPTOR ), NO_CAPABILITY ), format( ":%s(%s)", FIRST.name(), name ), flipper, failureDelegateFactory ); return job; } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationTest.java index 33f290b81095e..270317871e2ac 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationTest.java @@ -35,7 +35,7 @@ import org.neo4j.kernel.api.labelscan.NodeLabelUpdate; import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.logging.NullLogProvider; import org.neo4j.storageengine.api.schema.PopulationProgress; @@ -144,8 +144,8 @@ public void acceptUpdate( MultipleIndexPopulator.MultipleIndexUpdater updater, I private CapableIndexDescriptor dummyMeta() { - return new CapableIndexDescriptor( IndexDescriptor.indexRule( 0, IndexDescriptorFactory.forLabel( 0, 0 ), TestIndexProviderDescriptor.PROVIDER_DESCRIPTOR ), - IndexCapability.NO_CAPABILITY ); + return new CapableIndexDescriptor( StoreIndexDescriptor.indexRule( 0, IndexDescriptorFactory.forLabel( 0, 0 ), TestIndexProviderDescriptor.PROVIDER_DESCRIPTOR ), + IndexCapability.NO_CAPABILITY ); } private IndexEntryUpdate someUpdate() diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java index 9d3b0e788e6bf..275439841be18 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java @@ -48,7 +48,7 @@ import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.api.index.updater.SwallowingIndexUpdater; @@ -68,7 +68,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; @@ -91,7 +90,7 @@ public void shouldBeAbleToRecoverInTheMiddleOfPopulatingAnIndex() throws Excepti CountDownLatch latch = new CountDownLatch( 1 ); when( mockedIndexProvider - .getPopulator( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + .getPopulator( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( indexPopulatorWithControlledCompletionTiming( latch ) ); createIndex( myLabel ); @@ -101,11 +100,11 @@ public void shouldBeAbleToRecoverInTheMiddleOfPopulatingAnIndex() throws Excepti killFuture.get(); // When - when( mockedIndexProvider.getInitialState( any( IndexDescriptor.class ) ) ) + when( mockedIndexProvider.getInitialState( any( StoreIndexDescriptor.class ) ) ) .thenReturn( InternalIndexState.POPULATING ); latch = new CountDownLatch( 1 ); when( mockedIndexProvider - .getPopulator( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + .getPopulator( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( indexPopulatorWithControlledCompletionTiming( latch ) ); startDb(); @@ -113,8 +112,8 @@ public void shouldBeAbleToRecoverInTheMiddleOfPopulatingAnIndex() throws Excepti assertThat( getIndexes( db, myLabel ), inTx( db, hasSize( 1 ) ) ); assertThat( getIndexes( db, myLabel ), inTx( db, haveState( db, Schema.IndexState.POPULATING ) ) ); verify( mockedIndexProvider, times( 2 ) ) - .getPopulator( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ); - verify( mockedIndexProvider, never() ).getOnlineAccessor( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) + .getPopulator( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ); + verify( mockedIndexProvider, never() ).getOnlineAccessor( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ); latch.countDown(); } @@ -127,7 +126,7 @@ public void shouldBeAbleToRecoverInTheMiddleOfPopulatingAnIndexWhereLogHasRotate CountDownLatch latch = new CountDownLatch( 1 ); when( mockedIndexProvider - .getPopulator( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + .getPopulator( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( indexPopulatorWithControlledCompletionTiming( latch ) ); createIndex( myLabel ); rotateLogsAndCheckPoint(); @@ -138,9 +137,9 @@ public void shouldBeAbleToRecoverInTheMiddleOfPopulatingAnIndexWhereLogHasRotate killFuture.get(); latch = new CountDownLatch( 1 ); when( mockedIndexProvider - .getPopulator( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + .getPopulator( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( indexPopulatorWithControlledCompletionTiming( latch ) ); - when( mockedIndexProvider.getInitialState( any( IndexDescriptor.class ) ) ) + when( mockedIndexProvider.getInitialState( any( StoreIndexDescriptor.class ) ) ) .thenReturn( InternalIndexState.POPULATING ); // When @@ -150,8 +149,8 @@ public void shouldBeAbleToRecoverInTheMiddleOfPopulatingAnIndexWhereLogHasRotate assertThat( getIndexes( db, myLabel ), inTx( db, hasSize( 1 ) ) ); assertThat( getIndexes( db, myLabel ), inTx( db, haveState( db, Schema.IndexState.POPULATING ) ) ); verify( mockedIndexProvider, times( 2 ) ) - .getPopulator( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ); - verify( mockedIndexProvider, never() ).getOnlineAccessor( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) + .getPopulator( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ); + verify( mockedIndexProvider, never() ).getOnlineAccessor( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ); latch.countDown(); } @@ -164,12 +163,12 @@ public void shouldBeAbleToRecoverAndUpdateOnlineIndex() throws Exception IndexPopulator populator = mock( IndexPopulator.class ); when( mockedIndexProvider - .getPopulator( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + .getPopulator( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( populator ); when( populator.sampleResult() ).thenReturn( new IndexSample() ); IndexAccessor mockedAccessor = mock( IndexAccessor.class ); when( mockedAccessor.newUpdater( any( IndexUpdateMode.class ) ) ).thenReturn( SwallowingIndexUpdater.INSTANCE ); - when( mockedIndexProvider.getOnlineAccessor( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) + when( mockedIndexProvider.getOnlineAccessor( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ).thenReturn( mockedAccessor ); createIndexAndAwaitPopulation( myLabel ); // rotate logs @@ -179,10 +178,10 @@ public void shouldBeAbleToRecoverAndUpdateOnlineIndex() throws Exception // And Given killDb(); - when( mockedIndexProvider.getInitialState( any( IndexDescriptor.class )) ) + when( mockedIndexProvider.getInitialState( any( StoreIndexDescriptor.class )) ) .thenReturn( InternalIndexState.ONLINE ); GatheringIndexWriter writer = new GatheringIndexWriter(); - when( mockedIndexProvider.getOnlineAccessor( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) + when( mockedIndexProvider.getOnlineAccessor( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ).thenReturn( writer ); // When @@ -192,10 +191,10 @@ public void shouldBeAbleToRecoverAndUpdateOnlineIndex() throws Exception assertThat( getIndexes( db, myLabel ), inTx( db, hasSize( 1 ) ) ); assertThat( getIndexes( db, myLabel ), inTx( db, haveState( db, Schema.IndexState.ONLINE ) ) ); verify( mockedIndexProvider, times( 1 ) ) - .getPopulator( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ); + .getPopulator( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ); int onlineAccessorInvocationCount = 2; // once when we create the index, and once when we restart the db verify( mockedIndexProvider, times( onlineAccessorInvocationCount ) ) - .getOnlineAccessor( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ); + .getOnlineAccessor( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ); assertEquals( expectedUpdates, writer.batchedUpdates ); } @@ -204,10 +203,10 @@ public void shouldKeepFailedIndexesAsFailedAfterRestart() throws Exception { // Given IndexPopulator indexPopulator = mock( IndexPopulator.class ); - when( mockedIndexProvider.getPopulator( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + when( mockedIndexProvider.getPopulator( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( indexPopulator ); IndexAccessor indexAccessor = mock( IndexAccessor.class ); - when( mockedIndexProvider.getOnlineAccessor( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + when( mockedIndexProvider.getOnlineAccessor( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( indexAccessor ); startDb(); createIndex( myLabel ); @@ -215,7 +214,7 @@ public void shouldKeepFailedIndexesAsFailedAfterRestart() throws Exception // And Given killDb(); - when( mockedIndexProvider.getInitialState( any( IndexDescriptor.class ) ) ) + when( mockedIndexProvider.getInitialState( any( StoreIndexDescriptor.class ) ) ) .thenReturn( InternalIndexState.FAILED ); // When @@ -225,7 +224,7 @@ public void shouldKeepFailedIndexesAsFailedAfterRestart() throws Exception assertThat( getIndexes( db, myLabel ), inTx( db, hasSize( 1 ) ) ); assertThat( getIndexes( db, myLabel ), inTx( db, haveState( db, Schema.IndexState.FAILED ) ) ); verify( mockedIndexProvider, times( 2 ) ) - .getPopulator( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ); + .getPopulator( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ); } private GraphDatabaseAPI db; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsTest.java index e9ebd94e786bb..07760a07d279f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsTest.java @@ -53,7 +53,7 @@ import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.store.DefaultIndexReference; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; @@ -719,7 +719,7 @@ private static class IndexOnlineMonitor extends IndexingService.MonitorAdapter private final Set onlineIndexes = Collections.newSetFromMap( new ConcurrentHashMap<>() ); @Override - public void populationCompleteOn( IndexDescriptor descriptor ) + public void populationCompleteOn( StoreIndexDescriptor descriptor ) { onlineIndexes.add( descriptor ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexUpdaterMapTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexUpdaterMapTest.java index debcbbf445880..02d3c4af29b42 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexUpdaterMapTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexUpdaterMapTest.java @@ -33,7 +33,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.neo4j.kernel.api.schema.index.IndexDescriptor.indexRule; +import static org.neo4j.kernel.api.schema.index.StoreIndexDescriptor.indexRule; import static org.neo4j.kernel.api.schema.index.IndexDescriptorFactory.forLabel; import static org.neo4j.kernel.impl.api.index.TestIndexProviderDescriptor.*; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java index 5d7ca4104faf6..ab5ac9a9ed2b3 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java @@ -65,7 +65,7 @@ import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; import org.neo4j.kernel.configuration.Config; @@ -188,7 +188,7 @@ public void shouldBringIndexOnlineAndFlipOverToIndexAccessor() throws Exception life.start(); // when - indexingService.createIndexes( IndexDescriptor.indexRule( 0, index, PROVIDER_DESCRIPTOR ) ); + indexingService.createIndexes( StoreIndexDescriptor.indexRule( 0, index, PROVIDER_DESCRIPTOR ) ); IndexProxy proxy = indexingService.getIndexProxy( 0 ); waitForIndexesToComeOnline( indexingService, 0 ); @@ -220,8 +220,8 @@ public void indexCreationShouldBeIdempotent() throws Exception life.start(); // when - indexingService.createIndexes( IndexDescriptor.indexRule( 0, index, PROVIDER_DESCRIPTOR ) ); - indexingService.createIndexes( IndexDescriptor.indexRule( 0, index, PROVIDER_DESCRIPTOR ) ); + indexingService.createIndexes( StoreIndexDescriptor.indexRule( 0, index, PROVIDER_DESCRIPTOR ) ); + indexingService.createIndexes( StoreIndexDescriptor.indexRule( 0, index, PROVIDER_DESCRIPTOR ) ); // We are asserting that the second call to createIndex does not throw an exception. waitForIndexesToComeOnline( indexingService, 0 ); @@ -266,7 +266,7 @@ public void indexPopulationScanComplete() // when - indexingService.createIndexes( IndexDescriptor.indexRule( 0, index, PROVIDER_DESCRIPTOR ) ); + indexingService.createIndexes( StoreIndexDescriptor.indexRule( 0, index, PROVIDER_DESCRIPTOR ) ); IndexProxy proxy = indexingService.getIndexProxy( 0 ); assertEquals( InternalIndexState.POPULATING, proxy.getState() ); populationStartBarrier.await(); @@ -364,14 +364,14 @@ public void shouldLogIndexStateOnInit() throws Exception IndexProvider provider = mock( IndexProvider.class ); when( provider.getProviderDescriptor() ).thenReturn( PROVIDER_DESCRIPTOR ); IndexAccessor indexAccessor = mock( IndexAccessor.class ); - when( provider.getOnlineAccessor( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + when( provider.getOnlineAccessor( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( indexAccessor ); IndexProviderMap providerMap = new DefaultIndexProviderMap( provider ); TokenNameLookup mockLookup = mock( TokenNameLookup.class ); - IndexDescriptor onlineIndex = indexRule( 1, 1, 1, PROVIDER_DESCRIPTOR ); - IndexDescriptor populatingIndex = indexRule( 2, 1, 2, PROVIDER_DESCRIPTOR ); - IndexDescriptor failedIndex = indexRule( 3, 2, 2, PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor onlineIndex = indexRule( 1, 1, 1, PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor populatingIndex = indexRule( 2, 1, 2, PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor failedIndex = indexRule( 3, 2, 2, PROVIDER_DESCRIPTOR ); life.add( IndexingServiceFactory.createIndexingService( Config.defaults(), mock( JobScheduler.class ), providerMap, mock( IndexStoreView.class ), mockLookup, asList( onlineIndex, populatingIndex, failedIndex ), @@ -409,9 +409,9 @@ public void shouldLogIndexStateOnStart() throws Exception IndexProviderMap providerMap = new DefaultIndexProviderMap( provider ); TokenNameLookup mockLookup = mock( TokenNameLookup.class ); - IndexDescriptor onlineIndex = indexRule( 1, 1, 1, PROVIDER_DESCRIPTOR ); - IndexDescriptor populatingIndex = indexRule( 2, 1, 2, PROVIDER_DESCRIPTOR ); - IndexDescriptor failedIndex = indexRule( 3, 2, 2, PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor onlineIndex = indexRule( 1, 1, 1, PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor populatingIndex = indexRule( 2, 1, 2, PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor failedIndex = indexRule( 3, 2, 2, PROVIDER_DESCRIPTOR ); IndexingService indexingService = IndexingServiceFactory.createIndexingService( Config.defaults(), mock( JobScheduler.class ), providerMap, storeView, mockLookup, @@ -424,7 +424,7 @@ public void shouldLogIndexStateOnStart() throws Exception .thenReturn( InternalIndexState.POPULATING ); when( provider.getInitialState( failedIndex ) ) .thenReturn( InternalIndexState.FAILED ); - when( provider.getOnlineAccessor( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ).thenAnswer( + when( provider.getOnlineAccessor( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ).thenAnswer( invocation -> mock( IndexAccessor.class ) ); indexingService.init(); @@ -456,7 +456,7 @@ public void shouldFailToStartIfMissingIndexProvider() throws Exception String otherProviderKey = "something-completely-different"; IndexProvider.Descriptor otherDescriptor = new IndexProvider.Descriptor( otherProviderKey, "no-version" ); - IndexDescriptor rule = indexRule( 1, 2, 3, otherDescriptor ); + StoreIndexDescriptor rule = indexRule( 1, 2, 3, otherDescriptor ); IndexingService indexing = newIndexingServiceWithMockedDependencies( mock( IndexPopulator.class ), mock( IndexAccessor.class ), new DataUpdates(), rule ); @@ -480,8 +480,8 @@ public void shouldSnapshotOnlineIndexes() throws Exception // GIVEN int indexId = 1; int indexId2 = 2; - IndexDescriptor rule1 = indexRule( indexId, 2, 3, PROVIDER_DESCRIPTOR ); - IndexDescriptor rule2 = indexRule( indexId2, 4, 5, PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor rule1 = indexRule( indexId, 2, 3, PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor rule2 = indexRule( indexId2, 4, 5, PROVIDER_DESCRIPTOR ); IndexAccessor indexAccessor = mock( IndexAccessor.class ); IndexingService indexing = newIndexingServiceWithMockedDependencies( @@ -513,8 +513,8 @@ public void shouldNotSnapshotPopulatingIndexes() throws Exception IndexAccessor indexAccessor = mock(IndexAccessor.class); int indexId = 1; int indexId2 = 2; - IndexDescriptor rule1 = indexRule( indexId, 2, 3, PROVIDER_DESCRIPTOR ); - IndexDescriptor rule2 = indexRule( indexId2, 4, 5, PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor rule1 = indexRule( indexId, 2, 3, PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor rule2 = indexRule( indexId2, 4, 5, PROVIDER_DESCRIPTOR ); IndexingService indexing = newIndexingServiceWithMockedDependencies( populator, indexAccessor, new DataUpdates(), rule1, rule2 ); @@ -573,7 +573,8 @@ public void shouldLogTriggerSamplingOnAnIndexes() throws Exception IndexSamplingMode mode = TRIGGER_REBUILD_ALL; PendingIndexDescriptor descriptor = IndexDescriptorFactory.forLabel( 0, 1 ); IndexingService indexingService = newIndexingServiceWithMockedDependencies( populator, accessor, withData(), - IndexDescriptor.indexRule( indexId, descriptor, PROVIDER_DESCRIPTOR ) ); + StoreIndexDescriptor + .indexRule( indexId, descriptor, PROVIDER_DESCRIPTOR ) ); life.init(); life.start(); @@ -622,7 +623,7 @@ public void applicationOfUpdatesShouldFlush() throws Exception IndexingService indexing = newIndexingServiceWithMockedDependencies( populator, accessor, withData() ); life.start(); - indexing.createIndexes( IndexDescriptor.indexRule( 0, index, PROVIDER_DESCRIPTOR ) ); + indexing.createIndexes( StoreIndexDescriptor.indexRule( 0, index, PROVIDER_DESCRIPTOR ) ); waitForIndexesToComeOnline( indexing, 0 ); verify( populator, timeout( 10000 ) ).close( true ); @@ -657,9 +658,9 @@ public void closingOfValidatedUpdatesShouldCloseUpdaters() throws Exception IndexUpdater updater2 = mock( IndexUpdater.class ); when( accessor2.newUpdater( any( IndexUpdateMode.class ) ) ).thenReturn( updater2 ); - when( indexProvider.getOnlineAccessor( any( IndexDescriptor.class ), + when( indexProvider.getOnlineAccessor( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ).thenReturn( accessor1 ); - when( indexProvider.getOnlineAccessor( any( IndexDescriptor.class ), + when( indexProvider.getOnlineAccessor( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ).thenReturn( accessor2 ); life.start(); @@ -762,7 +763,7 @@ public void shouldNotLoseIndexDescriptorDueToOtherSimilarIndexDuringRecovery() t // For some reason the usual accessor returned null from newUpdater, even when told to return the updater // so spying on a real object instead. IndexAccessor accessor = spy( new TrackingIndexAccessor() ); - IndexDescriptor index = IndexDescriptor.indexRule( indexId, this.index, PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor index = StoreIndexDescriptor.indexRule( indexId, this.index, PROVIDER_DESCRIPTOR ); IndexingService indexing = newIndexingServiceWithMockedDependencies( populator, accessor, withData( update ), index ); @@ -770,7 +771,7 @@ populator, accessor, withData( update ), index life.init(); // WHEN dropping another index, which happens to have the same label/property... while recovering - IndexDescriptor otherIndex = IndexDescriptor.indexRule( otherIndexId, index, PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor otherIndex = StoreIndexDescriptor.indexRule( otherIndexId, index, PROVIDER_DESCRIPTOR ); indexing.createIndexes( otherIndex ); indexing.dropIndex( otherIndex ); // and WHEN finally creating our index again (at a later point in recovery) @@ -832,17 +833,20 @@ public void shouldCreateMultipleIndexesInOneCall() throws Exception life.start(); // WHEN - IndexDescriptor indexRule1 = indexRule( 0, 0, 0, PROVIDER_DESCRIPTOR ); - IndexDescriptor indexRule2 = indexRule( 1, 0, 1, PROVIDER_DESCRIPTOR ); - IndexDescriptor indexRule3 = indexRule( 2, 1, 0, PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor indexRule1 = indexRule( 0, 0, 0, PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor indexRule2 = indexRule( 1, 0, 1, PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor indexRule3 = indexRule( 2, 1, 0, PROVIDER_DESCRIPTOR ); indexing.createIndexes( indexRule1, indexRule2, indexRule3 ); // THEN - verify( indexProvider ).getPopulator( eq( IndexDescriptor.indexRule( 0, IndexDescriptorFactory.forLabel( 0, 0 ), PROVIDER_DESCRIPTOR ) ), + verify( indexProvider ).getPopulator( eq( StoreIndexDescriptor + .indexRule( 0, IndexDescriptorFactory.forLabel( 0, 0 ), PROVIDER_DESCRIPTOR ) ), any( IndexSamplingConfig.class ) ); - verify( indexProvider ).getPopulator( eq( IndexDescriptor.indexRule( 1, IndexDescriptorFactory.forLabel( 0, 1 ), PROVIDER_DESCRIPTOR ) ), + verify( indexProvider ).getPopulator( eq( StoreIndexDescriptor + .indexRule( 1, IndexDescriptorFactory.forLabel( 0, 1 ), PROVIDER_DESCRIPTOR ) ), any( IndexSamplingConfig.class ) ); - verify( indexProvider ).getPopulator( eq( IndexDescriptor.indexRule( 2, IndexDescriptorFactory.forLabel( 1, 0 ), PROVIDER_DESCRIPTOR ) ), + verify( indexProvider ).getPopulator( eq( StoreIndexDescriptor + .indexRule( 2, IndexDescriptorFactory.forLabel( 1, 0 ), PROVIDER_DESCRIPTOR ) ), any( IndexSamplingConfig.class ) ); waitForIndexesToComeOnline( indexing, 0, 1, 2 ); @@ -859,14 +863,14 @@ public void shouldStoreIndexFailureWhenFailingToCreateOnlineAccessorAfterPopulat when( nameLookup.labelGetName( labelId ) ).thenReturn( "TheLabel" ); when( nameLookup.propertyKeyGetName( propertyKeyId ) ).thenReturn( "propertyKey" ); - when( indexProvider.getOnlineAccessor( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + when( indexProvider.getOnlineAccessor( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenThrow( exception ); life.start(); ArgumentCaptor closeArgs = ArgumentCaptor.forClass( Boolean.class ); // when - indexing.createIndexes( IndexDescriptor.indexRule( indexId, index, PROVIDER_DESCRIPTOR ) ); + indexing.createIndexes( StoreIndexDescriptor.indexRule( indexId, index, PROVIDER_DESCRIPTOR ) ); waitForIndexesToGetIntoState( indexing, InternalIndexState.FAILED, indexId ); verify( populator, timeout( 10000 ).times( 2 ) ).close( closeArgs.capture() ); @@ -887,7 +891,7 @@ public void shouldStoreIndexFailureWhenFailingToCreateOnlineAccessorAfterRecover { // given long indexId = 1; - IndexDescriptor indexRule = IndexDescriptor.indexRule( indexId, index, PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor indexRule = StoreIndexDescriptor.indexRule( indexId, index, PROVIDER_DESCRIPTOR ); IndexingService indexing = newIndexingServiceWithMockedDependencies( populator, accessor, withData(), indexRule ); IOException exception = new IOException( "Expected failure" ); @@ -895,7 +899,7 @@ public void shouldStoreIndexFailureWhenFailingToCreateOnlineAccessorAfterRecover when( nameLookup.propertyKeyGetName( propertyKeyId ) ).thenReturn( "propertyKey" ); when( indexProvider.getInitialState( indexRule ) ).thenReturn( POPULATING ); - when( indexProvider.getOnlineAccessor( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + when( indexProvider.getOnlineAccessor( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenThrow( exception ); life.start(); @@ -924,22 +928,22 @@ public void shouldLogIndexStateOutliersOnInit() throws Exception IndexProvider provider = mock( IndexProvider.class ); when( provider.getProviderDescriptor() ).thenReturn( PROVIDER_DESCRIPTOR ); IndexAccessor indexAccessor = mock( IndexAccessor.class ); - when( provider.getOnlineAccessor( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + when( provider.getOnlineAccessor( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( indexAccessor ); IndexProviderMap providerMap = new DefaultIndexProviderMap( provider ); TokenNameLookup mockLookup = mock( TokenNameLookup.class ); - List indexes = new ArrayList<>(); + List indexes = new ArrayList<>(); int nextIndexId = 1; - IndexDescriptor populatingIndex = indexRule( nextIndexId, nextIndexId++, 1, PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor populatingIndex = indexRule( nextIndexId, nextIndexId++, 1, PROVIDER_DESCRIPTOR ); when( provider.getInitialState( populatingIndex ) ).thenReturn( POPULATING ); indexes.add( populatingIndex ); - IndexDescriptor failedIndex = indexRule( nextIndexId, nextIndexId++, 1, PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor failedIndex = indexRule( nextIndexId, nextIndexId++, 1, PROVIDER_DESCRIPTOR ); when( provider.getInitialState( failedIndex ) ).thenReturn( FAILED ); indexes.add( failedIndex ); for ( int i = 0; i < 10; i++ ) { - IndexDescriptor indexRule = indexRule( nextIndexId, nextIndexId++, 1, PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor indexRule = indexRule( nextIndexId, nextIndexId++, 1, PROVIDER_DESCRIPTOR ); when( provider.getInitialState( indexRule ) ).thenReturn( ONLINE ); indexes.add( indexRule ); } @@ -973,22 +977,22 @@ public void shouldLogIndexStateOutliersOnStart() throws Exception IndexProvider provider = mock( IndexProvider.class ); when( provider.getProviderDescriptor() ).thenReturn( PROVIDER_DESCRIPTOR ); IndexAccessor indexAccessor = mock( IndexAccessor.class ); - when( provider.getOnlineAccessor( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + when( provider.getOnlineAccessor( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( indexAccessor ); IndexProviderMap providerMap = new DefaultIndexProviderMap( provider ); TokenNameLookup mockLookup = mock( TokenNameLookup.class ); - List indexes = new ArrayList<>(); + List indexes = new ArrayList<>(); int nextIndexId = 1; - IndexDescriptor populatingIndex = indexRule( nextIndexId, nextIndexId++, 1, PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor populatingIndex = indexRule( nextIndexId, nextIndexId++, 1, PROVIDER_DESCRIPTOR ); when( provider.getInitialState( populatingIndex ) ).thenReturn( POPULATING ); indexes.add( populatingIndex ); - IndexDescriptor failedIndex = indexRule( nextIndexId, nextIndexId++, 1, PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor failedIndex = indexRule( nextIndexId, nextIndexId++, 1, PROVIDER_DESCRIPTOR ); when( provider.getInitialState( failedIndex ) ).thenReturn( FAILED ); indexes.add( failedIndex ); for ( int i = 0; i < 10; i++ ) { - IndexDescriptor indexRule = indexRule( nextIndexId, nextIndexId++, 1, PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor indexRule = indexRule( nextIndexId, nextIndexId++, 1, PROVIDER_DESCRIPTOR ); when( provider.getInitialState( indexRule ) ).thenReturn( ONLINE ); indexes.add( indexRule ); } @@ -1078,13 +1082,13 @@ public void failForceAllWhenOneOfTheIndexesFailToForce() throws IOException public void shouldRefreshIndexesOnStart() throws Exception { // given - IndexDescriptor rule = IndexDescriptor.indexRule( 0, index, PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor rule = StoreIndexDescriptor.indexRule( 0, index, PROVIDER_DESCRIPTOR ); IndexingService indexing = newIndexingServiceWithMockedDependencies( populator, accessor, withData(), rule ); IndexAccessor accessor = mock( IndexAccessor.class ); IndexUpdater updater = mock( IndexUpdater.class ); when( accessor.newUpdater( any( IndexUpdateMode.class ) ) ).thenReturn( updater ); - when( indexProvider.getOnlineAccessor( any( IndexDescriptor.class ), + when( indexProvider.getOnlineAccessor( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ).thenReturn( accessor ); life.init(); @@ -1101,7 +1105,7 @@ public void shouldRefreshIndexesOnStart() throws Exception public void shouldForgetDeferredIndexDropDuringRecoveryIfCreatedIndexWithSameRuleId() throws Exception { // given - IndexDescriptor rule = IndexDescriptor.indexRule( 0, index, PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor rule = StoreIndexDescriptor.indexRule( 0, index, PROVIDER_DESCRIPTOR ); IndexingService indexing = newIndexingServiceWithMockedDependencies( populator, accessor, withData(), rule ); life.init(); @@ -1120,7 +1124,7 @@ private IndexProxy createIndexProxyMock() { IndexProxy proxy = mock( IndexProxy.class ); CapableIndexDescriptor descriptor = - IndexDescriptor.indexRule( 0, IndexDescriptorFactory.forLabel( 1, 2 ), PROVIDER_DESCRIPTOR ) + StoreIndexDescriptor.indexRule( 0, IndexDescriptorFactory.forLabel( 1, 2 ), PROVIDER_DESCRIPTOR ) .withoutCapabilities(); when( proxy.getDescriptor() ).thenReturn( descriptor ); return proxy; @@ -1220,7 +1224,7 @@ private IndexEntryUpdate add( long nodeId, Object propertyValu private IndexingService newIndexingServiceWithMockedDependencies( IndexPopulator populator, IndexAccessor accessor, DataUpdates data, - IndexDescriptor... rules ) throws IOException + StoreIndexDescriptor... rules ) throws IOException { return newIndexingServiceWithMockedDependencies( populator, accessor, data, IndexingService.NO_MONITOR, rules ); } @@ -1229,14 +1233,14 @@ private IndexingService newIndexingServiceWithMockedDependencies( IndexPopulator IndexAccessor accessor, DataUpdates data, IndexingService.Monitor monitor, - IndexDescriptor... rules ) throws IOException + StoreIndexDescriptor... rules ) throws IOException { - when( indexProvider.getInitialState( any( IndexDescriptor.class ) ) ).thenReturn( ONLINE ); + when( indexProvider.getInitialState( any( StoreIndexDescriptor.class ) ) ).thenReturn( ONLINE ); when( indexProvider.getProviderDescriptor() ).thenReturn( PROVIDER_DESCRIPTOR ); - when( indexProvider.getPopulator( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + when( indexProvider.getPopulator( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( populator ); data.getsProcessedByStoreScanFrom( storeView ); - when( indexProvider.getOnlineAccessor( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + when( indexProvider.getOnlineAccessor( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( accessor ); when( indexProvider.storeMigrationParticipant( any( FileSystemAbstraction.class ), any( PageCache.class ) ) ) .thenReturn( StoreMigrationParticipant.NOT_PARTICIPATING ); @@ -1394,24 +1398,24 @@ public ResourceIterator snapshotFiles() } } - private IndexDescriptor indexRule( long ruleId, int labelId, int propertyKeyId, IndexProvider.Descriptor + private StoreIndexDescriptor indexRule( long ruleId, int labelId, int propertyKeyId, IndexProvider.Descriptor providerDescriptor ) { - return IndexDescriptor.indexRule( ruleId, IndexDescriptorFactory.forLabel( labelId, propertyKeyId ), - providerDescriptor ); + return StoreIndexDescriptor.indexRule( ruleId, IndexDescriptorFactory.forLabel( labelId, propertyKeyId ), + providerDescriptor ); } - private IndexDescriptor constraintIndexRule( long ruleId, int labelId, int propertyKeyId, IndexProvider.Descriptor + private StoreIndexDescriptor constraintIndexRule( long ruleId, int labelId, int propertyKeyId, IndexProvider.Descriptor providerDescriptor ) { - return IndexDescriptor.indexRule( ruleId, IndexDescriptorFactory.uniqueForLabel( labelId, propertyKeyId ), - providerDescriptor ); + return StoreIndexDescriptor.indexRule( ruleId, IndexDescriptorFactory.uniqueForLabel( labelId, propertyKeyId ), + providerDescriptor ); } - private IndexDescriptor constraintIndexRule( long ruleId, int labelId, int propertyKeyId, IndexProvider.Descriptor + private StoreIndexDescriptor constraintIndexRule( long ruleId, int labelId, int propertyKeyId, IndexProvider.Descriptor providerDescriptor, long constraintId ) { - return IndexDescriptor.constraintIndexRule( + return StoreIndexDescriptor.constraintIndexRule( ruleId, IndexDescriptorFactory.uniqueForLabel( labelId, propertyKeyId ), providerDescriptor, constraintId ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorTest.java index e72f9450cdc9d..c19f3305e399a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorTest.java @@ -41,7 +41,7 @@ import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.api.index.MultipleIndexPopulator.IndexPopulation; import org.neo4j.logging.LogProvider; @@ -504,12 +504,13 @@ private IndexPopulation addPopulator( IndexPopulator indexPopulator, int id, private IndexPopulation addPopulator( MultipleIndexPopulator multipleIndexPopulator, IndexPopulator indexPopulator, int id, FlippableIndexProxy flippableIndexProxy, FailedIndexProxyFactory failedIndexProxyFactory ) { - return addPopulator( multipleIndexPopulator, IndexDescriptor.indexRule( id, IndexDescriptorFactory.forLabel( id, id ), PROVIDER_DESCRIPTOR ), - indexPopulator, flippableIndexProxy, failedIndexProxyFactory ); + return addPopulator( multipleIndexPopulator, StoreIndexDescriptor + .indexRule( id, IndexDescriptorFactory.forLabel( id, id ), PROVIDER_DESCRIPTOR ), + indexPopulator, flippableIndexProxy, failedIndexProxyFactory ); } - private IndexPopulation addPopulator( MultipleIndexPopulator multipleIndexPopulator, IndexDescriptor descriptor, IndexPopulator indexPopulator, - FlippableIndexProxy flippableIndexProxy, FailedIndexProxyFactory failedIndexProxyFactory ) + private IndexPopulation addPopulator( MultipleIndexPopulator multipleIndexPopulator, StoreIndexDescriptor descriptor, IndexPopulator indexPopulator, + FlippableIndexProxy flippableIndexProxy, FailedIndexProxyFactory failedIndexProxyFactory ) { return multipleIndexPopulator.addPopulator( indexPopulator, new CapableIndexDescriptor( descriptor, NO_CAPABILITY ), flippableIndexProxy, failedIndexProxyFactory, "userIndexDescription" ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorUpdatesTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorUpdatesTest.java index 00cc914e192dd..7a1918d596712 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorUpdatesTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorUpdatesTest.java @@ -38,7 +38,7 @@ import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.labelscan.NodeLabelUpdate; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; import org.neo4j.kernel.impl.locking.LockService; @@ -118,11 +118,12 @@ private IndexPopulator createIndexPopulator() private MultipleIndexPopulator.IndexPopulation addPopulator( MultipleIndexPopulator multipleIndexPopulator, IndexPopulator indexPopulator, long indexId, PendingIndexDescriptor descriptor ) { - return addPopulator( multipleIndexPopulator, IndexDescriptor.indexRule( indexId, descriptor, PROVIDER_DESCRIPTOR ), indexPopulator, - mock( FlippableIndexProxy.class ), mock( FailedIndexProxyFactory.class ) ); + return addPopulator( multipleIndexPopulator, StoreIndexDescriptor + .indexRule( indexId, descriptor, PROVIDER_DESCRIPTOR ), indexPopulator, + mock( FlippableIndexProxy.class ), mock( FailedIndexProxyFactory.class ) ); } - private MultipleIndexPopulator.IndexPopulation addPopulator( MultipleIndexPopulator multipleIndexPopulator, IndexDescriptor descriptor, + private MultipleIndexPopulator.IndexPopulation addPopulator( MultipleIndexPopulator multipleIndexPopulator, StoreIndexDescriptor descriptor, IndexPopulator indexPopulator, FlippableIndexProxy flippableIndexProxy, FailedIndexProxyFactory failedIndexProxyFactory ) { return multipleIndexPopulator.addPopulator( indexPopulator, new CapableIndexDescriptor( descriptor, NO_CAPABILITY ), diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/OnlineIndexProxyTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/OnlineIndexProxyTest.java index 2b4fddba9624b..cc997725c3bd2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/OnlineIndexProxyTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/OnlineIndexProxyTest.java @@ -25,7 +25,7 @@ import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; @@ -47,7 +47,7 @@ public void shouldRemoveIndexCountsWhenTheIndexItselfIsDropped() throws IOExcept { // given CapableIndexDescriptor - capableIndexDescriptor = new CapableIndexDescriptor( IndexDescriptor.indexRule( indexId, descriptor, providerDescriptor ), NO_CAPABILITY ); + capableIndexDescriptor = new CapableIndexDescriptor( StoreIndexDescriptor.indexRule( indexId, descriptor, providerDescriptor ), NO_CAPABILITY ); OnlineIndexProxy index = new OnlineIndexProxy( capableIndexDescriptor, accessor, storeView, false ); // when diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndexProvider.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndexProvider.java index 3b74a17e6bcb8..03f4f95970c08 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndexProvider.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/InMemoryIndexProvider.java @@ -29,7 +29,7 @@ import org.neo4j.kernel.api.index.IndexDirectoryStructure; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.storemigration.StoreMigrationParticipant; import org.neo4j.kernel.impl.util.CopyOnWriteHashMap; @@ -57,7 +57,7 @@ private InMemoryIndexProvider( int prio, Map indexes ) } @Override - public InternalIndexState getInitialState( IndexDescriptor descriptor ) + public InternalIndexState getInitialState( StoreIndexDescriptor descriptor ) { InMemoryIndex index = indexes.get( descriptor.getId() ); return index != null ? index.getState() : InternalIndexState.POPULATING; @@ -76,7 +76,7 @@ public StoreMigrationParticipant storeMigrationParticipant( FileSystemAbstractio } @Override - public IndexPopulator getPopulator( IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) + public IndexPopulator getPopulator( StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { InMemoryIndex index = descriptor.type() == UNIQUE ? new UniqueInMemoryIndex( descriptor ) : new InMemoryIndex( descriptor ); @@ -85,7 +85,7 @@ public IndexPopulator getPopulator( IndexDescriptor descriptor, IndexSamplingCon } @Override - public IndexAccessor getOnlineAccessor( IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) + public IndexAccessor getOnlineAccessor( StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { InMemoryIndex index = indexes.get( descriptor.getId() ); if ( index == null || index.getState() != InternalIndexState.ONLINE ) @@ -102,7 +102,7 @@ public IndexAccessor getOnlineAccessor( IndexDescriptor descriptor, IndexSamplin } @Override - public String getPopulationFailure( IndexDescriptor descriptor ) throws IllegalStateException + public String getPopulationFailure( StoreIndexDescriptor descriptor ) throws IllegalStateException { String failure = indexes.get( descriptor.getId() ).failure; if ( failure == null ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/UpdateCapturingIndexProvider.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/UpdateCapturingIndexProvider.java index 08e764ca207bf..9a9c7c9d282d0 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/UpdateCapturingIndexProvider.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/UpdateCapturingIndexProvider.java @@ -33,7 +33,7 @@ import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.kernel.impl.storemigration.StoreMigrationParticipant; @@ -51,13 +51,13 @@ public UpdateCapturingIndexProvider( IndexProvider actual, Map rules = asList( hans, witch, gretel, robot ); SchemaCache cache = new SchemaCache( new ConstraintSemantics(), rules, IndexProviderMap.EMPTY ); - IndexDescriptor rule1 = newIndexRule( 10, 11, 12 ); - IndexDescriptor rule2 = newIndexRule( 13, 14, 15 ); + StoreIndexDescriptor rule1 = newIndexRule( 10, 11, 12 ); + StoreIndexDescriptor rule2 = newIndexRule( 13, 14, 15 ); cache.addSchemaRule( rule1 ); cache.addSchemaRule( rule2 ); @@ -338,9 +338,9 @@ public void concurrentSchemaRuleRemove() throws Throwable } } - private IndexDescriptor newIndexRule( long id, int label, int propertyKey ) + private StoreIndexDescriptor newIndexRule( long id, int label, int propertyKey ) { - return IndexDescriptor + return StoreIndexDescriptor .indexRule( id, IndexDescriptorFactory.forLabel( label, propertyKey ), PROVIDER_DESCRIPTOR ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/IndexPopulationStressTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/IndexPopulationStressTest.java index a16903222925a..0bdb0624322f2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/IndexPopulationStressTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/IndexPopulationStressTest.java @@ -38,7 +38,7 @@ import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; import org.neo4j.test.Race; @@ -59,7 +59,8 @@ public abstract class IndexPopulationStressTest public PageCacheAndDependenciesRule rules = new PageCacheAndDependenciesRule( DefaultFileSystemRule::new, this.getClass() ); - protected final IndexDescriptor descriptor = IndexDescriptor.indexRule( 0, IndexDescriptorFactory.forLabel( 0, 0 ), PROVIDER ); + protected final StoreIndexDescriptor + descriptor = StoreIndexDescriptor.indexRule( 0, IndexDescriptorFactory.forLabel( 0, 0 ), PROVIDER ); private IndexPopulator populator; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LayoutTestUtil.java index cd1992c5db512..03e8c185349b6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LayoutTestUtil.java @@ -33,7 +33,7 @@ import org.neo4j.index.internal.gbptree.Layout; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; import org.neo4j.test.rule.RandomRule; import org.neo4j.values.storable.RandomValues; @@ -47,11 +47,11 @@ abstract class LayoutTestUtil, VALUE extends Na private static final Comparator> UPDATE_COMPARATOR = ( u1, u2 ) -> Values.COMPARATOR.compare( u1.values()[0], u2.values()[0] ); - final IndexDescriptor indexDescriptor; + final StoreIndexDescriptor indexDescriptor; LayoutTestUtil( PendingIndexDescriptor indexDescriptor ) { - this.indexDescriptor = IndexDescriptor.indexRule( 0, indexDescriptor, PROVIDER_DESCRIPTOR ); + this.indexDescriptor = StoreIndexDescriptor.indexRule( 0, indexDescriptor, PROVIDER_DESCRIPTOR ); } abstract Layout createLayout(); @@ -67,7 +67,7 @@ protected double fractionDuplicates() abstract int compareIndexedPropertyValue( KEY key1, KEY key2 ); - IndexDescriptor indexDescriptor() + StoreIndexDescriptor indexDescriptor() { return indexDescriptor; } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalTimeLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalTimeLayoutTestUtil.java index 445b8065d97fa..cc07090555be2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalTimeLayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalTimeLayoutTestUtil.java @@ -28,7 +28,7 @@ import org.neo4j.index.internal.gbptree.Layout; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; import org.neo4j.values.storable.LocalTimeValue; import org.neo4j.values.storable.RandomValues; @@ -51,7 +51,7 @@ public class LocalTimeLayoutTestUtil extends LayoutTestUtil @Rule public final RuleChain rules = outerRule( fs ).around( directory ).around( pageCacheRule ).around( random ); - IndexDescriptor indexDescriptor; + StoreIndexDescriptor indexDescriptor; LayoutTestUtil layoutUtil; Layout layout; private File indexFile; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberLayoutTestUtil.java index ad299d11a0f15..b80a19c9b5731 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberLayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberLayoutTestUtil.java @@ -26,7 +26,7 @@ import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; import org.neo4j.values.storable.NumberValue; import org.neo4j.values.storable.RandomValues; @@ -60,7 +60,7 @@ abstract class NumberLayoutTestUtil extends LayoutTestUtil( accessors), mock( IndexDescriptor.class ), dropAction ); + fusionIndexAccessor = new FusionIndexAccessor( fusionVersion.slotSelector(), new InstanceSelector<>( accessors), mock( StoreIndexDescriptor.class ), dropAction ); } private void resetMocks() diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexProviderTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexProviderTest.java index b33c68ea70b26..42d94db15ad9b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexProviderTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexProviderTest.java @@ -32,7 +32,7 @@ import org.neo4j.internal.kernel.api.InternalIndexState; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.index.schema.NumberIndexProvider; import org.neo4j.kernel.impl.index.schema.SpatialIndexProvider; @@ -168,13 +168,14 @@ public void getPopulationFailureMustThrowIfNoFailure() IllegalStateException failure = new IllegalStateException( "not failed" ); for ( IndexProvider provider : aliveProviders ) { - when( provider.getPopulationFailure( any( IndexDescriptor.class ) ) ).thenThrow( failure ); + when( provider.getPopulationFailure( any( StoreIndexDescriptor.class ) ) ).thenThrow( failure ); } // then try { - fusionIndexProvider.getPopulationFailure( IndexDescriptor.indexRule( 0, forLabel( 0, 0 ), PROVIDER_DESCRIPTOR ) ); + fusionIndexProvider.getPopulationFailure( StoreIndexDescriptor + .indexRule( 0, forLabel( 0, 0 ), PROVIDER_DESCRIPTOR ) ); fail( "Should have failed" ); } catch ( IllegalStateException e ) @@ -194,16 +195,16 @@ public void getPopulationFailureMustReportFailureWhenAnyFailed() { if ( provider == failingProvider ) { - when( provider.getPopulationFailure( any( IndexDescriptor.class ) ) ).thenReturn( failure ); + when( provider.getPopulationFailure( any( StoreIndexDescriptor.class ) ) ).thenReturn( failure ); } else { - when( provider.getPopulationFailure( any( IndexDescriptor.class ) ) ).thenThrow( exception ); + when( provider.getPopulationFailure( any( StoreIndexDescriptor.class ) ) ).thenThrow( exception ); } } // then - assertThat( fusionIndexProvider.getPopulationFailure( IndexDescriptor.indexRule( 0, forLabel( 0, 0 ), PROVIDER_DESCRIPTOR ) ), + assertThat( fusionIndexProvider.getPopulationFailure( StoreIndexDescriptor.indexRule( 0, forLabel( 0, 0 ), PROVIDER_DESCRIPTOR ) ), containsString( failure ) ); } } @@ -217,11 +218,12 @@ public void getPopulationFailureMustReportFailureWhenMultipleFail() { String failureMessage = "FAILURE[" + aliveProvider + "]"; failureMessages.add( failureMessage ); - when( aliveProvider.getPopulationFailure( any( IndexDescriptor.class ) ) ).thenReturn( failureMessage ); + when( aliveProvider.getPopulationFailure( any( StoreIndexDescriptor.class ) ) ).thenReturn( failureMessage ); } // then - String populationFailure = fusionIndexProvider.getPopulationFailure( IndexDescriptor.indexRule( 0, forLabel( 0, 0 ), PROVIDER_DESCRIPTOR ) ); + String populationFailure = fusionIndexProvider.getPopulationFailure( StoreIndexDescriptor + .indexRule( 0, forLabel( 0, 0 ), PROVIDER_DESCRIPTOR ) ); for ( String failureMessage : failureMessages ) { assertThat( populationFailure, containsString( failureMessage ) ); @@ -233,7 +235,8 @@ public void shouldReportFailedIfAnyIsFailed() { // given IndexProvider provider = fusionIndexProvider; - IndexDescriptor indexDescriptor = IndexDescriptor.indexRule( 0, IndexDescriptorFactory.forLabel( 1, 1 ), PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor indexDescriptor = StoreIndexDescriptor + .indexRule( 0, IndexDescriptorFactory.forLabel( 1, 1 ), PROVIDER_DESCRIPTOR ); for ( InternalIndexState state : InternalIndexState.values() ) { @@ -256,7 +259,8 @@ public void shouldReportFailedIfAnyIsFailed() public void shouldReportPopulatingIfAnyIsPopulating() { // given - IndexDescriptor indexDescriptor = IndexDescriptor.indexRule( 0, IndexDescriptorFactory.forLabel( 1, 1 ), PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor indexDescriptor = StoreIndexDescriptor + .indexRule( 0, IndexDescriptorFactory.forLabel( 1, 1 ), PROVIDER_DESCRIPTOR ); for ( InternalIndexState state : array( InternalIndexState.ONLINE, InternalIndexState.POPULATING ) ) { @@ -333,7 +337,7 @@ private IndexProvider mockProvider( Class providerClass private void setInitialState( IndexProvider mockedProvider, InternalIndexState state ) { - when( mockedProvider.getInitialState( any( IndexDescriptor.class ) ) ).thenReturn( state ); + when( mockedProvider.getInitialState( any( StoreIndexDescriptor.class ) ) ).thenReturn( state ); } private IndexProvider orLucene( IndexProvider provider ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/OperationsLockTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/OperationsLockTest.java index c2462d60409a5..4188884f18be4 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/OperationsLockTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/OperationsLockTest.java @@ -48,7 +48,7 @@ import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.RelExistenceConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.impl.api.KernelTransactionImplementation; @@ -448,7 +448,7 @@ public void shouldAcquireSchemaReadLockLazilyBeforeGettingAllConstraints() public void shouldAcquireSchemaWriteLockBeforeRemovingIndexRule() throws Exception { // given - CapableIndexDescriptor index = IndexDescriptor.indexRule( 0, IndexDescriptorFactory.forLabel( 0, 0 ), + CapableIndexDescriptor index = StoreIndexDescriptor.indexRule( 0, IndexDescriptorFactory.forLabel( 0, 0 ), IndexProvider.UNDECIDED ).withoutCapabilities(); when( storageReader.indexGetForSchema( any() )).thenReturn( index ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStorageTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStorageTest.java index 838d6c4a12eff..4ef4302793baa 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStorageTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStorageTest.java @@ -51,7 +51,7 @@ import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.impl.store.record.ConstraintRule; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.test.GraphDatabaseServiceCleaner; import org.neo4j.test.mockito.matcher.KernelExceptionUserMessageMatcher; import org.neo4j.test.rule.DatabaseRule; @@ -115,7 +115,7 @@ public void shouldReturnIndexRuleForLabelAndProperty() index( LABEL2, PROP1 ) ); // When - IndexDescriptor rule = storage.indexGetForSchema( indexDescriptor( LABEL1, PROP2 ) ); + StoreIndexDescriptor rule = storage.indexGetForSchema( indexDescriptor( LABEL1, PROP2 ) ); // Then assertNotNull( rule ); @@ -134,7 +134,7 @@ public void shouldReturnIndexRuleForLabelAndPropertyComposite() createSchema( db -> db.schema().indexFor( Label.label( LABEL1 ) ) .on( a ).on( b ).on( c ).on( d ).on( e ).on( f ).create() ); - IndexDescriptor rule = storage.indexGetForSchema( IndexDescriptorFactory.forLabel( + StoreIndexDescriptor rule = storage.indexGetForSchema( IndexDescriptorFactory.forLabel( labelId( LABEL1 ), propId( a ), propId( b ), propId( c ), propId( d ), propId( e ), propId( f ) ) ); assertNotNull( rule ); @@ -162,7 +162,7 @@ public void shouldReturnIndexRuleForLabelAndVeryManyPropertiesComposite() indexCreator.create(); } ); - IndexDescriptor rule = storage.indexGetForSchema( IndexDescriptorFactory.forLabel( + StoreIndexDescriptor rule = storage.indexGetForSchema( IndexDescriptorFactory.forLabel( labelId( LABEL1 ), Arrays.stream( props ).mapToInt( this::propId ).toArray() ) ); assertNotNull( rule ); @@ -182,7 +182,7 @@ public void shouldReturnNullIfIndexRuleForLabelAndPropertyDoesNotExist() index( LABEL1, PROP1 ) ); // When - IndexDescriptor rule = storage.indexGetForSchema( indexDescriptor( LABEL1, PROP2 ) ); + StoreIndexDescriptor rule = storage.indexGetForSchema( indexDescriptor( LABEL1, PROP2 ) ); // Then assertNull( rule ); @@ -197,7 +197,7 @@ public void shouldListIndexRulesForLabelPropertyAndKind() index( LABEL1, PROP2 ) ); // When - IndexDescriptor rule = storage.indexGetForSchema( uniqueIndexDescriptor( LABEL1, PROP1 ) ); + StoreIndexDescriptor rule = storage.indexGetForSchema( uniqueIndexDescriptor( LABEL1, PROP1 ) ); // Then assertNotNull( rule ); @@ -214,10 +214,10 @@ public void shouldListAllIndexRules() uniquenessConstraint( LABEL2, PROP1 ) ); // When - Set listedRules = asSet( storage.indexesGetAll() ); + Set listedRules = asSet( storage.indexesGetAll() ); // Then - Set expectedRules = new HashSet<>(); + Set expectedRules = new HashSet<>(); expectedRules.add( makeIndexRule( 0, LABEL1, PROP1 ) ); expectedRules.add( makeIndexRule( 1, LABEL1, PROP2 ) ); expectedRules.add( makeIndexRuleForConstraint( 2, LABEL2, PROP1, 0L ) ); @@ -331,7 +331,7 @@ private TokenNameLookup getDefaultTokenNameLookup() return tokenNameLookup; } - private void assertRule( IndexDescriptor rule, String label, String propertyKey, PendingIndexDescriptor.Type type ) + private void assertRule( StoreIndexDescriptor rule, String label, String propertyKey, PendingIndexDescriptor.Type type ) { assertTrue( SchemaDescriptorPredicates.hasLabel( rule, labelId( label ) ) ); assertTrue( SchemaDescriptorPredicates.hasProperty( rule, propId( propertyKey ) ) ); @@ -355,18 +355,18 @@ private PendingIndexDescriptor uniqueIndexDescriptor( String label, String prope return IndexDescriptorFactory.uniqueForLabel( labelId( label ), propId( property ) ); } - private IndexDescriptor makeIndexRule( long ruleId, String label, String propertyKey ) + private StoreIndexDescriptor makeIndexRule( long ruleId, String label, String propertyKey ) { - return IndexDescriptor.indexRule( + return StoreIndexDescriptor.indexRule( ruleId, IndexDescriptorFactory.forLabel( labelId( label ), propId( propertyKey ) ), PROVIDER_DESCRIPTOR ); } - private IndexDescriptor makeIndexRuleForConstraint( long ruleId, String label, String propertyKey, - long constraintId ) + private StoreIndexDescriptor makeIndexRuleForConstraint( long ruleId, String label, String propertyKey, + long constraintId ) { - return IndexDescriptor.constraintIndexRule( + return StoreIndexDescriptor.constraintIndexRule( ruleId, IndexDescriptorFactory.uniqueForLabel( labelId( label ), propId( propertyKey ) ), PROVIDER_DESCRIPTOR, constraintId ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStoreTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStoreTest.java index 8c28b88a361e5..fd2a84882d651 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStoreTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStoreTest.java @@ -39,7 +39,7 @@ import org.neo4j.kernel.impl.store.id.DefaultIdGeneratorFactory; import org.neo4j.kernel.impl.store.record.ConstraintRule; import org.neo4j.kernel.impl.store.record.DynamicRecord; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.store.record.SchemaRuleSerialization; import org.neo4j.logging.NullLogProvider; import org.neo4j.storageengine.api.schema.SchemaRule; @@ -86,11 +86,11 @@ public void after() public void storeAndLoadSchemaRule() throws Exception { // GIVEN - IndexDescriptor indexRule = IndexDescriptor.indexRule( store.nextId(), - IndexDescriptorFactory.forLabel( 1, 4 ), PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor indexRule = StoreIndexDescriptor.indexRule( store.nextId(), + IndexDescriptorFactory.forLabel( 1, 4 ), PROVIDER_DESCRIPTOR ); // WHEN - IndexDescriptor readIndexRule = (IndexDescriptor) SchemaRuleSerialization.deserialize( + StoreIndexDescriptor readIndexRule = (StoreIndexDescriptor) SchemaRuleSerialization.deserialize( indexRule.getId(), wrap( SchemaRuleSerialization.serialize( indexRule ) ) ); // THEN @@ -105,11 +105,11 @@ public void storeAndLoadCompositeSchemaRule() throws Exception { // GIVEN int[] propertyIds = {4, 5, 6, 7}; - IndexDescriptor indexRule = IndexDescriptor.indexRule( store.nextId(), - IndexDescriptorFactory.forLabel( 2, propertyIds ), PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor indexRule = StoreIndexDescriptor.indexRule( store.nextId(), + IndexDescriptorFactory.forLabel( 2, propertyIds ), PROVIDER_DESCRIPTOR ); // WHEN - IndexDescriptor readIndexRule = (IndexDescriptor) SchemaRuleSerialization.deserialize( + StoreIndexDescriptor readIndexRule = (StoreIndexDescriptor) SchemaRuleSerialization.deserialize( indexRule.getId(), wrap( SchemaRuleSerialization.serialize( indexRule ) ) ); // THEN @@ -123,12 +123,12 @@ public void storeAndLoadCompositeSchemaRule() throws Exception public void storeAndLoad_Big_CompositeSchemaRule() throws Exception { // GIVEN - IndexDescriptor indexRule = IndexDescriptor.indexRule( store.nextId(), - IndexDescriptorFactory + StoreIndexDescriptor indexRule = StoreIndexDescriptor.indexRule( store.nextId(), + IndexDescriptorFactory .forLabel( 2, IntStream.range( 1, 200).toArray() ), PROVIDER_DESCRIPTOR ); // WHEN - IndexDescriptor readIndexRule = (IndexDescriptor) SchemaRuleSerialization.deserialize( + StoreIndexDescriptor readIndexRule = (StoreIndexDescriptor) SchemaRuleSerialization.deserialize( indexRule.getId(), wrap( SchemaRuleSerialization.serialize( indexRule ) ) ); // THEN @@ -174,18 +174,18 @@ private long storeRule( SchemaRule rule ) return Iterables.first( records ).getId(); } - private IndexDescriptor indexRule( long ruleId, IndexProvider.Descriptor descriptor, - int labelId, int... propertyIds ) + private StoreIndexDescriptor indexRule( long ruleId, IndexProvider.Descriptor descriptor, + int labelId, int... propertyIds ) { - return IndexDescriptor + return StoreIndexDescriptor .indexRule( ruleId, IndexDescriptorFactory.forLabel( labelId, propertyIds ), descriptor ); } - private IndexDescriptor uniqueIndexRule( long ruleId, long owningConstraint, - IndexProvider.Descriptor descriptor, int labelId, int... propertyIds ) + private StoreIndexDescriptor uniqueIndexRule( long ruleId, long owningConstraint, + IndexProvider.Descriptor descriptor, int labelId, int... propertyIds ) { - return IndexDescriptor.constraintIndexRule( ruleId, - IndexDescriptorFactory.uniqueForLabel( labelId, propertyIds ), descriptor, owningConstraint ); + return StoreIndexDescriptor.constraintIndexRule( ruleId, + IndexDescriptorFactory.uniqueForLabel( labelId, propertyIds ), descriptor, owningConstraint ); } private ConstraintRule constraintUniqueRule( long ruleId, long ownedIndexId, int labelId, int... propertyIds ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/IndexRuleTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/IndexRuleTest.java index 4b7dfb214d05e..53239416687d1 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/IndexRuleTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/IndexRuleTest.java @@ -21,7 +21,7 @@ import org.junit.Test; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; import static org.hamcrest.MatcherAssert.assertThat; @@ -39,7 +39,7 @@ public void shouldCreateGeneralIndex() { // GIVEN PendingIndexDescriptor descriptor = forLabel( LABEL_ID, PROPERTY_ID_1 ); - IndexDescriptor indexRule = IndexDescriptor.indexRule( RULE_ID, descriptor, PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor indexRule = StoreIndexDescriptor.indexRule( RULE_ID, descriptor, PROVIDER_DESCRIPTOR ); // THEN assertThat( indexRule.getId(), equalTo( RULE_ID ) ); @@ -56,7 +56,7 @@ public void shouldCreateUniqueIndex() { // GIVEN PendingIndexDescriptor descriptor = uniqueForLabel( LABEL_ID, PROPERTY_ID_1 ); - IndexDescriptor indexRule = IndexDescriptor.indexRule( RULE_ID, descriptor, PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor indexRule = StoreIndexDescriptor.indexRule( RULE_ID, descriptor, PROVIDER_DESCRIPTOR ); // THEN assertThat( indexRule.getId(), equalTo( RULE_ID ) ); @@ -66,7 +66,7 @@ public void shouldCreateUniqueIndex() assertThat( indexRule.providerDescriptor(), equalTo( PROVIDER_DESCRIPTOR ) ); assertThat( indexRule.getOwningConstraint(), equalTo( null ) ); - IndexDescriptor withConstraint = indexRule.withOwningConstraint( RULE_ID_2 ); + StoreIndexDescriptor withConstraint = indexRule.withOwningConstraint( RULE_ID_2 ); assertThat( withConstraint.getOwningConstraint(), equalTo( RULE_ID_2 ) ); assertThat( indexRule.getOwningConstraint(), equalTo( null ) ); // this is unchanged } @@ -84,15 +84,15 @@ public void indexRulesAreEqualBasedOnIndexDescriptor() public void detectUniqueIndexWithoutOwningConstraint() { PendingIndexDescriptor descriptor = uniqueForLabel( LABEL_ID, PROPERTY_ID_1 ); - IndexDescriptor indexRule = IndexDescriptor.indexRule( RULE_ID, descriptor, PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor indexRule = StoreIndexDescriptor.indexRule( RULE_ID, descriptor, PROVIDER_DESCRIPTOR ); assertTrue( indexRule.isIndexWithoutOwningConstraint() ); } private void assertEqualityByDescriptor( PendingIndexDescriptor descriptor ) { - IndexDescriptor rule1 = IndexDescriptor.indexRule( RULE_ID, descriptor, PROVIDER_DESCRIPTOR ); - IndexDescriptor rule2 = IndexDescriptor.indexRule( RULE_ID_2, descriptor, PROVIDER_DESCRIPTOR_2 ); + StoreIndexDescriptor rule1 = StoreIndexDescriptor.indexRule( RULE_ID, descriptor, PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor rule2 = StoreIndexDescriptor.indexRule( RULE_ID_2, descriptor, PROVIDER_DESCRIPTOR_2 ); assertEquality( rule1, rule2 ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerializationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerializationTest.java index ea60ffc6f7405..a16a25f47bf26 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerializationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerializationTest.java @@ -32,7 +32,7 @@ import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.storageengine.api.schema.SchemaRule; @@ -46,23 +46,23 @@ public class SchemaRuleSerializationTest extends SchemaRuleTestBase { - IndexDescriptor indexRegular = IndexDescriptor.indexRule( RULE_ID, - forLabel( LABEL_ID, PROPERTY_ID_1 ), PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor indexRegular = StoreIndexDescriptor.indexRule( RULE_ID, + forLabel( LABEL_ID, PROPERTY_ID_1 ), PROVIDER_DESCRIPTOR ); - IndexDescriptor indexUnique = IndexDescriptor.constraintIndexRule( RULE_ID_2, - IndexDescriptorFactory + StoreIndexDescriptor indexUnique = StoreIndexDescriptor.constraintIndexRule( RULE_ID_2, + IndexDescriptorFactory .uniqueForLabel( LABEL_ID, PROPERTY_ID_1 ), PROVIDER_DESCRIPTOR, RULE_ID ); - IndexDescriptor indexCompositeRegular = IndexDescriptor.indexRule( RULE_ID, - forLabel( LABEL_ID, PROPERTY_ID_1, PROPERTY_ID_2 ), PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor indexCompositeRegular = StoreIndexDescriptor.indexRule( RULE_ID, + forLabel( LABEL_ID, PROPERTY_ID_1, PROPERTY_ID_2 ), PROVIDER_DESCRIPTOR ); - IndexDescriptor indexCompositeUnique = IndexDescriptor.constraintIndexRule( RULE_ID_2, - IndexDescriptorFactory + StoreIndexDescriptor indexCompositeUnique = StoreIndexDescriptor.constraintIndexRule( RULE_ID_2, + IndexDescriptorFactory .uniqueForLabel( LABEL_ID, PROPERTY_ID_1, PROPERTY_ID_2 ), - PROVIDER_DESCRIPTOR, RULE_ID ); + PROVIDER_DESCRIPTOR, RULE_ID ); - IndexDescriptor indexBigComposite = IndexDescriptor.indexRule( RULE_ID, - forLabel( LABEL_ID, IntStream.range(1, 200).toArray() ), PROVIDER_DESCRIPTOR ); + StoreIndexDescriptor indexBigComposite = StoreIndexDescriptor.indexRule( RULE_ID, + forLabel( LABEL_ID, IntStream.range(1, 200).toArray() ), PROVIDER_DESCRIPTOR ); ConstraintRule constraintExistsLabel = ConstraintRule.constraintRule( RULE_ID, ConstraintDescriptorFactory.existsForLabel( LABEL_ID, PROPERTY_ID_1 ) ); @@ -121,20 +121,20 @@ public void rulesCreatedWithNameMustRetainGivenNameAfterDeserialisation() throws { String name = "custom_rule"; - assertThat( serialiseAndDeserialise( IndexDescriptor.indexRule( RULE_ID, - forLabel( LABEL_ID, PROPERTY_ID_1 ), PROVIDER_DESCRIPTOR, name ) ).getName(), is( name ) ); - assertThat( serialiseAndDeserialise( IndexDescriptor.constraintIndexRule( RULE_ID_2, - IndexDescriptorFactory + assertThat( serialiseAndDeserialise( StoreIndexDescriptor.indexRule( RULE_ID, + forLabel( LABEL_ID, PROPERTY_ID_1 ), PROVIDER_DESCRIPTOR, name ) ).getName(), is( name ) ); + assertThat( serialiseAndDeserialise( StoreIndexDescriptor.constraintIndexRule( RULE_ID_2, + IndexDescriptorFactory .uniqueForLabel( LABEL_ID, PROPERTY_ID_1 ), - PROVIDER_DESCRIPTOR, RULE_ID, name ) ).getName(), is( name ) ); - assertThat( serialiseAndDeserialise( IndexDescriptor.indexRule( RULE_ID, - forLabel( LABEL_ID, PROPERTY_ID_1, PROPERTY_ID_2 ), PROVIDER_DESCRIPTOR, name ) ).getName(), is( name ) ); - assertThat( serialiseAndDeserialise( IndexDescriptor.constraintIndexRule( RULE_ID_2, - IndexDescriptorFactory + PROVIDER_DESCRIPTOR, RULE_ID, name ) ).getName(), is( name ) ); + assertThat( serialiseAndDeserialise( StoreIndexDescriptor.indexRule( RULE_ID, + forLabel( LABEL_ID, PROPERTY_ID_1, PROPERTY_ID_2 ), PROVIDER_DESCRIPTOR, name ) ).getName(), is( name ) ); + assertThat( serialiseAndDeserialise( StoreIndexDescriptor.constraintIndexRule( RULE_ID_2, + IndexDescriptorFactory .uniqueForLabel( LABEL_ID, PROPERTY_ID_1, PROPERTY_ID_2 ), - PROVIDER_DESCRIPTOR, RULE_ID, name ) ).getName(), is( name ) ); - assertThat( serialiseAndDeserialise( IndexDescriptor.indexRule( RULE_ID, - forLabel( LABEL_ID, IntStream.range(1, 200).toArray() ), PROVIDER_DESCRIPTOR, name ) ).getName(), is( name ) ); + PROVIDER_DESCRIPTOR, RULE_ID, name ) ).getName(), is( name ) ); + assertThat( serialiseAndDeserialise( StoreIndexDescriptor.indexRule( RULE_ID, + forLabel( LABEL_ID, IntStream.range(1, 200).toArray() ), PROVIDER_DESCRIPTOR, name ) ).getName(), is( name ) ); assertThat( serialiseAndDeserialise( ConstraintRule.constraintRule( RULE_ID, ConstraintDescriptorFactory.existsForLabel( LABEL_ID, PROPERTY_ID_1 ), name ) ).getName(), is( name ) ); assertThat( serialiseAndDeserialise( ConstraintRule.constraintRule( RULE_ID_2, @@ -155,20 +155,20 @@ public void rulesCreatedWithNullNameMustRetainComputedNameAfterDeserialisation() { String name = null; - assertThat( serialiseAndDeserialise( IndexDescriptor.indexRule( RULE_ID, - forLabel( LABEL_ID, PROPERTY_ID_1 ), PROVIDER_DESCRIPTOR, name ) ).getName(), is( "index_1" ) ); - assertThat( serialiseAndDeserialise( IndexDescriptor.constraintIndexRule( RULE_ID_2, - IndexDescriptorFactory + assertThat( serialiseAndDeserialise( StoreIndexDescriptor.indexRule( RULE_ID, + forLabel( LABEL_ID, PROPERTY_ID_1 ), PROVIDER_DESCRIPTOR, name ) ).getName(), is( "index_1" ) ); + assertThat( serialiseAndDeserialise( StoreIndexDescriptor.constraintIndexRule( RULE_ID_2, + IndexDescriptorFactory .uniqueForLabel( LABEL_ID, PROPERTY_ID_1 ), - PROVIDER_DESCRIPTOR, RULE_ID, name ) ).getName(), is( "index_2" ) ); - assertThat( serialiseAndDeserialise( IndexDescriptor.indexRule( RULE_ID, - forLabel( LABEL_ID, PROPERTY_ID_1, PROPERTY_ID_2 ), PROVIDER_DESCRIPTOR, name ) ).getName(), is( "index_1" ) ); - assertThat( serialiseAndDeserialise( IndexDescriptor.constraintIndexRule( RULE_ID_2, - IndexDescriptorFactory + PROVIDER_DESCRIPTOR, RULE_ID, name ) ).getName(), is( "index_2" ) ); + assertThat( serialiseAndDeserialise( StoreIndexDescriptor.indexRule( RULE_ID, + forLabel( LABEL_ID, PROPERTY_ID_1, PROPERTY_ID_2 ), PROVIDER_DESCRIPTOR, name ) ).getName(), is( "index_1" ) ); + assertThat( serialiseAndDeserialise( StoreIndexDescriptor.constraintIndexRule( RULE_ID_2, + IndexDescriptorFactory .uniqueForLabel( LABEL_ID, PROPERTY_ID_1, PROPERTY_ID_2 ), - PROVIDER_DESCRIPTOR, RULE_ID, name ) ).getName(), is( "index_2" ) ); - assertThat( serialiseAndDeserialise( IndexDescriptor.indexRule( RULE_ID, - forLabel( LABEL_ID, IntStream.range(1, 200).toArray() ), PROVIDER_DESCRIPTOR, name ) ).getName(), + PROVIDER_DESCRIPTOR, RULE_ID, name ) ).getName(), is( "index_2" ) ); + assertThat( serialiseAndDeserialise( StoreIndexDescriptor.indexRule( RULE_ID, + forLabel( LABEL_ID, IntStream.range(1, 200).toArray() ), PROVIDER_DESCRIPTOR, name ) ).getName(), is( "index_1" ) ); assertThat( serialiseAndDeserialise( ConstraintRule.constraintRule( RULE_ID, ConstraintDescriptorFactory.existsForLabel( LABEL_ID, PROPERTY_ID_1 ), name ) ).getName(), @@ -194,8 +194,8 @@ public void rulesCreatedWithNullNameMustRetainComputedNameAfterDeserialisation() public void indexRuleNameMustNotContainNullCharacter() { String name = "a\0b"; - IndexDescriptor.indexRule( RULE_ID, - forLabel( LABEL_ID, PROPERTY_ID_1 ), PROVIDER_DESCRIPTOR, name ); + StoreIndexDescriptor.indexRule( RULE_ID, + forLabel( LABEL_ID, PROPERTY_ID_1 ), PROVIDER_DESCRIPTOR, name ); } @Test( expected = IllegalArgumentException.class ) @@ -203,16 +203,16 @@ public void indexRuleNameMustNotBeTheEmptyString() { //noinspection RedundantStringConstructorCall String name = new String( "" ); - IndexDescriptor.indexRule( RULE_ID, - forLabel( LABEL_ID, PROPERTY_ID_1 ), PROVIDER_DESCRIPTOR, name ); + StoreIndexDescriptor.indexRule( RULE_ID, + forLabel( LABEL_ID, PROPERTY_ID_1 ), PROVIDER_DESCRIPTOR, name ); } @Test( expected = IllegalArgumentException.class ) public void constraintIndexRuleNameMustNotContainNullCharacter() { String name = "a\0b"; - IndexDescriptor.constraintIndexRule( RULE_ID, - forLabel( LABEL_ID, PROPERTY_ID_1 ), PROVIDER_DESCRIPTOR, RULE_ID_2, name ); + StoreIndexDescriptor.constraintIndexRule( RULE_ID, + forLabel( LABEL_ID, PROPERTY_ID_1 ), PROVIDER_DESCRIPTOR, RULE_ID_2, name ); } @Test( expected = IllegalArgumentException.class ) @@ -220,8 +220,8 @@ public void constraintIndexRuleNameMustNotBeTheEmptyString() { //noinspection RedundantStringConstructorCall String name = new String( "" ); - IndexDescriptor.constraintIndexRule( RULE_ID, - forLabel( LABEL_ID, PROPERTY_ID_1 ), PROVIDER_DESCRIPTOR, RULE_ID_2, name ); + StoreIndexDescriptor.constraintIndexRule( RULE_ID, + forLabel( LABEL_ID, PROPERTY_ID_1 ), PROVIDER_DESCRIPTOR, RULE_ID_2, name ); } @Test( expected = IllegalArgumentException.class ) @@ -460,7 +460,7 @@ private void assertParseIndexRule( String serialized, String name ) throws Excep byte[] bytes = decodeBase64( serialized ); // WHEN - IndexDescriptor + StoreIndexDescriptor deserialized = assertIndexRule( SchemaRuleSerialization.deserialize( ruleId, ByteBuffer.wrap( bytes ) ) ); // THEN @@ -482,7 +482,7 @@ private void assertParseUniqueIndexRule( String serialized, String name ) throws byte[] bytes = decodeBase64( serialized ); // WHEN - IndexDescriptor + StoreIndexDescriptor deserialized = assertIndexRule( SchemaRuleSerialization.deserialize( ruleId, ByteBuffer.wrap( bytes ) ) ); // THEN @@ -578,10 +578,10 @@ private void assertParseRelationshipPropertyExistsRule( String serialized, Strin // HELPERS - private void assertSerializeAndDeserializeIndexRule( IndexDescriptor indexRule ) + private void assertSerializeAndDeserializeIndexRule( StoreIndexDescriptor indexRule ) throws MalformedSchemaRuleException { - IndexDescriptor deserialized = assertIndexRule( serialiseAndDeserialise( indexRule ) ); + StoreIndexDescriptor deserialized = assertIndexRule( serialiseAndDeserialise( indexRule ) ); assertThat( deserialized.getId(), equalTo( indexRule.getId() ) ); assertThat( deserialized, equalTo( indexRule ) ); @@ -589,13 +589,13 @@ private void assertSerializeAndDeserializeIndexRule( IndexDescriptor indexRule ) assertThat( deserialized.providerDescriptor(), equalTo( indexRule.providerDescriptor() ) ); } - private IndexDescriptor assertIndexRule( SchemaRule schemaRule ) + private StoreIndexDescriptor assertIndexRule( SchemaRule schemaRule ) { - if ( !(schemaRule instanceof IndexDescriptor) ) + if ( !(schemaRule instanceof StoreIndexDescriptor) ) { fail( "Expected IndexRule, but got " + schemaRule.getClass().getSimpleName() ); } - return (IndexDescriptor)schemaRule; + return (StoreIndexDescriptor)schemaRule; } private void assertSerializeAndDeserializeConstraintRule( ConstraintRule constraintRule ) @@ -614,7 +614,7 @@ private SchemaRule serialiseAndDeserialise( ConstraintRule constraintRule ) thro return SchemaRuleSerialization.deserialize( constraintRule.getId(), buffer ); } - private SchemaRule serialiseAndDeserialise( IndexDescriptor indexRule ) throws MalformedSchemaRuleException + private SchemaRule serialiseAndDeserialise( StoreIndexDescriptor indexRule ) throws MalformedSchemaRuleException { ByteBuffer buffer = ByteBuffer.wrap( SchemaRuleSerialization.serialize( indexRule ) ); return SchemaRuleSerialization.deserialize( indexRule.getId(), buffer ); @@ -629,7 +629,7 @@ private ConstraintRule assertConstraintRule( SchemaRule schemaRule ) return (ConstraintRule)schemaRule; } - private void assertCorrectLength( IndexDescriptor indexRule ) + private void assertCorrectLength( StoreIndexDescriptor indexRule ) { // GIVEN ByteBuffer buffer = ByteBuffer.wrap( SchemaRuleSerialization.serialize( indexRule ) ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/Commands.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/Commands.java index fd6473610f667..fad43e33c83ce 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/Commands.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/Commands.java @@ -32,7 +32,7 @@ import org.neo4j.kernel.impl.store.PropertyStore; import org.neo4j.kernel.impl.store.PropertyType; import org.neo4j.kernel.impl.store.record.DynamicRecord; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.store.record.LabelTokenRecord; import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.kernel.impl.store.record.PropertyBlock; @@ -148,7 +148,7 @@ public static RelationshipGroupCommand createRelationshipGroup( long id, int typ public static SchemaRuleCommand createIndexRule( IndexProvider.Descriptor provider, long id, LabelSchemaDescriptor descriptor ) { - SchemaRule rule = IndexDescriptor.indexRule( + SchemaRule rule = StoreIndexDescriptor.indexRule( id, IndexDescriptorFactory.forSchema( descriptor ), provider ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/NeoStoreTransactionApplierTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/NeoStoreTransactionApplierTest.java index 986f7ef46379c..c5ee7da2f0d2f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/NeoStoreTransactionApplierTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/NeoStoreTransactionApplierTest.java @@ -55,7 +55,7 @@ import org.neo4j.kernel.impl.store.SchemaStore; import org.neo4j.kernel.impl.store.record.ConstraintRule; import org.neo4j.kernel.impl.store.record.DynamicRecord; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.store.record.LabelTokenRecord; import org.neo4j.kernel.impl.store.record.NeoStoreRecord; import org.neo4j.kernel.impl.store.record.NodeRecord; @@ -561,7 +561,7 @@ public void shouldApplyCreateIndexRuleSchemaRuleCommandToTheStore() throws Excep final DynamicRecord record = DynamicRecord.dynamicRecord( 21, true ); record.setCreated(); final Collection recordsAfter = singletonList( record ); - final IndexDescriptor rule = indexRule( 0, 1, 2, new IndexProvider.Descriptor( "K", "X.Y" ) ); + final StoreIndexDescriptor rule = indexRule( 0, 1, 2, new IndexProvider.Descriptor( "K", "X.Y" ) ); final Command.SchemaRuleCommand command = new Command.SchemaRuleCommand( Collections.emptyList(), recordsAfter, rule ); @@ -584,7 +584,7 @@ public void shouldApplyCreateIndexRuleSchemaRuleCommandToTheStoreInRecovery() th final DynamicRecord record = DynamicRecord.dynamicRecord( 21, true ); record.setCreated(); final Collection recordsAfter = singletonList( record ); - final IndexDescriptor rule = indexRule( 0, 1, 2, new IndexProvider.Descriptor( "K", "X.Y" ) ); + final StoreIndexDescriptor rule = indexRule( 0, 1, 2, new IndexProvider.Descriptor( "K", "X.Y" ) ); final Command.SchemaRuleCommand command = new Command.SchemaRuleCommand( Collections.emptyList(), recordsAfter, rule ); @@ -607,7 +607,7 @@ public void shouldApplyUpdateIndexRuleSchemaRuleCommandToTheStore() throws Excep final BatchTransactionApplier applier = newApplierFacade( newIndexApplier(), newApplier( false ) ); final DynamicRecord record = DynamicRecord.dynamicRecord( 21, true ); final Collection recordsAfter = singletonList( record ); - final IndexDescriptor rule = + final StoreIndexDescriptor rule = constraintIndexRule( 0, 1, 2, new IndexProvider.Descriptor( "K", "X.Y" ), 42L ); final Command.SchemaRuleCommand command = new Command.SchemaRuleCommand( Collections.emptyList(), recordsAfter, rule ); @@ -630,7 +630,7 @@ public void shouldApplyUpdateIndexRuleSchemaRuleCommandToTheStoreInRecovery() th final BatchTransactionApplier applier = newApplierFacade( newIndexApplier(), newApplier( true ) ); final DynamicRecord record = DynamicRecord.dynamicRecord( 21, true ); final Collection recordsAfter = singletonList( record ); - final IndexDescriptor rule = + final StoreIndexDescriptor rule = constraintIndexRule( 0, 1, 2, new IndexProvider.Descriptor( "K", "X.Y" ), 42L ); final Command.SchemaRuleCommand command = new Command.SchemaRuleCommand( Collections.emptyList(), recordsAfter, rule ); @@ -658,7 +658,7 @@ public void shouldApplyUpdateIndexRuleSchemaRuleCommandToTheStoreThrowingIndexPr final DynamicRecord record = DynamicRecord.dynamicRecord( 21, true ); final Collection recordsAfter = singletonList( record ); - final IndexDescriptor rule = + final StoreIndexDescriptor rule = constraintIndexRule( 0, 1, 2, new IndexProvider.Descriptor( "K", "X.Y" ), 42L ); final Command.SchemaRuleCommand command = new Command.SchemaRuleCommand( Collections.emptyList(), recordsAfter, rule ); @@ -686,7 +686,7 @@ public void shouldApplyDeleteIndexRuleSchemaRuleCommandToTheStore() throws Excep final DynamicRecord record = DynamicRecord.dynamicRecord( 21, true ); record.setInUse( false ); final Collection recordsAfter = singletonList( record ); - final IndexDescriptor rule = indexRule( 0, 1, 2, new IndexProvider.Descriptor( "K", "X.Y" ) ); + final StoreIndexDescriptor rule = indexRule( 0, 1, 2, new IndexProvider.Descriptor( "K", "X.Y" ) ); final Command.SchemaRuleCommand command = new Command.SchemaRuleCommand( Collections.emptyList(), recordsAfter, rule ); @@ -709,7 +709,7 @@ public void shouldApplyDeleteIndexRuleSchemaRuleCommandToTheStoreInRecovery() th final DynamicRecord record = DynamicRecord.dynamicRecord( 21, true ); record.setInUse( false ); final Collection recordsAfter = singletonList( record ); - final IndexDescriptor rule = indexRule( 0, 1, 2, new IndexProvider.Descriptor( "K", "X.Y" ) ); + final StoreIndexDescriptor rule = indexRule( 0, 1, 2, new IndexProvider.Descriptor( "K", "X.Y" ) ); final Command.SchemaRuleCommand command = new Command.SchemaRuleCommand( Collections.emptyList(), recordsAfter, rule ); @@ -929,19 +929,19 @@ private BatchTransactionApplier newIndexApplier() // SCHEMA RULE COMMAND - public static IndexDescriptor indexRule( long id, int label, int propertyKeyId, - IndexProvider.Descriptor providerDescriptor ) + public static StoreIndexDescriptor indexRule( long id, int label, int propertyKeyId, + IndexProvider.Descriptor providerDescriptor ) { //TODO: Consider testing composite indexes - return IndexDescriptor.indexRule( id, IndexDescriptorFactory.forLabel( label, propertyKeyId ), - providerDescriptor ); + return StoreIndexDescriptor.indexRule( id, IndexDescriptorFactory.forLabel( label, propertyKeyId ), + providerDescriptor ); } - private static IndexDescriptor constraintIndexRule( long id, int label, int propertyKeyId, - IndexProvider.Descriptor providerDescriptor, Long owningConstraint ) + private static StoreIndexDescriptor constraintIndexRule( long id, int label, int propertyKeyId, + IndexProvider.Descriptor providerDescriptor, Long owningConstraint ) { //TODO: Consider testing composite indexes - return IndexDescriptor + return StoreIndexDescriptor .constraintIndexRule( id, IndexDescriptorFactory.uniqueForLabel( label, propertyKeyId ), providerDescriptor, owningConstraint ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/NeoTransactionIndexApplierTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/NeoTransactionIndexApplierTest.java index ad7c310c61e53..dc26c3d143388 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/NeoTransactionIndexApplierTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/NeoTransactionIndexApplierTest.java @@ -38,7 +38,7 @@ import org.neo4j.kernel.impl.store.NodeStore; import org.neo4j.kernel.impl.store.PropertyStore; import org.neo4j.kernel.impl.store.record.DynamicRecord; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.util.concurrent.WorkSync; @@ -106,7 +106,7 @@ labelScanStoreSynchronizer, indexUpdatesSync, mock( NodeStore.class ), public void shouldCreateIndexGivenCreateSchemaRuleCommand() throws Exception { // Given - final IndexDescriptor indexRule = indexRule( 1, 42, 42, INDEX_DESCRIPTOR ); + final StoreIndexDescriptor indexRule = indexRule( 1, 42, 42, INDEX_DESCRIPTOR ); final IndexBatchTransactionApplier applier = newIndexTransactionApplier(); @@ -125,9 +125,9 @@ public void shouldCreateIndexGivenCreateSchemaRuleCommand() throws Exception verify( indexingService ).createIndexes( indexRule ); } - private IndexDescriptor indexRule( long ruleId, int labelId, int propertyId, Descriptor descriptor ) + private StoreIndexDescriptor indexRule( long ruleId, int labelId, int propertyId, Descriptor descriptor ) { - return IndexDescriptor + return StoreIndexDescriptor .indexRule( ruleId, IndexDescriptorFactory.forLabel( labelId, propertyId ), descriptor ); } @@ -135,7 +135,7 @@ private IndexDescriptor indexRule( long ruleId, int labelId, int propertyId, Des public void shouldDropIndexGivenDropSchemaRuleCommand() throws Exception { // Given - final IndexDescriptor indexRule = indexRule( 1, 42, 42, INDEX_DESCRIPTOR ); + final StoreIndexDescriptor indexRule = indexRule( 1, 42, 42, INDEX_DESCRIPTOR ); final IndexBatchTransactionApplier applier = newIndexTransactionApplier(); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/LogTruncationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/LogTruncationTest.java index 55ef6af1f45df..897e96219cb15 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/LogTruncationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/LogTruncationTest.java @@ -40,7 +40,7 @@ import org.neo4j.kernel.impl.index.IndexDefineCommand; import org.neo4j.kernel.impl.index.IndexEntityType; import org.neo4j.kernel.impl.store.record.DynamicRecord; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.store.record.LabelTokenRecord; import org.neo4j.kernel.impl.store.record.NeoStoreRecord; import org.neo4j.kernel.impl.store.record.NodeRecord; @@ -98,8 +98,8 @@ public class LogTruncationTest permutations.put( Command.SchemaRuleCommand.class, new Command[] { new Command.SchemaRuleCommand( singletonList( dynamicRecord( 1L, false, true, -1L, 1, "hello".getBytes() ) ), singletonList( dynamicRecord( 1L, true, true, -1L, 1, "hello".getBytes() ) ), - IndexDescriptor.indexRule( 1, IndexDescriptorFactory.forLabel( 3, 4 ), - new IndexProvider.Descriptor( "1", "2" ) ) ) } ); + StoreIndexDescriptor.indexRule( 1, IndexDescriptorFactory.forLabel( 3, 4 ), + new IndexProvider.Descriptor( "1", "2" ) ) ) } ); permutations .put( Command.RelationshipTypeTokenCommand.class, new Command[] { new Command.RelationshipTypeTokenCommand( diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/SchemaRuleCommandTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/SchemaRuleCommandTest.java index b20aea97ac2b0..f04d71353bf84 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/SchemaRuleCommandTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/SchemaRuleCommandTest.java @@ -42,7 +42,7 @@ import org.neo4j.kernel.impl.store.SchemaStore; import org.neo4j.kernel.impl.store.record.ConstraintRule; import org.neo4j.kernel.impl.store.record.DynamicRecord; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.store.record.SchemaRecord; import org.neo4j.kernel.impl.store.record.SchemaRuleSerialization; import org.neo4j.kernel.impl.transaction.command.BaseCommandReader; @@ -92,9 +92,9 @@ public class SchemaRuleCommandTest labelScanStoreSynchronizer, indexUpdatesSync, mock( NodeStore.class ), new PropertyPhysicalToLogicalConverter( propertyStore ) ); private final BaseCommandReader reader = new PhysicalLogCommandReaderV3_0_2(); - private final IndexDescriptor - rule = IndexDescriptor.indexRule( id, IndexDescriptorFactory.forLabel( labelId, propertyKey ), - PROVIDER_DESCRIPTOR ); + private final StoreIndexDescriptor + rule = StoreIndexDescriptor.indexRule( id, IndexDescriptorFactory.forLabel( labelId, propertyKey ), + PROVIDER_DESCRIPTOR ); @Test public void shouldWriteCreatedSchemaRuleToStore() throws Exception diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordStateTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordStateTest.java index 91cfa83c027ba..229cd77af227f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordStateTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordStateTest.java @@ -107,7 +107,7 @@ import static org.neo4j.kernel.api.schema.index.IndexDescriptorFactory.forLabel; import static org.neo4j.kernel.impl.api.index.TestIndexProviderDescriptor.PROVIDER_DESCRIPTOR; import static org.neo4j.kernel.impl.store.record.ConstraintRule.constraintRule; -import static org.neo4j.kernel.api.schema.index.IndexDescriptor.indexRule; +import static org.neo4j.kernel.api.schema.index.StoreIndexDescriptor.indexRule; import static org.neo4j.kernel.impl.store.record.RecordLoad.FORCE; import static org.neo4j.kernel.impl.store.record.RecordLoad.NORMAL; diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInsertTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInsertTest.java index 71e12f7aa3d5d..9511851fe351c 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInsertTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInsertTest.java @@ -83,7 +83,7 @@ import org.neo4j.kernel.impl.store.SchemaStore; import org.neo4j.kernel.impl.store.record.ConstraintRule; import org.neo4j.kernel.impl.store.record.DynamicRecord; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.kernel.impl.store.record.RecordLoad; import org.neo4j.kernel.internal.GraphDatabaseAPI; @@ -796,17 +796,17 @@ public void shouldCreateConsistentUniquenessConstraint() throws Exception assertEquals( "records in use", 2, inUse.size() ); SchemaRule rule0 = storage.loadSingleSchemaRule( inUse.get( 0 ) ); SchemaRule rule1 = storage.loadSingleSchemaRule( inUse.get( 1 ) ); - IndexDescriptor indexRule; + StoreIndexDescriptor indexRule; ConstraintRule constraintRule; - if ( rule0 instanceof IndexDescriptor ) + if ( rule0 instanceof StoreIndexDescriptor ) { - indexRule = (IndexDescriptor) rule0; + indexRule = (StoreIndexDescriptor) rule0; constraintRule = (ConstraintRule) rule1; } else { constraintRule = (ConstraintRule) rule0; - indexRule = (IndexDescriptor) rule1; + indexRule = (StoreIndexDescriptor) rule1; } assertEquals( "index should reference constraint", constraintRule.getId(), indexRule.getOwningConstraint().longValue() ); @@ -911,7 +911,7 @@ public void shouldRunIndexPopulationJobAtShutdown() throws Throwable IndexProvider provider = mock( IndexProvider.class ); when( provider.getProviderDescriptor() ).thenReturn( InMemoryIndexProviderFactory.PROVIDER_DESCRIPTOR ); - when( provider.getPopulator( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + when( provider.getPopulator( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( populator ); BatchInserter inserter = newBatchInserterWithIndexProvider( @@ -927,7 +927,7 @@ public void shouldRunIndexPopulationJobAtShutdown() throws Throwable // THEN verify( provider ).init(); verify( provider ).start(); - verify( provider ).getPopulator( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ); + verify( provider ).getPopulator( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ); verify( populator ).create(); verify( populator ).add( argThat( matchesCollection( add( nodeId, internalIndex.schema(), Values.of( "Jakewins" ) ) ) ) ); @@ -946,7 +946,7 @@ public void shouldRunConstraintPopulationJobAtShutdown() throws Throwable IndexProvider provider = mock( IndexProvider.class ); when( provider.getProviderDescriptor() ).thenReturn( InMemoryIndexProviderFactory.PROVIDER_DESCRIPTOR ); - when( provider.getPopulator( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + when( provider.getPopulator( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( populator ); BatchInserter inserter = newBatchInserterWithIndexProvider( @@ -962,7 +962,7 @@ public void shouldRunConstraintPopulationJobAtShutdown() throws Throwable // THEN verify( provider ).init(); verify( provider ).start(); - verify( provider ).getPopulator( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ); + verify( provider ).getPopulator( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ); verify( populator ).create(); verify( populator ).add( argThat( matchesCollection( add( nodeId, internalUniqueIndex.schema(), Values.of( "Jakewins" ) ) ) ) ); verify( populator ).verifyDeferredConstraints( any( PropertyAccessor.class ) ); @@ -982,7 +982,7 @@ public void shouldRepopulatePreexistingIndexed() throws Throwable IndexProvider provider = mock( IndexProvider.class ); when( provider.getProviderDescriptor() ).thenReturn( InMemoryIndexProviderFactory.PROVIDER_DESCRIPTOR ); - when( provider.getPopulator( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + when( provider.getPopulator( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( populator ); BatchInserter inserter = newBatchInserterWithIndexProvider( @@ -996,7 +996,7 @@ public void shouldRepopulatePreexistingIndexed() throws Throwable // THEN verify( provider ).init(); verify( provider ).start(); - verify( provider ).getPopulator( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ); + verify( provider ).getPopulator( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ); verify( populator ).create(); verify( populator ).add( argThat( matchesCollection( add( jakewins, internalIndex.schema(), Values.of( "Jakewins" ) ), @@ -1461,7 +1461,7 @@ private long dbWithIndexAndSingleIndexedNode() throws Exception IndexProvider provider = mock( IndexProvider.class ); when( provider.getProviderDescriptor() ).thenReturn( InMemoryIndexProviderFactory.PROVIDER_DESCRIPTOR ); - when( provider.getPopulator( any( IndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) + when( provider.getPopulator( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) ) ) .thenReturn( populator ); BatchInserter inserter = newBatchInserterWithIndexProvider( diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProvider.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProvider.java index 33e64dbd74520..302a2e29cc97d 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProvider.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProvider.java @@ -36,7 +36,7 @@ import org.neo4j.kernel.api.index.IndexDirectoryStructure; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; @@ -82,7 +82,7 @@ protected IndexStorageFactory buildIndexStorageFactory( FileSystemAbstraction fi } @Override - public IndexPopulator getPopulator( IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) + public IndexPopulator getPopulator( StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { SchemaIndex luceneIndex = LuceneSchemaIndexBuilder.create( descriptor, config ) .withFileSystem( fileSystem ) @@ -106,7 +106,7 @@ public IndexPopulator getPopulator( IndexDescriptor descriptor, IndexSamplingCon } @Override - public IndexAccessor getOnlineAccessor( IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException + public IndexAccessor getOnlineAccessor( StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException { SchemaIndex luceneIndex = LuceneSchemaIndexBuilder.create( descriptor, config ) .withOperationalMode( operationalMode ) @@ -123,7 +123,7 @@ public void shutdown() } @Override - public InternalIndexState getInitialState( IndexDescriptor descriptor ) + public InternalIndexState getInitialState( StoreIndexDescriptor descriptor ) { PartitionedIndexStorage indexStorage = getIndexStorage( descriptor.getId() ); String failure = indexStorage.getStoredIndexFailure(); @@ -155,7 +155,7 @@ public StoreMigrationParticipant storeMigrationParticipant( final FileSystemAbst } @Override - public String getPopulationFailure( IndexDescriptor descriptor ) throws IllegalStateException + public String getPopulationFailure( StoreIndexDescriptor descriptor ) throws IllegalStateException { String failure = getIndexStorage( descriptor.getId() ).getStoredIndexFailure(); if ( failure == null ) diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/explicit/NonUniqueIndexTest.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/explicit/NonUniqueIndexTest.java index 6d09feb159e99..32ea375b5db01 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/explicit/NonUniqueIndexTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/explicit/NonUniqueIndexTest.java @@ -41,7 +41,7 @@ import org.neo4j.kernel.api.impl.schema.NativeLuceneFusionIndexProviderFactory20; import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; @@ -167,7 +167,7 @@ private List nodeIdsInIndex( Config config, int indexId, String value ) th IndexProvider indexProvider = selectIndexProvider( pageCache, storeDir, fs, monitor, config, operationalMode ); IndexSamplingConfig samplingConfig = new IndexSamplingConfig( config ); try ( IndexAccessor accessor = indexProvider.getOnlineAccessor( - IndexDescriptor.indexRule( indexId, IndexDescriptorFactory.forLabel( 0, 0 ), indexProvider.getProviderDescriptor() ), samplingConfig ); + StoreIndexDescriptor.indexRule( indexId, IndexDescriptorFactory.forLabel( 0, 0 ), indexProvider.getProviderDescriptor() ), samplingConfig ); IndexReader reader = accessor.newReader() ) { return PrimitiveLongCollections.asList( reader.query( IndexQuery.exact( 1, value ) ) ); diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderTest.java index e798d3573b081..893af26567257 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderTest.java @@ -33,7 +33,7 @@ import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.configuration.Settings; @@ -60,7 +60,8 @@ public class LuceneIndexProviderTest private File graphDbDir; private FileSystemAbstraction fs; - private static final IndexDescriptor descriptor = IndexDescriptor.indexRule( 1, IndexDescriptorFactory.forLabel( 1, 1 ), PROVIDER_DESCRIPTOR ); + private static final StoreIndexDescriptor + descriptor = StoreIndexDescriptor.indexRule( 1, IndexDescriptorFactory.forLabel( 1, 1 ), PROVIDER_DESCRIPTOR ); @Before public void setup() diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java index 71fb1a37869bf..9038dd3affe03 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java @@ -37,7 +37,7 @@ import org.neo4j.internal.kernel.api.InternalIndexState; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.spi.KernelContext; import org.neo4j.kernel.impl.transaction.log.checkpoint.CheckPointer; @@ -318,7 +318,7 @@ public Lifecycle newInstance( KernelContext context, LuceneIndexProviderFactory. IndexProvider.Monitor.EMPTY, dependencies.getConfig(), context.databaseInfo().operationalMode ) { @Override - public InternalIndexState getInitialState( IndexDescriptor descriptor ) + public InternalIndexState getInitialState( StoreIndexDescriptor descriptor ) { return InternalIndexState.POPULATING; } diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexCorruptionTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexCorruptionTest.java index 5b6277be914d8..c3f8123d01021 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexCorruptionTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexCorruptionTest.java @@ -39,7 +39,7 @@ import org.neo4j.kernel.api.index.IndexDirectoryStructure; import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.index.LoggingMonitor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.factory.OperationalMode; @@ -76,7 +76,8 @@ public void shouldRequestIndexPopulationIfTheIndexIsCorrupt() LuceneIndexProvider provider = newFaultyIndexProvider( faultyIndexId, error ); // When - IndexDescriptor descriptor = IndexDescriptor.indexRule( faultyIndexId, IndexDescriptorFactory.forLabel( 1, 1 ), provider.getProviderDescriptor() ); + StoreIndexDescriptor descriptor = StoreIndexDescriptor + .indexRule( faultyIndexId, IndexDescriptorFactory.forLabel( 1, 1 ), provider.getProviderDescriptor() ); InternalIndexState initialState = provider.getInitialState( descriptor ); // Then @@ -94,7 +95,8 @@ public void shouldRequestIndexPopulationFailingWithFileNotFoundException() LuceneIndexProvider provider = newFaultyIndexProvider( faultyIndexId, error ); // When - IndexDescriptor descriptor = IndexDescriptor.indexRule( faultyIndexId, IndexDescriptorFactory.forLabel( 1, 1 ), provider.getProviderDescriptor() ); + StoreIndexDescriptor descriptor = StoreIndexDescriptor + .indexRule( faultyIndexId, IndexDescriptorFactory.forLabel( 1, 1 ), provider.getProviderDescriptor() ); InternalIndexState initialState = provider.getInitialState( descriptor ); // Then @@ -112,7 +114,8 @@ public void shouldRequestIndexPopulationWhenFailingWithEOFException() LuceneIndexProvider provider = newFaultyIndexProvider( faultyIndexId, error ); // When - IndexDescriptor descriptor = IndexDescriptor.indexRule( faultyIndexId, IndexDescriptorFactory.forLabel( 1, 1 ), provider.getProviderDescriptor() ); + StoreIndexDescriptor descriptor = StoreIndexDescriptor + .indexRule( faultyIndexId, IndexDescriptorFactory.forLabel( 1, 1 ), provider.getProviderDescriptor() ); InternalIndexState initialState = provider.getInitialState( descriptor ); // Then diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexPopulatorTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexPopulatorTest.java index a50485631a213..76207f3e7106d 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexPopulatorTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexPopulatorTest.java @@ -44,7 +44,7 @@ import org.neo4j.kernel.api.index.IndexQueryHelper; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.IndexStoreView; @@ -77,7 +77,7 @@ public class LuceneSchemaIndexPopulatorTest private IndexReader reader; private IndexSearcher searcher; private static final int propertyKeyId = 666; - private IndexDescriptor index; + private StoreIndexDescriptor index; @Before public void before() throws Exception @@ -89,7 +89,7 @@ public void before() throws Exception IndexProvider.Monitor.EMPTY, Config.defaults(), OperationalMode.single ); indexStoreView = mock( IndexStoreView.class ); IndexSamplingConfig samplingConfig = new IndexSamplingConfig( Config.defaults() ); - index = IndexDescriptor.indexRule( 0, IndexDescriptorFactory.forLabel( 42, propertyKeyId ), provider.getProviderDescriptor() ); + index = StoreIndexDescriptor.indexRule( 0, IndexDescriptorFactory.forLabel( 42, propertyKeyId ), provider.getProviderDescriptor() ); indexPopulator = provider.getPopulator( index, samplingConfig ); indexPopulator.create(); } 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 fded40c90910d..b0b0e34a0c13a 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 @@ -55,7 +55,7 @@ import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.kernel.impl.store.SchemaStore; import org.neo4j.kernel.impl.store.UnderlyingStorageException; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.storageengine.api.schema.PopulationProgress; import org.neo4j.test.TestGraphDatabaseFactory; @@ -129,7 +129,7 @@ public void testManualIndexPopulation() throws IOException, IndexNotFoundKernelE int foodId = labelTokenHolder.getIdByName( FOOD_LABEL ); int propertyId = propertyKeyTokenHolder.getIdByName( PROPERTY_NAME ); - IndexDescriptor rule = IndexDescriptor.indexRule( + StoreIndexDescriptor rule = StoreIndexDescriptor.indexRule( schemaStore.nextId(), IndexDescriptorFactory.forLabel( foodId, propertyId ), indexDescriptor ); indexingService.createIndexes( rule ); IndexProxy indexProxy = indexingService.getIndexProxy( rule.getId() ); diff --git a/community/neo4j/src/test/java/migration/StartOldDbOn3_4AndCreateFusionIndexIT.java b/community/neo4j/src/test/java/migration/StartOldDbOn3_4AndCreateFusionIndexIT.java index fa1fc9ba2d859..975ff01082ad3 100644 --- a/community/neo4j/src/test/java/migration/StartOldDbOn3_4AndCreateFusionIndexIT.java +++ b/community/neo4j/src/test/java/migration/StartOldDbOn3_4AndCreateFusionIndexIT.java @@ -52,7 +52,7 @@ import org.neo4j.kernel.api.impl.schema.NativeLuceneFusionIndexProviderFactory10; import org.neo4j.kernel.api.impl.schema.NativeLuceneFusionIndexProviderFactory20; import org.neo4j.kernel.api.index.IndexProvider; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; import org.neo4j.kernel.configuration.Settings; import org.neo4j.kernel.impl.api.index.IndexingService; @@ -436,7 +436,7 @@ private class IndexRecoveryTracker extends IndexingService.MonitorAdapter Map initialStateMap = new HashMap<>(); @Override - public void initialState( IndexDescriptor descriptor, InternalIndexState state ) + public void initialState( StoreIndexDescriptor descriptor, InternalIndexState state ) { initialStateMap.put( descriptor, state ); } diff --git a/community/neo4j/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java b/community/neo4j/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java index 864f4b9868330..3ca981779f03b 100644 --- a/community/neo4j/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java +++ b/community/neo4j/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java @@ -80,7 +80,7 @@ import org.neo4j.kernel.impl.store.NodeStore; import org.neo4j.kernel.impl.store.PropertyStore; import org.neo4j.kernel.impl.store.SchemaStorage; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.transaction.state.DirectIndexUpdates; import org.neo4j.kernel.impl.transaction.state.storeview.DynamicIndexStoreView; import org.neo4j.kernel.impl.transaction.state.storeview.LabelScanViewNodeStoreScan; @@ -114,7 +114,7 @@ public class MultiIndexPopulationConcurrentUpdatesIT @Rule public EmbeddedDatabaseRule embeddedDatabase = new EmbeddedDatabaseRule(); - private IndexDescriptor[] rules; + private StoreIndexDescriptor[] rules; @Parameterized.Parameters( name = "{0}" ) public static Collection parameters() @@ -382,15 +382,15 @@ private void waitIndexOnline( IndexingService indexService, int propertyId, int indexProxy.activate(); } - private IndexDescriptor[] createIndexRules( Map labelNameIdMap, int propertyId ) + private StoreIndexDescriptor[] createIndexRules( Map labelNameIdMap, int propertyId ) { return labelNameIdMap.values().stream() - .map( index -> IndexDescriptor + .map( index -> StoreIndexDescriptor .indexRule( index, IndexDescriptorFactory.forLabel( index, propertyId ), indexDescriptor ) ) - .toArray( IndexDescriptor[]::new ); + .toArray( StoreIndexDescriptor[]::new ); } - private List getIndexRules( NeoStores neoStores ) + private List getIndexRules( NeoStores neoStores ) { return Iterators.asList( new SchemaStorage( neoStores.getSchemaStore() ).indexesGetAll() ); } @@ -659,13 +659,13 @@ public void run() { org.neo4j.kernel.api.schema.LabelSchemaDescriptor descriptor = SchemaDescriptorFactory.forLabel( labelIdToDropIndexFor, propertyId ); - IndexDescriptor rule = findRuleForLabel( descriptor ); + StoreIndexDescriptor rule = findRuleForLabel( descriptor ); indexService.dropIndex( rule ); } - private IndexDescriptor findRuleForLabel( LabelSchemaDescriptor schemaDescriptor ) + private StoreIndexDescriptor findRuleForLabel( LabelSchemaDescriptor schemaDescriptor ) { - for ( IndexDescriptor rule : rules ) + for ( StoreIndexDescriptor rule : rules ) { if ( rule.schema().equals( schemaDescriptor ) ) { 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 1a43a9a1b1476..41a680de20d4d 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 @@ -62,7 +62,7 @@ import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.ha.HighlyAvailableGraphDatabase; @@ -504,20 +504,20 @@ private static class ControlledIndexProvider extends IndexProvider } @Override - public IndexPopulator getPopulator( IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) + public IndexPopulator getPopulator( StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) { IndexPopulator populator = delegate.getPopulator( descriptor, samplingConfig ); return new ControlledIndexPopulator( populator, latch ); } @Override - public IndexAccessor getOnlineAccessor( IndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException + public IndexAccessor getOnlineAccessor( StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig ) throws IOException { return delegate.getOnlineAccessor( descriptor, samplingConfig ); } @Override - public InternalIndexState getInitialState( IndexDescriptor descriptor ) + public InternalIndexState getInitialState( StoreIndexDescriptor descriptor ) { return delegate.getInitialState( descriptor ); } @@ -535,7 +535,7 @@ public StoreMigrationParticipant storeMigrationParticipant( FileSystemAbstractio } @Override - public String getPopulationFailure( IndexDescriptor descriptor ) throws IllegalStateException + public String getPopulationFailure( StoreIndexDescriptor descriptor ) throws IllegalStateException { return delegate.getPopulationFailure( descriptor ); } diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintCreationIT.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintCreationIT.java index 55883df4013ae..121819774bbb6 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintCreationIT.java +++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintCreationIT.java @@ -30,7 +30,6 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.ResourceIterator; -import org.neo4j.internal.kernel.api.IndexReference; import org.neo4j.internal.kernel.api.SchemaWrite; import org.neo4j.internal.kernel.api.TokenNameLookup; import org.neo4j.internal.kernel.api.TokenWrite; @@ -55,7 +54,7 @@ import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.kernel.impl.store.SchemaStorage; import org.neo4j.kernel.impl.store.record.ConstraintRule; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.values.storable.Values; import static java.util.Collections.emptySet; @@ -253,7 +252,7 @@ public void committedConstraintRuleShouldCrossReferenceTheCorrespondingIndexRule // then SchemaStorage schema = new SchemaStorage( neoStores().getSchemaStore() ); - IndexDescriptor indexRule = schema.indexGetForSchema( IndexDescriptorFactory + StoreIndexDescriptor indexRule = schema.indexGetForSchema( IndexDescriptorFactory .uniqueForLabel( typeId, propertyKeyId ) ); ConstraintRule constraintRule = schema.constraintsGetSingle( ConstraintDescriptorFactory.uniqueForLabel( typeId, propertyKeyId ) ); diff --git a/tools/src/main/java/org/neo4j/tools/dump/DumpCountsStore.java b/tools/src/main/java/org/neo4j/tools/dump/DumpCountsStore.java index 2641df68b5a45..680cc71ac5f38 100644 --- a/tools/src/main/java/org/neo4j/tools/dump/DumpCountsStore.java +++ b/tools/src/main/java/org/neo4j/tools/dump/DumpCountsStore.java @@ -51,7 +51,7 @@ import org.neo4j.kernel.impl.store.kvstore.MetadataVisitor; import org.neo4j.kernel.impl.store.kvstore.ReadableBuffer; import org.neo4j.kernel.impl.store.kvstore.UnknownKey; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.lifecycle.Lifespan; import org.neo4j.logging.LogProvider; import org.neo4j.logging.NullLogProvider; @@ -261,10 +261,10 @@ private static List allTokensFrom( TokenStore getAllIndexesFrom( SchemaStorage storage ) { HashMap indexes = new HashMap<>(); - Iterator indexRules = storage.indexesGetAll(); + Iterator indexRules = storage.indexesGetAll(); while ( indexRules.hasNext() ) { - IndexDescriptor rule = indexRules.next(); + StoreIndexDescriptor rule = indexRules.next(); indexes.put( rule.getId(), rule ); } return indexes; diff --git a/tools/src/test/java/org/neo4j/tools/dump/DumpCountsStoreTest.java b/tools/src/test/java/org/neo4j/tools/dump/DumpCountsStoreTest.java index 6fa875b356d84..1b83eeb9096c5 100644 --- a/tools/src/test/java/org/neo4j/tools/dump/DumpCountsStoreTest.java +++ b/tools/src/test/java/org/neo4j/tools/dump/DumpCountsStoreTest.java @@ -45,7 +45,7 @@ import org.neo4j.kernel.impl.store.kvstore.Headers; import org.neo4j.kernel.impl.store.kvstore.ReadableBuffer; import org.neo4j.kernel.impl.store.kvstore.WritableBuffer; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.storageengine.api.Token; import org.neo4j.test.rule.SuppressOutput; @@ -157,8 +157,8 @@ private SchemaStorage createSchemaStorage() { SchemaStorage schemaStorage = mock(SchemaStorage.class); IndexProvider.Descriptor providerDescriptor = new IndexProvider.Descriptor( "in-memory", "1.0" ); - IndexDescriptor rule = IndexDescriptor.indexRule( indexId, descriptor, providerDescriptor ); - ArrayList rules = new ArrayList<>(); + StoreIndexDescriptor rule = StoreIndexDescriptor.indexRule( indexId, descriptor, providerDescriptor ); + ArrayList rules = new ArrayList<>(); rules.add( rule ); when( schemaStorage.indexesGetAll() ).thenReturn( rules.iterator() ); diff --git a/tools/src/test/java/org/neo4j/tools/dump/InconsistencyReportReaderTest.java b/tools/src/test/java/org/neo4j/tools/dump/InconsistencyReportReaderTest.java index 9485ea6805f8c..bffb9c62df22f 100644 --- a/tools/src/test/java/org/neo4j/tools/dump/InconsistencyReportReaderTest.java +++ b/tools/src/test/java/org/neo4j/tools/dump/InconsistencyReportReaderTest.java @@ -33,7 +33,7 @@ import org.neo4j.consistency.store.synthetic.IndexEntry; import org.neo4j.kernel.api.index.IndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.kernel.impl.store.record.PropertyRecord; import org.neo4j.kernel.impl.store.record.RelationshipGroupRecord; @@ -69,8 +69,8 @@ public void shouldReadBasicEntities() throws Exception "Some error", "something" ); logger.error( RecordType.INDEX, new IndexEntry( indexNodeId ), "Some index error", "Something wrong with index" ); logger.error( RecordType.NODE, new NodeRecord( nodeNotInTheIndexId ), "Some index error", - IndexDescriptor.indexRule( indexId, IndexDescriptorFactory.forLabel( 1, 2 ), - new IndexProvider.Descriptor( "key", "version" ) ).toString() ); + StoreIndexDescriptor.indexRule( indexId, IndexDescriptorFactory.forLabel( 1, 2 ), + new IndexProvider.Descriptor( "key", "version" ) ).toString() ); String text = out.toString(); // WHEN