JHUAPL/AccumuloGraph
1
0
Fork 0
mirror of https://github.com/JHUAPL/AccumuloGraph.git synced 2026-01-09 20:57:55 -05:00
Code Issues Packages Projects Releases 4 Wiki Activity

Tweaks and cleanup

Browse Source
This commit is contained in:
Michael Lieberman
2015-01-19 15:16:27 -05:00
parent 72c9685450
commit ff17e6a5af
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/edu/jhuapl/tinkerpop/AccumuloGraph.java
View File

@@ -45,6 +45,7 @@ import com.tinkerpop.blueprints.Edge;
import com.tinkerpop.blueprints.Element;
import com.tinkerpop.blueprints.Features;
import com.tinkerpop.blueprints.Graph;
import com.tinkerpop.blueprints.GraphFactory;
import com.tinkerpop.blueprints.GraphQuery;
import com.tinkerpop.blueprints.Index;
import com.tinkerpop.blueprints.IndexableGraph;
@@ -123,17 +124,34 @@ public class AccumuloGraph implements Graph, KeyIndexableGraph, IndexableGraph {
private GlobalInstances globals;
/**
* @deprecated Use {@link #globals} instead.
*/
private AccumuloGraphConfiguration config;
/**
* @deprecated Remove when vertex functionality is gone.
*/
private BatchWriter vertexBW;
/**
* Factory method for {@link GraphFactory}.
*/
public static AccumuloGraph open(Configuration properties) throws AccumuloException {
return new AccumuloGraph(properties);
}
/**
* Instantiate from a generic {@link Configuration} populated
* with appropriate AccumuloGraph parameters.
* @param cfg
*/
public AccumuloGraph(Configuration cfg) {
this(new AccumuloGraphConfiguration(cfg));
}
/**
* Constructor that ensures that the needed tables are made
*
* Main constructor.
* @param config
*/
public AccumuloGraph(AccumuloGraphConfiguration config) {
@@ -164,13 +182,6 @@ public class AccumuloGraph implements Graph, KeyIndexableGraph, IndexableGraph {
vertexBW = globals.getMtbw().getBatchWriter(config.getVertexTableName());
}
/**
* Factory method for GraphFactory
*/
public static AccumuloGraph open(Configuration properties) throws AccumuloException {
return new AccumuloGraph(properties);
}
protected Scanner getElementScanner(Class<? extends Element> type) {
try {
String tableName = config.getEdgeTableName();