Support removing graph property

neo4j · Mar 1, 2018 · 2f74c49 · 2f74c49
1 parent 220edf4
commit 2f74c49
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 1 deletion.
diff --git a/...unity/kernel-api/src/test/java/org/neo4j/internal/kernel/api/GraphPropertiesTestBase.java b/...unity/kernel-api/src/test/java/org/neo4j/internal/kernel/api/GraphPropertiesTestBase.java
@@ -73,6 +73,29 @@ public void shouldBeAbleToReplaceExistingGraphProperty() throws Exception
         }
     }
 
+    @Test
+    public void shouldBeAbleToRemoveExistingGraphProperty() throws Exception
+    {
+        int prop;
+        try ( Transaction tx = session.beginTransaction() )
+        {
+            prop = tx.tokenWrite().propertyKeyGetOrCreateForName( "prop" );
+            assertThat( tx.dataWrite().graphSetProperty( prop, stringValue( "hello" ) ), equalTo( NO_VALUE ) );
+            tx.success();
+        }
+
+        try ( Transaction tx = session.beginTransaction() )
+        {
+            assertThat( tx.dataWrite().graphRemoveProperty( prop ), equalTo( stringValue("hello") ) );
+            tx.success();
+        }
+
+        try ( org.neo4j.graphdb.Transaction ignore = graphDb.beginTx() )
+        {
+            assertFalse( graphProperties().hasProperty( "prop" ) );
+        }
+    }
+
     @Test
     public void shouldBeAbleToReadExistingGraphProperties() throws Exception
     {
@@ -150,5 +173,26 @@ public void shouldSeeUpdatedGraphPropertyInTransaction() throws Exception
         }
     }
 
+    @Test
+    public void shouldNotSeeURemovedGraphPropertyInTransaction() throws Exception
+    {
+        int prop;
+        try ( Transaction tx = session.beginTransaction() )
+        {
+            prop = tx.tokenWrite().propertyKeyGetOrCreateForName( "prop" );
+            assertThat( tx.dataWrite().graphSetProperty( prop, stringValue( "hello" ) ), equalTo( NO_VALUE ) );
+            tx.success();
+        }
+
+        try ( Transaction tx = session.beginTransaction();
+              PropertyCursor cursor = cursors.allocatePropertyCursor() )
+        {
+            assertThat( tx.dataWrite().graphRemoveProperty( prop ), equalTo( stringValue( "hello" ) ) );
+
+            tx.dataRead().graphProperties( cursor );
+            assertFalse( cursor.next() );
+        }
+    }
+
     protected abstract PropertyContainer graphProperties();
 }
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Operations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Operations.java
@@ -509,8 +509,14 @@ public Value graphSetProperty( int propertyKey, Value value )
     @Override
     public Value graphRemoveProperty( int propertyKey )
     {
+        ktx.locks().optimistic().acquireExclusive( ktx.lockTracer(), ResourceTypes.GRAPH_PROPS, ResourceTypes.graphPropertyResource() );
         ktx.assertOpen();
-        throw new UnsupportedOperationException();
+        Value existingValue = readGraphProperty( propertyKey );
+        if ( existingValue != Values.NO_VALUE )
+        {
+            ktx.txState().graphDoRemoveProperty( propertyKey, existingValue );
+        }
+        return existingValue;
     }
 
     @Override