diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundPlanContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundPlanContext.scala index 5ba273d513ecc..5d329108ec304 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundPlanContext.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundPlanContext.scala @@ -29,7 +29,6 @@ import org.neo4j.internal.kernel.api.exceptions.KernelException import org.neo4j.internal.kernel.api.{IndexReference, InternalIndexState} import org.neo4j.kernel.api.schema.SchemaDescriptorFactory import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor -import org.neo4j.kernel.api.schema.index.{IndexDescriptor => KernelIndexDescriptor} import org.neo4j.kernel.impl.transaction.log.TransactionIdStore import scala.collection.JavaConverters._ diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexPopulator.java index 3492de8b6b7d3..e59aa6fd5a3b1 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexPopulator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexPopulator.java @@ -24,7 +24,7 @@ import org.neo4j.internal.kernel.api.InternalIndexState; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.UpdateMode; import org.neo4j.kernel.impl.api.index.updater.SwallowingIndexUpdater; import org.neo4j.storageengine.api.schema.IndexSample; @@ -107,19 +107,19 @@ void add( Collection> updates ) * Close this populator and releases any resources related to it. * If {@code populationCompletedSuccessfully} is {@code true} then it must mark this index * as {@link InternalIndexState#ONLINE} so that future invocations of its parent - * {@link IndexProvider#getInitialState(long, IndexDescriptor)} also returns {@link InternalIndexState#ONLINE}. + * {@link IndexProvider#getInitialState(StoreIndexDescriptor)} also returns {@link InternalIndexState#ONLINE}. * * @param populationCompletedSuccessfully {@code true} if the index population was successful, where the index should * be marked as {@link InternalIndexState#ONLINE}, otherwise {@code false} where index should be marked as * {@link InternalIndexState#FAILED} and the failure, previously handed to this populator using {@link #markAsFailed(String)} - * should be stored and made available for later requests from {@link IndexProvider#getPopulationFailure(long, IndexDescriptor)}. + * should be stored and made available for later requests from {@link IndexProvider#getPopulationFailure(StoreIndexDescriptor)}. * @throws IOException on I/O error. */ void close( boolean populationCompletedSuccessfully ) throws IOException; /** * Called then a population failed. The failure string should be stored for future retrieval by - * {@link IndexProvider#getPopulationFailure(long, IndexDescriptor)}. Called before {@link #close(boolean)} + * {@link IndexProvider#getPopulationFailure(StoreIndexDescriptor)}. Called before {@link #close(boolean)} * if there was a failure during population. * * @param failure the description of the failure. 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 216218eb76e46..6d917947e0589 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 @@ -125,7 +125,7 @@ public interface Monitor void indexPopulationScanComplete(); - void awaitingPopulationOfRecoveredIndex( long indexId, IndexDescriptor descriptor ); + void awaitingPopulationOfRecoveredIndex( StoreIndexDescriptor descriptor ); } public static class MonitorAdapter implements Monitor @@ -151,7 +151,7 @@ public void indexPopulationScanComplete() } @Override - public void awaitingPopulationOfRecoveredIndex( long indexId, IndexDescriptor descriptor ) + public void awaitingPopulationOfRecoveredIndex( StoreIndexDescriptor descriptor ) { // Do nothing } } @@ -326,7 +326,7 @@ public void start() "What? This index was seen during recovery just now, why isn't it available now?", e ); } - monitor.awaitingPopulationOfRecoveredIndex( indexId, descriptor.getIndexDescriptor() ); + monitor.awaitingPopulationOfRecoveredIndex( descriptor.getIndexDescriptor() ); awaitOnline( proxy ); } ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingController.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingController.java index a72751209acab..6ea3d95d7193a 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingController.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingController.java @@ -26,7 +26,7 @@ import org.neo4j.collection.PrimitiveLongCollections; import org.neo4j.internal.kernel.api.InternalIndexState; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexMap; import org.neo4j.kernel.impl.api.index.IndexMapSnapshotProvider; import org.neo4j.kernel.impl.api.index.IndexProxy; @@ -92,7 +92,7 @@ public void recoverIndexSamples() while ( indexIds.hasNext() ) { long indexId = indexIds.next(); - if ( indexRecoveryCondition.test( indexId, indexMap.getIndexProxy( indexId ).getDescriptor() ) ) + if ( indexRecoveryCondition.test( indexMap.getIndexProxy( indexId ).getDescriptor() ) ) { sampleIndexOnCurrentThread( indexMap, indexId ); } @@ -106,7 +106,7 @@ public void recoverIndexSamples() public interface RecoveryCondition { - boolean test( long indexId, IndexDescriptor descriptor ); + boolean test( StoreIndexDescriptor descriptor ); } private void scheduleSampling( IndexSamplingMode mode, IndexMap indexMap ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingControllerFactory.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingControllerFactory.java index bcc8af3c921b2..3b150544ad8ae 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingControllerFactory.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingControllerFactory.java @@ -22,7 +22,7 @@ import java.util.function.Predicate; import org.neo4j.internal.kernel.api.TokenNameLookup; -import org.neo4j.kernel.api.schema.index.IndexDescriptor; +import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexMapSnapshotProvider; import org.neo4j.kernel.impl.api.index.IndexStoreView; import org.neo4j.scheduler.JobScheduler; @@ -92,9 +92,9 @@ private IndexSamplingController.RecoveryCondition createIndexRecoveryCondition( private final DoubleLongRegister register = newDoubleLongRegister(); @Override - public boolean test( long indexId, IndexDescriptor descriptor ) + public boolean test( StoreIndexDescriptor descriptor ) { - boolean result = storeView.indexSample( indexId, register ).readSecond() == 0; + boolean result = storeView.indexSample( descriptor.getId(), register ).readSecond() == 0; if ( result ) { log.debug( "Recovering index sampling for index %s", diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DeferredConflictCheckingIndexUpdater.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DeferredConflictCheckingIndexUpdater.java index 5e07d9da66a26..cdde83457c86f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DeferredConflictCheckingIndexUpdater.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DeferredConflictCheckingIndexUpdater.java @@ -62,14 +62,14 @@ public class DeferredConflictCheckingIndexUpdater implements IndexUpdater { private final IndexUpdater actual; private final Supplier readerSupplier; - private final IndexDescriptor schemaIndexDescriptor; + private final IndexDescriptor indexDescriptor; private final Set touchedTuples = new HashSet<>(); - public DeferredConflictCheckingIndexUpdater( IndexUpdater actual, Supplier readerSupplier, IndexDescriptor schemaIndexDescriptor ) + public DeferredConflictCheckingIndexUpdater( IndexUpdater actual, Supplier readerSupplier, IndexDescriptor indexDescriptor ) { this.actual = actual; this.readerSupplier = readerSupplier; - this.schemaIndexDescriptor = schemaIndexDescriptor; + this.indexDescriptor = indexDescriptor; } @Override @@ -113,7 +113,7 @@ public void close() throws IOException, IndexEntryConflictException private IndexQuery[] queryOf( ValueTuple tuple ) { IndexQuery[] predicates = new IndexQuery[tuple.size()]; - int[] propertyIds = schemaIndexDescriptor.schema().getPropertyIds(); + int[] propertyIds = indexDescriptor.schema().getPropertyIds(); for ( int i = 0; i < predicates.length; i++ ) { predicates[i] = exact( propertyIds[i], tuple.valueAt( i ) ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/AllStoreHolder.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/AllStoreHolder.java index d773779445d12..73cf835150366 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/AllStoreHolder.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/AllStoreHolder.java @@ -242,11 +242,8 @@ long graphPropertiesReference() @Override IndexReader indexReader( IndexReference index, boolean fresh ) throws IndexNotFoundKernelException { - IndexDescriptor schemaIndexDescriptor = index.isUnique() ? - IndexDescriptorFactory.uniqueForLabel( index.label(), index.properties() ) : - IndexDescriptorFactory.forLabel( index.label(), index.properties() ); - return fresh ? storageReader.getFreshIndexReader( schemaIndexDescriptor ) : - storageReader.getIndexReader( schemaIndexDescriptor ); + return fresh ? storageReader.getFreshIndexReader( (IndexDescriptor) index ) : + storageReader.getIndexReader( (IndexDescriptor) index ); } @Override @@ -559,14 +556,14 @@ Long indexGetOwningUniquenessConstraintId( IndexDescriptor index ) IndexDescriptor indexGetForSchema( SchemaDescriptor descriptor ) { IndexDescriptor indexDescriptor = storageReader.indexGetForSchema( descriptor ); - Iterator rules = iterator( indexDescriptor ); + Iterator indexes = iterator( indexDescriptor ); if ( ktx.hasTxStateWithChanges() ) { - rules = filter( + indexes = filter( SchemaDescriptor.equalTo( descriptor ), - ktx.txState().indexDiffSetsByLabel( descriptor.keyId() ).apply( rules ) ); + ktx.txState().indexDiffSetsByLabel( descriptor.keyId() ).apply( indexes ) ); } - return singleOrNull( rules ); + return singleOrNull( indexes ); } private boolean checkIndexState( IndexDescriptor index, ReadableDiffSets diffSet ) 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 4bd139fac4044..5f9e88a5c3c72 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 @@ -297,11 +297,11 @@ public Iterator indexesGetRelatedToProperty( int propert @Override public Long indexGetOwningUniquenessConstraintId( IndexDescriptor index ) { - StoreIndexDescriptor rule = indexRule( index ); - if ( rule != null ) + StoreIndexDescriptor storeIndexDescriptor = getStoreIndexDescriptor( index ); + if ( storeIndexDescriptor != null ) { // Think of the index as being orphaned if the owning constraint is missing or broken. - Long owningConstraint = rule.getOwningConstraint(); + Long owningConstraint = storeIndexDescriptor.getOwningConstraint(); return schemaCache.hasConstraintRule( owningConstraint ) ? owningConstraint : null; } return null; @@ -311,12 +311,12 @@ public Long indexGetOwningUniquenessConstraintId( IndexDescriptor index ) public long indexGetCommittedId( IndexDescriptor index ) throws SchemaRuleNotFoundException { - StoreIndexDescriptor rule = indexRule( index ); - if ( rule == null ) + StoreIndexDescriptor storeIndexDescriptor = getStoreIndexDescriptor( index ); + if ( storeIndexDescriptor == null ) { throw new SchemaRuleNotFoundException( SchemaRule.Kind.INDEX_RULE, index.schema() ); } - return rule.getId(); + return storeIndexDescriptor.getId(); } @Override @@ -671,13 +671,13 @@ public void degrees( NodeItem nodeItem, DegreeVisitor visitor ) } } - private StoreIndexDescriptor indexRule( IndexDescriptor index ) + private StoreIndexDescriptor getStoreIndexDescriptor( IndexDescriptor index ) { - for ( StoreIndexDescriptor rule : schemaCache.indexRules() ) + for ( StoreIndexDescriptor descriptor : schemaCache.indexRules() ) { - if ( rule.equals( index ) ) + if ( descriptor.equals( index ) ) { - return rule; + return descriptor; } } 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 5993b6e25b7e2..afc6ad73bb733 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 @@ -56,17 +56,17 @@ public SchemaStorage( RecordStore schemaStore ) */ public StoreIndexDescriptor indexGetForSchema( final IndexDescriptor descriptor ) { - Iterator rules = loadAllSchemaRules( descriptor::equals, StoreIndexDescriptor.class, false ); + Iterator indexes = loadAllSchemaRules( descriptor::equals, StoreIndexDescriptor.class, false ); StoreIndexDescriptor foundRule = null; - while ( rules.hasNext() ) + while ( indexes.hasNext() ) { - StoreIndexDescriptor candidate = rules.next(); + StoreIndexDescriptor candidate = indexes.next(); if ( foundRule != null ) { throw new IllegalStateException( String.format( - "Found more than one matching index rule, %s and %s", foundRule, candidate ) ); + "Found more than one matching index, %s and %s", foundRule, candidate ) ); } foundRule = candidate; } 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 91e4377adf891..413cdfb5e7ab0 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 @@ -120,21 +120,20 @@ public static SchemaRule deserialize( long id, ByteBuffer source ) throws Malfor /** * Serialize the provided IndexRule onto the target buffer * - * @param indexRule the IndexRule to serialize - * @throws IllegalStateException if the IndexRule is of type unique, but the owning constrain has not been set + * @param indexDescriptor the StoreIndexDescriptor to serialize + * @throws IllegalStateException if the StoreIndexDescriptor is of type unique, but the owning constrain has not been set */ - public static byte[] serialize( StoreIndexDescriptor indexRule ) + public static byte[] serialize( StoreIndexDescriptor indexDescriptor ) { - ByteBuffer target = ByteBuffer.allocate( lengthOf( indexRule ) ); + ByteBuffer target = ByteBuffer.allocate( lengthOf( indexDescriptor ) ); target.putInt( LEGACY_LABEL_OR_REL_TYPE_ID ); target.put( INDEX_RULE ); - IndexProvider.Descriptor providerDescriptor = indexRule.providerDescriptor(); + IndexProvider.Descriptor providerDescriptor = indexDescriptor.providerDescriptor(); UTF8.putEncodedStringInto( providerDescriptor.getKey(), target ); UTF8.putEncodedStringInto( providerDescriptor.getVersion(), target ); - IndexDescriptor schemaIndexDescriptor = indexRule; - switch ( schemaIndexDescriptor.type() ) + switch ( indexDescriptor.type() ) { case GENERAL: target.put( GENERAL_INDEX ); @@ -144,17 +143,17 @@ public static byte[] serialize( StoreIndexDescriptor indexRule ) target.put( UNIQUE_INDEX ); // The owning constraint can be null. See IndexRule.getOwningConstraint() - Long owningConstraint = indexRule.getOwningConstraint(); + Long owningConstraint = indexDescriptor.getOwningConstraint(); target.putLong( owningConstraint == null ? NO_OWNING_CONSTRAINT_YET : owningConstraint ); break; default: throw new UnsupportedOperationException( format( "Got unknown index descriptor type '%s'.", - schemaIndexDescriptor.type() ) ); + indexDescriptor.type() ) ); } - schemaIndexDescriptor.schema().processWith( new SchemaDescriptorSerializer( target ) ); - UTF8.putEncodedStringInto( indexRule.getName(), target ); + indexDescriptor.schema().processWith( new SchemaDescriptorSerializer( target ) ); + UTF8.putEncodedStringInto( indexDescriptor.getName(), target ); return target.array(); } @@ -198,27 +197,26 @@ public static byte[] serialize( ConstraintRule constraintRule ) /** * Compute the byte size needed to serialize the provided IndexRule using serialize. - * @param indexRule the IndexRule - * @return the byte size of indexRule + * @param indexDescriptor the StoreIndexDescriptor + * @return the byte size of StoreIndexDescriptor */ - public static int lengthOf( StoreIndexDescriptor indexRule ) + public static int lengthOf( StoreIndexDescriptor indexDescriptor ) { int length = 4; // legacy label or relType id length += 1; // schema rule type - IndexProvider.Descriptor providerDescriptor = indexRule.providerDescriptor(); + IndexProvider.Descriptor providerDescriptor = indexDescriptor.providerDescriptor(); length += UTF8.computeRequiredByteBufferSize( providerDescriptor.getKey() ); length += UTF8.computeRequiredByteBufferSize( providerDescriptor.getVersion() ); length += 1; // index type - IndexDescriptor schemaIndexDescriptor = indexRule; - if ( schemaIndexDescriptor.type() == IndexDescriptor.Type.UNIQUE ) + if ( indexDescriptor.type() == IndexDescriptor.Type.UNIQUE ) { length += 8; // owning constraint id } - length += schemaIndexDescriptor.schema().computeWith( schemaSizeComputer ); - length += UTF8.computeRequiredByteBufferSize( indexRule.getName() ); + length += indexDescriptor.schema().computeWith( schemaSizeComputer ); + length += UTF8.computeRequiredByteBufferSize( indexDescriptor.getName() ); return length; } 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 ec7de5b87e897..83364ca409fbc 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 @@ -599,18 +599,18 @@ public ConstraintCreator createDeferredConstraint( Label label ) return new BaseNodeConstraintCreator( new BatchSchemaActions(), label ); } - private void createUniqueIndexAndOwningConstraint( IndexDescriptor schemaIndexDescriptor, + private void createUniqueIndexAndOwningConstraint( IndexDescriptor indexDescriptor, IndexBackedConstraintDescriptor constraintDescriptor ) { // TODO: Do not create duplicate index - long indexRuleId = schemaStore.nextId(); + long indexId = schemaStore.nextId(); long constraintRuleId = schemaStore.nextId(); - StoreIndexDescriptor indexRule = + StoreIndexDescriptor storeIndexDescriptor = StoreIndexDescriptor.constraintIndexRule( - indexRuleId, - schemaIndexDescriptor, + indexId, + indexDescriptor, this.indexProviderMap.getDefaultProvider().getProviderDescriptor(), constraintRuleId ); @@ -618,7 +618,7 @@ private void createUniqueIndexAndOwningConstraint( IndexDescriptor schemaIndexDe ConstraintRule.constraintRule( constraintRuleId, constraintDescriptor, - indexRuleId + indexId ); for ( DynamicRecord record : schemaStore.allocateFrom( constraintRule ) ) @@ -626,11 +626,11 @@ private void createUniqueIndexAndOwningConstraint( IndexDescriptor schemaIndexDe schemaStore.updateRecord( record ); } schemaCache.addSchemaRule( constraintRule ); - for ( DynamicRecord record : schemaStore.allocateFrom( indexRule ) ) + for ( DynamicRecord record : schemaStore.allocateFrom( storeIndexDescriptor ) ) { schemaStore.updateRecord( record ); } - schemaCache.addSchemaRule( indexRule ); + schemaCache.addSchemaRule( storeIndexDescriptor ); labelsTouched = true; flushStrategy.forceFlush(); } 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 450b68deddbc3..05d1cb4680bdc 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 @@ -797,11 +797,11 @@ public void shouldWaitForRecoveredUniquenessConstraintIndexesToBeFullyPopulated( IndexingService.Monitor monitor = new IndexingService.MonitorAdapter() { @Override - public void awaitingPopulationOfRecoveredIndex( long index, IndexDescriptor descriptor ) + public void awaitingPopulationOfRecoveredIndex( StoreIndexDescriptor descriptor ) { // When we see that we start to await the index to populate, notify the slow-as-heck // populator that it can actually go and complete its job. - indexId.set( index ); + indexId.set( descriptor.getId() ); latch.startAndWaitForAllToStart(); } }; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingControllerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingControllerTest.java index e170c5d597322..b9bdc966b3cd3 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingControllerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingControllerTest.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.neo4j.function.Predicates; -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.IndexMap; import org.neo4j.kernel.impl.api.index.IndexMapSnapshotProvider; @@ -351,7 +351,7 @@ private static class Always implements IndexSamplingController.RecoveryCondition } @Override - public boolean test( long indexId, IndexDescriptor descriptor ) + public boolean test( StoreIndexDescriptor descriptor ) { return ans; } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingJobTrackerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingJobTrackerTest.java index 94207fde2e468..d21949e24c1c8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingJobTrackerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingJobTrackerTest.java @@ -28,10 +28,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import org.neo4j.internal.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.IndexDescriptorFactory; import org.neo4j.kernel.impl.scheduler.CentralJobScheduler; import org.neo4j.scheduler.JobScheduler; import org.neo4j.test.DoubleLatch; @@ -48,12 +44,6 @@ public class IndexSamplingJobTrackerTest { private final IndexSamplingConfig config = mock( IndexSamplingConfig.class ); - LabelSchemaDescriptor descriptor11 = SchemaDescriptorFactory.forLabel( 1, 1 ); - LabelSchemaDescriptor descriptor12 = SchemaDescriptorFactory.forLabel( 1, 2 ); - LabelSchemaDescriptor descriptor22 = SchemaDescriptorFactory.forLabel( 2, 2 ); - IndexDescriptor index11 = IndexDescriptorFactory.forSchema( descriptor11 ); - IndexDescriptor index12 = IndexDescriptorFactory.forSchema( descriptor12 ); - IndexDescriptor index22 = IndexDescriptorFactory.forSchema( descriptor22 ); long indexId11; long indexId12 = 1; long indexId22 = 2;