From b55cacda46cbc89b97249c674f36463bffcef81b Mon Sep 17 00:00:00 2001 From: Ragnar Mellbin Date: Tue, 8 May 2018 10:17:50 +0200 Subject: [PATCH] Rename IndexMeta to CapableIndexReference --- .../index/AbstractSwallowingIndexProxy.java | 16 +++++------ ...xMeta.java => CapableIndexDescriptor.java} | 4 +-- .../impl/api/index/FailedIndexProxy.java | 4 +-- .../FailedPopulatingIndexProxyFactory.java | 8 +++--- .../impl/api/index/IndexPopulationJob.java | 8 +++--- .../impl/api/index/IndexProxyCreator.java | 28 +++++++++---------- .../api/index/MultipleIndexPopulator.java | 22 +++++++-------- .../impl/api/index/OnlineIndexProxy.java | 18 ++++++------ .../impl/api/index/PopulatingIndexProxy.java | 16 +++++------ .../impl/api/index/RecoveringIndexProxy.java | 4 +-- .../BatchingMultipleIndexPopulatorTest.java | 2 +- .../impl/api/index/FailedIndexProxyTest.java | 4 +-- .../api/index/IndexPopulationJobTest.java | 4 +-- .../impl/api/index/IndexPopulationTest.java | 4 +-- .../api/index/MultipleIndexPopulatorTest.java | 2 +- .../MultipleIndexPopulatorUpdatesTest.java | 3 +- .../impl/api/index/OnlineIndexProxyTest.java | 5 ++-- .../api/index/PopulatingIndexProxyTest.java | 4 +-- 18 files changed, 77 insertions(+), 79 deletions(-) rename community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/{IndexMeta.java => CapableIndexDescriptor.java} (90%) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/AbstractSwallowingIndexProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/AbstractSwallowingIndexProxy.java index be21d8f880e13..af6183feb6b50 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/AbstractSwallowingIndexProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/AbstractSwallowingIndexProxy.java @@ -31,12 +31,12 @@ public abstract class AbstractSwallowingIndexProxy implements IndexProxy { - private final IndexMeta indexMeta; + private final CapableIndexDescriptor capableIndexDescriptor; private final IndexPopulationFailure populationFailure; - AbstractSwallowingIndexProxy( IndexMeta indexMeta, IndexPopulationFailure populationFailure ) + AbstractSwallowingIndexProxy( CapableIndexDescriptor capableIndexDescriptor, IndexPopulationFailure populationFailure ) { - this.indexMeta = indexMeta; + this.capableIndexDescriptor = capableIndexDescriptor; this.populationFailure = populationFailure; } @@ -73,7 +73,7 @@ public void force( IOLimiter ioLimiter ) @Override public IndexCapability getIndexCapability() { - return indexMeta; + return capableIndexDescriptor; } @Override @@ -84,19 +84,19 @@ public void refresh() @Override public IndexDescriptor getDescriptor() { - return indexMeta; + return capableIndexDescriptor; } @Override public SchemaDescriptor schema() { - return indexMeta.schema(); + return capableIndexDescriptor.schema(); } @Override public IndexProvider.Descriptor getProviderDescriptor() { - return indexMeta.providerDescriptor(); + return capableIndexDescriptor.providerDescriptor(); } @Override @@ -113,6 +113,6 @@ public IndexReader newReader() @Override public long getIndexId() { - return indexMeta.getId(); + return capableIndexDescriptor.getId(); } } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMeta.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/CapableIndexDescriptor.java similarity index 90% rename from community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMeta.java rename to community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/CapableIndexDescriptor.java index a9dec4182ee0f..de84173aa7348 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMeta.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/CapableIndexDescriptor.java @@ -26,11 +26,11 @@ import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.values.storable.ValueCategory; -public class IndexMeta extends IndexDescriptor implements CapableIndexReference +public class CapableIndexDescriptor extends IndexDescriptor implements CapableIndexReference { private final IndexCapability indexCapability; - public IndexMeta( IndexDescriptor indexDescriptor, IndexCapability indexCapability ) + public CapableIndexDescriptor( IndexDescriptor 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/FailedIndexProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/FailedIndexProxy.java index 056f3a5a9c652..847c5b29291df 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/FailedIndexProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/FailedIndexProxy.java @@ -39,14 +39,14 @@ public class FailedIndexProxy extends AbstractSwallowingIndexProxy private final IndexCountsRemover indexCountsRemover; private final Log log; - FailedIndexProxy( IndexMeta indexMeta, + FailedIndexProxy( CapableIndexDescriptor capableIndexDescriptor, String indexUserDescription, IndexPopulator populator, IndexPopulationFailure populationFailure, IndexCountsRemover indexCountsRemover, LogProvider logProvider ) { - super( indexMeta, populationFailure ); + super( capableIndexDescriptor, populationFailure ); this.populator = populator; this.indexUserDescription = indexUserDescription; this.indexCountsRemover = indexCountsRemover; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/FailedPopulatingIndexProxyFactory.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/FailedPopulatingIndexProxyFactory.java index cb9630002e324..c456d9bd3311b 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/FailedPopulatingIndexProxyFactory.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/FailedPopulatingIndexProxyFactory.java @@ -26,19 +26,19 @@ public class FailedPopulatingIndexProxyFactory implements FailedIndexProxyFactory { - private final IndexMeta indexMeta; + private final CapableIndexDescriptor capableIndexDescriptor; private final IndexPopulator populator; private final String indexUserDescription; private final IndexCountsRemover indexCountsRemover; private final LogProvider logProvider; - FailedPopulatingIndexProxyFactory( IndexMeta indexMeta, + FailedPopulatingIndexProxyFactory( CapableIndexDescriptor capableIndexDescriptor, IndexPopulator populator, String indexUserDescription, IndexCountsRemover indexCountsRemover, LogProvider logProvider ) { - this.indexMeta = indexMeta; + this.capableIndexDescriptor = capableIndexDescriptor; this.populator = populator; this.indexUserDescription = indexUserDescription; this.indexCountsRemover = indexCountsRemover; @@ -48,7 +48,7 @@ public class FailedPopulatingIndexProxyFactory implements FailedIndexProxyFactor @Override public IndexProxy create( Throwable failure ) { - return new FailedIndexProxy( indexMeta, indexUserDescription, populator, failure( failure ), + return new FailedIndexProxy( capableIndexDescriptor, indexUserDescription, populator, failure( failure ), indexCountsRemover, logProvider ); } } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexPopulationJob.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexPopulationJob.java index b0c44ab1136e2..fab00a103a3bf 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexPopulationJob.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexPopulationJob.java @@ -35,7 +35,7 @@ /** * A background job for initially populating one or more index over existing data in the database. * Use provided store view to scan store. Participating {@link IndexPopulator} are added with - * {@link #addPopulator(IndexPopulator, IndexMeta, String, FlippableIndexProxy, FailedIndexProxyFactory)} + * {@link #addPopulator(IndexPopulator, CapableIndexDescriptor, String, FlippableIndexProxy, FailedIndexProxyFactory)} * before {@link #run() running} this job. */ public class IndexPopulationJob implements Runnable @@ -59,16 +59,16 @@ public IndexPopulationJob( MultipleIndexPopulator multiPopulator, IndexingServic * Adds an {@link IndexPopulator} to be populated in this store scan. All participating populators must * be added before calling {@link #run()}. * @param populator {@link IndexPopulator} to participate. - * @param indexMeta {@link IndexMeta} meta information about index. + * @param capableIndexDescriptor {@link CapableIndexDescriptor} meta information about index. * @param indexUserDescription user description of this index. * @param flipper {@link FlippableIndexProxy} to call after a successful population. * @param failedIndexProxyFactory {@link FailedIndexProxyFactory} to use after an unsuccessful population. */ - MultipleIndexPopulator.IndexPopulation addPopulator( IndexPopulator populator, IndexMeta indexMeta, String indexUserDescription, + MultipleIndexPopulator.IndexPopulation addPopulator( IndexPopulator populator, CapableIndexDescriptor capableIndexDescriptor, String indexUserDescription, FlippableIndexProxy flipper, FailedIndexProxyFactory failedIndexProxyFactory ) { assert storeScan == null : "Population have already started, too late to add populators at this point"; - return this.multiPopulator.addPopulator( populator, indexMeta, flipper, failedIndexProxyFactory, + return this.multiPopulator.addPopulator( populator, capableIndexDescriptor, flipper, failedIndexProxyFactory, indexUserDescription ); } 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 4891fd165f766..b860e0b31a739 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 @@ -63,18 +63,17 @@ IndexProxy createPopulatingIndexProxy( final IndexDescriptor descriptor, final b final String indexUserDescription = indexUserDescription( descriptor ); IndexPopulator populator = populatorFromProvider( descriptor, samplingConfig ); - IndexMeta indexMeta = indexMetaFromProvider( descriptor ); + CapableIndexDescriptor capableIndexDescriptor = indexMetaFromProvider( descriptor ); - FailedIndexProxyFactory failureDelegateFactory = new FailedPopulatingIndexProxyFactory( - indexMeta, + FailedIndexProxyFactory failureDelegateFactory = new FailedPopulatingIndexProxyFactory( capableIndexDescriptor, populator, indexUserDescription, new IndexCountsRemover( storeView, descriptor.getId() ), logProvider ); MultipleIndexPopulator.IndexPopulation indexPopulation = populationJob - .addPopulator( populator, indexMeta, indexUserDescription, flipper, failureDelegateFactory ); - PopulatingIndexProxy populatingIndex = new PopulatingIndexProxy( indexMeta, populationJob, indexPopulation ); + .addPopulator( populator, capableIndexDescriptor, indexUserDescription, flipper, failureDelegateFactory ); + PopulatingIndexProxy populatingIndex = new PopulatingIndexProxy( capableIndexDescriptor, populationJob, indexPopulation ); flipper.flipTo( populatingIndex ); @@ -82,7 +81,7 @@ IndexProxy createPopulatingIndexProxy( final IndexDescriptor descriptor, final b flipper.setFlipTarget( () -> { monitor.populationCompleteOn( descriptor ); - OnlineIndexProxy onlineProxy = new OnlineIndexProxy( indexMeta, onlineAccessorFromProvider( descriptor, samplingConfig ), + OnlineIndexProxy onlineProxy = new OnlineIndexProxy( capableIndexDescriptor, onlineAccessorFromProvider( descriptor, samplingConfig ), storeView, true ); if ( flipToTentative ) @@ -97,8 +96,8 @@ IndexProxy createPopulatingIndexProxy( final IndexDescriptor descriptor, final b IndexProxy createRecoveringIndexProxy( IndexDescriptor descriptor ) { - IndexMeta indexMeta = indexMetaFromProvider( descriptor ); - IndexProxy proxy = new RecoveringIndexProxy( indexMeta ); + CapableIndexDescriptor capableIndexDescriptor = indexMetaFromProvider( descriptor ); + IndexProxy proxy = new RecoveringIndexProxy( capableIndexDescriptor ); return new ContractCheckingIndexProxy( proxy, true ); } @@ -107,9 +106,9 @@ IndexProxy createOnlineIndexProxy( IndexDescriptor descriptor ) try { IndexAccessor onlineAccessor = onlineAccessorFromProvider( descriptor, samplingConfig ); - IndexMeta indexMeta = indexMetaFromProvider( descriptor ); + CapableIndexDescriptor capableIndexDescriptor = indexMetaFromProvider( descriptor ); IndexProxy proxy; - proxy = new OnlineIndexProxy( indexMeta, onlineAccessor, storeView, false ); + proxy = new OnlineIndexProxy( capableIndexDescriptor, onlineAccessor, storeView, false ); proxy = new ContractCheckingIndexProxy( proxy, true ); return proxy; } @@ -125,11 +124,10 @@ IndexProxy createOnlineIndexProxy( IndexDescriptor descriptor ) IndexProxy createFailedIndexProxy( IndexDescriptor descriptor, IndexPopulationFailure populationFailure ) { IndexPopulator indexPopulator = populatorFromProvider( descriptor, samplingConfig ); - IndexMeta indexMeta = indexMetaFromProvider( descriptor ); + CapableIndexDescriptor capableIndexDescriptor = indexMetaFromProvider( descriptor ); String indexUserDescription = indexUserDescription( descriptor ); IndexProxy proxy; - proxy = new FailedIndexProxy( - indexMeta, + proxy = new FailedIndexProxy( capableIndexDescriptor, indexUserDescription, indexPopulator, populationFailure, @@ -157,9 +155,9 @@ private IndexAccessor onlineAccessorFromProvider( IndexDescriptor descriptor, In return indexProvider.getOnlineAccessor( descriptor, samplingConfig ); } - private IndexMeta indexMetaFromProvider( IndexDescriptor indexDescriptor ) + private CapableIndexDescriptor indexMetaFromProvider( IndexDescriptor indexDescriptor ) { IndexCapability indexCapability = providerMap.apply( indexDescriptor.providerDescriptor() ).getCapability(); - return new IndexMeta( indexDescriptor, indexCapability ); + return new CapableIndexDescriptor( indexDescriptor, indexCapability ); } } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulator.java index 469d977bc0fbb..2225ddc105923 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulator.java @@ -73,7 +73,7 @@ * Usage of this class should be something like: *
    *
  1. Instantiation.
    2. - *
  2. One or more calls to {@link #addPopulator(IndexPopulator, IndexMeta, FlippableIndexProxy, FailedIndexProxyFactory, String)}.
    3. + *
  3. One or more calls to {@link #addPopulator(IndexPopulator, CapableIndexDescriptor, FlippableIndexProxy, FailedIndexProxyFactory, String)}.
    4. *
  4. Call to {@link #create()} to create data structures and files to start accepting updates.
    5. *
  5. Call to {@link #indexAllNodes()} (blocking call).
    6. *
  6. While all nodes are being indexed, calls to {@link #queueUpdate(IndexEntryUpdate)} are accepted.
    7. @@ -109,18 +109,18 @@ public MultipleIndexPopulator( IndexStoreView storeView, LogProvider logProvider this.log = logProvider.getLog( IndexPopulationJob.class ); } - IndexPopulation addPopulator( IndexPopulator populator, IndexMeta indexMeta, FlippableIndexProxy flipper, FailedIndexProxyFactory failedIndexProxyFactory, + IndexPopulation addPopulator( IndexPopulator populator, CapableIndexDescriptor capableIndexDescriptor, FlippableIndexProxy flipper, FailedIndexProxyFactory failedIndexProxyFactory, String indexUserDescription ) { IndexPopulation population = - createPopulation( populator, indexMeta, flipper, failedIndexProxyFactory, indexUserDescription ); + createPopulation( populator, capableIndexDescriptor, flipper, failedIndexProxyFactory, indexUserDescription ); populations.add( population ); return population; } - private IndexPopulation createPopulation( IndexPopulator populator, IndexMeta indexMeta, FlippableIndexProxy flipper, FailedIndexProxyFactory failedIndexProxyFactory, String indexUserDescription ) + private IndexPopulation createPopulation( IndexPopulator populator, CapableIndexDescriptor capableIndexDescriptor, FlippableIndexProxy flipper, FailedIndexProxyFactory failedIndexProxyFactory, String indexUserDescription ) { - return new IndexPopulation( populator, indexMeta, flipper, failedIndexProxyFactory, indexUserDescription ); + return new IndexPopulation( populator, capableIndexDescriptor, flipper, failedIndexProxyFactory, indexUserDescription ); } boolean hasPopulators() @@ -476,7 +476,7 @@ public class IndexPopulation implements SchemaDescriptorSupplier public final IndexPopulator populator; final FlippableIndexProxy flipper; private final long indexId; - private final IndexMeta indexMeta; + private final CapableIndexDescriptor capableIndexDescriptor; private final IndexCountsRemover indexCountsRemover; private final FailedIndexProxyFactory failedIndexProxyFactory; private final String indexUserDescription; @@ -485,11 +485,11 @@ public class IndexPopulation implements SchemaDescriptorSupplier List> batchedUpdates; - IndexPopulation( IndexPopulator populator, IndexMeta indexMeta, FlippableIndexProxy flipper, FailedIndexProxyFactory failedIndexProxyFactory, String indexUserDescription ) + IndexPopulation( IndexPopulator populator, CapableIndexDescriptor capableIndexDescriptor, FlippableIndexProxy flipper, FailedIndexProxyFactory failedIndexProxyFactory, String indexUserDescription ) { this.populator = populator; - this.indexMeta = indexMeta; - this.indexId = indexMeta.getId(); + this.capableIndexDescriptor = capableIndexDescriptor; + this.indexId = capableIndexDescriptor.getId(); this.flipper = flipper; this.failedIndexProxyFactory = failedIndexProxyFactory; this.indexUserDescription = indexUserDescription; @@ -499,7 +499,7 @@ public class IndexPopulation implements SchemaDescriptorSupplier private void flipToFailed( IndexPopulationFailure failure ) { - flipper.flipTo( new FailedIndexProxy( indexMeta, indexUserDescription, populator, failure, indexCountsRemover, logProvider ) ); + flipper.flipTo( new FailedIndexProxy( capableIndexDescriptor, indexUserDescription, populator, failure, indexCountsRemover, logProvider ) ); } void create() throws IOException @@ -580,7 +580,7 @@ void flip() throws FlipFailedKernelException @Override public SchemaDescriptor schema() { - return indexMeta.schema(); + return capableIndexDescriptor.schema(); } public boolean batch( IndexEntryUpdate update ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/OnlineIndexProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/OnlineIndexProxy.java index 3749b24589d66..d0981b4756e5c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/OnlineIndexProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/OnlineIndexProxy.java @@ -41,7 +41,7 @@ public class OnlineIndexProxy implements IndexProxy { private final long indexId; - private final IndexMeta indexMeta; + private final CapableIndexDescriptor capableIndexDescriptor; final IndexAccessor accessor; private final IndexStoreView storeView; private final IndexCountsRemover indexCountsRemover; @@ -73,11 +73,11 @@ public class OnlineIndexProxy implements IndexProxy // slightly more costly, but shouldn't make that big of a difference hopefully. private final boolean forcedIdempotentMode; - OnlineIndexProxy( IndexMeta indexMeta, IndexAccessor accessor, IndexStoreView storeView, boolean forcedIdempotentMode ) + OnlineIndexProxy( CapableIndexDescriptor capableIndexDescriptor, IndexAccessor accessor, IndexStoreView storeView, boolean forcedIdempotentMode ) { assert accessor != null; - this.indexId = indexMeta.getId(); - this.indexMeta = indexMeta; + this.indexId = capableIndexDescriptor.getId(); + this.capableIndexDescriptor = capableIndexDescriptor; this.accessor = accessor; this.storeView = storeView; this.forcedIdempotentMode = forcedIdempotentMode; @@ -134,19 +134,19 @@ public void drop() @Override public IndexDescriptor getDescriptor() { - return indexMeta; + return capableIndexDescriptor; } @Override public SchemaDescriptor schema() { - return indexMeta.schema(); + return capableIndexDescriptor.schema(); } @Override public IndexProvider.Descriptor getProviderDescriptor() { - return indexMeta.providerDescriptor(); + return capableIndexDescriptor.providerDescriptor(); } @Override @@ -158,7 +158,7 @@ public InternalIndexState getState() @Override public IndexCapability getIndexCapability() { - return indexMeta; + return capableIndexDescriptor; } @Override @@ -236,7 +236,7 @@ public ResourceIterator snapshotFiles() throws IOException @Override public String toString() { - return getClass().getSimpleName() + "[accessor:" + accessor + ", descriptor:" + indexMeta + "]"; + return getClass().getSimpleName() + "[accessor:" + accessor + ", descriptor:" + capableIndexDescriptor + "]"; } @Override diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/PopulatingIndexProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/PopulatingIndexProxy.java index 3a2d9c4fb0285..f60935f9462b2 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/PopulatingIndexProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/PopulatingIndexProxy.java @@ -39,13 +39,13 @@ public class PopulatingIndexProxy implements IndexProxy { - private final IndexMeta indexMeta; + private final CapableIndexDescriptor capableIndexDescriptor; private final IndexPopulationJob job; private final MultipleIndexPopulator.IndexPopulation indexPopulation; - PopulatingIndexProxy( IndexMeta indexMeta, IndexPopulationJob job, MultipleIndexPopulator.IndexPopulation indexPopulation ) + PopulatingIndexProxy( CapableIndexDescriptor capableIndexDescriptor, IndexPopulationJob job, MultipleIndexPopulator.IndexPopulation indexPopulation ) { - this.indexMeta = indexMeta; + this.capableIndexDescriptor = capableIndexDescriptor; this.job = job; this.indexPopulation = indexPopulation; } @@ -91,19 +91,19 @@ public void drop() @Override public IndexDescriptor getDescriptor() { - return indexMeta; + return capableIndexDescriptor; } @Override public SchemaDescriptor schema() { - return indexMeta.schema(); + return capableIndexDescriptor.schema(); } @Override public IndexProvider.Descriptor getProviderDescriptor() { - return indexMeta.providerDescriptor(); + return capableIndexDescriptor.providerDescriptor(); } @Override @@ -115,7 +115,7 @@ public InternalIndexState getState() @Override public IndexCapability getIndexCapability() { - return indexMeta; + return capableIndexDescriptor; } @Override @@ -170,7 +170,7 @@ public void validateBeforeCommit( Value[] tuple ) @Override public long getIndexId() { - return indexMeta.getId(); + return capableIndexDescriptor.getId(); } @Override diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/RecoveringIndexProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/RecoveringIndexProxy.java index df43762695635..5642ae8e056b6 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/RecoveringIndexProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/RecoveringIndexProxy.java @@ -28,9 +28,9 @@ public class RecoveringIndexProxy extends AbstractSwallowingIndexProxy { - RecoveringIndexProxy( IndexMeta indexMeta ) + RecoveringIndexProxy( CapableIndexDescriptor capableIndexDescriptor ) { - super( indexMeta, null ); + super( capableIndexDescriptor, null ); } @Override 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 8a7e52fcbef5c..e591c37d9306c 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 @@ -350,7 +350,7 @@ private static IndexPopulator addPopulator( BatchingMultipleIndexPopulator batch flipper.setFlipTarget( indexProxyFactory ); batchingPopulator.addPopulator( populator, - new IndexMeta( IndexDescriptor.indexRule( 1, descriptor, new IndexProvider.Descriptor( "foo", "1" ) ), NO_CAPABILITY ), flipper, + new CapableIndexDescriptor( IndexDescriptor.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/FailedIndexProxyTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/FailedIndexProxyTest.java index eba45d73577d8..53f7edb20e908 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 @@ -79,8 +79,8 @@ public void shouldLogReasonForDroppingIndex() throws IOException ); } - private IndexMeta indexMeta( IndexDescriptor descriptor ) + private CapableIndexDescriptor indexMeta( IndexDescriptor descriptor ) { - return new IndexMeta( descriptor, indexCapability ); + return new CapableIndexDescriptor( descriptor, indexCapability ); } } 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 9c7d37e2c6e93..3a3ee4627605d 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 @@ -54,8 +54,8 @@ 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.PendingIndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; +import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.DatabaseSchemaState; import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProvider; @@ -619,7 +619,7 @@ private IndexPopulationJob newIndexPopulationJob( FailedIndexProxyFactory failur MultipleIndexPopulator multiPopulator = new MultipleIndexPopulator( storeView, logProvider ); IndexPopulationJob job = new IndexPopulationJob( multiPopulator, NO_MONITOR, stateHolder ); - job.addPopulator( populator, new IndexMeta( IndexDescriptor.indexRule( indexId, descriptor, PROVIDER_DESCRIPTOR ), NO_CAPABILITY ), + job.addPopulator( populator, new CapableIndexDescriptor( IndexDescriptor.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 0614f403beef5..33f290b81095e 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 @@ -142,9 +142,9 @@ public void acceptUpdate( MultipleIndexPopulator.MultipleIndexUpdater updater, I }; } - private IndexMeta dummyMeta() + private CapableIndexDescriptor dummyMeta() { - return new IndexMeta( IndexDescriptor.indexRule( 0, IndexDescriptorFactory.forLabel( 0, 0 ), TestIndexProviderDescriptor.PROVIDER_DESCRIPTOR ), + return new CapableIndexDescriptor( IndexDescriptor.indexRule( 0, IndexDescriptorFactory.forLabel( 0, 0 ), TestIndexProviderDescriptor.PROVIDER_DESCRIPTOR ), IndexCapability.NO_CAPABILITY ); } 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 464fc2d1dcfb8..e72f9450cdc9d 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 @@ -511,7 +511,7 @@ private IndexPopulation addPopulator( MultipleIndexPopulator multipleIndexPopula private IndexPopulation addPopulator( MultipleIndexPopulator multipleIndexPopulator, IndexDescriptor descriptor, IndexPopulator indexPopulator, FlippableIndexProxy flippableIndexProxy, FailedIndexProxyFactory failedIndexProxyFactory ) { - return multipleIndexPopulator.addPopulator( indexPopulator, new IndexMeta( descriptor, NO_CAPABILITY ), + 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 3d5313e5bd6a3..00cc914e192dd 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 @@ -35,7 +35,6 @@ import org.neo4j.kernel.api.exceptions.index.IndexPopulationFailedKernelException; 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.index.IndexUpdater; import org.neo4j.kernel.api.labelscan.NodeLabelUpdate; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; @@ -126,7 +125,7 @@ private MultipleIndexPopulator.IndexPopulation addPopulator( MultipleIndexPopula private MultipleIndexPopulator.IndexPopulation addPopulator( MultipleIndexPopulator multipleIndexPopulator, IndexDescriptor descriptor, IndexPopulator indexPopulator, FlippableIndexProxy flippableIndexProxy, FailedIndexProxyFactory failedIndexProxyFactory ) { - return multipleIndexPopulator.addPopulator( indexPopulator, new IndexMeta( descriptor, NO_CAPABILITY ), + 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/OnlineIndexProxyTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/OnlineIndexProxyTest.java index 0f3dcff96028c..2b4fddba9624b 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 @@ -46,8 +46,9 @@ public class OnlineIndexProxyTest public void shouldRemoveIndexCountsWhenTheIndexItselfIsDropped() throws IOException { // given - IndexMeta indexMeta = new IndexMeta( IndexDescriptor.indexRule( indexId, descriptor, providerDescriptor ), NO_CAPABILITY ); - OnlineIndexProxy index = new OnlineIndexProxy( indexMeta, accessor, storeView, false ); + CapableIndexDescriptor + capableIndexDescriptor = new CapableIndexDescriptor( IndexDescriptor.indexRule( indexId, descriptor, providerDescriptor ), NO_CAPABILITY ); + OnlineIndexProxy index = new OnlineIndexProxy( capableIndexDescriptor, accessor, storeView, false ); // when index.drop(); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/PopulatingIndexProxyTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/PopulatingIndexProxyTest.java index 665b027b900bf..e16f5c0fe8b47 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/PopulatingIndexProxyTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/PopulatingIndexProxyTest.java @@ -31,7 +31,7 @@ public class PopulatingIndexProxyTest { @Mock - private IndexMeta indexMeta; + private CapableIndexDescriptor capableIndexDescriptor; @Mock private IndexPopulationJob indexPopulationJob; @Mock @@ -41,7 +41,7 @@ public class PopulatingIndexProxyTest @Before public void setUp() { - populatingIndexProxy = new PopulatingIndexProxy( indexMeta, indexPopulationJob, indexPopulation ); + populatingIndexProxy = new PopulatingIndexProxy( capableIndexDescriptor, indexPopulationJob, indexPopulation ); } @Test