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 b68bda1dd31c9..a53949a50ff00 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 @@ -19,6 +19,8 @@ */ package org.neo4j.consistency.checking.full; +import org.eclipse.collections.api.iterator.LongIterator; + import java.util.Arrays; import java.util.Collection; import java.util.List; @@ -27,7 +29,6 @@ import org.neo4j.collection.primitive.Primitive; import org.neo4j.collection.primitive.PrimitiveIntObjectMap; import org.neo4j.collection.primitive.PrimitiveIntSet; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.consistency.checking.ChainCheck; import org.neo4j.consistency.checking.CheckerEngine; import org.neo4j.consistency.checking.RecordCheck; @@ -131,7 +132,7 @@ private void verifyNodeCorrectlyIndexedUniquely( long nodeId, Value[] propertyVa { IndexQuery[] query = seek( indexRule.schema(), propertyValues ); - PrimitiveLongIterator indexedNodeIds = queryIndexOrEmpty( reader, query ); + final LongIterator indexedNodeIds = queryIndexOrEmpty( reader, query ); long count = 0; while ( indexedNodeIds.hasNext() ) @@ -230,9 +231,9 @@ private IndexQuery[] seek( SchemaDescriptor schema, Value[] propertyValues ) return query; } - private PrimitiveLongIterator queryIndexOrEmpty( IndexReader reader, IndexQuery[] query ) + private LongIterator queryIndexOrEmpty( IndexReader reader, IndexQuery[] query ) { - PrimitiveLongIterator indexedNodeIds; + final LongIterator indexedNodeIds; try { indexedNodeIds = reader.query( query ); diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_5/ExceptionTranslatingQueryContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_5/ExceptionTranslatingQueryContext.scala index dd3cb50e10782..19335b40761e3 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_5/ExceptionTranslatingQueryContext.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_5/ExceptionTranslatingQueryContext.scala @@ -21,7 +21,7 @@ package org.neo4j.cypher.internal.compatibility.v3_5 import java.net.URL -import org.neo4j.collection.primitive.PrimitiveLongIterator +import org.eclipse.collections.api.iterator.LongIterator import org.neo4j.cypher.internal.planner.v3_5.spi.IndexDescriptor import org.neo4j.cypher.internal.runtime._ import org.neo4j.cypher.internal.runtime.interpreted.{DelegatingOperations, DelegatingQueryTransactionalContext} @@ -106,7 +106,7 @@ class ExceptionTranslatingQueryContext(val inner: QueryContext) extends QueryCon override def getNodesByLabel(id: Int): Iterator[NodeValue] = translateException(inner.getNodesByLabel(id)) - override def getNodesByLabelPrimitive(id: Int): PrimitiveLongIterator = + override def getNodesByLabelPrimitive(id: Int): LongIterator = translateException(inner.getNodesByLabelPrimitive(id)) override def nodeGetDegree(node: Long, dir: SemanticDirection): Int = @@ -301,7 +301,7 @@ class ExceptionTranslatingQueryContext(val inner: QueryContext) extends QueryCon override def all: Iterator[T] = translateException(inner.all) - override def allPrimitive: PrimitiveLongIterator = + override def allPrimitive: LongIterator = translateException(inner.allPrimitive) override def isDeletedInThisTx(id: Long): Boolean = diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_5/runtime/helpers/PrimitiveLongHelper.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_5/runtime/helpers/PrimitiveLongHelper.scala index c26b07d401cbc..dcea4e57a90a7 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_5/runtime/helpers/PrimitiveLongHelper.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_5/runtime/helpers/PrimitiveLongHelper.scala @@ -19,16 +19,17 @@ */ package org.neo4j.cypher.internal.compatibility.v3_5.runtime.helpers -import org.neo4j.collection.primitive.PrimitiveLongIterator +import org.eclipse.collections.api.iterator.LongIterator + object PrimitiveLongHelper { - def map[T](in: PrimitiveLongIterator, f: Long => T): Iterator[T] = new Iterator[T] { + def map[T](in: LongIterator, f: Long => T): Iterator[T] = new Iterator[T] { override def hasNext: Boolean = in.hasNext override def next(): T = f(in.next()) } - def mapPrimitive(in: PrimitiveLongIterator, f: Long => Long): PrimitiveLongIterator = new PrimitiveLongIterator { + def mapPrimitive(in: LongIterator, f: Long => Long): LongIterator = new LongIterator { override def hasNext: Boolean = in.hasNext override def next(): Long = f(in.next()) diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_5/runtime/profiler/Profiler.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_5/runtime/profiler/Profiler.scala index 4a8fa255b1ec0..93b78055ccae7 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_5/runtime/profiler/Profiler.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_5/runtime/profiler/Profiler.scala @@ -19,7 +19,7 @@ */ package org.neo4j.cypher.internal.compatibility.v3_5.runtime.profiler -import org.neo4j.collection.primitive.PrimitiveLongIterator +import org.eclipse.collections.api.iterator.LongIterator import org.neo4j.cypher.internal.compatibility.v3_5.runtime.helpers.PrimitiveLongHelper import org.neo4j.cypher.internal.runtime.interpreted.pipes.{Pipe, PipeDecorator, QueryState} import org.neo4j.cypher.internal.runtime.interpreted.{DelegatingOperations, DelegatingQueryContext, ExecutionContext} @@ -146,7 +146,7 @@ final class ProfilingPipeQueryContext(inner: QueryContext, val p: Pipe) } } - override protected def manyDbHits[A](value: PrimitiveLongIterator): PrimitiveLongIterator = { + override protected def manyDbHits[A](value: LongIterator): LongIterator = { increment() PrimitiveLongHelper.mapPrimitive(value, { x => increment() @@ -190,7 +190,7 @@ final class ProfilingPipeQueryContext(inner: QueryContext, val p: Pipe) override protected def singleDbHit[A](value: A): A = self.singleDbHit(value) override protected def manyDbHits[A](value: Iterator[A]): Iterator[A] = self.manyDbHits(value) - override protected def manyDbHits[A](value: PrimitiveLongIterator): PrimitiveLongIterator = self.manyDbHits(value) + override protected def manyDbHits[A](value: LongIterator): LongIterator = self.manyDbHits(value) } override def nodeOps: Operations[NodeValue] = new ProfilerOperations(inner.nodeOps) diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala index cd32257348f72..ca64e1a90508c 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala @@ -22,7 +22,8 @@ package org.neo4j.cypher.internal.spi.v2_3 import java.net.URL import java.util.function.Predicate -import org.neo4j.collection.primitive.PrimitiveLongIterator +import org.eclipse.collections.api.iterator.LongIterator +import org.neo4j.collection.primitive.base.Empty.EMPTY_PRIMITIVE_LONG_COLLECTION import org.neo4j.cypher.InternalException import org.neo4j.cypher.internal.compiler.v2_3.MinMaxOrdering.{BY_NUMBER, BY_STRING, BY_VALUE} import org.neo4j.cypher.internal.compiler.v2_3._ @@ -698,7 +699,7 @@ final class TransactionBoundQueryContext(tc: TransactionalContextWrapper, val re }) abstract class BaseOperations[T <: PropertyContainer] extends Operations[T] { - def primitiveLongIteratorToScalaIterator(primitiveIterator: PrimitiveLongIterator): Iterator[Long] = + def primitiveLongIteratorToScalaIterator(primitiveIterator: LongIterator): Iterator[Long] = new Iterator[Long] { override def hasNext: Boolean = primitiveIterator.hasNext diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundQueryContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundQueryContext.scala index 10e1fe5a029da..fffeeb36aa1d6 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundQueryContext.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundQueryContext.scala @@ -22,8 +22,8 @@ package org.neo4j.cypher.internal.spi.v3_1 import java.net.URL import java.util.function.Predicate +import org.eclipse.collections.api.iterator.LongIterator import org.neo4j.collection.RawIterator -import org.neo4j.collection.primitive.PrimitiveLongIterator import org.neo4j.cypher.InternalException import org.neo4j.cypher.internal.compiler.v3_1.MinMaxOrdering.{BY_NUMBER, BY_STRING, BY_VALUE} import org.neo4j.cypher.internal.compiler.v3_1._ @@ -713,7 +713,7 @@ final class TransactionBoundQueryContext(txContext: TransactionalContextWrapper, tokenWrite.propertyKeyGetOrCreateForName(propertyKey) abstract class BaseOperations[T <: PropertyContainer] extends Operations[T] { - def primitiveLongIteratorToScalaIterator(primitiveIterator: PrimitiveLongIterator): Iterator[Long] = + def primitiveLongIteratorToScalaIterator(primitiveIterator: LongIterator): Iterator[Long] = new Iterator[Long] { override def hasNext: Boolean = primitiveIterator.hasNext diff --git a/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/DelegatingQueryContext.scala b/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/DelegatingQueryContext.scala index b1b61a74f563b..47bc124a051ad 100644 --- a/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/DelegatingQueryContext.scala +++ b/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/DelegatingQueryContext.scala @@ -21,7 +21,7 @@ package org.neo4j.cypher.internal.runtime.interpreted import java.net.URL -import org.neo4j.collection.primitive.PrimitiveLongIterator +import org.eclipse.collections.api.iterator.LongIterator import org.neo4j.cypher.internal.planner.v3_5.spi.{IndexDescriptor, KernelStatisticProvider} import org.neo4j.cypher.internal.runtime._ import org.neo4j.cypher.internal.v3_5.expressions.SemanticDirection @@ -43,7 +43,8 @@ abstract class DelegatingQueryContext(val inner: QueryContext) extends QueryCont protected def singleDbHit[A](value: A): A = value protected def manyDbHits[A](value: Iterator[A]): Iterator[A] = value - protected def manyDbHits[A](value: PrimitiveLongIterator): PrimitiveLongIterator = value + + protected def manyDbHits[A](value: LongIterator): LongIterator = value protected def manyDbHits[A](value: RelationshipIterator): RelationshipIterator = value protected def manyDbHits[A](value: RelationshipSelectionCursor): RelationshipSelectionCursor = value protected def manyDbHits(count: Int): Int = count @@ -118,7 +119,7 @@ abstract class DelegatingQueryContext(val inner: QueryContext) extends QueryCont override def indexScan(index: IndexReference): Iterator[NodeValue] = manyDbHits(inner.indexScan(index)) - override def indexScanPrimitive(index: IndexReference): PrimitiveLongIterator = manyDbHits(inner.indexScanPrimitive(index)) + override def indexScanPrimitive(index: IndexReference): LongIterator = manyDbHits(inner.indexScanPrimitive(index)) override def indexScanByContains(index: IndexReference, value: String): scala.Iterator[NodeValue] = manyDbHits(inner.indexScanByContains(index, value)) @@ -128,7 +129,7 @@ abstract class DelegatingQueryContext(val inner: QueryContext) extends QueryCont override def getNodesByLabel(id: Int): Iterator[NodeValue] = manyDbHits(inner.getNodesByLabel(id)) - override def getNodesByLabelPrimitive(id: Int): PrimitiveLongIterator = manyDbHits(inner.getNodesByLabelPrimitive(id)) + override def getNodesByLabelPrimitive(id: Int): LongIterator = manyDbHits(inner.getNodesByLabelPrimitive(id)) override def getOrCreateFromSchemaState[K, V](key: K, creator: => V): V = singleDbHit(inner.getOrCreateFromSchemaState(key, creator)) @@ -261,7 +262,8 @@ class DelegatingOperations[T](protected val inner: Operations[T]) extends Operat protected def singleDbHit[A](value: A): A = value protected def manyDbHits[A](value: Iterator[A]): Iterator[A] = value - protected def manyDbHits[A](value: PrimitiveLongIterator): PrimitiveLongIterator = value + + protected def manyDbHits[A](value: LongIterator): LongIterator = value override def delete(id: Long): Unit = singleDbHit(inner.delete(id)) @@ -280,7 +282,7 @@ class DelegatingOperations[T](protected val inner: Operations[T]) extends Operat override def all: Iterator[T] = manyDbHits(inner.all) - override def allPrimitive: PrimitiveLongIterator = manyDbHits(inner.allPrimitive) + override def allPrimitive: LongIterator = manyDbHits(inner.allPrimitive) override def isDeletedInThisTx(id: Long): Boolean = inner.isDeletedInThisTx(id) diff --git a/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/JavaConversionSupport.scala b/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/JavaConversionSupport.scala index 678cc733e7701..8a870c9177351 100644 --- a/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/JavaConversionSupport.scala +++ b/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/JavaConversionSupport.scala @@ -20,7 +20,6 @@ package org.neo4j.cypher.internal.runtime.interpreted import org.eclipse.collections.api.iterator.{IntIterator, LongIterator} -import org.neo4j.collection.primitive.PrimitiveLongIterator object JavaConversionSupport { @@ -32,7 +31,7 @@ object JavaConversionSupport { def asScalaENFXSafe(iterator: IntIterator): Iterator[Int] = makeENFXSafe(iterator.hasNext, iterator.next)(Some(_)) // Same as mapToScala, but handles concurrency exceptions by swallowing exceptions - def mapToScalaENFXSafe[T](iterator: PrimitiveLongIterator)(f: Long => Option[T]): Iterator[T] = makeENFXSafe(iterator.hasNext, iterator.next)(f) + def mapToScalaENFXSafe[T](iterator: LongIterator)(f: Long => Option[T]): Iterator[T] = makeENFXSafe(iterator.hasNext, iterator.next)(f) private def makeENFXSafe[S,T](hasMore: () => Boolean, more: () => S)(f: S => Option[T]): Iterator[T] = new Iterator[T] { private var _next: Option[T] = fetchNext() diff --git a/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionBoundQueryContext.scala b/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionBoundQueryContext.scala index 79b7ebc898562..cce7009cabb4c 100644 --- a/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionBoundQueryContext.scala +++ b/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionBoundQueryContext.scala @@ -22,8 +22,10 @@ package org.neo4j.cypher.internal.runtime.interpreted import java.net.URL import java.util.function.Predicate +import org.eclipse.collections.api.iterator.LongIterator import org.neo4j.collection.RawIterator -import org.neo4j.collection.primitive.{PrimitiveLongIterator, PrimitiveLongResourceIterator} +import org.neo4j.collection.primitive.PrimitiveLongResourceIterator +import org.neo4j.cypher.InternalException import org.neo4j.cypher.internal.javacompat.GraphDatabaseCypherService import org.neo4j.cypher.internal.planner.v3_5.spi.{IdempotentResult, IndexDescriptor} import org.neo4j.cypher.internal.runtime._ @@ -330,7 +332,7 @@ sealed class TransactionBoundQueryContext(val transactionalContext: Transactiona } } - override def getNodesByLabelPrimitive(id: Int): PrimitiveLongIterator = { + override def getNodesByLabelPrimitive(id: Int): LongIterator = { val cursor = allocateAndTraceNodeLabelIndexCursor() reads().nodeLabelScan(id, cursor) new PrimitiveCursorIterator { @@ -461,7 +463,7 @@ sealed class TransactionBoundQueryContext(val transactionalContext: Transactiona } } - override def allPrimitive: PrimitiveLongIterator = { + override def allPrimitive: LongIterator = { val nodeCursor = allocateAndTraceNodeCursor() reads().allNodesScan(nodeCursor) new PrimitiveCursorIterator { @@ -593,7 +595,7 @@ sealed class TransactionBoundQueryContext(val transactionalContext: Transactiona } } - override def allPrimitive: PrimitiveLongIterator = { + override def allPrimitive: LongIterator = { val relCursor = allocateAndTraceRelationshipScanCursor() reads().allRelationshipsScan(relCursor) new PrimitiveCursorIterator { @@ -618,7 +620,7 @@ sealed class TransactionBoundQueryContext(val transactionalContext: Transactiona abstract class BaseOperations[T] extends Operations[T] { - def primitiveLongIteratorToScalaIterator(primitiveIterator: PrimitiveLongIterator): Iterator[Long] = + def primitiveLongIteratorToScalaIterator(primitiveIterator: LongIterator): Iterator[Long] = new Iterator[Long] { override def hasNext: Boolean = primitiveIterator.hasNext diff --git a/community/cypher/interpreted-runtime/src/test/scala/org/neo4j/cypher/internal/runtime/interpreted/QueryContextAdaptation.scala b/community/cypher/interpreted-runtime/src/test/scala/org/neo4j/cypher/internal/runtime/interpreted/QueryContextAdaptation.scala index d20e07df5ced9..7f3b30407e44d 100644 --- a/community/cypher/interpreted-runtime/src/test/scala/org/neo4j/cypher/internal/runtime/interpreted/QueryContextAdaptation.scala +++ b/community/cypher/interpreted-runtime/src/test/scala/org/neo4j/cypher/internal/runtime/interpreted/QueryContextAdaptation.scala @@ -21,7 +21,7 @@ package org.neo4j.cypher.internal.runtime.interpreted import java.net.URL -import org.neo4j.collection.primitive.PrimitiveLongIterator +import org.eclipse.collections.api.iterator.LongIterator import org.neo4j.cypher.internal.planner.v3_5.spi.{IdempotentResult, IndexDescriptor} import org.neo4j.cypher.internal.runtime._ import org.neo4j.cypher.internal.v3_5.expressions.SemanticDirection @@ -122,7 +122,7 @@ trait QueryContextAdaptation { override def indexScan(index: IndexReference): scala.Iterator[NodeValue] = ??? - override def indexScanPrimitive(index: IndexReference): PrimitiveLongIterator = ??? + override def indexScanPrimitive(index: IndexReference): LongIterator = ??? override def getImportURL(url: URL): Either[String, URL] = ??? @@ -142,7 +142,7 @@ trait QueryContextAdaptation { override def getNodesByLabel(id: Int): scala.Iterator[NodeValue] = ??? - override def getNodesByLabelPrimitive(id: Int): PrimitiveLongIterator = ??? + override def getNodesByLabelPrimitive(id: Int): LongIterator = ??? override def lockingUniqueIndexSeek(index: IndexReference, values: Seq[IndexQuery.ExactPredicate]): Option[NodeValue] = ??? diff --git a/community/cypher/interpreted-runtime/src/test/scala/org/neo4j/cypher/internal/runtime/interpreted/pipes/LazyGroupingIteratorTest.scala b/community/cypher/interpreted-runtime/src/test/scala/org/neo4j/cypher/internal/runtime/interpreted/pipes/LazyGroupingIteratorTest.scala index 09cd5b8665846..64460d370fc8e 100644 --- a/community/cypher/interpreted-runtime/src/test/scala/org/neo4j/cypher/internal/runtime/interpreted/pipes/LazyGroupingIteratorTest.scala +++ b/community/cypher/interpreted-runtime/src/test/scala/org/neo4j/cypher/internal/runtime/interpreted/pipes/LazyGroupingIteratorTest.scala @@ -19,7 +19,7 @@ */ package org.neo4j.cypher.internal.runtime.interpreted.pipes -import org.neo4j.collection.primitive.{PrimitiveLongIterable, PrimitiveLongSet} +import org.neo4j.collection.primitive.{PrimitiveLongCollection, PrimitiveLongSet} import org.neo4j.cypher.internal.util.v3_5.test_helpers.CypherFunSuite class LazyGroupingIteratorTest extends CypherFunSuite { @@ -99,9 +99,9 @@ class LazyGroupingIteratorTest extends CypherFunSuite { override def getKey(row: Row) = row.key } - def asScalaSet(in: PrimitiveLongIterable): Set[Long] = { + def asScalaSet(in: PrimitiveLongCollection): Set[Long] = { val builder = Set.newBuilder[Long] - val iter = in.iterator() + val iter = in.longIterator() while (iter.hasNext) { builder += iter.next() } diff --git a/community/cypher/interpreted-runtime/src/test/scala/org/neo4j/cypher/internal/runtime/interpreted/pipes/TriadicSelectionPipeTest.scala b/community/cypher/interpreted-runtime/src/test/scala/org/neo4j/cypher/internal/runtime/interpreted/pipes/TriadicSelectionPipeTest.scala index 47dbdfb8d29ec..ff57c4993bc65 100644 --- a/community/cypher/interpreted-runtime/src/test/scala/org/neo4j/cypher/internal/runtime/interpreted/pipes/TriadicSelectionPipeTest.scala +++ b/community/cypher/interpreted-runtime/src/test/scala/org/neo4j/cypher/internal/runtime/interpreted/pipes/TriadicSelectionPipeTest.scala @@ -19,7 +19,7 @@ */ package org.neo4j.cypher.internal.runtime.interpreted.pipes -import org.neo4j.collection.primitive.PrimitiveLongIterable +import org.eclipse.collections.api.LongIterable import org.neo4j.cypher.internal.runtime.interpreted.{ExecutionContext, QueryStateHelper} import org.neo4j.cypher.internal.util.v3_5.symbols._ import org.neo4j.cypher.internal.util.v3_5.test_helpers.CypherFunSuite @@ -154,9 +154,9 @@ class TriadicSelectionPipeTest extends CypherFunSuite { ids should equal(Set((0, 11), (0, 12), (0, 21), (0, 22), (3, 21), (3, 22), (3, 41), (3, 42))) } - private def asScalaSet(in: PrimitiveLongIterable): Set[Long] = { + private def asScalaSet(in: LongIterable): Set[Long] = { val builder = Set.newBuilder[Long] - val iter = in.iterator() + val iter = in.longIterator() while (iter.hasNext) { builder += iter.next() } diff --git a/community/cypher/runtime-util/src/main/scala/org/neo4j/cypher/internal/runtime/QueryContext.scala b/community/cypher/runtime-util/src/main/scala/org/neo4j/cypher/internal/runtime/QueryContext.scala index fe7284c0004fd..38b95daf4cd61 100644 --- a/community/cypher/runtime-util/src/main/scala/org/neo4j/cypher/internal/runtime/QueryContext.scala +++ b/community/cypher/runtime-util/src/main/scala/org/neo4j/cypher/internal/runtime/QueryContext.scala @@ -21,7 +21,7 @@ package org.neo4j.cypher.internal.runtime import java.net.URL -import org.neo4j.collection.primitive.PrimitiveLongIterator +import org.eclipse.collections.api.iterator.LongIterator import org.neo4j.cypher.internal.planner.v3_5.spi.{IdempotentResult, IndexDescriptor, KernelStatisticProvider, TokenContext} import org.neo4j.cypher.internal.v3_5.expressions.SemanticDirection import org.neo4j.cypher.internal.v3_5.logical.plans.QualifiedName @@ -108,13 +108,13 @@ trait QueryContext extends TokenContext { def indexScan(index: IndexReference): Iterator[NodeValue] - def indexScanPrimitive(index: IndexReference): PrimitiveLongIterator + def indexScanPrimitive(index: IndexReference): LongIterator def lockingUniqueIndexSeek(index: IndexReference, queries: Seq[IndexQuery.ExactPredicate]): Option[NodeValue] def getNodesByLabel(id: Int): Iterator[NodeValue] - def getNodesByLabelPrimitive(id: Int): PrimitiveLongIterator + def getNodesByLabelPrimitive(id: Int): LongIterator def getOrCreateFromSchemaState[K, V](key: K, creator: => V): V @@ -228,7 +228,7 @@ trait Operations[T] { def all: Iterator[T] - def allPrimitive: PrimitiveLongIterator + def allPrimitive: LongIterator def acquireExclusiveLock(obj: Long): Unit diff --git a/community/index/src/main/java/org/neo4j/index/internal/gbptree/ConsistencyChecker.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/ConsistencyChecker.java index 69ca8d7d371c7..a22a006ab762b 100644 --- a/community/index/src/main/java/org/neo4j/index/internal/gbptree/ConsistencyChecker.java +++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/ConsistencyChecker.java @@ -19,13 +19,14 @@ */ package org.neo4j.index.internal.gbptree; +import org.eclipse.collections.api.iterator.LongIterator; + import java.io.IOException; import java.util.ArrayList; import java.util.BitSet; import java.util.Comparator; import java.util.List; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.io.pagecache.CursorException; import org.neo4j.io.pagecache.PageCursor; @@ -87,7 +88,7 @@ public boolean check( PageCursor cursor, long expectedGeneration ) throws IOExce * assert calls. * @throws IOException on {@link PageCursor} error. */ - boolean checkSpace( PageCursor cursor, long lastId, PrimitiveLongIterator freelistIds ) throws IOException + boolean checkSpace( PageCursor cursor, long lastId, LongIterator freelistIds ) throws IOException { assertOnTreeNode( cursor ); diff --git a/community/index/src/main/java/org/neo4j/index/internal/gbptree/GBPTree.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/GBPTree.java index 72ee5b6782680..d19291deef189 100644 --- a/community/index/src/main/java/org/neo4j/index/internal/gbptree/GBPTree.java +++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/GBPTree.java @@ -1084,7 +1084,7 @@ boolean consistencyCheck() throws IOException PrimitiveLongSet freelistIds = Primitive.longSet(); freeList.visitFreelistPageIds( freelistIds::add ); freeList.visitUnacquiredIds( freelistIds::add, unstableGeneration ); - boolean checkSpace = consistencyChecker.checkSpace( cursor, freeList.lastId(), freelistIds.iterator() ); + boolean checkSpace = consistencyChecker.checkSpace( cursor, freeList.lastId(), freelistIds.longIterator() ); return check && checkSpace; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/LookupFilter.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/LookupFilter.java index e191fa8362a4a..33b254d0cd738 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/LookupFilter.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/LookupFilter.java @@ -19,11 +19,12 @@ */ package org.neo4j.kernel.impl.api; +import org.eclipse.collections.api.iterator.LongIterator; + import java.util.Arrays; import java.util.function.LongPredicate; import org.neo4j.collection.primitive.PrimitiveLongCollections; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.index.PropertyAccessor; @@ -48,8 +49,8 @@ private LookupFilter() /** * used by the consistency checker */ - public static PrimitiveLongIterator exactIndexMatches( PropertyAccessor accessor, - PrimitiveLongIterator indexedNodeIds, IndexQuery... predicates ) + public static LongIterator exactIndexMatches( PropertyAccessor accessor, + LongIterator indexedNodeIds, IndexQuery... predicates ) { if ( !indexedNodeIds.hasNext() ) { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/cursor/TxIteratorRelationshipCursor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/cursor/TxIteratorRelationshipCursor.java index ed0dbbbb00300..aee2742f95088 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/cursor/TxIteratorRelationshipCursor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/cursor/TxIteratorRelationshipCursor.java @@ -19,9 +19,10 @@ */ package org.neo4j.kernel.impl.api.cursor; +import org.eclipse.collections.api.iterator.LongIterator; + import java.util.function.Consumer; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.cursor.Cursor; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.storageengine.api.RelationshipItem; @@ -32,8 +33,8 @@ */ public class TxIteratorRelationshipCursor extends TxAbstractRelationshipCursor { - private PrimitiveLongIterator added; - private PrimitiveLongIterator addedRelationshipIterator; + private LongIterator added; + private LongIterator addedRelationshipIterator; public TxIteratorRelationshipCursor( TransactionState state, Consumer instanceCache ) { @@ -41,7 +42,7 @@ public TxIteratorRelationshipCursor( TransactionState state, Consumer cursor, - PrimitiveLongIterator addedRelationshipIterator ) + LongIterator addedRelationshipIterator ) { super.init( cursor ); 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 0bd62ced7b623..daaeb8df7bce0 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 @@ -34,7 +34,6 @@ import org.neo4j.collection.primitive.PrimitiveIntObjectMap; import org.neo4j.collection.primitive.PrimitiveIntSet; import org.neo4j.collection.primitive.PrimitiveLongCollections; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.collection.primitive.PrimitiveLongObjectMap; import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; @@ -178,9 +177,9 @@ public Iterator descriptors() return indexesByDescriptor.keySet().iterator(); } - public PrimitiveLongIterator indexIds() + public LongIterator indexIds() { - return indexesById.iterator(); + return indexesById.longIterator(); } public int size() 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 7a83146a16ea5..1d0b962a8c87f 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 @@ -19,6 +19,8 @@ */ package org.neo4j.kernel.impl.api.index; +import org.eclipse.collections.api.iterator.LongIterator; + import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -30,7 +32,6 @@ import java.util.function.BiConsumer; import org.neo4j.collection.primitive.Primitive; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.collection.primitive.PrimitiveLongObjectMap; import org.neo4j.collection.primitive.PrimitiveLongObjectVisitor; import org.neo4j.collection.primitive.PrimitiveLongSet; @@ -277,7 +278,7 @@ public void start() throws Exception logIndexStateSummary( "start", indexStates ); // Drop placeholder proxies for indexes that need to be rebuilt - dropRecoveringIndexes( indexMap, rebuildingDescriptors.iterator() ); + dropRecoveringIndexes( indexMap, rebuildingDescriptors.longIterator() ); // Rebuild indexes by recreating and repopulating them if ( !rebuildingDescriptors.isEmpty() ) @@ -522,7 +523,7 @@ public void triggerIndexSampling( SchemaDescriptor descriptor, IndexSamplingMode samplingController.sampleIndex( indexMapRef.getIndexId( descriptor ), mode ); } - private void dropRecoveringIndexes( IndexMap indexMap, PrimitiveLongIterator indexesToRebuild ) + private void dropRecoveringIndexes( IndexMap indexMap, LongIterator indexesToRebuild ) throws IOException { while ( indexesToRebuild.hasNext() ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/NodeUpdatesIterator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/NodeUpdatesIterator.java index 4ece921dbec71..04bda4ffcab4a 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/NodeUpdatesIterator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/NodeUpdatesIterator.java @@ -19,18 +19,18 @@ */ package org.neo4j.kernel.impl.api.index; -import java.util.Iterator; +import org.eclipse.collections.api.iterator.LongIterator; -import org.neo4j.collection.primitive.PrimitiveLongIterator; +import java.util.Iterator; class NodeUpdatesIterator implements Iterator { private final IndexStoreView storeView; - private final PrimitiveLongIterator nodeIdIterator; + private final LongIterator nodeIdIterator; private NodeUpdates nextUpdate; - NodeUpdatesIterator( IndexStoreView storeView, PrimitiveLongIterator nodeIdIterator ) + NodeUpdatesIterator( IndexStoreView storeView, LongIterator nodeIdIterator ) { this.storeView = storeView; this.nodeIdIterator = nodeIdIterator; 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 79fe59a9b6cc1..6de6de2ec772c 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 @@ -19,11 +19,12 @@ */ package org.neo4j.kernel.impl.api.index.sampling; +import org.eclipse.collections.api.iterator.LongIterator; + import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; import org.neo4j.collection.primitive.PrimitiveLongCollections; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.internal.kernel.api.InternalIndexState; import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.impl.api.index.IndexMap; @@ -87,7 +88,7 @@ public void recoverIndexSamples() try { IndexMap indexMap = indexMapSnapshotProvider.indexMapSnapshot(); - PrimitiveLongIterator indexIds = indexMap.indexIds(); + final LongIterator indexIds = indexMap.indexIds(); while ( indexIds.hasNext() ) { long indexId = indexIds.next(); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/NodeStateImpl.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/NodeStateImpl.java index dc095a1e97ffd..797561ad1564a 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/NodeStateImpl.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/NodeStateImpl.java @@ -19,6 +19,8 @@ */ package org.neo4j.kernel.impl.api.state; +import org.eclipse.collections.api.iterator.LongIterator; + import java.util.Collections; import java.util.IdentityHashMap; import java.util.Iterator; @@ -26,7 +28,6 @@ import org.neo4j.collection.primitive.PrimitiveIntSet; import org.neo4j.collection.primitive.PrimitiveLongCollections; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.internal.kernel.api.exceptions.schema.ConstraintValidationException; import org.neo4j.kernel.impl.api.state.RelationshipChangesForNode.DiffStrategy; import org.neo4j.kernel.impl.newapi.RelationshipDirection; @@ -158,25 +159,25 @@ public boolean isPropertyRemoved( int propertyKeyId ) } @Override - public PrimitiveLongIterator getAddedRelationships( Direction direction ) + public LongIterator getAddedRelationships( Direction direction ) { return PrimitiveLongCollections.emptyIterator(); } @Override - public PrimitiveLongIterator getAddedRelationships( Direction direction, int[] relTypes ) + public LongIterator getAddedRelationships( Direction direction, int[] relTypes ) { return PrimitiveLongCollections.emptyIterator(); } @Override - public PrimitiveLongIterator getAddedRelationships() + public LongIterator getAddedRelationships() { return PrimitiveLongCollections.emptyIterator(); } @Override - public PrimitiveLongIterator getAddedRelationships( RelationshipDirection direction, int relType ) + public LongIterator getAddedRelationships( RelationshipDirection direction, int relType ) { return PrimitiveLongCollections.emptyIterator(); } @@ -373,28 +374,28 @@ public boolean hasRelationshipChanges() } @Override - public PrimitiveLongIterator getAddedRelationships( Direction direction ) + public LongIterator getAddedRelationships( Direction direction ) { return relationshipsAdded != null ? relationshipsAdded.getRelationships( direction ) : PrimitiveLongCollections.emptyIterator(); } @Override - public PrimitiveLongIterator getAddedRelationships( Direction direction, int[] relTypes ) + public LongIterator getAddedRelationships( Direction direction, int[] relTypes ) { return relationshipsAdded != null ? relationshipsAdded.getRelationships( direction, relTypes ) : PrimitiveLongCollections.emptyIterator(); } @Override - public PrimitiveLongIterator getAddedRelationships() + public LongIterator getAddedRelationships() { return relationshipsAdded != null ? relationshipsAdded.getRelationships() : PrimitiveLongCollections.emptyIterator(); } @Override - public PrimitiveLongIterator getAddedRelationships( RelationshipDirection direction, int relType ) + public LongIterator getAddedRelationships( RelationshipDirection direction, int relType ) { return relationshipsAdded != null ? relationshipsAdded.getRelationships( direction, relType ) : PrimitiveLongCollections.emptyIterator(); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/RelationshipChangesForNode.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/RelationshipChangesForNode.java index fa5b39ae5a111..4350fccfb3b25 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/RelationshipChangesForNode.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/RelationshipChangesForNode.java @@ -34,7 +34,6 @@ import org.neo4j.collection.primitive.PrimitiveIntCollections; import org.neo4j.collection.primitive.PrimitiveIntSet; import org.neo4j.collection.primitive.PrimitiveLongCollections; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.helpers.collection.Iterators; import org.neo4j.helpers.collection.PrefetchingIterator; import org.neo4j.kernel.impl.api.RelationshipVisitor; @@ -76,7 +75,7 @@ RelationshipIterator augmentPrimitiveIterator( RelationshipIterator original, } @Override - PrimitiveLongIterator getPrimitiveIterator( Iterator> diff ) + LongIterator getPrimitiveIterator( Iterator> diff ) { throw new UnsupportedOperationException(); } @@ -136,7 +135,7 @@ public boolean relationshipVisit( long relationshi } @Override - PrimitiveLongIterator getPrimitiveIterator( final Iterator> diff ) + LongIterator getPrimitiveIterator( final Iterator> diff ) { if ( !diff.hasNext() ) { @@ -172,7 +171,7 @@ private Iterator currentSetOfAddedRels() abstract RelationshipIterator augmentPrimitiveIterator( RelationshipIterator original, Iterator> diff, RelationshipVisitor.Home txStateRelationshipHome ); - abstract PrimitiveLongIterator getPrimitiveIterator( Iterator> diff ); + abstract LongIterator getPrimitiveIterator( Iterator> diff ); } private final DiffStrategy diffStrategy; @@ -510,17 +509,17 @@ private Iterator> diffs( Function>,Iterator> map ) + private LongIterator primitiveIds( Map> map ) { return map == null ? emptyIterator() : toPrimitiveIterator( Iterators.flatMap( Set::iterator, map.values().iterator() ) ); } - private PrimitiveLongIterator primitiveIdsByType( Map> map, int type ) + private LongIterator primitiveIdsByType( Map> map, int type ) { Set relationships = map.get( type ); return relationships == null ? emptyIterator() : toPrimitiveIterator( relationships.iterator() ); } - private PrimitiveLongIterator getRelationships( Direction direction, + private LongIterator getRelationships( Direction direction, Function>,Iterator>> types ) { switch ( direction ) 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 index a7cae699e30cc..30db72d5422d7 100644 --- 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 @@ -19,6 +19,8 @@ */ package org.neo4j.kernel.impl.api.state; +import org.eclipse.collections.api.iterator.LongIterator; + import java.util.Collection; import java.util.HashMap; import java.util.HashSet; @@ -31,7 +33,6 @@ import org.neo4j.collection.primitive.PrimitiveIntObjectMap; import org.neo4j.collection.primitive.PrimitiveIntObjectVisitor; import org.neo4j.collection.primitive.PrimitiveIntSet; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.collection.primitive.PrimitiveLongObjectMap; import org.neo4j.collection.primitive.PrimitiveLongSet; import org.neo4j.cursor.Cursor; @@ -1002,8 +1003,8 @@ public PrimitiveLongReadableDiffSets indexUpdatesForScan( SchemaIndexDescriptor PrimitiveLongDiffSets diffs = new PrimitiveLongDiffSets(); for ( PrimitiveLongDiffSets diffSet : updates.values() ) { - diffs.addAll( diffSet.getAdded().iterator() ); - diffs.removeAll( diffSet.getRemoved().iterator() ); + diffs.addAll( diffSet.getAdded().longIterator() ); + diffs.removeAll( diffSet.getRemoved().longIterator() ); } return diffs; } @@ -1029,8 +1030,8 @@ public PrimitiveLongReadableDiffSets indexUpdatesForSuffixOrContains( SchemaInde if ( query.acceptsValue( entry.getKey().getOnlyValue() ) ) { PrimitiveLongDiffSets diffsets = entry.getValue(); - diffs.addAll( diffsets.getAdded().iterator() ); - diffs.removeAll( diffsets.getRemoved().iterator() ); + diffs.addAll( diffsets.getAdded().longIterator() ); + diffs.removeAll( diffsets.getRemoved().longIterator() ); } } return diffs; @@ -1095,8 +1096,8 @@ private PrimitiveLongReadableDiffSets indexUpdatesForRangeSeek( TreeMap inRange = sortedUpdates.subMap( lower, includeLower, upper, includeUpper ).values(); for ( PrimitiveLongDiffSets diffForSpecificValue : inRange ) { - diffs.addAll( diffForSpecificValue.getAdded().iterator() ); - diffs.removeAll( diffForSpecificValue.getRemoved().iterator() ); + diffs.addAll( diffForSpecificValue.getAdded().longIterator() ); + diffs.removeAll( diffForSpecificValue.getRemoved().longIterator() ); } return diffs; } @@ -1117,8 +1118,8 @@ public PrimitiveLongReadableDiffSets indexUpdatesForRangeSeekByPrefix( SchemaInd if ( ((TextValue) key.getOnlyValue()).stringValue().startsWith( prefix ) ) { PrimitiveLongDiffSets diffSets = entry.getValue(); - diffs.addAll( diffSets.getAdded().iterator() ); - diffs.removeAll( diffSets.getRemoved().iterator() ); + diffs.addAll( diffSets.getAdded().longIterator() ); + diffs.removeAll( diffSets.getRemoved().longIterator() ); } else { @@ -1253,7 +1254,7 @@ private boolean hasNodeState( long nodeId ) } @Override - public PrimitiveLongIterator augmentNodesGetAll( PrimitiveLongIterator committed ) + public LongIterator augmentNodesGetAll( LongIterator committed ) { return addedAndRemovedNodes().augment( committed ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/NodeLoadingIterator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/NodeLoadingIterator.java index 82087fe1f13d8..733ed00de4058 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/NodeLoadingIterator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/NodeLoadingIterator.java @@ -19,7 +19,8 @@ */ package org.neo4j.kernel.impl.api.store; -import org.neo4j.collection.primitive.PrimitiveLongIterator; +import org.eclipse.collections.api.iterator.LongIterator; + import org.neo4j.cursor.Cursor; import org.neo4j.function.ThrowingLongFunction; import org.neo4j.helpers.collection.PrefetchingIterator; @@ -28,10 +29,10 @@ public class NodeLoadingIterator extends PrefetchingIterator> { - private final PrimitiveLongIterator ids; + private final LongIterator ids; private final ThrowingLongFunction,EntityNotFoundException> loader; - public NodeLoadingIterator( PrimitiveLongIterator ids, + public NodeLoadingIterator( LongIterator ids, ThrowingLongFunction,EntityNotFoundException> loader ) { this.ids = ids; 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 index b22f5e5e07ebc..883a2d113dc34 100644 --- 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 @@ -19,12 +19,13 @@ */ package org.neo4j.kernel.impl.api.store; +import org.eclipse.collections.api.iterator.LongIterator; + import org.neo4j.collection.primitive.PrimitiveLongCollections; import org.neo4j.collection.primitive.PrimitiveLongCollections.PrimitiveLongBaseIterator; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.kernel.impl.api.RelationshipVisitor; -public interface RelationshipIterator extends PrimitiveLongIterator, RelationshipVisitor.Home +public interface RelationshipIterator extends RelationshipVisitor.Home, LongIterator { /** * Can be called to visit the data about the most recent id returned from {@link #next()}. diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java index 74c0e889b8ba7..3772bc767f8af 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java @@ -28,7 +28,6 @@ import java.util.function.Supplier; import org.neo4j.collection.primitive.PrimitiveIntSet; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.collection.primitive.PrimitiveLongResourceIterator; import org.neo4j.cursor.Cursor; import org.neo4j.graphdb.TransactionFailureException; @@ -414,7 +413,7 @@ public void relationshipVisit( long relationshipId } @Override - public PrimitiveLongIterator nodesGetAll() + public LongIterator nodesGetAll() { return new AllNodeIterator( nodeStore ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StoreIteratorRelationshipCursor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StoreIteratorRelationshipCursor.java index ae1db6bee37cd..df88ed2aa00b8 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StoreIteratorRelationshipCursor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StoreIteratorRelationshipCursor.java @@ -19,7 +19,8 @@ */ package org.neo4j.kernel.impl.api.store; -import org.neo4j.collection.primitive.PrimitiveLongIterator; +import org.eclipse.collections.api.iterator.LongIterator; + import org.neo4j.graphdb.Resource; import org.neo4j.kernel.impl.locking.LockService; import org.neo4j.kernel.impl.store.RecordCursors; @@ -33,7 +34,7 @@ */ public class StoreIteratorRelationshipCursor extends StoreAbstractRelationshipCursor { - private PrimitiveLongIterator iterator; + private LongIterator iterator; private final InstanceCache instanceCache; public StoreIteratorRelationshipCursor( RelationshipRecord relationshipRecord, @@ -45,7 +46,7 @@ public StoreIteratorRelationshipCursor( RelationshipRecord relationshipRecord, this.instanceCache = instanceCache; } - public StoreIteratorRelationshipCursor init( PrimitiveLongIterator iterator ) + public StoreIteratorRelationshipCursor init( LongIterator iterator ) { this.iterator = iterator; return this; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/CompositeLabelScanValueIterator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/CompositeLabelScanValueIterator.java index fbfe5838c2796..cd4b0d371ca82 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/CompositeLabelScanValueIterator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/CompositeLabelScanValueIterator.java @@ -19,17 +19,18 @@ */ package org.neo4j.kernel.impl.index.labelscan; +import org.eclipse.collections.api.iterator.LongIterator; + import java.util.List; import java.util.Objects; import java.util.PriorityQueue; import org.neo4j.collection.primitive.PrimitiveLongCollections.PrimitiveLongBaseIterator; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.collection.primitive.PrimitiveLongResourceIterator; import org.neo4j.graphdb.ResourceUtils; /** - * {@link PrimitiveLongIterator} acting as a combining of multiple {@link PrimitiveLongIterator} + * {@link LongIterator} acting as a combining of multiple {@link LongIterator} * for merging their results lazily as iterating commences. Both {@code AND} and {@code OR} merging is supported. *

* Source iterators must be sorted in ascending order. @@ -44,14 +45,14 @@ class CompositeLabelScanValueIterator extends PrimitiveLongBaseIterator implemen /** * Constructs a {@link CompositeLabelScanValueIterator}. * - * @param iterators {@link PrimitiveLongIterator iterators} to merge. + * @param iterators {@link LongIterator iterators} to merge. * @param trueForAll if {@code true} using {@code AND} merging, otherwise {@code OR} merging. */ CompositeLabelScanValueIterator( List iterators, boolean trueForAll ) { this.toClose = iterators; this.atLeastNumberOfLabels = trueForAll ? iterators.size() : 1; - for ( PrimitiveLongIterator iterator : iterators ) + for ( LongIterator iterator : iterators ) { if ( iterator.hasNext() ) { @@ -105,9 +106,9 @@ public void close() private static class IdAndSource implements Comparable { private long latestReturned; - private final PrimitiveLongIterator source; + private final LongIterator source; - private IdAndSource( long latestReturned, PrimitiveLongIterator source ) + private IdAndSource( long latestReturned, LongIterator source ) { this.latestReturned = latestReturned; this.source = source; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/LabelScanValueIterator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/LabelScanValueIterator.java index dbb0116920ed9..280d9a8f38368 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/LabelScanValueIterator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/LabelScanValueIterator.java @@ -19,18 +19,19 @@ */ package org.neo4j.kernel.impl.index.labelscan; +import org.eclipse.collections.api.iterator.LongIterator; + import java.io.IOException; import java.io.UncheckedIOException; import java.util.Collection; import java.util.NoSuchElementException; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.collection.primitive.PrimitiveLongResourceIterator; import org.neo4j.cursor.RawCursor; import org.neo4j.index.internal.gbptree.Hit; /** - * {@link PrimitiveLongIterator} which iterate over multiple {@link LabelScanValue} and for each + * {@link LongIterator} which iterate over multiple {@link LabelScanValue} and for each * iterate over each set bit, returning actual node ids, i.e. {@code nodeIdRange+bitOffset}. * * The provided {@link RawCursor} is managed externally, e.g. {@link NativeLabelScanReader}, diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanReader.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanReader.java index 13652ed0910b6..fa5e17f406905 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanReader.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanReader.java @@ -19,6 +19,8 @@ */ package org.neo4j.kernel.impl.index.labelscan; +import org.eclipse.collections.api.iterator.LongIterator; + import java.io.IOException; import java.io.UncheckedIOException; import java.util.ArrayList; @@ -26,7 +28,6 @@ import java.util.List; import java.util.Set; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.collection.primitive.PrimitiveLongResourceIterator; import org.neo4j.cursor.RawCursor; import org.neo4j.graphdb.index.Index; @@ -37,10 +38,10 @@ /** * {@link LabelScanReader} for reading data from {@link NativeLabelScanStore}. - * Each {@link PrimitiveLongIterator} returned from each of the methods is backed by {@link RawCursor} + * Each {@link LongIterator} returned from each of the methods is backed by {@link RawCursor} * directly from {@link GBPTree#seek(Object, Object)}. *

- * The returned {@link PrimitiveLongIterator} aren't closable so the cursors retrieved are managed + * The returned {@link LongIterator} aren't closable so the cursors retrieved are managed * inside of this reader and closed between each new query and on {@link #close()}. */ class NativeLabelScanReader implements LabelScanReader diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeHitIterator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeHitIterator.java index f6d4c89861a12..dda20806a0059 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeHitIterator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeHitIterator.java @@ -19,19 +19,20 @@ */ package org.neo4j.kernel.impl.index.schema; +import org.eclipse.collections.api.iterator.LongIterator; + import java.io.IOException; import java.io.UncheckedIOException; import java.util.Collection; import org.neo4j.collection.primitive.PrimitiveLongCollections; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.collection.primitive.PrimitiveLongResourceIterator; import org.neo4j.cursor.RawCursor; import org.neo4j.index.internal.gbptree.Hit; import org.neo4j.values.storable.Value; /** - * Wraps number key/value results in a {@link PrimitiveLongIterator}. + * Wraps number key/value results in a {@link LongIterator}. * * @param type of {@link NumberSchemaKey}. * @param type of {@link NativeSchemaValue}. diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NodeValueIterator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NodeValueIterator.java index b7740729525cb..5493cc98cfef5 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NodeValueIterator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NodeValueIterator.java @@ -19,8 +19,9 @@ */ package org.neo4j.kernel.impl.index.schema; +import org.eclipse.collections.api.iterator.LongIterator; + import org.neo4j.collection.primitive.PrimitiveLongCollections; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.collection.primitive.PrimitiveLongResourceIterator; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; @@ -28,7 +29,7 @@ import org.neo4j.values.storable.Value; /** - * A {@link IndexProgressor} + {@link IndexProgressor.NodeValueClient} combo presented as a {@link PrimitiveLongIterator}. + * A {@link IndexProgressor} + {@link IndexProgressor.NodeValueClient} combo presented as a {@link LongIterator}. */ public class NodeValueIterator extends PrimitiveLongCollections.PrimitiveLongBaseIterator implements IndexProgressor.NodeValueClient, PrimitiveLongResourceIterator diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultNodeLabelIndexCursor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultNodeLabelIndexCursor.java index 886256fdd3c5a..cab558fb97583 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultNodeLabelIndexCursor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultNodeLabelIndexCursor.java @@ -19,11 +19,12 @@ */ package org.neo4j.kernel.impl.newapi; +import org.eclipse.collections.api.iterator.LongIterator; + import java.util.HashSet; import java.util.Set; import org.neo4j.collection.primitive.PrimitiveLongCollections; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.internal.kernel.api.LabelSet; import org.neo4j.internal.kernel.api.NodeCursor; import org.neo4j.internal.kernel.api.NodeLabelIndexCursor; @@ -40,7 +41,7 @@ class DefaultNodeLabelIndexCursor extends IndexCursor removed; private final DefaultCursors pool; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultNodeValueIndexCursor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultNodeValueIndexCursor.java index cd62dd1c3387b..2ef60308342b1 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultNodeValueIndexCursor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultNodeValueIndexCursor.java @@ -19,10 +19,11 @@ */ package org.neo4j.kernel.impl.newapi; +import org.eclipse.collections.api.iterator.LongIterator; + import java.util.Arrays; import org.neo4j.collection.primitive.PrimitiveLongCollections; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.collection.primitive.PrimitiveLongSet; import org.neo4j.graphdb.Resource; import org.neo4j.internal.kernel.api.IndexQuery; @@ -51,7 +52,7 @@ final class DefaultNodeValueIndexCursor extends IndexCursor private long node; private IndexQuery[] query; private Value[] values; - private PrimitiveLongIterator added = emptyIterator(); + private LongIterator added = emptyIterator(); private PrimitiveLongSet removed = emptySet(); private boolean needsValues; private final DefaultCursors pool; @@ -306,7 +307,7 @@ private void seekQuery( SchemaIndexDescriptor descriptor, IndexQuery[] query ) private PrimitiveLongSet removed( TransactionState txState, PrimitiveLongReadableDiffSets changes ) { PrimitiveLongSet longSet = asSet( txState.addedAndRemovedNodes().getRemoved() ); - longSet.addAll( changes.getRemoved().iterator() ); + longSet.addAll( changes.getRemoved().longIterator() ); return longSet; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultRelationshipGroupCursor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultRelationshipGroupCursor.java index e7165e4c4be42..7e3a61bb5717b 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultRelationshipGroupCursor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultRelationshipGroupCursor.java @@ -25,7 +25,6 @@ import org.neo4j.collection.primitive.Primitive; import org.neo4j.collection.primitive.PrimitiveIntObjectMap; import org.neo4j.collection.primitive.PrimitiveIntSet; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.internal.kernel.api.RelationshipGroupCursor; import org.neo4j.internal.kernel.api.RelationshipTraversalCursor; import org.neo4j.io.pagecache.PageCursor; @@ -223,7 +222,7 @@ private void checkTxStateForUpdates() if ( read.hasTxStateWithChanges() ) { NodeState nodeState = read.txState().getNodeState( getOwningNode() ); - PrimitiveLongIterator addedRelationships = nodeState.getAddedRelationships(); + LongIterator addedRelationships = nodeState.getAddedRelationships(); while ( addedRelationships.hasNext() ) { RelationshipState relationshipState = read.txState().getRelationshipState( addedRelationships.next() ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultRelationshipTraversalCursor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultRelationshipTraversalCursor.java index 295bfdbb813f0..8a120ef475407 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultRelationshipTraversalCursor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultRelationshipTraversalCursor.java @@ -19,8 +19,9 @@ */ package org.neo4j.kernel.impl.newapi; +import org.eclipse.collections.api.iterator.LongIterator; + import org.neo4j.collection.primitive.PrimitiveLongCollections; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.internal.kernel.api.NodeCursor; import org.neo4j.internal.kernel.api.RelationshipTraversalCursor; import org.neo4j.io.pagecache.PageCursor; @@ -128,7 +129,7 @@ private static FilterState fromRelationshipDirection( RelationshipDirection dire private boolean filterStore; private int filterType = NO_ID; - private PrimitiveLongIterator addedRelationships; + private LongIterator addedRelationships; DefaultRelationshipTraversalCursor( DefaultRelationshipGroupCursor group, DefaultCursors pool ) { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/Scanner.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/Scanner.java index c4801e096a5b4..34c096bb12309 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/Scanner.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/Scanner.java @@ -19,9 +19,10 @@ */ package org.neo4j.kernel.impl.store; +import org.eclipse.collections.api.iterator.LongIterator; + import java.util.function.Predicate; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.graphdb.ResourceIterable; import org.neo4j.graphdb.ResourceIterator; import org.neo4j.helpers.collection.PrefetchingResourceIterator; @@ -55,7 +56,7 @@ public static ResourceIterable scan( final Rec private static class Scan extends PrefetchingResourceIterator { - private final PrimitiveLongIterator ids; + private final LongIterator ids; private final RecordCursor cursor; private final Predicate[] filters; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/StoreIdIterator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/StoreIdIterator.java index 5aed4edbe5b3c..d9f889e00262c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/StoreIdIterator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/StoreIdIterator.java @@ -19,13 +19,13 @@ */ package org.neo4j.kernel.impl.store; -import java.util.NoSuchElementException; +import org.eclipse.collections.api.iterator.LongIterator; -import org.neo4j.collection.primitive.PrimitiveLongIterator; +import java.util.NoSuchElementException; import static java.lang.String.format; -public class StoreIdIterator implements PrimitiveLongIterator +public class StoreIdIterator implements LongIterator { private final RecordStore store; private long targetId; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/OnlineIndexUpdates.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/OnlineIndexUpdates.java index d004738b320ab..5593fbd4ddbad 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/OnlineIndexUpdates.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/OnlineIndexUpdates.java @@ -19,13 +19,14 @@ */ package org.neo4j.kernel.impl.transaction.state; +import org.eclipse.collections.api.iterator.LongIterator; + import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.List; import org.neo4j.collection.primitive.Primitive; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.collection.primitive.PrimitiveLongObjectMap; import org.neo4j.collection.primitive.PrimitiveLongSet; import org.neo4j.helpers.collection.Iterables; @@ -79,7 +80,7 @@ public Iterator> iterator() public void feed( PrimitiveLongObjectMap> propertyCommands, PrimitiveLongObjectMap nodeCommands ) { - PrimitiveLongIterator nodeIds = allKeys( nodeCommands, propertyCommands ).iterator(); + final LongIterator nodeIds = allKeys( nodeCommands, propertyCommands ).longIterator(); while ( nodeIds.hasNext() ) { long nodeId = nodeIds.next(); @@ -92,7 +93,7 @@ private PrimitiveLongSet allKeys( PrimitiveLongObjectMap... maps ) PrimitiveLongSet union = Primitive.longSet(); for ( PrimitiveLongObjectMap map : maps ) { - union.addAll( map.iterator() ); + union.addAll( map.longIterator() ); } return union; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/storeview/LabelScanViewIdIterator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/storeview/LabelScanViewIdIterator.java index 9fd5fe05b6387..ad194f26795ad 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/storeview/LabelScanViewIdIterator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/storeview/LabelScanViewIdIterator.java @@ -19,7 +19,8 @@ */ package org.neo4j.kernel.impl.transaction.state.storeview; -import org.neo4j.collection.primitive.PrimitiveLongIterator; +import org.eclipse.collections.api.iterator.LongIterator; + import org.neo4j.collection.primitive.PrimitiveLongResourceIterator; import org.neo4j.storageengine.api.schema.LabelScanReader; @@ -29,7 +30,7 @@ class LabelScanViewIdIterator implements PrimitiveLongResourceIterator { private LabelScanReader labelScanReader; - private PrimitiveLongIterator idIterator; + private LongIterator idIterator; LabelScanViewIdIterator( LabelScanReader labelScanReader, int[] labelIds ) { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/diffsets/DiffApplyingLongIterator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/diffsets/DiffApplyingLongIterator.java index 6b7013937cf47..16aa29bb6307a 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/diffsets/DiffApplyingLongIterator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/diffsets/DiffApplyingLongIterator.java @@ -19,12 +19,13 @@ */ package org.neo4j.kernel.impl.util.diffsets; +import org.eclipse.collections.api.iterator.LongIterator; + import java.util.Iterator; import java.util.Set; import javax.annotation.Nullable; import org.neo4j.collection.primitive.PrimitiveLongCollections.PrimitiveLongBaseIterator; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.collection.primitive.PrimitiveLongResourceIterator; import org.neo4j.graphdb.Resource; @@ -67,7 +68,7 @@ boolean fetchNext( DiffApplyingLongIterator self ) abstract boolean fetchNext( DiffApplyingLongIterator self ); } - private final PrimitiveLongIterator source; + private final LongIterator source; private final Iterator addedElementsIterator; private final Set addedElements; private final Set removedElements; @@ -75,7 +76,7 @@ boolean fetchNext( DiffApplyingLongIterator self ) private final Resource resource; protected Phase phase; - DiffApplyingLongIterator( PrimitiveLongIterator source, Set addedElements, Set removedElements, @Nullable Resource resource ) + DiffApplyingLongIterator( LongIterator source, Set addedElements, Set removedElements, @Nullable Resource resource ) { this.source = source; this.addedElements = addedElements; @@ -85,7 +86,7 @@ boolean fetchNext( DiffApplyingLongIterator self ) this.phase = Phase.FILTERED_SOURCE; } - static PrimitiveLongIterator augment( PrimitiveLongIterator source, Set addedElements, Set removedElements ) + static LongIterator augment( LongIterator source, Set addedElements, Set removedElements ) { return new DiffApplyingLongIterator( source, addedElements, removedElements, null ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/diffsets/DiffApplyingPrimitiveLongIterator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/diffsets/DiffApplyingPrimitiveLongIterator.java index b8e32cf31c1af..ba50c567556f2 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/diffsets/DiffApplyingPrimitiveLongIterator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/diffsets/DiffApplyingPrimitiveLongIterator.java @@ -19,16 +19,17 @@ */ package org.neo4j.kernel.impl.util.diffsets; +import org.eclipse.collections.api.iterator.LongIterator; + import javax.annotation.Nullable; import org.neo4j.collection.primitive.PrimitiveLongCollections.PrimitiveLongBaseIterator; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.collection.primitive.PrimitiveLongResourceIterator; import org.neo4j.collection.primitive.PrimitiveLongSet; import org.neo4j.graphdb.Resource; /** - * Applies a diffset to the provided {@link PrimitiveLongIterator}. + * Applies a diffset to the provided {@link LongIterator}. */ class DiffApplyingPrimitiveLongIterator extends PrimitiveLongBaseIterator implements PrimitiveLongResourceIterator { @@ -64,26 +65,26 @@ boolean fetchNext( DiffApplyingPrimitiveLongIterator self ) abstract boolean fetchNext( DiffApplyingPrimitiveLongIterator self ); } - private final PrimitiveLongIterator source; - private final PrimitiveLongIterator addedElementsIterator; + private final LongIterator source; + private final LongIterator addedElementsIterator; private final PrimitiveLongSet addedElements; private final PrimitiveLongSet removedElements; @Nullable private final Resource resource; private Phase phase; - private DiffApplyingPrimitiveLongIterator( PrimitiveLongIterator source, PrimitiveLongSet addedElements, PrimitiveLongSet removedElements, + private DiffApplyingPrimitiveLongIterator( LongIterator source, PrimitiveLongSet addedElements, PrimitiveLongSet removedElements, @Nullable Resource resource ) { this.source = source; this.addedElements = addedElements; - this.addedElementsIterator = addedElements.iterator(); + this.addedElementsIterator = addedElements.longIterator(); this.removedElements = removedElements; this.resource = resource; this.phase = Phase.FILTERED_SOURCE; } - static PrimitiveLongIterator augment( PrimitiveLongIterator source, PrimitiveLongSet addedElements, PrimitiveLongSet removedElements ) + static LongIterator augment( LongIterator source, PrimitiveLongSet addedElements, PrimitiveLongSet removedElements ) { return new DiffApplyingPrimitiveLongIterator( source, addedElements, removedElements, null ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/diffsets/DiffSets.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/diffsets/DiffSets.java index 22145dc612538..0c77c69151396 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/diffsets/DiffSets.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/diffsets/DiffSets.java @@ -19,11 +19,12 @@ */ package org.neo4j.kernel.impl.util.diffsets; +import org.eclipse.collections.api.iterator.LongIterator; + import java.util.Collections; import java.util.Set; import java.util.function.Predicate; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.collection.primitive.PrimitiveLongResourceIterator; import org.neo4j.helpers.collection.Iterables; import org.neo4j.storageengine.api.txstate.ReadableDiffSets; @@ -49,19 +50,19 @@ public DiffSets( Set addedElements, Set removedElements ) } @Override - public PrimitiveLongIterator augment( final PrimitiveLongIterator source ) + public LongIterator augment( final LongIterator source ) { return DiffApplyingLongIterator.augment( source, added( false ), removed( false ) ); } @Override - public PrimitiveLongResourceIterator augment( PrimitiveLongResourceIterator source ) + public PrimitiveLongResourceIterator augment( final PrimitiveLongResourceIterator source ) { return DiffApplyingLongIterator.augment( source, added( false ), removed( false ) ); } @Override - public PrimitiveLongResourceIterator augmentWithRemovals( PrimitiveLongResourceIterator source ) + public PrimitiveLongResourceIterator augmentWithRemovals( final PrimitiveLongResourceIterator source ) { return DiffApplyingLongIterator.augment( source, Collections.emptySet(), removed( false ) ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/diffsets/PrimitiveLongDiffSets.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/diffsets/PrimitiveLongDiffSets.java index 7c857236e210b..568c9cc35b994 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/diffsets/PrimitiveLongDiffSets.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/diffsets/PrimitiveLongDiffSets.java @@ -19,10 +19,11 @@ */ package org.neo4j.kernel.impl.util.diffsets; +import org.eclipse.collections.api.iterator.LongIterator; + import java.io.Closeable; import java.util.Objects; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.collection.primitive.PrimitiveLongResourceIterator; import org.neo4j.collection.primitive.PrimitiveLongSet; import org.neo4j.kernel.impl.util.collection.CollectionsFactory; @@ -69,7 +70,7 @@ public boolean isRemoved( long element ) return removedElements.contains( element ); } - public void removeAll( PrimitiveLongIterator elementsToRemove ) + public void removeAll( LongIterator elementsToRemove ) { checkRemovedElements(); while ( elementsToRemove.hasNext() ) @@ -78,7 +79,7 @@ public void removeAll( PrimitiveLongIterator elementsToRemove ) } } - public void addAll( PrimitiveLongIterator elementsToAdd ) + public void addAll( LongIterator elementsToAdd ) { checkAddedElements(); while ( elementsToAdd.hasNext() ) @@ -101,12 +102,12 @@ public boolean remove( long element ) public void visit( PrimitiveLongDiffSetsVisitor visitor ) { - PrimitiveLongIterator addedItems = addedElements.iterator(); + LongIterator addedItems = addedElements.longIterator(); while ( addedItems.hasNext() ) { visitor.visitAdded( addedItems.next() ); } - PrimitiveLongIterator removedItems = removedElements.iterator(); + LongIterator removedItems = removedElements.longIterator(); while ( removedItems.hasNext() ) { visitor.visitRemoved( removedItems.next() ); @@ -114,7 +115,7 @@ public void visit( PrimitiveLongDiffSetsVisitor visitor ) } @Override - public PrimitiveLongIterator augment( PrimitiveLongIterator source ) + public LongIterator augment( LongIterator source ) { return DiffApplyingPrimitiveLongIterator.augment( source, addedElements, removedElements ); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/diffsets/SuperDiffSets.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/diffsets/SuperDiffSets.java index 874d4ca9413e9..f5ddbfe8a6aec 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/diffsets/SuperDiffSets.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/diffsets/SuperDiffSets.java @@ -19,13 +19,14 @@ */ package org.neo4j.kernel.impl.util.diffsets; +import org.eclipse.collections.api.iterator.LongIterator; + import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.Set; import java.util.function.Predicate; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.helpers.collection.Iterators; import org.neo4j.internal.kernel.api.exceptions.schema.ConstraintValidationException; import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; @@ -37,7 +38,7 @@ import static java.util.Collections.newSetFromMap; /** - * Super class of readable diffsets where use of {@link PrimitiveLongIterator} can be parameterized + * Super class of readable diffsets where use of {@link LongIterator} can be parameterized * to a specific subclass instead. */ abstract class SuperDiffSets implements SuperReadableDiffSets diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java index 1c9931ad930de..d1f51fdae1257 100644 --- a/community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java +++ b/community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java @@ -27,7 +27,6 @@ import java.util.function.IntPredicate; import org.neo4j.collection.primitive.PrimitiveIntSet; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.collection.primitive.PrimitiveLongResourceIterator; import org.neo4j.cursor.Cursor; import org.neo4j.internal.kernel.api.CapableIndexReference; @@ -288,7 +287,7 @@ void relationshipVisit( long relationshipId, /** * @return ids of all stored nodes. */ - PrimitiveLongIterator nodesGetAll(); + LongIterator nodesGetAll(); /** * @return ids of all stored relationships. The returned iterator can optionally visit data about diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/NodeState.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/NodeState.java index edde614a99aa2..0c456a07c70b1 100644 --- a/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/NodeState.java +++ b/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/NodeState.java @@ -19,10 +19,11 @@ */ package org.neo4j.storageengine.api.txstate; +import org.eclipse.collections.api.iterator.LongIterator; + import java.util.Set; import org.neo4j.collection.primitive.PrimitiveIntSet; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.internal.kernel.api.exceptions.schema.ConstraintValidationException; import org.neo4j.kernel.impl.newapi.RelationshipDirection; import org.neo4j.storageengine.api.Direction; @@ -63,14 +64,14 @@ void visitLabelChanges( long nodeId, Set added, Set removed ) long getId(); @Deprecated - PrimitiveLongIterator getAddedRelationships( Direction direction ); + LongIterator getAddedRelationships( Direction direction ); @Deprecated - PrimitiveLongIterator getAddedRelationships( Direction direction, int[] relTypes ); + LongIterator getAddedRelationships( Direction direction, int[] relTypes ); - PrimitiveLongIterator getAddedRelationships(); + LongIterator getAddedRelationships(); - PrimitiveLongIterator getAddedRelationships( RelationshipDirection direction, int relType ); + LongIterator getAddedRelationships( RelationshipDirection direction, int relType ); boolean hasRelationshipChanges(); } diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/PrimitiveLongReadableDiffSets.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/PrimitiveLongReadableDiffSets.java index 8cbb095d6a515..37739db39f76c 100644 --- a/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/PrimitiveLongReadableDiffSets.java +++ b/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/PrimitiveLongReadableDiffSets.java @@ -19,7 +19,8 @@ */ package org.neo4j.storageengine.api.txstate; -import org.neo4j.collection.primitive.PrimitiveLongIterator; +import org.eclipse.collections.api.iterator.LongIterator; + import org.neo4j.collection.primitive.PrimitiveLongResourceIterator; import org.neo4j.collection.primitive.PrimitiveLongSet; @@ -78,7 +79,7 @@ public int delta() } @Override - public PrimitiveLongIterator augment( PrimitiveLongIterator elements ) + public LongIterator augment( LongIterator elements ) { return elements; } @@ -140,7 +141,7 @@ public PrimitiveLongResourceIterator augment( PrimitiveLongResourceIterator elem * @param elements elements to augment with * @return iterator that will iterate over augmented elements as well as over diff set */ - PrimitiveLongIterator augment( PrimitiveLongIterator elements ); + LongIterator augment( LongIterator elements ); /** * Augment current diff sets with elements. Provided element will be augmented if diffset diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/ReadableDiffSets.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/ReadableDiffSets.java index 3fbab7c3a30c2..6e4a52f6e309a 100644 --- a/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/ReadableDiffSets.java +++ b/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/ReadableDiffSets.java @@ -19,12 +19,13 @@ */ package org.neo4j.storageengine.api.txstate; +import org.eclipse.collections.api.iterator.LongIterator; + import java.util.Collections; import java.util.Iterator; import java.util.Set; import java.util.function.Predicate; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.collection.primitive.PrimitiveLongResourceIterator; /** @@ -104,7 +105,7 @@ public int delta() } @Override - public PrimitiveLongIterator augment( PrimitiveLongIterator source ) + public LongIterator augment( LongIterator source ) { return source; } diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/ReadableRelationshipDiffSets.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/ReadableRelationshipDiffSets.java index 8ef7152a65c1b..cf5befa34e6ae 100644 --- a/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/ReadableRelationshipDiffSets.java +++ b/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/ReadableRelationshipDiffSets.java @@ -19,12 +19,13 @@ */ package org.neo4j.storageengine.api.txstate; +import org.eclipse.collections.api.iterator.LongIterator; + import java.util.Collections; import java.util.Iterator; import java.util.Set; import java.util.function.Predicate; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.collection.primitive.PrimitiveLongResourceIterator; import org.neo4j.kernel.impl.api.store.RelationshipIterator; @@ -39,7 +40,7 @@ public interface ReadableRelationshipDiffSets extends SuperReadableDiffSets @@ -50,7 +51,7 @@ public interface SuperReadableDiffSets int delta(); - PrimitiveLongIterator augment( PrimitiveLongIterator source ); + LongIterator augment( LongIterator source ); PrimitiveLongResourceIterator augment( PrimitiveLongResourceIterator source ); diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/BatchingIdGetter.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/BatchingIdGetter.java index e0f00da42a744..8d8188119042f 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/BatchingIdGetter.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/BatchingIdGetter.java @@ -19,8 +19,9 @@ */ package org.neo4j.unsafe.impl.batchimport; +import org.eclipse.collections.api.iterator.LongIterator; + import org.neo4j.collection.primitive.PrimitiveLongCollections; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.kernel.impl.store.RecordStore; import org.neo4j.kernel.impl.store.id.IdRange; import org.neo4j.kernel.impl.store.id.IdRangeIterator; @@ -29,7 +30,7 @@ import org.neo4j.kernel.impl.store.record.AbstractBaseRecord; /** - * Exposes batches of ids from a {@link RecordStore} as a {@link PrimitiveLongIterator}. + * Exposes batches of ids from a {@link RecordStore} as a {@link LongIterator}. * It makes use of {@link IdSequence#nextIdBatch(int)} (with default batch size the number of records per page) * and caches that batch, exhausting it in {@link #next()} before getting next batch. */ diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/DeleteDuplicateNodesStage.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/DeleteDuplicateNodesStage.java index a3ff3836dd7f5..eb4798f4fe89a 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/DeleteDuplicateNodesStage.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/DeleteDuplicateNodesStage.java @@ -19,9 +19,10 @@ */ package org.neo4j.unsafe.impl.batchimport; +import org.eclipse.collections.api.iterator.LongIterator; + import java.util.function.LongFunction; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.helpers.progress.ProgressListener; import org.neo4j.unsafe.impl.batchimport.cache.idmapping.IdMapper; import org.neo4j.unsafe.impl.batchimport.input.Collector; @@ -35,7 +36,7 @@ */ public class DeleteDuplicateNodesStage extends Stage { - public DeleteDuplicateNodesStage( Configuration config, PrimitiveLongIterator duplicateNodeIds, + public DeleteDuplicateNodesStage( Configuration config, LongIterator duplicateNodeIds, BatchingNeoStores neoStore, DataImporter.Monitor storeMonitor ) { super( "DEDUP", null, config, 0 ); diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/DeleteDuplicateNodesStep.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/DeleteDuplicateNodesStep.java index 79255360eaf04..f192029393d6e 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/DeleteDuplicateNodesStep.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/DeleteDuplicateNodesStep.java @@ -19,8 +19,8 @@ */ package org.neo4j.unsafe.impl.batchimport; -import java.io.IOException; -import org.neo4j.collection.primitive.PrimitiveLongIterator; +import org.eclipse.collections.api.iterator.LongIterator; + import org.neo4j.kernel.impl.store.NodeStore; import org.neo4j.kernel.impl.store.PropertyStore; import org.neo4j.kernel.impl.store.RecordCursor; @@ -38,13 +38,13 @@ public class DeleteDuplicateNodesStep extends LonelyProcessingStep { private final NodeStore nodeStore; private final PropertyStore propertyStore; - private final PrimitiveLongIterator nodeIds; + private final LongIterator nodeIds; private final DataImporter.Monitor storeMonitor; private long nodesRemoved; private long propertiesRemoved; - public DeleteDuplicateNodesStep( StageControl control, Configuration config, PrimitiveLongIterator nodeIds, NodeStore nodeStore, + public DeleteDuplicateNodesStep( StageControl control, Configuration config, LongIterator nodeIds, NodeStore nodeStore, PropertyStore propertyStore, DataImporter.Monitor storeMonitor ) { super( control, "DEDUP", config ); diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/ImportLogic.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/ImportLogic.java index 36b2b5eb367f0..1714f253189b0 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/ImportLogic.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/ImportLogic.java @@ -19,6 +19,8 @@ */ package org.neo4j.unsafe.impl.batchimport; +import org.eclipse.collections.api.iterator.LongIterator; + import java.io.Closeable; import java.io.File; import java.io.IOException; @@ -29,7 +31,6 @@ import java.util.function.Predicate; import org.neo4j.collection.primitive.PrimitiveIntSet; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.io.pagecache.tracing.PageCacheTracer; @@ -271,7 +272,7 @@ public void prepareIdMapper() MemoryUsageStatsProvider memoryUsageStats = new MemoryUsageStatsProvider( neoStore, idMapper ); LongFunction inputIdLookup = new NodeInputIdPropertyLookup( neoStore.getTemporaryPropertyStore() ); executeStage( new IdMapperPreparationStage( config, idMapper, inputIdLookup, badCollector, memoryUsageStats ) ); - PrimitiveLongIterator duplicateNodeIds = idMapper.leftOverDuplicateNodesIds(); + final LongIterator duplicateNodeIds = idMapper.leftOverDuplicateNodesIds(); if ( duplicateNodeIds.hasNext() ) { executeStage( new DeleteDuplicateNodesStage( config, duplicateNodeIds, neoStore, storeUpdateMonitor ) ); diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/RecordIdIterator.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/RecordIdIterator.java index ba3172be26c01..14562441f4cc9 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/RecordIdIterator.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/RecordIdIterator.java @@ -19,13 +19,13 @@ */ package org.neo4j.unsafe.impl.batchimport; -import org.neo4j.collection.primitive.PrimitiveLongIterator; +import org.eclipse.collections.api.iterator.LongIterator; + import org.neo4j.kernel.impl.store.RecordStore; import org.neo4j.kernel.impl.store.record.AbstractBaseRecord; import static java.lang.Long.max; import static java.lang.Long.min; - import static org.neo4j.collection.primitive.PrimitiveLongCollections.range; /** @@ -37,9 +37,9 @@ public interface RecordIdIterator { /** - * @return next batch of ids as {@link PrimitiveLongIterator}, or {@code null} if there are no more ids to return. + * @return next batch of ids as {@link LongIterator}, or {@code null} if there are no more ids to return. */ - PrimitiveLongIterator nextBatch(); + LongIterator nextBatch(); static RecordIdIterator backwards( long lowIncluded, long highExcluded, Configuration config ) { @@ -78,7 +78,7 @@ public Forwards( long lowIncluded, long highExcluded, Configuration config ) } @Override - public PrimitiveLongIterator nextBatch() + public LongIterator nextBatch() { if ( startId >= highExcluded ) { @@ -86,7 +86,7 @@ public PrimitiveLongIterator nextBatch() } long endId = min( highExcluded, findRoofId( startId ) ); - PrimitiveLongIterator result = range( startId, endId - 1 /*excluded*/ ); + final LongIterator result = range( startId, endId - 1 /*excluded*/ ); startId = endId; return result; } @@ -120,7 +120,7 @@ public Backwards( long lowIncluded, long highExcluded, Configuration config ) } @Override - public PrimitiveLongIterator nextBatch() + public LongIterator nextBatch() { if ( endId <= lowIncluded ) { @@ -128,7 +128,7 @@ public PrimitiveLongIterator nextBatch() } long startId = findFloorId( endId ); - PrimitiveLongIterator result = range( startId, endId - 1 /*excluded*/ ); + final LongIterator result = range( startId, endId - 1 /*excluded*/ ); endId = max( lowIncluded, startId ); return result; } diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/IdMapper.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/IdMapper.java index b707b3907d4ba..3708687df8ee1 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/IdMapper.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/IdMapper.java @@ -19,9 +19,10 @@ */ package org.neo4j.unsafe.impl.batchimport.cache.idmapping; +import org.eclipse.collections.api.iterator.LongIterator; + import java.util.function.LongFunction; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.helpers.progress.ProgressListener; import org.neo4j.unsafe.impl.batchimport.cache.MemoryStatsVisitor; import org.neo4j.unsafe.impl.batchimport.input.Collector; @@ -92,5 +93,5 @@ public interface IdMapper extends MemoryStatsVisitor.Visitable, AutoCloseable */ MemoryStatsVisitor.Visitable memoryEstimation( long numberOfNodes ); - PrimitiveLongIterator leftOverDuplicateNodesIds(); + LongIterator leftOverDuplicateNodesIds(); } diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/IdMappers.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/IdMappers.java index 93cac73f6add6..1495c958221a2 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/IdMappers.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/IdMappers.java @@ -19,10 +19,11 @@ */ package org.neo4j.unsafe.impl.batchimport.cache.idmapping; +import org.eclipse.collections.api.iterator.LongIterator; + import java.util.function.LongFunction; import org.neo4j.collection.primitive.PrimitiveLongCollections; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.helpers.progress.ProgressListener; import org.neo4j.unsafe.impl.batchimport.cache.MemoryStatsVisitor; import org.neo4j.unsafe.impl.batchimport.cache.NumberArrayFactory; @@ -91,7 +92,7 @@ public MemoryStatsVisitor.Visitable memoryEstimation( long numberOfNodes ) } @Override - public PrimitiveLongIterator leftOverDuplicateNodesIds() + public LongIterator leftOverDuplicateNodesIds() { return PrimitiveLongCollections.emptyIterator(); } diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/string/EncodingIdMapper.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/string/EncodingIdMapper.java index 83b26def8dfd2..69efa7c8bd834 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/string/EncodingIdMapper.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/cache/idmapping/string/EncodingIdMapper.java @@ -19,12 +19,13 @@ */ package org.neo4j.unsafe.impl.batchimport.cache.idmapping.string; +import org.eclipse.collections.api.iterator.LongIterator; + import java.util.Arrays; import java.util.HashMap; import java.util.function.LongFunction; import org.neo4j.collection.primitive.PrimitiveLongCollections; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.function.Factory; import org.neo4j.helpers.progress.ProgressListener; import org.neo4j.unsafe.impl.batchimport.HighestId; @@ -881,7 +882,7 @@ public void acceptMemoryStatsVisitor( MemoryStatsVisitor visitor ) } @Override - public PrimitiveLongIterator leftOverDuplicateNodesIds() + public LongIterator leftOverDuplicateNodesIds() { if ( numberOfCollisions == 0 ) { diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/ReadRecordsStep.java b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/ReadRecordsStep.java index d1a37121f16a1..b7656da179cc6 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/ReadRecordsStep.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/staging/ReadRecordsStep.java @@ -19,7 +19,8 @@ */ package org.neo4j.unsafe.impl.batchimport.staging; -import org.neo4j.collection.primitive.PrimitiveLongIterator; +import org.eclipse.collections.api.iterator.LongIterator; + import org.neo4j.io.pagecache.PageCursor; import org.neo4j.kernel.impl.store.RecordCursor; import org.neo4j.kernel.impl.store.RecordStore; @@ -34,7 +35,7 @@ * * @param type of {@link AbstractBaseRecord} */ -public class ReadRecordsStep extends ProcessorStep +public class ReadRecordsStep extends ProcessorStep { private final RecordStore store; private final int batchSize; @@ -67,7 +68,7 @@ public void start( int orderingGuarantees ) } @Override - protected void process( PrimitiveLongIterator idRange, BatchSender sender ) + protected void process( LongIterator idRange, BatchSender sender ) { if ( !idRange.hasNext() ) { diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/IndexingCompositeQueryAcceptanceTest.java b/community/kernel/src/test/java/org/neo4j/graphdb/IndexingCompositeQueryAcceptanceTest.java index f46c49582d411..688e2f1773aff 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/IndexingCompositeQueryAcceptanceTest.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/IndexingCompositeQueryAcceptanceTest.java @@ -19,6 +19,7 @@ */ package org.neo4j.graphdb; +import org.eclipse.collections.api.iterator.LongIterator; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; @@ -35,7 +36,6 @@ import java.util.concurrent.TimeUnit; import org.neo4j.collection.primitive.Primitive; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.collection.primitive.PrimitiveLongSet; import org.neo4j.graphdb.schema.IndexCreator; import org.neo4j.test.rule.ImpermanentDatabaseRule; @@ -185,7 +185,7 @@ public void shouldNotIncludeNodesDeletedInSameTxInIndexSeek() PrimitiveLongSet found = Primitive.longSet(); try ( Transaction tx = db.beginTx() ) { - PrimitiveLongIterator deleting = toDelete.iterator(); + LongIterator deleting = toDelete.longIterator(); while ( deleting.hasNext() ) { long id = deleting.next(); @@ -211,14 +211,14 @@ public void shouldConsiderNodesChangedInSameTxInIndexSeek() PrimitiveLongSet found = Primitive.longSet(); try ( Transaction tx = db.beginTx() ) { - PrimitiveLongIterator toMatching = toChangeToMatch.iterator(); + LongIterator toMatching = toChangeToMatch.longIterator(); while ( toMatching.hasNext() ) { long id = toMatching.next(); setProperties( id, values ); expected.add( id ); } - PrimitiveLongIterator toNotMatching = toChangeToNotMatch.iterator(); + LongIterator toNotMatching = toChangeToNotMatch.longIterator(); while ( toNotMatching.hasNext() ) { long id = toNotMatching.next(); diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/IndexingStringQueryAcceptanceTestBase.java b/community/kernel/src/test/java/org/neo4j/graphdb/IndexingStringQueryAcceptanceTestBase.java index 7f9dd18f81b2e..1e327105fe9cb 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/IndexingStringQueryAcceptanceTestBase.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/IndexingStringQueryAcceptanceTestBase.java @@ -19,6 +19,7 @@ */ package org.neo4j.graphdb; +import org.eclipse.collections.api.iterator.LongIterator; import org.junit.Before; import org.junit.ClassRule; import org.junit.Rule; @@ -29,7 +30,6 @@ import java.util.concurrent.TimeUnit; import org.neo4j.collection.primitive.Primitive; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.collection.primitive.PrimitiveLongSet; import org.neo4j.test.rule.ImpermanentDatabaseRule; @@ -133,7 +133,7 @@ public void shouldNotIncludeNodesDeletedInSameTxInIndexSeek() PrimitiveLongSet found = Primitive.longSet(); try ( Transaction tx = db.beginTx() ) { - PrimitiveLongIterator deleting = toDelete.iterator(); + LongIterator deleting = toDelete.longIterator(); while ( deleting.hasNext() ) { long id = deleting.next(); @@ -159,14 +159,14 @@ public void shouldConsiderNodesChangedInSameTxInIndexSeek() PrimitiveLongSet found = Primitive.longSet(); try ( Transaction tx = db.beginTx() ) { - PrimitiveLongIterator toMatching = toChangeToMatch.iterator(); + LongIterator toMatching = toChangeToMatch.longIterator(); while ( toMatching.hasNext() ) { long id = toMatching.next(); db.getNodeById( id ).setProperty( KEY, matching[2] ); expected.add( id ); } - PrimitiveLongIterator toNotMatching = toChangeToNotMatch.iterator(); + LongIterator toNotMatching = toChangeToNotMatch.longIterator(); while ( toNotMatching.hasNext() ) { long id = toNotMatching.next(); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/impl/labelscan/LabelScanStoreTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/impl/labelscan/LabelScanStoreTest.java index c9971f7f6e556..fc16865b3615c 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/impl/labelscan/LabelScanStoreTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/impl/labelscan/LabelScanStoreTest.java @@ -20,6 +20,7 @@ package org.neo4j.kernel.api.impl.labelscan; import org.apache.commons.lang3.mutable.MutableInt; +import org.eclipse.collections.api.iterator.LongIterator; import org.hamcrest.Matcher; import org.junit.After; import org.junit.Before; @@ -44,7 +45,6 @@ import java.util.TreeSet; import org.neo4j.collection.primitive.PrimitiveLongCollections; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.graphdb.ResourceIterator; import org.neo4j.helpers.collection.BoundedIterable; import org.neo4j.helpers.collection.PrefetchingIterator; @@ -434,7 +434,7 @@ protected NodeLabelUpdate fetchNextOrNull() // WHEN Set nodeSet = new TreeSet<>(); LabelScanReader reader = store.newReader(); - PrimitiveLongIterator nodes = reader.nodesWithLabel( labelId ); + LongIterator nodes = reader.nodesWithLabel( labelId ); while ( nodes.hasNext() ) { nodeSet.add( nodes.next() ); @@ -543,7 +543,7 @@ private Set gaps( Set ids, int expectedCount ) private void assertNodesForLabel( int labelId, long... expectedNodeIds ) { Set nodeSet = new HashSet<>(); - PrimitiveLongIterator nodes = store.newReader().nodesWithLabel( labelId ); + LongIterator nodes = store.newReader().nodesWithLabel( labelId ); while ( nodes.hasNext() ) { nodeSet.add( nodes.next() ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/CompositeIndexPopulatorCompatibility.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/CompositeIndexPopulatorCompatibility.java index 3843388b416c0..4d53ca8ba40c6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/CompositeIndexPopulatorCompatibility.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/CompositeIndexPopulatorCompatibility.java @@ -19,13 +19,13 @@ */ package org.neo4j.kernel.api.index; +import org.eclipse.collections.api.iterator.LongIterator; import org.junit.Ignore; import org.junit.Test; import java.util.Arrays; import org.neo4j.collection.primitive.PrimitiveLongCollections; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; @@ -77,7 +77,7 @@ public void shouldProvidePopulatorThatAcceptsDuplicateEntries() throws Exception { try ( IndexReader reader = accessor.newReader() ) { - PrimitiveLongIterator nodes = reader.query( IndexQuery.exact( 1, "v1" ), IndexQuery.exact( 1, "v2" ) ); + LongIterator nodes = reader.query( IndexQuery.exact( 1, "v1" ), IndexQuery.exact( 1, "v2" ) ); assertEquals( asSet( 1L, 2L ), PrimitiveLongCollections.toSet( nodes ) ); } } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexAccessorCompatibility.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexAccessorCompatibility.java index 02eb864b68f3f..7ab6365fe312a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexAccessorCompatibility.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexAccessorCompatibility.java @@ -19,6 +19,7 @@ */ package org.neo4j.kernel.api.index; +import org.eclipse.collections.api.iterator.LongIterator; import org.junit.After; import org.junit.Before; @@ -27,7 +28,6 @@ import java.util.LinkedList; import java.util.List; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; @@ -72,7 +72,7 @@ private List metaGet( ReaderInteraction interaction ) throws Exception try ( IndexReader reader = accessor.newReader() ) { List list = new LinkedList<>(); - for ( PrimitiveLongIterator iterator = interaction.results( reader ); iterator.hasNext(); ) + for ( LongIterator iterator = interaction.results( reader ); iterator.hasNext(); ) { list.add( iterator.next() ); } @@ -83,7 +83,7 @@ private List metaGet( ReaderInteraction interaction ) throws Exception interface ReaderInteraction { - PrimitiveLongIterator results( IndexReader reader ) throws Exception; + LongIterator results( IndexReader reader ) throws Exception; } void updateAndCommit( List> updates ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/SimpleIndexPopulatorCompatibility.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/SimpleIndexPopulatorCompatibility.java index 32741de15f2cd..e553b1def04a7 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/SimpleIndexPopulatorCompatibility.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/SimpleIndexPopulatorCompatibility.java @@ -19,6 +19,7 @@ */ package org.neo4j.kernel.api.index; +import org.eclipse.collections.api.iterator.LongIterator; import org.junit.Ignore; import org.junit.Test; @@ -27,7 +28,6 @@ import java.util.List; import org.neo4j.collection.primitive.PrimitiveLongCollections; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.helpers.Exceptions; import org.neo4j.helpers.collection.Iterables; import org.neo4j.internal.kernel.api.IndexOrder; @@ -141,7 +141,7 @@ public void shouldApplyUpdatesIdempotently() throws Exception try ( IndexReader reader = accessor.newReader() ) { int propertyKeyId = descriptor.schema().getPropertyId(); - PrimitiveLongIterator nodes = reader.query( IndexQuery.exact( propertyKeyId, propertyValue ) ); + LongIterator nodes = reader.query( IndexQuery.exact( propertyKeyId, propertyValue ) ); assertEquals( asSet( 1L ), PrimitiveLongCollections.toSet( nodes ) ); } } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LongDiffSetsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LongDiffSetsTest.java index 27214d9d97243..ab22ab91b37ab 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LongDiffSetsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LongDiffSetsTest.java @@ -19,11 +19,11 @@ */ package org.neo4j.kernel.impl.api; +import org.eclipse.collections.api.iterator.LongIterator; import org.junit.Test; import java.util.Iterator; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.kernel.impl.util.diffsets.DiffSets; import static java.util.Arrays.asList; @@ -45,7 +45,7 @@ public void shouldContainSourceForEmptyDiffSets() Iterator expected = diffSets.apply( iteratorSource( 1L, 2L ) ); // when - PrimitiveLongIterator actual = diffSets.augment( iterator( 1L, 2L ) ); + LongIterator actual = diffSets.augment( iterator( 1L, 2L ) ); // then assertThat( expected, hasSamePrimitiveItems( actual ) ); @@ -61,7 +61,7 @@ public void shouldContainFilteredSourceForDiffSetsWithRemovedElements() Iterator expected = diffSets.apply( iteratorSource( 1L, 17L, 3L ) ); // when - PrimitiveLongIterator actual = diffSets.augment( iterator( 1L, 17L, 3L ) ); + LongIterator actual = diffSets.augment( iterator( 1L, 17L, 3L ) ); // then assertThat( expected, hasSamePrimitiveItems( actual ) ); @@ -77,7 +77,7 @@ public void shouldContainFilteredSourceForDiffSetsWithAddedElements() Iterator expected = diffSets.apply( iteratorSource( 1L, 17L, 3L ) ); // when - PrimitiveLongIterator actual = diffSets.augment( iterator( 1L, 17L, 3L ) ); + LongIterator actual = diffSets.augment( iterator( 1L, 17L, 3L ) ); // then assertThat( expected, hasSamePrimitiveItems( actual ) ); @@ -93,7 +93,7 @@ public void shouldContainAddedElementsForDiffSetsWithAddedElements() Iterator expected = diffSets.apply( iteratorSource( 19L ) ); // when - PrimitiveLongIterator actual = diffSets.augment( iterator( 19L ) ); + LongIterator actual = diffSets.augment( iterator( 19L ) ); // then assertThat( expected, hasSamePrimitiveItems( actual ) ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/NodeUpdatesIteratorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/NodeUpdatesIteratorTest.java index c7badd62f9c91..a413f68c85db9 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/NodeUpdatesIteratorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/NodeUpdatesIteratorTest.java @@ -19,6 +19,7 @@ */ package org.neo4j.kernel.impl.api.index; +import org.eclipse.collections.api.iterator.LongIterator; import org.junit.Test; import org.mockito.Mockito; @@ -27,7 +28,6 @@ import java.util.Deque; import org.neo4j.collection.primitive.PrimitiveLongCollections; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertSame; @@ -41,7 +41,7 @@ public class NodeUpdatesIteratorTest public void iterateOverEmptyNodeIds() { IndexStoreView storeView = Mockito.mock( IndexStoreView.class ); - PrimitiveLongIterator emptyIterator = PrimitiveLongCollections.emptyIterator(); + LongIterator emptyIterator = PrimitiveLongCollections.emptyIterator(); NodeUpdatesIterator nodeUpdatesIterator = new NodeUpdatesIterator( storeView, emptyIterator ); assertFalse( nodeUpdatesIterator.hasNext() ); } @@ -55,7 +55,7 @@ public void iterateOverUpdatesWithNext() when( storeView.nodeAsUpdates( 1 ) ).thenReturn( nodeUpdates1 ); when( storeView.nodeAsUpdates( 2 ) ).thenReturn( nodeUpdates2 ); - PrimitiveLongIterator nodeIdIterator = PrimitiveLongCollections.iterator( 1, 2 ); + LongIterator nodeIdIterator = PrimitiveLongCollections.iterator( 1, 2 ); NodeUpdatesIterator nodeUpdatesIterator = new NodeUpdatesIterator( storeView, nodeIdIterator ); assertSame( nodeUpdates1, nodeUpdatesIterator.next() ); @@ -77,7 +77,7 @@ public void iterateOverUpdatesWithHasNext() Deque updates = new ArrayDeque<>( Arrays.asList( nodeUpdates1, nodeUpdates2 ) ); - PrimitiveLongIterator nodeIdIterator = PrimitiveLongCollections.iterator( 1, 2 ); + LongIterator nodeIdIterator = PrimitiveLongCollections.iterator( 1, 2 ); NodeUpdatesIterator nodeUpdatesIterator = new NodeUpdatesIterator( storeView, nodeIdIterator ); while ( nodeUpdatesIterator.hasNext() ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/HashBasedIndex.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/HashBasedIndex.java index 296eb0eab87fe..99afebd6d199e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/HashBasedIndex.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/HashBasedIndex.java @@ -19,6 +19,8 @@ */ package org.neo4j.kernel.impl.api.index.inmemory; +import org.eclipse.collections.api.iterator.LongIterator; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -28,7 +30,6 @@ import java.util.Map; import java.util.Set; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.collection.primitive.PrimitiveLongResourceIterator; import org.neo4j.helpers.collection.Iterables; import org.neo4j.internal.kernel.api.IndexQuery; @@ -291,7 +292,7 @@ private PrimitiveLongResourceIterator stringSearch( StringFilter filter ) return asResource( toPrimitiveIterator( nodeIds.iterator() ) ); } - private PrimitiveLongResourceIterator asResource( PrimitiveLongIterator iterator ) + private PrimitiveLongResourceIterator asResource( LongIterator iterator ) { return resourceIterator( iterator, null ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/RelationshipChangesForNodeTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/RelationshipChangesForNodeTest.java index 998c431505638..d41aaa942c312 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/RelationshipChangesForNodeTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/RelationshipChangesForNodeTest.java @@ -19,11 +19,11 @@ */ package org.neo4j.kernel.impl.api.state; +import org.eclipse.collections.api.iterator.LongIterator; import org.hamcrest.Matcher; import org.junit.Test; import org.neo4j.collection.primitive.PrimitiveLongCollections; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.kernel.impl.api.RelationshipVisitor; import org.neo4j.kernel.impl.api.store.RelationshipIterator; import org.neo4j.kernel.impl.newapi.RelationshipDirection; @@ -87,7 +87,7 @@ public void shouldGetRelationships() changes.addRelationship( 5, TYPE, BOTH ); changes.addRelationship( 6, TYPE, BOTH ); - PrimitiveLongIterator rawRelationships = changes.getRelationships(); + LongIterator rawRelationships = changes.getRelationships(); assertThat( PrimitiveLongCollections.asArray( rawRelationships ), ids( 1, 2, 3, 4, 5, 6 ) ); } @@ -111,15 +111,15 @@ public void shouldGetRelationshipsByTypeAndDirection() changes.addRelationship( 11, DECOY_TYPE, OUTGOING ); changes.addRelationship( 12, DECOY_TYPE, BOTH ); - PrimitiveLongIterator rawIncoming = + LongIterator rawIncoming = changes.getRelationships( RelationshipDirection.INCOMING, TYPE ); assertThat( PrimitiveLongCollections.asArray( rawIncoming ), ids( 1 ) ); - PrimitiveLongIterator rawOutgoing = + LongIterator rawOutgoing = changes.getRelationships( RelationshipDirection.OUTGOING, TYPE ); assertThat( PrimitiveLongCollections.asArray( rawOutgoing ), ids( 2, 3 ) ); - PrimitiveLongIterator rawLoops = + LongIterator rawLoops = changes.getRelationships( RelationshipDirection.LOOP, TYPE ); assertThat( PrimitiveLongCollections.asArray( rawLoops ), ids( 4, 5, 6 ) ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/NodeLoadingIteratorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/NodeLoadingIteratorTest.java index e0480bc041ba9..e4a5eeac6fe03 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/NodeLoadingIteratorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/NodeLoadingIteratorTest.java @@ -19,6 +19,7 @@ */ package org.neo4j.kernel.impl.api.store; +import org.eclipse.collections.api.iterator.LongIterator; import org.junit.Test; import java.util.HashMap; @@ -26,7 +27,6 @@ import java.util.NoSuchElementException; import org.neo4j.collection.primitive.PrimitiveLongCollections; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.cursor.Cursor; import org.neo4j.function.ThrowingLongFunction; import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; @@ -63,7 +63,7 @@ public void shouldHandleANonEmptyIterator() map.put( 1L, mockCursor() ); map.put( 2L, mockCursor() ); map.put( 3L, mockCursor() ); - PrimitiveLongIterator inner = PrimitiveLongCollections.iterator( 1, 2, 3 ); + LongIterator inner = PrimitiveLongCollections.iterator( 1, 2, 3 ); NodeLoadingIterator iterator = new NodeLoadingIterator( inner, createMapping( map ) ); // when - then @@ -84,7 +84,7 @@ public void shouldHandleANonEmptyIteratorWithNotFoundEntities() map.put( 1L, mockCursor() ); map.put( 2L, null ); map.put( 3L, mockCursor() ); - PrimitiveLongIterator inner = PrimitiveLongCollections.iterator( 1, 2, 3 ); + LongIterator inner = PrimitiveLongCollections.iterator( 1, 2, 3 ); NodeLoadingIterator iterator = new NodeLoadingIterator( inner, createMapping( map ) ); // when - then diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorageLayerLabelTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorageLayerLabelTest.java index 4dcb505c89fff..016ae5ed7b544 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorageLayerLabelTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorageLayerLabelTest.java @@ -19,11 +19,11 @@ */ package org.neo4j.kernel.impl.api.store; +import org.eclipse.collections.api.iterator.LongIterator; import org.junit.Test; import org.neo4j.collection.primitive.PrimitiveIntCollections; import org.neo4j.collection.primitive.PrimitiveLongCollections; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; @@ -95,8 +95,8 @@ public void should_return_all_nodes_with_label() int labelId2 = disk.labelGetForName( label2.name() ); // WHEN - PrimitiveLongIterator nodesForLabel1 = disk.nodesGetForLabel( state.getStoreStatement(), labelId1 ); - PrimitiveLongIterator nodesForLabel2 = disk.nodesGetForLabel( state.getStoreStatement(), labelId2 ); + LongIterator nodesForLabel1 = disk.nodesGetForLabel( state.getStoreStatement(), labelId1 ); + LongIterator nodesForLabel2 = disk.nodesGetForLabel( state.getStoreStatement(), labelId2 ); // THEN assertEquals( asSet( node1.getId(), node2.getId() ), PrimitiveLongCollections.toSet( nodesForLabel1 ) ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/labelscan/LabelScanValueIteratorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/labelscan/LabelScanValueIteratorTest.java index b10629096ff26..0e24140cd9c2b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/labelscan/LabelScanValueIteratorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/labelscan/LabelScanValueIteratorTest.java @@ -19,13 +19,13 @@ */ package org.neo4j.kernel.impl.index.labelscan; +import org.eclipse.collections.api.iterator.LongIterator; import org.junit.Test; import java.io.IOException; import java.util.Collection; import java.util.HashSet; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.cursor.RawCursor; import org.neo4j.index.internal.gbptree.Hit; @@ -60,7 +60,7 @@ public void shouldCloseExhaustedCursors() throws Exception assertTrue( toRemoveFrom.isEmpty() ); } - private void exhaust( PrimitiveLongIterator iterator ) + private void exhaust( LongIterator iterator ) { while ( iterator.hasNext() ) { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanReaderTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanReaderTest.java index fca925c4526ca..c915047ebd9a7 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanReaderTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanReaderTest.java @@ -19,11 +19,11 @@ */ package org.neo4j.kernel.impl.index.labelscan; +import org.eclipse.collections.api.iterator.LongIterator; import org.junit.Test; import java.io.IOException; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.cursor.RawCursor; import org.neo4j.index.internal.gbptree.GBPTree; import org.neo4j.index.internal.gbptree.Hit; @@ -60,7 +60,7 @@ public void shouldFindMultipleNodesInEachRange() throws Exception try ( NativeLabelScanReader reader = new NativeLabelScanReader( index ) ) { // WHEN - PrimitiveLongIterator iterator = reader.nodesWithLabel( LABEL_ID ); + LongIterator iterator = reader.nodesWithLabel( LABEL_ID ); // THEN assertArrayEquals( new long[] { @@ -92,8 +92,8 @@ public void shouldSupportMultipleOpenCursorsConcurrently() throws Exception // first check test invariants verify( cursor1, never() ).close(); verify( cursor2, never() ).close(); - PrimitiveLongIterator first = reader.nodesWithLabel( LABEL_ID ); - PrimitiveLongIterator second = reader.nodesWithLabel( LABEL_ID ); + LongIterator first = reader.nodesWithLabel( LABEL_ID ); + LongIterator second = reader.nodesWithLabel( LABEL_ID ); // getting the second iterator should not have closed the first one verify( cursor1, never() ).close(); @@ -145,7 +145,7 @@ private static Hit hit( long baseNodeId, long bits return new MutableHit<>( key, value ); } - private void exhaust( PrimitiveLongIterator iterator ) + private void exhaust( LongIterator iterator ) { while ( iterator.hasNext() ) { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexAccessorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexAccessorTest.java index f535391fb99b1..a632bd3cd85b9 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexAccessorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexAccessorTest.java @@ -19,6 +19,7 @@ */ package org.neo4j.kernel.impl.index.schema; +import org.eclipse.collections.api.iterator.LongIterator; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -39,7 +40,6 @@ import java.util.stream.Stream; import org.neo4j.collection.primitive.PrimitiveLongCollections; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.graphdb.ResourceIterator; import org.neo4j.internal.kernel.api.IndexOrder; import org.neo4j.internal.kernel.api.IndexQuery; @@ -296,7 +296,7 @@ public void shouldReturnAllEntriesForExistsPredicate() throws Exception // when IndexReader reader = accessor.newReader(); - PrimitiveLongIterator result = query( reader, IndexQuery.exists( 0 ) ); + LongIterator result = query( reader, IndexQuery.exists( 0 ) ); // then assertEntityIdHits( extractEntityIds( updates, alwaysTrue() ), result ); @@ -307,7 +307,7 @@ public void shouldReturnNoEntriesForExistsPredicateForEmptyIndex() throws Except { // when IndexReader reader = accessor.newReader(); - PrimitiveLongIterator result = query( reader, IndexQuery.exists( 0 ) ); + LongIterator result = query( reader, IndexQuery.exists( 0 ) ); // then long[] actual = PrimitiveLongCollections.asArray( result ); @@ -326,7 +326,7 @@ public void shouldReturnMatchingEntriesForExactPredicate() throws Exception for ( IndexEntryUpdate update : updates ) { Value value = update.values()[0]; - PrimitiveLongIterator result = query( reader, IndexQuery.exact( 0, value ) ); + LongIterator result = query( reader, IndexQuery.exact( 0, value ) ); assertEntityIdHits( extractEntityIds( updates, in( value ) ), result ); } } @@ -341,7 +341,7 @@ public void shouldReturnNoEntriesForMismatchingExactPredicate() throws Exception // when IndexReader reader = accessor.newReader(); Object value = generateUniqueValue( updates ); - PrimitiveLongIterator result = query( reader, IndexQuery.exact( 0, value ) ); + LongIterator result = query( reader, IndexQuery.exact( 0, value ) ); assertEntityIdHits( EMPTY_LONG_ARRAY, result ); } @@ -355,7 +355,7 @@ public void shouldReturnMatchingEntriesForRangePredicateWithInclusiveStartAndExc // when IndexReader reader = accessor.newReader(); - PrimitiveLongIterator result = query( reader, + LongIterator result = query( reader, layoutUtil.rangeQuery( valueOf( updates[0] ), true, valueOf( updates[updates.length - 1] ), false ) ); assertEntityIdHits( extractEntityIds( Arrays.copyOf( updates, updates.length - 1 ), alwaysTrue() ), result ); } @@ -370,7 +370,7 @@ public void shouldReturnMatchingEntriesForRangePredicateWithInclusiveStartAndInc // when IndexReader reader = accessor.newReader(); - PrimitiveLongIterator result = query( reader, + LongIterator result = query( reader, layoutUtil.rangeQuery( valueOf( updates[0] ), true, valueOf( updates[updates.length - 1] ), true ) ); assertEntityIdHits( extractEntityIds( updates, alwaysTrue() ), result ); } @@ -385,7 +385,7 @@ public void shouldReturnMatchingEntriesForRangePredicateWithExclusiveStartAndExc // when IndexReader reader = accessor.newReader(); - PrimitiveLongIterator result = query( reader, + LongIterator result = query( reader, layoutUtil.rangeQuery( valueOf( updates[0] ), false, valueOf( updates[updates.length - 1] ), false ) ); assertEntityIdHits( extractEntityIds( Arrays.copyOfRange( updates, 1, updates.length - 1 ), alwaysTrue() ), result ); } @@ -400,7 +400,7 @@ public void shouldReturnMatchingEntriesForRangePredicateWithExclusiveStartAndInc // when IndexReader reader = accessor.newReader(); - PrimitiveLongIterator result = query( reader, + LongIterator result = query( reader, layoutUtil.rangeQuery( valueOf( updates[0] ), false, valueOf( updates[updates.length - 1] ), true ) ); assertEntityIdHits( extractEntityIds( Arrays.copyOfRange( updates, 1, updates.length ), alwaysTrue() ), result ); } @@ -415,7 +415,7 @@ public void shouldReturnNoEntriesForRangePredicateOutsideAnyMatch() throws Excep // when IndexReader reader = accessor.newReader(); - PrimitiveLongIterator result = query( reader, + LongIterator result = query( reader, layoutUtil.rangeQuery( valueOf( updates[2] ), true, valueOf( updates[updates.length - 3] ), true ) ); assertEntityIdHits( EMPTY_LONG_ARRAY, result ); } @@ -437,12 +437,12 @@ public void mustHandleNestedQueries() throws Exception long[] expectedOuter = new long[]{entityIdOf( updates[2] ), entityIdOf( updates[3] )}; long[] expectedInner = new long[]{entityIdOf( updates[0] ), entityIdOf( updates[1] )}; - PrimitiveLongIterator outerIter = query( reader, outerQuery ); + LongIterator outerIter = query( reader, outerQuery ); Collection outerResult = new ArrayList<>(); while ( outerIter.hasNext() ) { outerResult.add( outerIter.next() ); - PrimitiveLongIterator innerIter = query( reader, innerQuery ); + LongIterator innerIter = query( reader, innerQuery ); assertEntityIdHits( expectedInner, innerIter ); } assertEntityIdHits( expectedOuter, outerResult ); @@ -468,19 +468,19 @@ public void mustHandleMultipleNestedQueries() throws Exception long[] expected3 = new long[]{entityIdOf( updates[0] ), entityIdOf( updates[1] )}; Collection result1 = new ArrayList<>(); - PrimitiveLongIterator iter1 = query( reader, query1 ); + LongIterator iter1 = query( reader, query1 ); while ( iter1.hasNext() ) { result1.add( iter1.next() ); Collection result2 = new ArrayList<>(); - PrimitiveLongIterator iter2 = query( reader, query2 ); + LongIterator iter2 = query( reader, query2 ); while ( iter2.hasNext() ) { result2.add( iter2.next() ); Collection result3 = new ArrayList<>(); - PrimitiveLongIterator iter3 = query( reader, query3 ); + LongIterator iter3 = query( reader, query3 ); while ( iter3.hasNext() ) { result3.add( iter3.next() ); @@ -762,14 +762,14 @@ public boolean needsValues() }; } - private PrimitiveLongIterator query( IndexReader reader, IndexQuery query ) throws IndexNotApplicableKernelException + private LongIterator query( IndexReader reader, IndexQuery query ) throws IndexNotApplicableKernelException { NodeValueIterator client = new NodeValueIterator(); reader.query( client, IndexOrder.NONE, query ); return client; } - private void assertEntityIdHits( long[] expected, PrimitiveLongIterator result ) + private void assertEntityIdHits( long[] expected, LongIterator result ) { long[] actual = PrimitiveLongCollections.asArray( result ); assertSameContent( expected, actual ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexReaderTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexReaderTest.java index 9e25f86b23998..cc2f41915f540 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexReaderTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexReaderTest.java @@ -19,6 +19,7 @@ */ package org.neo4j.kernel.impl.index.schema.fusion; +import org.eclipse.collections.api.iterator.LongIterator; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -27,7 +28,6 @@ import java.util.Arrays; import org.neo4j.collection.primitive.PrimitiveLongCollections; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.collection.primitive.PrimitiveLongResourceCollections; import org.neo4j.collection.primitive.PrimitiveLongResourceIterator; import org.neo4j.collection.primitive.PrimitiveLongSet; @@ -354,7 +354,7 @@ public void mustCombineResultFromExistsPredicate() throws Exception } // when - PrimitiveLongIterator result = fusionIndexReader.query( exists ); + LongIterator result = fusionIndexReader.query( exists ); // then PrimitiveLongSet resultSet = PrimitiveLongCollections.asSet( result ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/SynchronizedArrayIdOrderingQueueStressTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/SynchronizedArrayIdOrderingQueueStressTest.java index 21536cc825a6f..bc7d2c697f799 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/SynchronizedArrayIdOrderingQueueStressTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/SynchronizedArrayIdOrderingQueueStressTest.java @@ -19,13 +19,14 @@ */ package org.neo4j.kernel.impl.transaction; +import org.eclipse.collections.api.iterator.LongIterator; import org.junit.Test; import java.util.Random; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import org.neo4j.collection.primitive.PrimitiveLongIterator; + import org.neo4j.kernel.impl.util.IdOrderingQueue; import org.neo4j.kernel.impl.util.SynchronizedArrayIdOrderingQueue; @@ -48,7 +49,7 @@ public void shouldWithstandHighStressAndStillKeepOrder() throws Exception CountDownLatch readySignal = new CountDownLatch( committers.length ); AtomicBoolean end = new AtomicBoolean(); CountDownLatch startSignal = new CountDownLatch( 1 ); - PrimitiveLongIterator idSource = neverEndingIdStream(); + LongIterator idSource = neverEndingIdStream(); for ( int i = 0; i < committers.length; i++ ) { committers[i] = new Committer( queue, idSource, end, readySignal, startSignal ); @@ -123,9 +124,9 @@ public int getNumberOfOrderlyRemovedIds() } } - private PrimitiveLongIterator neverEndingIdStream() + private LongIterator neverEndingIdStream() { - return new PrimitiveLongIterator() + return new LongIterator() { private final Stride stride = new Stride(); private long next; @@ -157,11 +158,11 @@ private static class Committer extends Thread private final IdOrderingQueue queue; private final AtomicBoolean end; private final CountDownLatch startSignal; - private final PrimitiveLongIterator idSource; + private final LongIterator idSource; private final CountDownLatch readySignal; private volatile Exception exception; - Committer( IdOrderingQueue queue, PrimitiveLongIterator idSource, AtomicBoolean end, + Committer( IdOrderingQueue queue, LongIterator idSource, AtomicBoolean end, CountDownLatch readySignal, CountDownLatch startSignal ) { this.queue = queue; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/IndexWorkSyncTransactionApplicationStressIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/IndexWorkSyncTransactionApplicationStressIT.java index 009b222d89c9f..fe9775456c944 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/IndexWorkSyncTransactionApplicationStressIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/IndexWorkSyncTransactionApplicationStressIT.java @@ -19,6 +19,7 @@ */ package org.neo4j.kernel.impl.transaction.command; +import org.eclipse.collections.api.iterator.LongIterator; import org.junit.Rule; import org.junit.Test; import org.junit.rules.RuleChain; @@ -29,7 +30,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.neo4j.collection.primitive.PrimitiveLongCollections; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.helpers.collection.Visitor; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.InternalIndexState; @@ -220,7 +220,7 @@ private void verifyIndex( TransactionToApply tx ) throws Exception Value propertyValue = propertyValue( id, base + i ); IndexQuery.ExactPredicate query = IndexQuery.exact( descriptor.getPropertyId(), propertyValue ); - PrimitiveLongIterator hits = reader.query( query ); + LongIterator hits = reader.query( query ); assertEquals( "Index doesn't contain " + visitor.nodeId + " " + propertyValue, visitor.nodeId, PrimitiveLongCollections.single( hits, -1 ) ); tx = tx.next(); 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 fd5b67a41acaa..6b345b583a3ed 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 @@ -230,10 +230,10 @@ public void shouldCreateEqualNodePropertyUpdatesOnRecoveryOfCreatedNode() throws // -- later recovering that tx, there should be only one update assertTrue( extractor.containsAnyNodeOrPropertyUpdate() ); PrimitiveLongSet recoveredNodeIds = Primitive.longSet(); - recoveredNodeIds.addAll( extractor.nodeCommandsById().iterator() ); - recoveredNodeIds.addAll( extractor.propertyCommandsByNodeIds().iterator() ); + recoveredNodeIds.addAll( extractor.nodeCommandsById().longIterator() ); + recoveredNodeIds.addAll( extractor.propertyCommandsByNodeIds().longIterator() ); assertEquals( 1, recoveredNodeIds.size() ); - assertEquals( nodeId, recoveredNodeIds.iterator().next() ); + assertEquals( nodeId, recoveredNodeIds.longIterator().next() ); } @Test diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/diffsets/DiffApplyingPrimitiveLongIteratorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/diffsets/DiffApplyingPrimitiveLongIteratorTest.java index 11f745fee502f..8fa739faa28ec 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/diffsets/DiffApplyingPrimitiveLongIteratorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/diffsets/DiffApplyingPrimitiveLongIteratorTest.java @@ -20,12 +20,12 @@ package org.neo4j.kernel.impl.util.diffsets; import org.apache.commons.lang3.ArrayUtils; +import org.eclipse.collections.api.iterator.LongIterator; import org.junit.Test; import org.mockito.Mockito; import java.util.Set; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.collection.primitive.PrimitiveLongResourceIterator; import org.neo4j.collection.primitive.PrimitiveLongSet; import org.neo4j.graphdb.Resource; @@ -47,11 +47,11 @@ public class DiffApplyingPrimitiveLongIteratorTest @Test public void iterateOnlyOverAddedElementsWhenSourceIsEmpty() { - PrimitiveLongIterator emptySource = emptyIterator(); + LongIterator emptySource = emptyIterator(); PrimitiveLongSet added = setOf( 1L, 2L ); PrimitiveLongSet removed = setOf( 3L ); - PrimitiveLongIterator iterator = DiffApplyingPrimitiveLongIterator.augment( emptySource, added, removed ); + LongIterator iterator = DiffApplyingPrimitiveLongIterator.augment( emptySource, added, removed ); Set resultSet = toSet( iterator ); assertThat( resultSet, containsInAnyOrder(1L, 2L) ); } @@ -59,11 +59,11 @@ public void iterateOnlyOverAddedElementsWhenSourceIsEmpty() @Test public void appendSourceElementsDuringIteration() { - PrimitiveLongIterator source = iterator( 4L, 5L ); + LongIterator source = iterator( 4L, 5L ); PrimitiveLongSet added = setOf( 1L, 2L ); PrimitiveLongSet removed = setOf( 3L ); - PrimitiveLongIterator iterator = DiffApplyingPrimitiveLongIterator.augment( source, added, removed ); + LongIterator iterator = DiffApplyingPrimitiveLongIterator.augment( source, added, removed ); Set resultSet = toSet( iterator ); assertThat( resultSet, containsInAnyOrder(1L, 2L, 4L, 5L) ); } @@ -71,11 +71,11 @@ public void appendSourceElementsDuringIteration() @Test public void doNotIterateTwiceOverSameElementsWhenItsPartOfSourceAndAdded() { - PrimitiveLongIterator source = iterator( 4L, 5L ); + LongIterator source = iterator( 4L, 5L ); PrimitiveLongSet added = setOf( 1L, 4L ); PrimitiveLongSet removed = setOf( 3L ); - PrimitiveLongIterator iterator = DiffApplyingPrimitiveLongIterator.augment( source, added, removed ); + LongIterator iterator = DiffApplyingPrimitiveLongIterator.augment( source, added, removed ); Long[] values = ArrayUtils.toObject( asArray( iterator ) ); assertThat( values, arrayContainingInAnyOrder( 1L, 4L, 5L ) ); assertThat( values, arrayWithSize( 3 ) ); @@ -84,11 +84,11 @@ public void doNotIterateTwiceOverSameElementsWhenItsPartOfSourceAndAdded() @Test public void doNotIterateOverDeletedElement() { - PrimitiveLongIterator source = iterator( 3L, 5L ); + LongIterator source = iterator( 3L, 5L ); PrimitiveLongSet added = setOf( 1L ); PrimitiveLongSet removed = setOf( 3L ); - PrimitiveLongIterator iterator = DiffApplyingPrimitiveLongIterator.augment( source, added, removed ); + LongIterator iterator = DiffApplyingPrimitiveLongIterator.augment( source, added, removed ); Set resultSet = toSet( iterator ); assertThat( resultSet, containsInAnyOrder(1L, 5L) ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/diffsets/PrimitiveLongDiffSetsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/diffsets/PrimitiveLongDiffSetsTest.java index 73e4f27cea91f..d308367e57f0a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/diffsets/PrimitiveLongDiffSetsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/diffsets/PrimitiveLongDiffSetsTest.java @@ -19,11 +19,11 @@ */ package org.neo4j.kernel.impl.util.diffsets; +import org.eclipse.collections.api.iterator.LongIterator; import org.junit.Test; import org.neo4j.collection.primitive.Primitive; import org.neo4j.collection.primitive.PrimitiveLongCollections; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.collection.primitive.PrimitiveLongSet; import org.neo4j.kernel.impl.util.collection.CollectionsFactory; import org.neo4j.kernel.impl.util.collection.OnHeapCollectionsFactory; @@ -156,7 +156,7 @@ public void augmentDiffSetWithExternalElements() diffSet.addAll( PrimitiveLongCollections.iterator( 9L, 10L, 11L ) ); diffSet.removeAll( PrimitiveLongCollections.iterator( 1L, 2L ) ); - PrimitiveLongIterator augmentedIterator = diffSet.augment( iterator( 5L, 6L ) ); + LongIterator augmentedIterator = diffSet.augment( iterator( 5L, 6L ) ); assertEquals( asSet( 5L, 6L, 9L, 10L, 11L ), toSet( augmentedIterator ) ); } diff --git a/community/kernel/src/test/java/org/neo4j/test/mockito/answer/Neo4jMockitoAnswers.java b/community/kernel/src/test/java/org/neo4j/test/mockito/answer/Neo4jMockitoAnswers.java index 6be0d03df348e..30b7bcc7429f2 100644 --- a/community/kernel/src/test/java/org/neo4j/test/mockito/answer/Neo4jMockitoAnswers.java +++ b/community/kernel/src/test/java/org/neo4j/test/mockito/answer/Neo4jMockitoAnswers.java @@ -27,7 +27,6 @@ import org.neo4j.collection.primitive.PrimitiveIntCollections; import org.neo4j.collection.primitive.PrimitiveLongCollections; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.graphdb.Resource; import static org.neo4j.collection.primitive.PrimitiveLongCollections.toPrimitiveIterator; @@ -43,7 +42,7 @@ public static Answer> answerAsIteratorFrom( final Iterable va return invocation -> values.iterator(); } - public static Answer answerAsPrimitiveLongIteratorFrom( final Iterable values ) + public static Answer answerAsPrimitiveLongIteratorFrom( final Iterable values ) { return invocation -> PrimitiveLongCollections.resourceIterator( toPrimitiveIterator( values.iterator() ), Resource.EMPTY ); diff --git a/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/Neo4jMatchers.java b/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/Neo4jMatchers.java index 0448c437c582c..91d89b37cb1a3 100644 --- a/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/Neo4jMatchers.java +++ b/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/Neo4jMatchers.java @@ -19,6 +19,7 @@ */ package org.neo4j.test.mockito.matcher; +import org.eclipse.collections.api.iterator.LongIterator; import org.hamcrest.Description; import org.hamcrest.DiagnosingMatcher; import org.hamcrest.Matcher; @@ -31,7 +32,6 @@ import java.util.Iterator; import java.util.Set; -import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Label; import org.neo4j.graphdb.Node; @@ -225,7 +225,7 @@ public static Set asLabelNameSet( Iterable