Fixed Kernel-Wrapper relationship and node cursors

Author: jexp

core/src/main/java/org/neo4j/graphalgo/core/Kernel.java

@@ -19,11 +19,9 @@
  * @since 27.06.17
  */
 public class Kernel {
-    private final Statement statement;
     private ReadOperations readOperations;
 
     public Kernel(Statement statement) {
-        this.statement = statement;
         readOperations = statement.readOperations();
     }
 
@@ -52,7 +50,6 @@ public Cursor<NodeItem> nodeCursorGetAll() {
 
     private Cursor<NodeItem> wrapNodes(PrimitiveLongIterator nodes) {
         return new Cursor<NodeItem>() {
-            Cursor<org.neo4j.storageengine.api.NodeItem> cursor;
             Kernel.NodeItem item = new Kernel.NodeItem();
             @Override
             public boolean next() {
@@ -61,7 +58,7 @@ public boolean next() {
                     if (!hasNext) return false;
                     long nodeId = nodes.next();
                     try {
-                        cursor = readOperations.nodeCursorById(nodeId);
+                        item.item = readOperations.nodeCursorById(nodeId).get();
                         return true;
                     } catch (EntityNotFoundException e) {
                         // throw new RuntimeException(e);
@@ -70,20 +67,16 @@ public boolean next() {
             }
 
             @Override
-            public void close() {
-                cursor.close();
-            }
+            public void close() { }
 
             @Override
             public NodeItem get() {
-                item.item = cursor.get();
                 return item;
             }
         };
     }
     private Cursor<RelationshipItem> wrapRelationships(PrimitiveLongIterator rels) {
         return new Cursor<RelationshipItem>() {
-            Cursor<org.neo4j.storageengine.api.RelationshipItem> cursor;
             Kernel.RelationshipItem item = new Kernel.RelationshipItem();
             @Override
             public boolean next() {
@@ -92,7 +85,7 @@ public boolean next() {
                     if (!hasNext) return false;
                     long relId = rels.next();
                     try {
-                        cursor = readOperations.relationshipCursorById(relId);
+                        item.item = readOperations.relationshipCursorById(relId).get();
                         return true;
                     } catch (EntityNotFoundException e) {
                         // throw new RuntimeException(e);
@@ -102,12 +95,11 @@ public boolean next() {
 
             @Override
             public void close() {
-                if (cursor!=null) cursor.close();
+
             }
 
             @Override
             public Kernel.RelationshipItem get() {
-                item.item = cursor.get();
                 return item;
             }
         };
@@ -152,43 +144,6 @@ public PropertyItem property(RelationshipItem item, int propertyId) {
         return item.property(propertyId).get();
     }
 
-    public Cursor<RelationshipItem> relationshipCursor(long relationId) {
-        try {
-            return new Cursor<Kernel.RelationshipItem>() {
-                RelationshipItem item = new RelationshipItem(readOperations.relationshipCursorById(relationId).get());
-                boolean first = true;
-
-                @Override
-                public boolean next() {
-                    if (first) {
-                        first = false;
-                        return true;
-                    }
-                    return false;
-                }
-
-                @Override
-                public void close() {
-                }
-
-                @Override
-                public RelationshipItem get() {
-                    return item;
-                }
-            };
-        } catch (EntityNotFoundException e) {
-            return EMPTY_CURSOR;
-        }
-    }
-
-    public Object relationshipGetProperty(long relationId, int propertyKey) {
-        try {
-            return readOperations.relationshipGetProperty(relationId,propertyKey);
-        } catch (EntityNotFoundException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
     public Cursor<NodeItem> nodeCursor(long nodeId) {
         try {
             return new Cursor<Kernel.NodeItem>() {
@@ -245,42 +200,6 @@ static org.neo4j.graphdb.Direction direction(Direction direction) {
         throw new RuntimeException("Illegal direction "+direction);
     }
 
-    public long countsForRelationship(int labelId, int relationId, int otherLabelId) {
-        return readOperations.countsForRelationship(labelId, relationId, otherLabelId);
-    }
-
-    public int nodeGetDegree(long nodeId, org.neo4j.graphdb.Direction direction) {
-        try {
-            return readOperations.nodeGetDegree(nodeId,direction);
-        } catch (EntityNotFoundException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public int nodeGetDegree(long nodeId, org.neo4j.graphdb.Direction direction, int relType) {
-        try {
-            return readOperations.nodeGetDegree(nodeId,direction,relType);
-        } catch (EntityNotFoundException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public long nodesGetCount() {
-        return readOperations.nodesGetCount();
-    }
-
-    public long countsForNodeWithoutTxState(int labelId) {
-        return readOperations.countsForNodeWithoutTxState(labelId);
-    }
-
-    public long relationshipsGetCount() {
-        return readOperations.relationshipsGetCount();
-    }
-
-    public long countsForRelationshipWithoutTxState(int labelId, int relTypeId, int otherLabelId) {
-        return readOperations.countsForRelationshipWithoutTxState(labelId, relTypeId, otherLabelId);
-    }
-
     public class NodeItem implements org.neo4j.storageengine.api.NodeItem {
         org.neo4j.storageengine.api.NodeItem item;
 

tests/pom.xml

@@ -19,7 +19,7 @@
         <logback.version>1.0.13</logback.version>
         <slf4j.version>1.7.5</slf4j.version>
         <junit.version>4.12</junit.version>
-        <neo4j.version>3.2.1</neo4j.version>
+        <neo4j.version>3.2.2</neo4j.version>
         <rr.version>2.5.0</rr.version>
         <mockito.version>1.10.19</mockito.version>
     </properties>