Moved RelationshipVisitor to neo4j-kernel-api

neo4j · Aug 10, 2018 · 55e9f53 · 55e9f53
1 parent 3e6dad3
commit 55e9f53
Show file tree

Hide file tree

Showing 21 changed files with 33 additions and 34 deletions.
diff --git a/...unity/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/store/NeoStoresTest.java b/...unity/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/store/NeoStoresTest.java
@@ -59,7 +59,6 @@
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.impl.api.KernelStatement;
 import org.neo4j.kernel.impl.api.KernelTransactionImplementation;
-import org.neo4j.kernel.impl.api.RelationshipVisitor;
 import org.neo4j.kernel.impl.core.DelegatingTokenHolder;
 import org.neo4j.kernel.impl.core.TokenHolder;
 import org.neo4j.kernel.impl.core.TokenNotFoundException;
@@ -82,6 +81,7 @@
 import org.neo4j.kernel.impl.transaction.log.entry.LogHeader;
 import org.neo4j.kernel.impl.util.Dependencies;
 import org.neo4j.logging.NullLogProvider;
+import org.neo4j.storageengine.api.RelationshipVisitor;
 import org.neo4j.storageengine.api.StorageEngine;
 import org.neo4j.storageengine.api.StorageNodeCursor;
 import org.neo4j.storageengine.api.StorageProperty;

diff --git a/...c/main/scala/org/neo4j/cypher/internal/compatibility/v3_5/runtime/profiler/Profiler.scala b/...c/main/scala/org/neo4j/cypher/internal/compatibility/v3_5/runtime/profiler/Profiler.scala
@@ -26,13 +26,13 @@ import org.neo4j.cypher.internal.runtime.interpreted.{DelegatingOperations, Dele
 import org.neo4j.cypher.internal.runtime.planDescription.InternalPlanDescription
 import org.neo4j.cypher.internal.runtime.planDescription.InternalPlanDescription.Arguments
 import org.neo4j.cypher.internal.runtime.{Operations, QueryContext}
-import org.opencypher.v9_0.util.attribution.Id
 import org.neo4j.helpers.MathUtil
 import org.neo4j.internal.kernel.api.helpers.RelationshipSelectionCursor
-import org.neo4j.kernel.impl.api.RelationshipVisitor
 import org.neo4j.kernel.impl.api.store.RelationshipIterator
 import org.neo4j.kernel.impl.factory.{DatabaseInfo, Edition}
+import org.neo4j.storageengine.api.RelationshipVisitor
 import org.neo4j.values.virtual.{NodeValue, RelationshipValue}
+import org.opencypher.v9_0.util.attribution.Id
 
 import scala.collection.mutable
 

diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/CursorIterator.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/CursorIterator.scala
@@ -21,8 +21,8 @@ package org.neo4j.cypher.internal.spi
 
 import org.neo4j.collection.PrimitiveLongResourceIterator
 import org.neo4j.internal.kernel.api.helpers.RelationshipSelectionCursor
-import org.neo4j.kernel.impl.api.RelationshipVisitor
 import org.neo4j.kernel.impl.api.store.RelationshipIterator
+import org.neo4j.storageengine.api.RelationshipVisitor
 
 import scala.collection.Iterator
 

diff --git a/...in/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionBoundQueryContext.scala b/...in/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionBoundQueryContext.scala
@@ -47,13 +47,13 @@ import org.neo4j.kernel.api._
 import org.neo4j.kernel.api.exceptions.schema.{AlreadyConstrainedException, AlreadyIndexedException}
 import org.neo4j.kernel.api.schema.SchemaDescriptorFactory
 import org.neo4j.kernel.api.schema.constraints.ConstraintDescriptorFactory
-import org.neo4j.kernel.impl.api.RelationshipVisitor
 import org.neo4j.kernel.impl.api.store.RelationshipIterator
 import org.neo4j.kernel.impl.core.{EmbeddedProxySPI, ThreadToStatementContextBridge}
 import org.neo4j.kernel.impl.coreapi.PropertyContainerLocker
 import org.neo4j.kernel.impl.query.Neo4jTransactionalContext
 import org.neo4j.kernel.impl.util.ValueUtils.{fromNodeProxy, fromRelationshipProxy}
 import org.neo4j.kernel.impl.util.{DefaultValueMapper, ValueUtils}
+import org.neo4j.storageengine.api.RelationshipVisitor
 import org.neo4j.values.storable.{TextValue, Value, Values, _}
 import org.neo4j.values.virtual._
 import org.neo4j.values.{AnyValue, ValueMapper}

diff --git a/.../kernel/impl/api/RelationshipVisitor.java → ...torageengine/api/RelationshipVisitor.java b/.../kernel/impl/api/RelationshipVisitor.java → ...torageengine/api/RelationshipVisitor.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.kernel.impl.api;
+package org.neo4j.storageengine.api;
 
 /**
  * Visitor of relationship data.

diff --git a/...unity/kernel-api/src/main/java/org/neo4j/storageengine/api/StorageRelationshipCursor.java b/...unity/kernel-api/src/main/java/org/neo4j/storageengine/api/StorageRelationshipCursor.java
@@ -19,8 +19,6 @@
  */
 package org.neo4j.storageengine.api;
 
-import org.neo4j.kernel.impl.api.RelationshipVisitor;
-
 /**
  * Shared interface between the two {@link StorageRelationshipScanCursor} and {@link StorageRelationshipTraversalCursor}.
  */

diff --git a/...ernel-api/src/main/java/org/neo4j/storageengine/api/txstate/ReadableTransactionState.java b/...ernel-api/src/main/java/org/neo4j/storageengine/api/txstate/ReadableTransactionState.java
@@ -27,8 +27,8 @@
 import org.neo4j.internal.kernel.api.schema.SchemaDescriptor;
 import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor;
 import org.neo4j.kernel.api.schema.index.IndexDescriptor;
-import org.neo4j.kernel.impl.api.RelationshipVisitor;
 import org.neo4j.kernel.impl.api.state.GraphState;
+import org.neo4j.storageengine.api.RelationshipVisitor;
 import org.neo4j.values.storable.Value;
 import org.neo4j.values.storable.ValueGroup;
 import org.neo4j.values.storable.ValueTuple;

diff --git a/...unity/kernel-api/src/main/java/org/neo4j/storageengine/api/txstate/RelationshipState.java b/...unity/kernel-api/src/main/java/org/neo4j/storageengine/api/txstate/RelationshipState.java
@@ -19,8 +19,7 @@
  */
 package org.neo4j.storageengine.api.txstate;
 
-
-import org.neo4j.kernel.impl.api.RelationshipVisitor;
+import org.neo4j.storageengine.api.RelationshipVisitor;
 
 /**
  * Represents the transactional changes to a relationship.

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/RelationshipDataExtractor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/RelationshipDataExtractor.java
@@ -19,6 +19,8 @@
  */
 package org.neo4j.kernel.impl.api;
 
+import org.neo4j.storageengine.api.RelationshipVisitor;
+
 public class RelationshipDataExtractor implements RelationshipVisitor<RuntimeException>
 {
     private int type;

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/RelationshipStateImpl.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/RelationshipStateImpl.java
@@ -24,8 +24,8 @@
 
 import java.util.Iterator;
 
-import org.neo4j.kernel.impl.api.RelationshipVisitor;
 import org.neo4j.kernel.impl.util.collection.CollectionsFactory;
+import org.neo4j.storageengine.api.RelationshipVisitor;
 import org.neo4j.storageengine.api.StorageProperty;
 import org.neo4j.storageengine.api.txstate.RelationshipState;
 

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/TxState.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/TxState.java
@@ -41,13 +41,13 @@
 import org.neo4j.kernel.api.schema.constraints.IndexBackedConstraintDescriptor;
 import org.neo4j.kernel.api.schema.index.IndexDescriptor;
 import org.neo4j.kernel.api.txstate.TransactionState;
-import org.neo4j.kernel.impl.api.RelationshipVisitor;
 import org.neo4j.kernel.impl.util.collection.CollectionsFactory;
 import org.neo4j.kernel.impl.util.collection.OnHeapCollectionsFactory;
 import org.neo4j.kernel.impl.util.diffsets.DiffSets;
 import org.neo4j.kernel.impl.util.diffsets.MutableLongDiffSets;
 import org.neo4j.kernel.impl.util.diffsets.MutableLongDiffSetsImpl;
 import org.neo4j.storageengine.api.Direction;
+import org.neo4j.storageengine.api.RelationshipVisitor;
 import org.neo4j.storageengine.api.txstate.DiffSetsVisitor;
 import org.neo4j.storageengine.api.txstate.LongDiffSets;
 import org.neo4j.storageengine.api.txstate.NodeState;

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/RelationshipIterator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/RelationshipIterator.java
@@ -22,7 +22,7 @@
 import org.eclipse.collections.api.iterator.LongIterator;
 
 import org.neo4j.collection.PrimitiveLongCollections;
-import org.neo4j.kernel.impl.api.RelationshipVisitor;
+import org.neo4j.storageengine.api.RelationshipVisitor;
 
 public interface RelationshipIterator extends RelationshipVisitor.Home, LongIterator
 {

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/RelationshipProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/RelationshipProxy.java
@@ -44,9 +44,9 @@
 import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException;
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.api.Statement;
-import org.neo4j.kernel.impl.api.RelationshipVisitor;
 import org.neo4j.kernel.impl.store.record.AbstractBaseRecord;
 import org.neo4j.storageengine.api.EntityType;
+import org.neo4j.storageengine.api.RelationshipVisitor;
 import org.neo4j.values.storable.Value;
 import org.neo4j.values.storable.Values;
 

diff --git a/...java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordRelationshipCursor.java b/...java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordRelationshipCursor.java
@@ -20,10 +20,10 @@
 package org.neo4j.kernel.impl.storageengine.impl.recordstorage;
 
 import org.neo4j.io.pagecache.PageCursor;
-import org.neo4j.kernel.impl.api.RelationshipVisitor;
 import org.neo4j.kernel.impl.store.RelationshipStore;
 import org.neo4j.kernel.impl.store.record.RecordLoad;
 import org.neo4j.kernel.impl.store.record.RelationshipRecord;
+import org.neo4j.storageengine.api.RelationshipVisitor;
 import org.neo4j.storageengine.api.StorageRelationshipCursor;
 
 abstract class RecordRelationshipCursor extends RelationshipRecord implements RelationshipVisitor<RuntimeException>, StorageRelationshipCursor

diff --git a/...main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageReader.java b/...main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageReader.java
@@ -35,7 +35,6 @@
 import org.neo4j.kernel.api.schema.index.IndexDescriptor;
 import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor;
 import org.neo4j.kernel.impl.api.IndexReaderFactory;
-import org.neo4j.kernel.impl.api.RelationshipVisitor;
 import org.neo4j.kernel.impl.api.index.IndexProxy;
 import org.neo4j.kernel.impl.api.index.IndexingService;
 import org.neo4j.kernel.impl.api.store.SchemaCache;
@@ -52,6 +51,7 @@
 import org.neo4j.register.Register;
 import org.neo4j.register.Register.DoubleLongRegister;
 import org.neo4j.storageengine.api.EntityType;
+import org.neo4j.storageengine.api.RelationshipVisitor;
 import org.neo4j.storageengine.api.StoragePropertyCursor;
 import org.neo4j.storageengine.api.StorageReader;
 import org.neo4j.storageengine.api.StorageRelationshipGroupCursor;

diff --git a/community/kernel/src/test/java/org/neo4j/storageengine/api/StubStorageCursors.java b/community/kernel/src/test/java/org/neo4j/storageengine/api/StubStorageCursors.java
@@ -34,7 +34,6 @@
 import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor;
 import org.neo4j.kernel.api.schema.index.CapableIndexDescriptor;
 import org.neo4j.kernel.api.schema.index.IndexDescriptor;
-import org.neo4j.kernel.impl.api.RelationshipVisitor;
 import org.neo4j.kernel.impl.core.DelegatingTokenHolder;
 import org.neo4j.kernel.impl.core.TokenHolder;
 import org.neo4j.register.Register;

diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/codegen/Methods.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/codegen/Methods.scala
@@ -29,20 +29,21 @@ import org.eclipse.collections.impl.map.mutable.primitive.LongIntHashMap
 import org.neo4j.codegen.MethodReference
 import org.neo4j.cypher.internal.codegen.CompiledConversionUtils.CompositeKey
 import org.neo4j.cypher.internal.codegen._
-import org.neo4j.cypher.internal.runtime.compiled.codegen.QueryExecutionEvent
 import org.neo4j.cypher.internal.javacompat.ResultRecord
-import org.opencypher.v9_0.util.attribution.Id
+import org.neo4j.cypher.internal.runtime.compiled.codegen.QueryExecutionEvent
 import org.neo4j.cypher.result.QueryResult.{QueryResultVisitor, Record}
 import org.neo4j.graphdb.Direction
 import org.neo4j.helpers.collection.MapUtil
 import org.neo4j.internal.kernel.api.helpers.RelationshipSelectionCursor
 import org.neo4j.internal.kernel.api.{Read, TokenRead, _}
+import org.neo4j.kernel.impl.api.RelationshipDataExtractor
 import org.neo4j.kernel.impl.api.store.RelationshipIterator
-import org.neo4j.kernel.impl.api.{RelationshipDataExtractor, RelationshipVisitor}
 import org.neo4j.kernel.impl.core.{EmbeddedProxySPI, NodeProxy, RelationshipProxy}
+import org.neo4j.storageengine.api.RelationshipVisitor
 import org.neo4j.values.AnyValue
 import org.neo4j.values.storable.{Value, Values}
 import org.neo4j.values.virtual.{NodeValue, RelationshipValue, VirtualNodeValue, VirtualRelationshipValue}
+import org.opencypher.v9_0.util.attribution.Id
 
 object Methods {
 

diff --git a/...src/main/scala/org/neo4j/cypher/internal/runtime/slotted/pipes/ExpandAllSlottedPipe.scala b/...src/main/scala/org/neo4j/cypher/internal/runtime/slotted/pipes/ExpandAllSlottedPipe.scala
@@ -26,11 +26,11 @@ import org.neo4j.cypher.internal.runtime.interpreted.pipes._
 import org.neo4j.cypher.internal.runtime.slotted.SlottedExecutionContext
 import org.neo4j.cypher.internal.runtime.slotted.helpers.NullChecker
 import org.neo4j.cypher.internal.runtime.slotted.helpers.SlottedPipeBuilderUtils.makeGetPrimitiveNodeFromSlotFunctionFor
+import org.neo4j.kernel.impl.api.store.RelationshipIterator
+import org.neo4j.storageengine.api.RelationshipVisitor
+import org.opencypher.v9_0.expressions.SemanticDirection
 import org.opencypher.v9_0.util.InternalException
 import org.opencypher.v9_0.util.attribution.Id
-import org.opencypher.v9_0.expressions.SemanticDirection
-import org.neo4j.kernel.impl.api.RelationshipVisitor
-import org.neo4j.kernel.impl.api.store.RelationshipIterator
 
 case class ExpandAllSlottedPipe(source: Pipe,
                                 fromSlot: Slot,

diff --git a/.../scala/org/neo4j/cypher/internal/runtime/slotted/pipes/OptionalExpandAllSlottedPipe.scala b/.../scala/org/neo4j/cypher/internal/runtime/slotted/pipes/OptionalExpandAllSlottedPipe.scala
@@ -27,11 +27,11 @@ import org.neo4j.cypher.internal.runtime.interpreted.pipes._
 import org.neo4j.cypher.internal.runtime.slotted.SlottedExecutionContext
 import org.neo4j.cypher.internal.runtime.slotted.helpers.NullChecker
 import org.neo4j.cypher.internal.runtime.slotted.helpers.SlottedPipeBuilderUtils.makeGetPrimitiveNodeFromSlotFunctionFor
+import org.neo4j.kernel.impl.api.store.RelationshipIterator
+import org.neo4j.storageengine.api.RelationshipVisitor
+import org.opencypher.v9_0.expressions.SemanticDirection
 import org.opencypher.v9_0.util.InternalException
 import org.opencypher.v9_0.util.attribution.Id
-import org.opencypher.v9_0.expressions.SemanticDirection
-import org.neo4j.kernel.impl.api.RelationshipVisitor
-import org.neo4j.kernel.impl.api.store.RelationshipIterator
 
 case class OptionalExpandAllSlottedPipe(source: Pipe,
                                         fromSlot: Slot,

diff --git a/...in/scala/org/neo4j/cypher/internal/runtime/slotted/pipes/PrimitiveCachingExpandInto.scala b/...in/scala/org/neo4j/cypher/internal/runtime/slotted/pipes/PrimitiveCachingExpandInto.scala
@@ -21,10 +21,10 @@ package org.neo4j.cypher.internal.runtime.slotted.pipes
 
 import org.eclipse.collections.api.iterator.LongIterator
 import org.neo4j.cypher.internal.runtime.QueryContext
-import org.opencypher.v9_0.util.InternalException
-import org.opencypher.v9_0.expressions.SemanticDirection
-import org.neo4j.kernel.impl.api.RelationshipVisitor
 import org.neo4j.kernel.impl.api.store.RelationshipIterator
+import org.neo4j.storageengine.api.RelationshipVisitor
+import org.opencypher.v9_0.expressions.SemanticDirection
+import org.opencypher.v9_0.util.InternalException
 
 import scala.collection.mutable
 

diff --git a/...in/scala/org/neo4j/cypher/internal/runtime/slotted/pipes/VarLengthExpandSlottedPipe.scala b/...in/scala/org/neo4j/cypher/internal/runtime/slotted/pipes/VarLengthExpandSlottedPipe.scala
@@ -26,13 +26,13 @@ import org.neo4j.cypher.internal.runtime.interpreted.pipes.{LazyTypes, Pipe, Pip
 import org.neo4j.cypher.internal.runtime.slotted.SlottedExecutionContext
 import org.neo4j.cypher.internal.runtime.slotted.helpers.NullChecker.entityIsNull
 import org.neo4j.cypher.internal.runtime.slotted.helpers.SlottedPipeBuilderUtils.makeGetPrimitiveNodeFromSlotFunctionFor
-import org.opencypher.v9_0.util.InternalException
-import org.opencypher.v9_0.util.attribution.Id
-import org.opencypher.v9_0.expressions.SemanticDirection
-import org.neo4j.kernel.impl.api.RelationshipVisitor
 import org.neo4j.kernel.impl.api.store.RelationshipIterator
+import org.neo4j.storageengine.api.RelationshipVisitor
 import org.neo4j.values.storable.Values
 import org.neo4j.values.virtual.{RelationshipValue, VirtualValues}
+import org.opencypher.v9_0.expressions.SemanticDirection
+import org.opencypher.v9_0.util.InternalException
+import org.opencypher.v9_0.util.attribution.Id
 
 import scala.collection.mutable