You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2013/10/09 20:13:02 UTC
svn commit: r1530744 - in /jena/trunk:
jena-arq/src/main/java/org/apache/jena/atlas/iterator/SingletonIterator.java
jena-arq/src/main/java/org/apache/jena/atlas/lib/DS.java
jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryEngineTDB.java
Author: andy
Date: Wed Oct 9 18:13:01 2013
New Revision: 1530744
URL: http://svn.apache.org/r1530744
Log:
Tidy up comments
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/SingletonIterator.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/DS.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryEngineTDB.java
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/SingletonIterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/SingletonIterator.java?rev=1530744&r1=1530743&r2=1530744&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/SingletonIterator.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/SingletonIterator.java Wed Oct 9 18:13:01 2013
@@ -48,11 +48,4 @@ public class SingletonIterator<T> implem
@Override
public void remove()
{ throw new NoSuchElementException("SingletonIterator.remove") ;}
-
-// @Override
-// public Iterator<T> iterator()
-// {
-// return this ;
-// }
-
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/DS.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/DS.java?rev=1530744&r1=1530743&r2=1530744&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/DS.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/DS.java Wed Oct 9 18:13:01 2013
@@ -21,33 +21,25 @@ package org.apache.jena.atlas.lib;
import java.util.* ;
-import org.apache.jena.atlas.iterator.NullIterator ;
-
public class DS
{
private DS() {}
-
- public static <X> Set<X> setOfNone() { return Collections.emptySet() ; }
- public static <X> Set<X> setOfOne(X element) { return Collections.singleton(element) ; }
- public static <X> Set<X> set() { return new HashSet<X>(); }
- public static <X> Set<X> set(int initialSize) { return new HashSet<X>(initialSize); }
- public static <X> Set<X> set(Set<X> other) { return new HashSet<X>(other); }
+
+ public static <X> Set<X> setOfNone() { return Collections.emptySet() ; }
+ public static <X> Set<X> setOfOne(X element) { return Collections.singleton(element) ; }
+ public static <X> Set<X> set() { return new HashSet<X>(); }
+ public static <X> Set<X> set(int initialSize) { return new HashSet<X>(initialSize); }
+ public static <X> Set<X> set(Set<X> other) { return new HashSet<X>(other); }
- public static <K, V> Map<K,V> mapOfNone() { return Collections.emptyMap() ; }
+ public static <K, V> Map<K,V> mapOfNone() { return Collections.emptyMap() ; }
public static <K, V> Map<K,V> mapOfOne(K key, V value) { return Collections.singletonMap(key, value) ; }
- public static <K, V> Map<K,V> map() { return new HashMap<K,V>(); }
+ public static <K, V> Map<K,V> map() { return new HashMap<K,V>(); }
public static <K, V> Map<K,V> map(int initialSize) { return new HashMap<K,V>(initialSize); }
public static <K, V> Map<K,V> map(Map<K,V> other) { return new HashMap<K,V>(other); }
- @SuppressWarnings("rawtypes")
- private static final Iterator iter0 = new NullIterator() ;
-
- @SuppressWarnings({"unchecked", "cast"})
- public static <T> Iterator<T> nothing() { return (NullIterator<T>)iter0 ; }
-
- public static <T> List<T> listOfNone() { return Collections.emptyList() ; }
- public static <T> List<T> listOfOne(T element) { return Collections.singletonList(element) ; }
- public static <T> List<T> list() { return new ArrayList<T>(); }
+ public static <T> List<T> listOfNone() { return Collections.emptyList() ; }
+ public static <T> List<T> listOfOne(T element) { return Collections.singletonList(element) ; }
+ public static <T> List<T> list() { return new ArrayList<T>(); }
public static <T> List<T> list(int initialSize) { return new ArrayList<T>(initialSize); }
- public static <T> List<T> list(List<T> other) { return new ArrayList<T>(other); }
+ public static <T> List<T> list(List<T> other) { return new ArrayList<T>(other); }
}
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryEngineTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryEngineTDB.java?rev=1530744&r1=1530743&r2=1530744&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryEngineTDB.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryEngineTDB.java Wed Oct 9 18:13:01 2013
@@ -107,15 +107,8 @@ public class QueryEngineTDB extends Quer
// Fix DatasetGraph for global union.
if ( context.isTrue(TDB.symUnionDefaultGraph) && ! doingDynamicDatasetBySpecialDataset )
{
- // doingDynamicDatasetBySpecialDataset => done earlier.
-// // Rewrite so that any explicitly named "default graph" is union graph.
op = A2.unionDefaultGraphQuads(op) ;
Explain.explain("REWRITE(Union default graph)", op, context) ;
-// // And set the default graph to be the union graph as well.
-// NOT NEEDED - OpExecutorTDB handles this.
-// DatasetGraphTDB ds = ((DatasetGraphTDB)dsg).duplicate() ;
-// ds.setEffectiveDefaultGraph(new GraphTDB(ds, Quad.unionGraph)) ;
-// dsg = ds ;
}
QueryIterator results = super.eval(op, dsg, input, context) ;
results = new QueryIteratorMaterializeBinding(results) ;