Skip to content

Commit

Permalink
more efficient use of automatic indices using KernalData in Neo4j.
Browse files Browse the repository at this point in the history
  • Loading branch information
@okram
okram committed Mar 11, 2012
1 parent 40d4aac commit 6bef747
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 40 deletions.
85 changes: 60 additions & 25 deletions ...prints-neo4j-graph/src/main/java/com/tinkerpop/blueprints/pgm/impls/neo4j/Neo4jGraph.java
View file
Expand Up @@ -7,12 +7,12 @@
import com.tinkerpop.blueprints.pgm.IndexableGraph;
import com.tinkerpop.blueprints.pgm.TransactionalGraph;
import com.tinkerpop.blueprints.pgm.Vertex;
import com.tinkerpop.blueprints.pgm.WrappableGraph;
import com.tinkerpop.blueprints.pgm.impls.Parameter;
import com.tinkerpop.blueprints.pgm.impls.StringFactory;
import com.tinkerpop.blueprints.pgm.impls.neo4j.util.Neo4jEdgeSequence;
import com.tinkerpop.blueprints.pgm.impls.neo4j.util.Neo4jVertexSequence;
import com.tinkerpop.blueprints.pgm.util.AutomaticIndexHelper;
import com.tinkerpop.blueprints.pgm.WrappableGraph;
import org.neo4j.graphdb.DynamicRelationshipType;
import org.neo4j.graphdb.GraphDatabaseService;
import org.neo4j.graphdb.Node;
Expand All @@ -22,12 +22,14 @@
import org.neo4j.graphdb.Transaction;
import org.neo4j.graphdb.TransactionFailureException;
import org.neo4j.graphdb.index.RelationshipIndex;
import org.neo4j.kernel.AbstractGraphDatabase;
import org.neo4j.kernel.EmbeddedGraphDatabase;
import org.neo4j.kernel.HighlyAvailableGraphDatabase;
import org.neo4j.tooling.GlobalGraphOperations;

import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Set;
Expand All @@ -40,6 +42,9 @@
public class Neo4jGraph implements TransactionalGraph, IndexableGraph, WrappableGraph<GraphDatabaseService> {

private GraphDatabaseService rawGraph;
private PropertyContainer kernalData;
private static final List EMPTY_LIST = Arrays.asList();

private final ThreadLocal<Transaction> tx = new ThreadLocal<Transaction>() {
protected Transaction initialValue() {
return null;
Expand All @@ -56,6 +61,25 @@ protected Integer initialValue() {
}
};

protected void setKernalProperty(final String key, final Object value) {
final Transaction tx = rawGraph.beginTx();
try {
this.kernalData.setProperty(key, value);
tx.success();
} catch (final Exception e) {
tx.failure();
} finally {
tx.finish();
}
}

protected Object getKernalProperty(final String key) {
if (!this.kernalData.hasProperty(key))
return null;
else
return this.kernalData.getProperty(key);
}

public Neo4jGraph(final String directory) {
this(directory, null);
}
Expand All @@ -66,20 +90,19 @@ public Neo4jGraph(final String directory, final Map<String, String> configuratio

public Neo4jGraph(final GraphDatabaseService rawGraph) {
this.rawGraph = rawGraph;
this.kernalData = ((AbstractGraphDatabase) this.rawGraph).getKernelData().properties();
}

public Neo4jGraph(final GraphDatabaseService rawGraph, boolean fresh) {
this.rawGraph = rawGraph;
this(rawGraph);
if (fresh)
this.freshLoad();
}

protected Neo4jGraph(final String directory, final Map<String, String> configuration, boolean highAvailabilityMode) {

if (highAvailabilityMode && configuration == null) {
throw new IllegalArgumentException("Configuration parameters must be supplied when using HA mode.");
}

boolean fresh = !new File(directory).exists();
try {
if (null != configuration)
Expand All @@ -90,6 +113,7 @@ protected Neo4jGraph(final String directory, final Map<String, String> configura
else
this.rawGraph = new EmbeddedGraphDatabase(directory);

this.kernalData = ((AbstractGraphDatabase) this.rawGraph).getKernelData().properties();
if (fresh)
this.freshLoad();

Expand Down Expand Up @@ -165,8 +189,8 @@ public <T extends Element> Index<T> getIndex(final String indexName, final Class
}

public synchronized void dropIndex(final String indexName) {
final Transaction tx = this.rawGraph.beginTx();
try {
this.autoStartTransaction();
org.neo4j.graphdb.index.Index<Node> nodeIndex = this.rawGraph.index().forNodes(indexName);
if (nodeIndex.isWriteable()) {
nodeIndex.delete();
Expand All @@ -175,37 +199,44 @@ public synchronized void dropIndex(final String indexName) {
if (relationshipIndex.isWriteable()) {
relationshipIndex.delete();
}
this.stopTransaction(Conclusion.SUCCESS);
tx.success();
} catch (RuntimeException e) {
this.stopTransaction(TransactionalGraph.Conclusion.FAILURE);
tx.failure();
throw e;
} catch (Exception e) {
this.stopTransaction(TransactionalGraph.Conclusion.FAILURE);
tx.failure();
throw new RuntimeException(e.getMessage(), e);
} finally {
tx.finish();
}
}

protected <T extends Neo4jElement> Iterable<Neo4jAutomaticIndex<T, PropertyContainer>> getAutoIndices(final Class<T> indexClass) {
final String[] names;
final boolean forVertices = Vertex.class.isAssignableFrom(indexClass);
if (forVertices) {
names = this.rawGraph.index().nodeIndexNames();
} else {
names = this.rawGraph.index().relationshipIndexNames();
}
final List<Neo4jAutomaticIndex<T, PropertyContainer>> indices = new ArrayList<Neo4jAutomaticIndex<T, PropertyContainer>>();
for (final String name : names) {
final Boolean hasAutoIndices = (Boolean) this.getKernalProperty(Neo4jTokens.BLUEPRINTS_HASAUTOINDEX);
if (null != hasAutoIndices && hasAutoIndices) {
final String[] names;
final boolean forVertices = Vertex.class.isAssignableFrom(indexClass);
if (forVertices) {
if (isAutomaticIndex(this.rawGraph.index().forNodes(name))) {
indices.add(new Neo4jAutomaticIndex(name, Vertex.class, this, null));
}
names = this.rawGraph.index().nodeIndexNames();
} else {
if (isAutomaticIndex(this.rawGraph.index().forRelationships(name))) {
indices.add(new Neo4jAutomaticIndex(name, Edge.class, this, null));
names = this.rawGraph.index().relationshipIndexNames();
}
final List<Neo4jAutomaticIndex<T, PropertyContainer>> indices = new ArrayList<Neo4jAutomaticIndex<T, PropertyContainer>>();
for (final String name : names) {
if (forVertices) {
if (isAutomaticIndex(this.rawGraph.index().forNodes(name))) {
indices.add(new Neo4jAutomaticIndex(name, Vertex.class, this, null));
}
} else {
if (isAutomaticIndex(this.rawGraph.index().forRelationships(name))) {
indices.add(new Neo4jAutomaticIndex(name, Edge.class, this, null));
}
}
}
return indices;
}
return indices;
return (Iterable) EMPTY_LIST;


}

Expand Down Expand Up @@ -275,7 +306,9 @@ public void removeVertex(final Vertex vertex) {
final Node node = this.rawGraph.getNodeById(id);
if (null != node) {
try {
AutomaticIndexHelper.removeElement(this, vertex);
for (final AutomaticIndex idx : this.getAutoIndices(Neo4jVertex.class)) {
AutomaticIndexHelper.removeElement(idx, vertex);
}
this.autoStartTransaction();
for (final Edge edge : vertex.getInEdges()) {
((Relationship) ((Neo4jEdge) edge).getRawElement()).delete();
Expand Down Expand Up @@ -334,7 +367,9 @@ public Edge getEdge(final Object id) {

public void removeEdge(final Edge edge) {
try {
AutomaticIndexHelper.removeElement(this, edge);
for (final AutomaticIndex idx : this.getAutoIndices(Neo4jEdge.class)) {
AutomaticIndexHelper.removeElement(idx, edge);
}
this.autoStartTransaction();
((Relationship) ((Neo4jEdge) edge).getRawElement()).delete();
this.autoStopTransaction(Conclusion.SUCCESS);
Expand Down
36 changes: 21 additions & 15 deletions ...prints-neo4j-graph/src/main/java/com/tinkerpop/blueprints/pgm/impls/neo4j/Neo4jIndex.java
View file
Expand Up @@ -106,28 +106,34 @@ protected void putBasic(final String key, final Object value, final T element) {
}

private void generateIndex(final Parameter<Object, Object>... indexParameters) {
if (this.indexClass.isAssignableFrom(Neo4jVertex.class)) {
final boolean alreadyExists;
final IndexManager manager = this.getIndexManager();
if (Vertex.class.isAssignableFrom(this.indexClass)) {
alreadyExists = manager.existsForNodes(this.indexName);
if (indexParameters.length > 0)
this.rawIndex = (org.neo4j.graphdb.index.Index<S>) graph.getRawGraph().index().forNodes(this.indexName, generateParameterMap(indexParameters));
this.rawIndex = (org.neo4j.graphdb.index.Index<S>) manager.forNodes(this.indexName, generateParameterMap(indexParameters));
else
this.rawIndex = (org.neo4j.graphdb.index.Index<S>) graph.getRawGraph().index().forNodes(this.indexName);
this.rawIndex = (org.neo4j.graphdb.index.Index<S>) manager.forNodes(this.indexName);
} else {
alreadyExists = manager.existsForRelationships(this.indexName);
if (indexParameters.length > 0)
this.rawIndex = (org.neo4j.graphdb.index.Index<S>) graph.getRawGraph().index().forRelationships(this.indexName, generateParameterMap(indexParameters));
this.rawIndex = (org.neo4j.graphdb.index.Index<S>) manager.forRelationships(this.indexName, generateParameterMap(indexParameters));
else
this.rawIndex = (org.neo4j.graphdb.index.Index<S>) graph.getRawGraph().index().forRelationships(this.indexName);
this.rawIndex = (org.neo4j.graphdb.index.Index<S>) manager.forRelationships(this.indexName);
}

final IndexManager manager = this.getIndexManager();
final String storedType = manager.getConfiguration(this.rawIndex).get(Neo4jTokens.BLUEPRINTS_TYPE);
if (null == storedType) {
if (this instanceof AutomaticIndex) {
this.getIndexManager().setConfiguration(this.rawIndex, Neo4jTokens.BLUEPRINTS_TYPE, Type.AUTOMATIC.toString());
} else {
this.getIndexManager().setConfiguration(this.rawIndex, Neo4jTokens.BLUEPRINTS_TYPE, Type.MANUAL.toString());
}
} else if (this.getIndexType() != Type.valueOf(storedType))
throw new RuntimeException("Stored index is " + storedType + " and is being loaded as a " + this.getIndexType() + " index");
if (!alreadyExists) {
final String storedType = manager.getConfiguration(this.rawIndex).get(Neo4jTokens.BLUEPRINTS_TYPE);
if (null == storedType) {
if (this instanceof AutomaticIndex) {
manager.setConfiguration(this.rawIndex, Neo4jTokens.BLUEPRINTS_TYPE, Type.AUTOMATIC.toString());
this.graph.setKernalProperty(Neo4jTokens.BLUEPRINTS_HASAUTOINDEX, Boolean.TRUE);
} else {
manager.setConfiguration(this.rawIndex, Neo4jTokens.BLUEPRINTS_TYPE, Type.MANUAL.toString());
}
} else if (this.getIndexType() != Type.valueOf(storedType))
throw new RuntimeException("Stored index is " + storedType + " and is being loaded as a " + this.getIndexType() + " index");
}
}

protected IndexManager getIndexManager() {
Expand Down
1 change: 1 addition & 0 deletions ...rints-neo4j-graph/src/main/java/com/tinkerpop/blueprints/pgm/impls/neo4j/Neo4jTokens.java
View file
Expand Up @@ -8,4 +8,5 @@ public class Neo4jTokens {
public static final String BLUEPRINTS_AUTOKEYS = "_blueprints:autokeys";
public static final String KEY_SEPARATOR = "!=!";
public static final String QUERY_HEADER = "%query%";
public static final String BLUEPRINTS_HASAUTOINDEX = "_blueprints:hasAutoIndex";
}

0 comments on commit 6bef747

Please sign in to comment.