Fixups after code review

neo4j · Nov 25, 2017 · ff03b0f · ff03b0f
1 parent 1e2cc56
commit ff03b0f
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 13 deletions.
diff --git a/...el-api/src/test/java/org/neo4j/internal/kernel/api/ExplicitIndexCursorWritesTestBase.java b/...el-api/src/test/java/org/neo4j/internal/kernel/api/ExplicitIndexCursorWritesTestBase.java
@@ -21,7 +21,6 @@
 
 import org.junit.Test;
 
-import java.util.Collections;
 import java.util.HashMap;
 
 import org.neo4j.graphdb.Node;
@@ -57,7 +56,7 @@ public void shouldRemoveNodeFromExplicitIndex() throws Exception
         // Then
         try ( org.neo4j.graphdb.Transaction ctx = graphDb.beginTx() )
         {
-            IndexHits<Node> hits = graphDb.index().forNodes( INDEX_NAME ).get( KEY, "this is it" );
+            IndexHits<Node> hits = graphDb.index().forNodes( INDEX_NAME ).get( KEY, VALUE );
             assertFalse( hits.hasNext() );
             hits.close();
             ctx.success();
@@ -88,7 +87,7 @@ public void shouldHandleRemoveNodeFromExplicitIndexTwice() throws Exception
         // Then
         try ( org.neo4j.graphdb.Transaction ctx = graphDb.beginTx() )
         {
-            IndexHits<Node> hits = graphDb.index().forNodes( INDEX_NAME ).get( KEY, "this is it" );
+            IndexHits<Node> hits = graphDb.index().forNodes( INDEX_NAME ).get( KEY, VALUE );
             assertFalse( hits.hasNext() );
             hits.close();
             ctx.success();
@@ -144,6 +143,37 @@ public void shouldCreateExplicitIndex() throws Exception
         }
     }
 
+    @Test
+    public void shouldCreateExplicitIndexTwice() throws Exception
+    {
+        // Given
+        HashMap<String,String> config = new HashMap<>();
+        config.put( "type", "exact" );
+        config.put( "provider", "lucene" );
+
+        try ( Transaction tx = session.beginTransaction() )
+        {
+            ExplicitIndexWrite indexWrite = tx.indexWrite();
+            indexWrite.nodeExplicitIndexCreateLazily( INDEX_NAME, config );
+            tx.success();
+        }
+
+        // When
+        try ( Transaction tx = session.beginTransaction() )
+        {
+            ExplicitIndexWrite indexWrite = tx.indexWrite();
+            indexWrite.nodeExplicitIndexCreateLazily( INDEX_NAME, config );
+            tx.success();
+        }
+
+        // Then
+        try ( org.neo4j.graphdb.Transaction ctx = graphDb.beginTx() )
+        {
+            assertTrue( graphDb.index().existsForNodes( INDEX_NAME ) );
+            ctx.success();
+        }
+    }
+
     private long addNodeToExplicitIndex()
     {
         long nodeId;

diff --git a/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/NodeWriteTestBase.java b/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/NodeWriteTestBase.java
@@ -133,7 +133,7 @@ public void shouldAddLabelNode() throws Exception
         final String labelName = "Town";
         try ( org.neo4j.graphdb.Transaction ctx = graphDb.beginTx() )
         {
-            node = graphDb.createNode( label( labelName ) ).getId();
+            node = graphDb.createNode().getId();
             ctx.success();
         }
 

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactions.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactions.java
@@ -159,7 +159,6 @@ public KernelTransactions( StatementLocksFactory statementLocksFactory,
         this.clock = clock;
         blockNewTransactions();
         this.cursors = cursors;
-
     }
 
     public Supplier<ExplicitIndexTransactionState> explicitIndexTxStateSupplier()

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Read.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Read.java
@@ -25,7 +25,6 @@
 import org.neo4j.internal.kernel.api.CapableIndexReference;
 import org.neo4j.internal.kernel.api.IndexOrder;
 import org.neo4j.internal.kernel.api.IndexQuery;
-import org.neo4j.internal.kernel.api.NodeExplicitIndexCursor;
 import org.neo4j.internal.kernel.api.RelationshipExplicitIndexCursor;
 import org.neo4j.internal.kernel.api.Scan;
 import org.neo4j.internal.kernel.api.exceptions.KernelException;
@@ -297,26 +296,26 @@ public final void graphProperties( org.neo4j.internal.kernel.api.PropertyCursor
 
     @Override
     public final void nodeExplicitIndexLookup(
-            NodeExplicitIndexCursor cursor, String index, String key, Value value ) throws KernelException
+            org.neo4j.internal.kernel.api.NodeExplicitIndexCursor cursor, String index, String key, Value value ) throws KernelException
     {
-        ((org.neo4j.kernel.impl.newapi.NodeExplicitIndexCursor) cursor).setRead( this );
+        ((NodeExplicitIndexCursor) cursor).setRead( this );
         explicitIndex( (org.neo4j.kernel.impl.newapi.NodeExplicitIndexCursor) cursor, explicitNodeIndex( index ).get( key, value.asObject() ) );
     }
 
     @Override
     public final void nodeExplicitIndexQuery(
-            NodeExplicitIndexCursor cursor, String index, Object query ) throws KernelException
+            org.neo4j.internal.kernel.api.NodeExplicitIndexCursor cursor, String index, Object query ) throws KernelException
     {
-        ((org.neo4j.kernel.impl.newapi.NodeExplicitIndexCursor) cursor).setRead( this );
+        ((NodeExplicitIndexCursor) cursor).setRead( this );
         explicitIndex( (org.neo4j.kernel.impl.newapi.NodeExplicitIndexCursor) cursor, explicitNodeIndex( index ).query(
                 query instanceof Value ? ((Value) query).asObject() : query ) );
     }
 
     @Override
     public final void nodeExplicitIndexQuery(
-            NodeExplicitIndexCursor cursor, String index, String key, Object query ) throws KernelException
+            org.neo4j.internal.kernel.api.NodeExplicitIndexCursor cursor, String index, String key, Object query ) throws KernelException
     {
-        ((org.neo4j.kernel.impl.newapi.NodeExplicitIndexCursor) cursor).setRead( this );
+        ((NodeExplicitIndexCursor) cursor).setRead( this );
         explicitIndex( (org.neo4j.kernel.impl.newapi.NodeExplicitIndexCursor) cursor, explicitNodeIndex( index ).query(
                 key, query instanceof Value ? ((Value) query).asObject() : query ) );
     }

diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/MockStore.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/MockStore.java
@@ -28,6 +28,7 @@
 import org.neo4j.internal.kernel.api.CapableIndexReference;
 import org.neo4j.io.pagecache.PageCursor;
 import org.neo4j.kernel.api.ExplicitIndex;
+import org.neo4j.kernel.api.txstate.TxStateHolder;
 import org.neo4j.kernel.impl.store.DynamicRecordAllocator;
 import org.neo4j.kernel.impl.store.PropertyStore;
 import org.neo4j.kernel.impl.store.RecordCursor;
@@ -45,6 +46,8 @@
 import org.neo4j.values.storable.TextValue;
 import org.neo4j.values.storable.Value;
 
+import static org.mockito.Mockito.mock;
+
 public class MockStore extends Read implements TestRule
 {
     private static final DynamicRecordAllocator NO_DYNAMIC_RECORDS = new DynamicRecordAllocator()
@@ -64,7 +67,7 @@ public DynamicRecord nextRecord()
 
     MockStore( Cursors cursors )
     {
-        super( cursors, null );//TODO fake txstateholder?
+        super( cursors, mock( TxStateHolder.class ) );
     }
 
     @Override