Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6354 from Mats-SX/3.0-deleted-entities-serializat…
…ion2 Mark deleted entities as deleted in the string serialization
- Loading branch information
Showing
34 changed files
with
1,858 additions
and
275 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
134 changes: 134 additions & 0 deletions
134
...nce/src/test/scala/org/neo4j/internal/cypher/acceptance/SerializationAcceptanceTest.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,134 @@ | ||
/* | ||
* Copyright (c) 2002-2016 "Neo Technology," | ||
* Network Engine for Objects in Lund AB [http://neotechnology.com] | ||
* | ||
* This file is part of Neo4j. | ||
* | ||
* Neo4j is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU General Public License as published by | ||
* the Free Software Foundation, either version 3 of the License, or | ||
* (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU General Public License | ||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
package org.neo4j.internal.cypher.acceptance | ||
|
||
import org.neo4j.cypher._ | ||
|
||
class SerializationAcceptanceTest extends ExecutionEngineFunSuite with QueryStatisticsTestSupport { | ||
|
||
// serialization of deleted entities | ||
|
||
test("deleted nodes should be returned marked as such") { | ||
createNode() | ||
|
||
val query = "MATCH (n) DELETE n RETURN n" | ||
|
||
graph.inTx { | ||
val result = execute(query) | ||
|
||
result.dumpToString() should include("Node[0]{deleted}") | ||
} | ||
} | ||
|
||
test("non-deleted nodes should be returned as normal") { | ||
createNode() | ||
|
||
val query = "MATCH (n) RETURN n" | ||
|
||
graph.inTx { | ||
val result = execute(query) | ||
|
||
result.dumpToString() should not include "deleted" | ||
} | ||
} | ||
|
||
test("non-deleted relationships should be returned as normal") { | ||
relate(createNode(), createNode(), "T") | ||
|
||
val query = "MATCH ()-[r]->() RETURN r" | ||
|
||
graph.inTx { | ||
val result = execute(query) | ||
|
||
result.dumpToString() should not include "deleted" | ||
} | ||
} | ||
|
||
test("deleted relationships should be returned marked as such") { | ||
relate(createNode(), createNode(), "T") | ||
|
||
val query = "MATCH ()-[r]->() DELETE r RETURN r" | ||
|
||
graph.inTx { | ||
val result = execute(query) | ||
|
||
result.dumpToString() should include(":T[0]{deleted}") | ||
} | ||
} | ||
|
||
test("returning everything when including deleted entities should work") { | ||
relate(createNode(), createNode(), "T") | ||
|
||
val query = "MATCH (a)-[r]->(b) DELETE a, r, b RETURN *" | ||
|
||
graph.inTx { | ||
val result = execute(query) | ||
|
||
result.dumpToString() should include(":T[0]{deleted}") | ||
result.dumpToString() should include("Node[0]{deleted}") | ||
result.dumpToString() should include("Node[1]{deleted}") | ||
} | ||
} | ||
|
||
test("returning a deleted path") { | ||
relate(createNode(), createNode(), "T") | ||
|
||
val query = "MATCH p=(a)-[r]->(b) DELETE p RETURN p" | ||
|
||
graph.inTx { | ||
val result = execute(query) | ||
|
||
result.dumpToString() should include(":T[0]{deleted}") | ||
result.dumpToString() should include("Node[0]{deleted}") | ||
result.dumpToString() should include("Node[1]{deleted}") | ||
} | ||
} | ||
|
||
test("returning a deleted path with deleted node") { | ||
relate(createNode(), createNode(), "T") | ||
|
||
val query = "MATCH p=(a)-[r]->(b) DELETE a, r RETURN p" | ||
|
||
graph.inTx { | ||
val result = execute(query) | ||
|
||
println(result.dumpToString()) | ||
|
||
result.dumpToString() should include(":T[0]{deleted}") | ||
result.dumpToString() should include("Node[0]{deleted}") | ||
result.dumpToString() should not include("Node[1]{deleted}") | ||
} | ||
} | ||
|
||
test("returning a deleted path with deleted relationship") { | ||
relate(createNode(), createNode(), "T") | ||
|
||
val query = "MATCH p=(a)-[r]->(b) DELETE r RETURN p" | ||
|
||
graph.inTx { | ||
val result = execute(query) | ||
|
||
result.dumpToString() should include(":T[0]{deleted}") | ||
result.dumpToString() should not include("Node[0]{deleted}") | ||
result.dumpToString() should not include("Node[1]{deleted}") | ||
} | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.