Spring/spring-data-neo4j
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAGRAPH-407 Don't delete (from) read-only indexes

Browse Source
This commit is contained in:
Michael Hunger
2013-11-08 10:10:34 +01:00
parent da03f652f8
commit e5ffbb5400
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/DelegatingGraphDatabase.java
View File

@@ -19,6 +19,7 @@ package org.springframework.data.neo4j.support;
import org.neo4j.graphdb.*;
import org.neo4j.graphdb.index.Index;
import org.neo4j.graphdb.index.IndexManager;
import org.neo4j.graphdb.index.RelationshipIndex;
import org.neo4j.graphdb.index.UniqueFactory;
import org.neo4j.graphdb.traversal.TraversalDescription;
import org.neo4j.index.lucene.ValueContext;
@@ -104,14 +105,16 @@ public class DelegatingGraphDatabase implements GraphDatabase {
private void removeFromIndexes(Node node) {
final IndexManager indexManager = delegate.index();
for (String indexName : indexManager.nodeIndexNames()) {
indexManager.forNodes(indexName).remove(node);
Index<Node> nodeIndex = indexManager.forNodes(indexName);
if (nodeIndex.isWriteable()) nodeIndex.remove(node);
}
}
private void removeFromIndexes(Relationship relationship) {
final IndexManager indexManager = delegate.index();
for (String indexName : indexManager.relationshipIndexNames()) {
indexManager.forRelationships(indexName).remove(relationship);
RelationshipIndex relationshipIndex = indexManager.forRelationships(indexName);
if (relationshipIndex.isWriteable()) relationshipIndex.remove(relationship);
}
}

10
spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/node/Neo4jHelper.java
View File

@@ -17,7 +17,9 @@
package org.springframework.data.neo4j.support.node;
import org.neo4j.graphdb.*;
import org.neo4j.graphdb.index.Index;
import org.neo4j.graphdb.index.IndexManager;
import org.neo4j.graphdb.index.RelationshipIndex;
import org.neo4j.tooling.GlobalGraphOperations;
import org.springframework.data.neo4j.support.Neo4jTemplate;
@@ -62,8 +64,8 @@ public abstract class Neo4jHelper {
public static void cleanDb( GraphDatabaseService graphDatabaseService, boolean includeReferenceNode ) {
Transaction tx = graphDatabaseService.beginTx();
try {
removeNodes(graphDatabaseService, includeReferenceNode);
clearIndex(graphDatabaseService);
removeNodes(graphDatabaseService, includeReferenceNode);
tx.success();
} catch(Throwable t) {
tx.failure();
@@ -99,10 +101,12 @@ public abstract class Neo4jHelper {
private static void clearIndex(GraphDatabaseService gds) {
IndexManager indexManager = gds.index();
for (String ix : indexManager.nodeIndexNames()) {
indexManager.forNodes(ix).delete();
Index<Node> nodeIndex = indexManager.forNodes(ix);
if (nodeIndex.isWriteable()) nodeIndex.delete();
}
for (String ix : indexManager.relationshipIndexNames()) {
indexManager.forRelationships(ix).delete();
RelationshipIndex relationshipIndex = indexManager.forRelationships(ix);
if (relationshipIndex.isWriteable()) relationshipIndex.delete();
}
}
}