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

Remove unnecessary parent argument to ScannerIterable

Browse Source
This commit is contained in:
Michael Lieberman
2014-12-23 17:53:06 -05:00
parent bd7cd409d2
commit b991d84a28
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -557,7 +557,7 @@ public class AccumuloGraph implements Graph, KeyIndexableGraph, IndexableGraph {
scan.fetchColumnFamily(new Text(x));
}
}
return new ScannerIterable<Vertex>(this, scan) {
return new ScannerIterable<Vertex>(scan) {
@Override
public Vertex next(PeekingIterator<Entry<Key,Value>> iterator) {
@@ -586,7 +586,7 @@ public class AccumuloGraph implements Graph, KeyIndexableGraph, IndexableGraph {
s.setRange(new Range(tVal, tVal));
s.fetchColumnFamily(new Text(key));
return new ScannerIterable<Vertex>(this, s) {
return new ScannerIterable<Vertex>(s) {
@Override
public Vertex next(PeekingIterator<Entry<Key,Value>> iterator) {
@@ -620,7 +620,7 @@ public class AccumuloGraph implements Graph, KeyIndexableGraph, IndexableGraph {
RegExFilter.setRegexs(is, null, null, null, Pattern.quote(new String(val)), false);
scan.addScanIterator(is);
return new ScannerIterable<Vertex>(this, scan) {
return new ScannerIterable<Vertex>(scan) {
@Override
public Vertex next(PeekingIterator<Entry<Key,Value>> iterator) {
@@ -838,7 +838,7 @@ public class AccumuloGraph implements Graph, KeyIndexableGraph, IndexableGraph {
}
}
return new ScannerIterable<Edge>(this, scan) {
return new ScannerIterable<Edge>(scan) {
@Override
public Edge next(PeekingIterator<Entry<Key,Value>> iterator) {
@@ -876,7 +876,7 @@ public class AccumuloGraph implements Graph, KeyIndexableGraph, IndexableGraph {
s.setRange(new Range(tVal, tVal));
s.fetchColumnFamily(new Text(key));
return new ScannerIterable<Edge>(this, s) {
return new ScannerIterable<Edge>(s) {
@Override
public Edge next(PeekingIterator<Entry<Key,Value>> iterator) {
AccumuloEdge e = null;
@@ -908,7 +908,7 @@ public class AccumuloGraph implements Graph, KeyIndexableGraph, IndexableGraph {
RegExFilter.setRegexs(is, null, null, null, Pattern.quote(new String(val)), false);
scan.addScanIterator(is);
return new ScannerIterable<Edge>(this, scan) {
return new ScannerIterable<Edge>(scan) {
@Override
public Edge next(PeekingIterator<Entry<Key,Value>> iterator) {
@@ -1134,7 +1134,7 @@ public class AccumuloGraph implements Graph, KeyIndexableGraph, IndexableGraph {
applyRegexValueFilter(scan, labels);
}
return new ScannerIterable<Edge>(this, scan) {
return new ScannerIterable<Edge>(scan) {
@Override
public Edge next(PeekingIterator<Entry<Key,Value>> iterator) {
@@ -1186,7 +1186,7 @@ public class AccumuloGraph implements Graph, KeyIndexableGraph, IndexableGraph {
applyRegexValueFilter(scan, labels);
}
return new ScannerIterable<Vertex>(this, scan) {
return new ScannerIterable<Vertex>(scan) {
@Override
public Vertex next(PeekingIterator<Entry<Key,Value>> iterator) {

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

@@ -144,7 +144,7 @@ public class AccumuloIndex<T extends Element> implements Index<T> {
@Override
public Iterator<T> iterator() {
if (!isClosed) {
return new ScannerIterable<T>(parent, scan) {
return new ScannerIterable<T>(scan) {
@Override
public T next(PeekingIterator<Entry<Key, Value>> iterator) {

4
src/main/java/edu/jhuapl/tinkerpop/ScannerIterable.java
View File

@@ -27,11 +27,9 @@ import com.tinkerpop.blueprints.Element;
public abstract class ScannerIterable<T extends Element> implements Iterable<T>, Closeable {
AccumuloGraph parent;
ScannerBase scanner;
ScannerIterable(AccumuloGraph parent, ScannerBase scanner) {
this.parent = parent;
ScannerIterable(ScannerBase scanner) {
this.scanner = scanner;
}