Remove redundant methods on IndexProxy

neo4j · May 21, 2018 · 756d86f · 756d86f
1 parent b55cacd
commit 756d86f
Show file tree

Hide file tree

Showing 18 changed files with 56 additions and 216 deletions.
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/IndexDescriptor.java
@@ -22,7 +22,9 @@
 import java.util.Optional;
 
 import org.neo4j.graphdb.Label;
+import org.neo4j.internal.kernel.api.IndexCapability;
 import org.neo4j.kernel.api.index.IndexProvider;
+import org.neo4j.kernel.impl.api.index.CapableIndexDescriptor;
 import org.neo4j.storageengine.api.schema.SchemaRule;
 
 import static org.neo4j.internal.kernel.api.schema.SchemaUtil.idTokenNameLookup;
@@ -150,4 +152,9 @@ public String getName()
     {
         return name().get();
     }
+
+    public CapableIndexDescriptor withoutCapabilities()
+    {
+        return new CapableIndexDescriptor( id, providerDescriptor, this, owningConstraintId, IndexCapability.NO_CAPABILITY );
+    }
 }
diff --git a/...ty/kernel/src/main/java/org/neo4j/kernel/impl/api/index/AbstractDelegatingIndexProxy.java b/...ty/kernel/src/main/java/org/neo4j/kernel/impl/api/index/AbstractDelegatingIndexProxy.java
@@ -23,7 +23,6 @@
 import java.io.IOException;
 
 import org.neo4j.graphdb.ResourceIterator;
-import org.neo4j.internal.kernel.api.IndexCapability;
 import org.neo4j.internal.kernel.api.InternalIndexState;
 import org.neo4j.internal.kernel.api.schema.SchemaDescriptor;
 import org.neo4j.io.pagecache.IOLimiter;
@@ -34,9 +33,6 @@
 import org.neo4j.kernel.api.exceptions.schema.UniquePropertyValueValidationException;
 import org.neo4j.kernel.api.index.IndexUpdater;
 import org.neo4j.kernel.api.index.PropertyAccessor;
-import org.neo4j.kernel.api.index.IndexProvider;
-import org.neo4j.kernel.api.schema.index.IndexDescriptor;
-import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor;
 import org.neo4j.storageengine.api.schema.IndexReader;
 import org.neo4j.storageengine.api.schema.PopulationProgress;
 import org.neo4j.values.storable.Value;
@@ -70,13 +66,7 @@ public InternalIndexState getState()
     }
 
     @Override
-    public IndexCapability getIndexCapability()
-    {
-        return getDelegate().getIndexCapability();
-    }
-
-    @Override
-    public IndexDescriptor getDescriptor()
+    public CapableIndexDescriptor getDescriptor()
     {
         return getDelegate().getDescriptor();
     }
@@ -87,12 +77,6 @@ public SchemaDescriptor schema()
         return getDelegate().schema();
     }
 
-    @Override
-    public IndexProvider.Descriptor getProviderDescriptor()
-    {
-        return getDelegate().getProviderDescriptor();
-    }
-
     @Override
     public void force( IOLimiter ioLimiter ) throws IOException
     {
@@ -159,12 +143,6 @@ public String toString()
         return String.format( "%s -> %s", getClass().getSimpleName(), getDelegate().toString() );
     }
 
-    @Override
-    public long getIndexId()
-    {
-        return getDelegate().getIndexId();
-    }
-
     @Override
     public ResourceIterator<File> snapshotFiles() throws IOException
     {

diff --git a/...ty/kernel/src/main/java/org/neo4j/kernel/impl/api/index/AbstractSwallowingIndexProxy.java b/...ty/kernel/src/main/java/org/neo4j/kernel/impl/api/index/AbstractSwallowingIndexProxy.java
@@ -19,12 +19,9 @@
  */
 package org.neo4j.kernel.impl.api.index;
 
-import org.neo4j.internal.kernel.api.IndexCapability;
 import org.neo4j.internal.kernel.api.schema.SchemaDescriptor;
 import org.neo4j.io.pagecache.IOLimiter;
-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.impl.api.index.updater.SwallowingIndexUpdater;
 import org.neo4j.storageengine.api.schema.IndexReader;
 import org.neo4j.storageengine.api.schema.PopulationProgress;
@@ -70,19 +67,13 @@ public void force( IOLimiter ioLimiter )
     {
     }
 
-    @Override
-    public IndexCapability getIndexCapability()
-    {
-        return capableIndexDescriptor;
-    }
-
     @Override
     public void refresh()
     {
     }
 
     @Override
-    public IndexDescriptor getDescriptor()
+    public CapableIndexDescriptor getDescriptor()
     {
         return capableIndexDescriptor;
     }
@@ -93,12 +84,6 @@ public SchemaDescriptor schema()
         return capableIndexDescriptor.schema();
     }
 
-    @Override
-    public IndexProvider.Descriptor getProviderDescriptor()
-    {
-        return capableIndexDescriptor.providerDescriptor();
-    }
-
     @Override
     public void close()
     {
@@ -109,10 +94,4 @@ public IndexReader newReader()
     {
         throw new UnsupportedOperationException();
     }
-
-    @Override
-    public long getIndexId()
-    {
-        return capableIndexDescriptor.getId();
-    }
 }
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
@@ -23,13 +23,25 @@
 import org.neo4j.internal.kernel.api.IndexCapability;
 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.PendingIndexDescriptor;
 import org.neo4j.values.storable.ValueCategory;
 
 public class CapableIndexDescriptor extends IndexDescriptor implements CapableIndexReference
 {
     private final IndexCapability indexCapability;
 
+    public CapableIndexDescriptor( long id,
+                                   IndexProvider.Descriptor providerDescriptor,
+                                   PendingIndexDescriptor descriptor,
+                                   Long owningConstraintId,
+                                   IndexCapability indexCapability )
+    {
+        super( id, providerDescriptor, descriptor, owningConstraintId );
+        this.indexCapability = indexCapability;
+    }
+
     public CapableIndexDescriptor( IndexDescriptor indexDescriptor, IndexCapability indexCapability )
     {
         super( indexDescriptor.getId(), indexDescriptor.providerDescriptor(), indexDescriptor, indexDescriptor.getOwningConstraint() );

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/FlippableIndexProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/FlippableIndexProxy.java
@@ -27,7 +27,6 @@
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import org.neo4j.graphdb.ResourceIterator;
-import org.neo4j.internal.kernel.api.IndexCapability;
 import org.neo4j.internal.kernel.api.InternalIndexState;
 import org.neo4j.internal.kernel.api.schema.SchemaDescriptor;
 import org.neo4j.io.pagecache.IOLimiter;
@@ -39,10 +38,8 @@
 import org.neo4j.kernel.api.exceptions.index.IndexPopulationFailedKernelException;
 import org.neo4j.kernel.api.exceptions.index.IndexProxyAlreadyClosedKernelException;
 import org.neo4j.kernel.api.exceptions.schema.UniquePropertyValueValidationException;
-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.impl.api.index.updater.DelegatingIndexUpdater;
 import org.neo4j.storageengine.api.schema.IndexReader;
 import org.neo4j.storageengine.api.schema.PopulationProgress;
@@ -215,7 +212,7 @@ private static void barge( ReentrantReadWriteLock.ReadLock lock )
     }
 
     @Override
-    public IndexDescriptor getDescriptor()
+    public CapableIndexDescriptor getDescriptor()
     {
         lock.readLock().lock();
         try
@@ -242,20 +239,6 @@ public SchemaDescriptor schema()
         }
     }
 
-    @Override
-    public IndexProvider.Descriptor getProviderDescriptor()
-    {
-        lock.readLock().lock();
-        try
-        {
-            return delegate.getProviderDescriptor();
-        }
-        finally
-        {
-            lock.readLock().unlock();
-        }
-    }
-
     @Override
     public InternalIndexState getState()
     {
@@ -270,20 +253,6 @@ public InternalIndexState getState()
         }
     }
 
-    @Override
-    public IndexCapability getIndexCapability()
-    {
-        lock.readLock().lock();
-        try
-        {
-            return delegate.getIndexCapability();
-        }
-        finally
-        {
-            lock.readLock().unlock();
-        }
-    }
-
     @Override
     public void close() throws IOException
     {
@@ -369,20 +338,6 @@ public void validateBeforeCommit( Value[] tuple )
         }
     }
 
-    @Override
-    public long getIndexId()
-    {
-        lock.readLock().lock();
-        try
-        {
-            return delegate.getIndexId();
-        }
-        finally
-        {
-            lock.readLock().unlock();
-        }
-    }
-
     @Override
     public ResourceIterator<File> snapshotFiles() throws IOException
     {

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexProxy.java
@@ -23,9 +23,7 @@
 import java.io.IOException;
 
 import org.neo4j.graphdb.ResourceIterator;
-import org.neo4j.internal.kernel.api.IndexCapability;
 import org.neo4j.internal.kernel.api.InternalIndexState;
-import org.neo4j.internal.kernel.api.schema.SchemaDescriptor;
 import org.neo4j.internal.kernel.api.schema.SchemaDescriptorSupplier;
 import org.neo4j.io.pagecache.IOLimiter;
 import org.neo4j.kernel.api.exceptions.index.IndexActivationFailedKernelException;
@@ -37,9 +35,6 @@
 import org.neo4j.kernel.api.index.IndexPopulator;
 import org.neo4j.kernel.api.index.IndexUpdater;
 import org.neo4j.kernel.api.index.PropertyAccessor;
-import org.neo4j.kernel.api.index.IndexProvider;
-import org.neo4j.kernel.api.schema.index.IndexDescriptor;
-import org.neo4j.kernel.api.schema.index.PendingIndexDescriptor;
 import org.neo4j.storageengine.api.schema.IndexReader;
 import org.neo4j.storageengine.api.schema.PopulationProgress;
 import org.neo4j.values.storable.Value;
@@ -79,17 +74,10 @@ public interface IndexProxy extends SchemaDescriptorSupplier
      */
     void close() throws IOException;
 
-    IndexDescriptor getDescriptor();
-
-    @Override
-    SchemaDescriptor schema();
-
-    IndexProvider.Descriptor getProviderDescriptor();
+    CapableIndexDescriptor getDescriptor();
 
     InternalIndexState getState();
 
-    IndexCapability getIndexCapability();
-
     /**
      * @return failure message. Expect a call to it if {@link #getState()} returns {@link InternalIndexState#FAILED}.
      */
@@ -123,8 +111,6 @@ public interface IndexProxy extends SchemaDescriptorSupplier
      */
     void validateBeforeCommit( Value[] tuple );
 
-    long getIndexId();
-
     ResourceIterator<File> snapshotFiles() throws IOException;
 
     default void verifyDeferredConstraints( PropertyAccessor accessor )  throws IndexEntryConflictException, IOException

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
@@ -656,7 +656,7 @@ public LongSet getIndexIds()
         MutableLongSet indexIds = new LongHashSet();
         for ( IndexProxy indexProxy : indexProxies )
         {
-            indexIds.add( indexProxy.getIndexId() );
+            indexIds.add( indexProxy.getDescriptor().getId() );
         }
         return indexIds;
     }

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
@@ -23,16 +23,13 @@
 import java.io.IOException;
 
 import org.neo4j.graphdb.ResourceIterator;
-import org.neo4j.internal.kernel.api.IndexCapability;
 import org.neo4j.internal.kernel.api.InternalIndexState;
 import org.neo4j.internal.kernel.api.schema.SchemaDescriptor;
 import org.neo4j.io.pagecache.IOLimiter;
 import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException;
 import org.neo4j.kernel.api.index.IndexAccessor;
-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.impl.api.index.updater.UpdateCountingIndexUpdater;
 import org.neo4j.storageengine.api.schema.IndexReader;
 import org.neo4j.storageengine.api.schema.PopulationProgress;
@@ -132,7 +129,7 @@ public void drop()
     }
 
     @Override
-    public IndexDescriptor getDescriptor()
+    public CapableIndexDescriptor getDescriptor()
     {
         return capableIndexDescriptor;
     }
@@ -143,24 +140,12 @@ public SchemaDescriptor schema()
         return capableIndexDescriptor.schema();
     }
 
-    @Override
-    public IndexProvider.Descriptor getProviderDescriptor()
-    {
-        return capableIndexDescriptor.providerDescriptor();
-    }
-
     @Override
     public InternalIndexState getState()
     {
         return InternalIndexState.ONLINE;
     }
 
-    @Override
-    public IndexCapability getIndexCapability()
-    {
-        return capableIndexDescriptor;
-    }
-
     @Override
     public void force( IOLimiter ioLimiter ) throws IOException
     {
@@ -209,12 +194,6 @@ public void validateBeforeCommit( Value[] tuple )
         accessor.validateBeforeCommit( tuple );
     }
 
-    @Override
-    public long getIndexId()
-    {
-        return indexId;
-    }
-
     @Override
     public IndexPopulationFailure getPopulationFailure() throws IllegalStateException
     {