Remove dead code. Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/473c3e44 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/473c3e44 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/473c3e44
Branch: refs/heads/add-contract-tests Commit: 473c3e447da5e6104f9d6d9f7eccba6a75fa3f6d Parents: 806aafc Author: Andy Seaborne <[email protected]> Authored: Thu May 7 17:52:37 2015 +0100 Committer: Andy Seaborne <[email protected]> Committed: Thu May 7 17:52:37 2015 +0100 ---------------------------------------------------------------------- .../engine/iterator/QueryIterTriplePattern.java | 18 +----------------- .../apache/jena/sparql/path/eval/PathEngine1.java | 2 -- .../jena/sparql/path/eval/PathEngineSPARQL.java | 2 -- .../jena/riot/writer/TestRiotWriterDataset.java | 5 ----- .../store/bulkloader2/CmdNodeTableBuilder.java | 3 --- .../jena/tdb/index/bplustree/TestBPlusTree.java | 2 +- 6 files changed, 2 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/473c3e44/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterTriplePattern.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterTriplePattern.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterTriplePattern.java index 0b9c14e..f805300 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterTriplePattern.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterTriplePattern.java @@ -18,8 +18,6 @@ package org.apache.jena.sparql.engine.iterator; -import java.util.List ; - import org.apache.jena.graph.Graph ; import org.apache.jena.graph.Node ; import org.apache.jena.graph.Triple ; @@ -31,9 +29,7 @@ import org.apache.jena.sparql.engine.binding.Binding ; import org.apache.jena.sparql.engine.binding.BindingFactory ; import org.apache.jena.sparql.engine.binding.BindingMap ; import org.apache.jena.util.iterator.ClosableIterator ; -import org.apache.jena.util.iterator.ExtendedIterator ; import org.apache.jena.util.iterator.NiceIterator ; -import org.apache.jena.util.iterator.WrappedIterator ; public class QueryIterTriplePattern extends QueryIterRepeatApply { @@ -76,19 +72,7 @@ public class QueryIterTriplePattern extends QueryIterRepeatApply Node p2 = tripleNode(p) ; Node o2 = tripleNode(o) ; Graph graph = cxt.getActiveGraph() ; - - ExtendedIterator<Triple> iter = graph.find(s2, p2, o2) ; - - if ( false ) - { - // Materialize the results now. Debugging only. - List<Triple> x = iter.toList() ; - this.graphIter = WrappedIterator.create(x.iterator()) ; - iter.close(); - } - else - // Stream. - this.graphIter = iter ; + this.graphIter = graph.find(s2, p2, o2) ; } private static Node tripleNode(Node node) http://git-wip-us.apache.org/repos/asf/jena/blob/473c3e44/jena-arq/src/main/java/org/apache/jena/sparql/path/eval/PathEngine1.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/path/eval/PathEngine1.java b/jena-arq/src/main/java/org/apache/jena/sparql/path/eval/PathEngine1.java index 476af77..9d449a1 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/path/eval/PathEngine1.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/path/eval/PathEngine1.java @@ -198,8 +198,6 @@ final class PathEngine1 extends PathEngine } private void ALP1(boolean forwardMode, int stepCount, int maxStepCount, Node node, Path path, Collection<Node> visited) { - if ( false ) - System.out.printf("ALP1 node=%s\n visited=%s\n output=%s\n", node, visited) ; if ( maxStepCount >= 0 && stepCount > maxStepCount ) return ; if ( visited.contains(node) ) http://git-wip-us.apache.org/repos/asf/jena/blob/473c3e44/jena-arq/src/main/java/org/apache/jena/sparql/path/eval/PathEngineSPARQL.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/path/eval/PathEngineSPARQL.java b/jena-arq/src/main/java/org/apache/jena/sparql/path/eval/PathEngineSPARQL.java index b1d5018..187932f 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/path/eval/PathEngineSPARQL.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/path/eval/PathEngineSPARQL.java @@ -115,8 +115,6 @@ public class PathEngineSPARQL extends PathEngine // TODO ?? switch to PathEngine1 for the sub-step as we only need uniques. private void ALP_1(boolean forwardMode, int stepCount, int maxStepCount, Node node, Path path, Collection<Node> visited) { - if ( false ) - System.out.printf("ALP1 node=%s\n visited=%s\n output=%s\n", node, visited) ; if ( maxStepCount >= 0 && stepCount > maxStepCount ) return ; if ( visited.contains(node) ) http://git-wip-us.apache.org/repos/asf/jena/blob/473c3e44/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterDataset.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterDataset.java b/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterDataset.java index 12ceca8..a46d47e 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterDataset.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterDataset.java @@ -97,11 +97,6 @@ public class TestRiotWriterDataset extends AbstractWriterTest ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()) ; String s = StrUtils.fromUTF8bytes(out.toByteArray()) ; - if (false) { - System.out.println(format.toString()); - System.out.println(s); - System.out.println(); - } Dataset ds2 = DatasetFactory.createMem() ; try { RDFDataMgr.read(ds2, in, lang) ; http://git-wip-us.apache.org/repos/asf/jena/blob/473c3e44/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java b/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java index 9662c03..5cc0d0e 100644 --- a/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java +++ b/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java @@ -120,9 +120,6 @@ public class CmdNodeTableBuilder extends CmdGeneral datafiles = Arrays.asList("-") ; // ---- Checking. -// if ( false ) -// SetupTDB.makeNodeTable(location, locationString, 0, outputFile, 0) ; - for( String filename : datafiles) { Lang lang = RDFLanguages.filenameToLang(filename, RDFLanguages.NQUADS) ; http://git-wip-us.apache.org/repos/asf/jena/blob/473c3e44/jena-tdb/src/test/java/org/apache/jena/tdb/index/bplustree/TestBPlusTree.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/test/java/org/apache/jena/tdb/index/bplustree/TestBPlusTree.java b/jena-tdb/src/test/java/org/apache/jena/tdb/index/bplustree/TestBPlusTree.java index c46c6a0..17bb72a 100644 --- a/jena-tdb/src/test/java/org/apache/jena/tdb/index/bplustree/TestBPlusTree.java +++ b/jena-tdb/src/test/java/org/apache/jena/tdb/index/bplustree/TestBPlusTree.java @@ -50,7 +50,7 @@ public class TestBPlusTree extends AbstractTestRangeIndex BPlusTree bpt = BPlusTree.makeMem(order, minRecords, RecordLib.TestRecordLength, 0) ; if ( false ) { - // Breaks with CheckingTree = true ; because they deep reads the tree. + // Breaks with CheckingTree = true ; because of deep reads into the tree. BPlusTreeParams.CheckingNode = true ; BPlusTreeParams.CheckingTree = false ; bpt = BPlusTree.addTracking(bpt) ;
