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

Rename tables to make their purpose clearer and other cleanup

Browse Source
This commit is contained in:
Michael Lieberman
2015-01-20 13:45:20 -05:00
parent 9832b92d7b
commit c90a379e2b
6 changed files with 29 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,8 +58,8 @@ import com.tinkerpop.blueprints.util.StringFactory;
import edu.jhuapl.tinkerpop.cache.ElementCaches;
import edu.jhuapl.tinkerpop.mutator.Mutators;
import edu.jhuapl.tinkerpop.tables.EdgeTableWrapper;
import edu.jhuapl.tinkerpop.tables.IndexMetadataTableWrapper;
import edu.jhuapl.tinkerpop.tables.KeyMetadataTableWrapper;
import edu.jhuapl.tinkerpop.tables.IndexNameTableWrapper;
import edu.jhuapl.tinkerpop.tables.IndexedKeysTableWrapper;
import edu.jhuapl.tinkerpop.tables.VertexTableWrapper;
/**
@@ -173,8 +173,8 @@ public class AccumuloGraph implements Graph, KeyIndexableGraph, IndexableGraph {
globals.setVertexWrapper(new VertexTableWrapper(globals));
globals.setEdgeWrapper(new EdgeTableWrapper(globals));
globals.setKeyMetadataWrapper(new KeyMetadataTableWrapper(globals));
globals.setIndexMetadataWrapper(new IndexMetadataTableWrapper(globals));
globals.setKeyMetadataWrapper(new IndexedKeysTableWrapper(globals));
globals.setIndexMetadataWrapper(new IndexNameTableWrapper(globals));
try {
setupWriters();
@@ -209,7 +209,7 @@ public class AccumuloGraph implements Graph, KeyIndexableGraph, IndexableGraph {
// Aliases for the lazy
private Scanner getMetadataScanner() {
return getScanner(config.getIndexMetadataTableName());
return getScanner(config.getIndexNamesTableName());
}
public Scanner getVertexIndexScanner() {
@@ -228,10 +228,6 @@ public class AccumuloGraph implements Graph, KeyIndexableGraph, IndexableGraph {
return getWriter(config.getEdgeKeyIndexTableName());
}
private Scanner getKeyMetadataScanner() {
return getScanner(config.getKeyMetadataTableName());
}
public BatchWriter getWriter(String tablename) {
try {
return globals.getMtbw().getBatchWriter(tablename);
@@ -809,7 +805,7 @@ public class AccumuloGraph implements Graph, KeyIndexableGraph, IndexableGraph {
if (config.getIndexableGraphDisabled())
throw new UnsupportedOperationException("IndexableGraph is disabled via the configuration");
Scanner scan = getScanner(config.getIndexMetadataTableName());
Scanner scan = getScanner(config.getIndexNamesTableName());
try {
scan.setRange(new Range(indexName, indexName));
Iterator<Entry<Key,Value>> iter = scan.iterator();
@@ -833,7 +829,7 @@ public class AccumuloGraph implements Graph, KeyIndexableGraph, IndexableGraph {
if (config.getIndexableGraphDisabled())
throw new UnsupportedOperationException("IndexableGraph is disabled via the configuration");
List<Index<? extends Element>> toRet = new ArrayList<Index<? extends Element>>();
Scanner scan = getScanner(config.getIndexMetadataTableName());
Scanner scan = getScanner(config.getIndexNamesTableName());
try {
Iterator<Entry<Key,Value>> iter = scan.iterator();
@@ -868,7 +864,7 @@ public class AccumuloGraph implements Graph, KeyIndexableGraph, IndexableGraph {
try {
globals.getConfig().getConnector().tableOperations().delete(globals.getConfig()
.getIndexTableName(indexName));
.getNamedIndexTableName(indexName));
} catch (Exception e) {
throw new AccumuloGraphException(e);
}

12
src/main/java/edu/jhuapl/tinkerpop/AccumuloGraphConfiguration.java
View File

@@ -968,7 +968,7 @@ implements Serializable {
* @param indexName
* @return
*/
public String getIndexTableName(String indexName) {
public String getNamedIndexTableName(String indexName) {
return getGraphName() + "_index_" + indexName;
}
@@ -977,22 +977,22 @@ implements Serializable {
* of elements.
* @return
*/
public String getKeyMetadataTableName() {
return getGraphName() + "_key_metadata";
public String getIndexedKeysTableName() {
return getGraphName() + "_indexed_keys";
}
/**
* Table of existing named indexes.
* @return
*/
public String getIndexMetadataTableName() {
return getGraphName() + "_index_metadata";
public String getIndexNamesTableName() {
return getGraphName() + "_index_names";
}
List<String> getTableNames() {
return Arrays.asList(getVertexTableName(),
getEdgeTableName(), getVertexKeyIndexTableName(), getEdgeKeyIndexTableName(),
getIndexMetadataTableName(), getKeyMetadataTableName());
getIndexNamesTableName(), getIndexedKeysTableName());
}
/**

2
src/main/java/edu/jhuapl/tinkerpop/AccumuloIndex.java
View File

@@ -44,7 +44,7 @@ public class AccumuloIndex<T extends Element> implements Index<T> {
this.indexedType = t;
this.globals = globals;
this.indexName = indexName;
this.tableName = globals.getConfig().getIndexTableName(indexName);
this.tableName = globals.getConfig().getNamedIndexTableName(indexName);
try {
if (!globals.getConfig().getConnector().tableOperations().exists(tableName)) {

16
src/main/java/edu/jhuapl/tinkerpop/GlobalInstances.java
View File

@@ -24,8 +24,8 @@ import com.tinkerpop.blueprints.Vertex;
import edu.jhuapl.tinkerpop.cache.ElementCaches;
import edu.jhuapl.tinkerpop.tables.EdgeTableWrapper;
import edu.jhuapl.tinkerpop.tables.ElementTableWrapper;
import edu.jhuapl.tinkerpop.tables.IndexMetadataTableWrapper;
import edu.jhuapl.tinkerpop.tables.KeyMetadataTableWrapper;
import edu.jhuapl.tinkerpop.tables.IndexNameTableWrapper;
import edu.jhuapl.tinkerpop.tables.IndexedKeysTableWrapper;
import edu.jhuapl.tinkerpop.tables.VertexTableWrapper;
/**
@@ -39,8 +39,8 @@ public class GlobalInstances {
private final MultiTableBatchWriter mtbw;
private VertexTableWrapper vertexWrapper;
private EdgeTableWrapper edgeWrapper;
private KeyMetadataTableWrapper keyMetadataWrapper;
private IndexMetadataTableWrapper indexMetadataWrapper;
private IndexedKeysTableWrapper keyMetadataWrapper;
private IndexNameTableWrapper indexMetadataWrapper;
private final ElementCaches caches;
public GlobalInstances(AccumuloGraph graph,
@@ -72,11 +72,11 @@ public class GlobalInstances {
return edgeWrapper;
}
public KeyMetadataTableWrapper getKeyMetadataWrapper() {
public IndexedKeysTableWrapper getKeyMetadataWrapper() {
return keyMetadataWrapper;
}
public IndexMetadataTableWrapper getIndexMetadataWrapper() {
public IndexNameTableWrapper getIndexMetadataWrapper() {
return indexMetadataWrapper;
}
@@ -130,7 +130,7 @@ public class GlobalInstances {
* @param wrapper
*/
@Deprecated
public void setKeyMetadataWrapper(KeyMetadataTableWrapper wrapper) {
public void setKeyMetadataWrapper(IndexedKeysTableWrapper wrapper) {
this.keyMetadataWrapper = wrapper;
}
@@ -139,7 +139,7 @@ public class GlobalInstances {
* @param wrapper
*/
@Deprecated
public void setIndexMetadataWrapper(IndexMetadataTableWrapper indexMetadataWrapper) {
public void setIndexMetadataWrapper(IndexNameTableWrapper indexMetadataWrapper) {
this.indexMetadataWrapper = indexMetadataWrapper;
}
}

6
src/main/java/edu/jhuapl/tinkerpop/tables/IndexMetadataTableWrapper.java → src/main/java/edu/jhuapl/tinkerpop/tables/IndexNameTableWrapper.java
View File

@@ -21,10 +21,10 @@ import edu.jhuapl.tinkerpop.GlobalInstances;
/**
* Wrapper around index metadata table.
*/
public class IndexMetadataTableWrapper extends MetadataTableWrapper {
public class IndexNameTableWrapper extends MetadataTableWrapper {
public IndexMetadataTableWrapper(GlobalInstances globals) {
super(globals, globals.getConfig().getIndexMetadataTableName());
public IndexNameTableWrapper(GlobalInstances globals) {
super(globals, globals.getConfig().getIndexNamesTableName());
}
public void writeIndexMetadataEntry(String indexName,

6
src/main/java/edu/jhuapl/tinkerpop/tables/KeyMetadataTableWrapper.java → src/main/java/edu/jhuapl/tinkerpop/tables/IndexedKeysTableWrapper.java
View File

@@ -28,10 +28,10 @@ import edu.jhuapl.tinkerpop.parser.IndexMetadataParser;
* about which property keys are indexed for different
* graph types.
*/
public class KeyMetadataTableWrapper extends MetadataTableWrapper {
public class IndexedKeysTableWrapper extends MetadataTableWrapper {
public KeyMetadataTableWrapper(GlobalInstances globals) {
super(globals, globals.getConfig().getKeyMetadataTableName());
public IndexedKeysTableWrapper(GlobalInstances globals) {
super(globals, globals.getConfig().getIndexedKeysTableName());
}
public void writeKeyMetadataEntry(String key, Class<? extends Element> clazz) {