svn commit: r1469022 - in /jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena: query/ResultSetFactory.java sparql/resultset/TextOutput.java

[andy]

Author: andy
Date: Wed Apr 17 18:46:51 2013
New Revision: 1469022

URL: http://svn.apache.org/r1469022
Log:
Make creation of ResultSetRewindable over an existing
ResultSetRewindable return the original result which
has been reset.

Text output to use a ResultSetFactory method, not directly call ResultSetMem.

Modified:
    
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetFactory.java
    
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/TextOutput.java

Modified: 
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetFactory.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetFactory.java?rev=1469022&r1=1469021&r2=1469022&view=diff
==============================================================================
--- 
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetFactory.java 
(original)
+++ 
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetFactory.java 
Wed Apr 17 18:46:51 2013
@@ -403,13 +403,20 @@ public class ResultSetFactory {
     }
 
     /**
-     * Turn an existing result set into a rewindable one. May take a copy - 
uses
-     * up the result set passed in.
+     * Turn an existing result set into a rewindable one.
+     * May take a copy but this is not guarantted
+     * Uses up the result set passed in which is no longer valid as a 
ResultSet.
      * 
      * @param resultSet
      * @return ResultSetRewindable
      */
     static public ResultSetRewindable makeRewindable(ResultSet resultSet) {
+        if ( resultSet instanceof ResultSetRewindable )
+        {
+            ResultSetRewindable rsw = (ResultSetRewindable)resultSet ;
+            rsw.reset() ;
+            return rsw ;
+        }
         return new ResultSetMem(resultSet);
     }
 
@@ -435,6 +442,7 @@ public class ResultSetFactory {
     }
 
     /**
+     * @deprecated This will be removed.
      * Sort an existing result set. Experimental. The list of variables is a
      * list of names (strings), with "x" for ascending in variable "x" and "-x"
      * for descending in variable "x"
@@ -443,6 +451,7 @@ public class ResultSetFactory {
      * @param conditions
      * @return ResultSet
      */
+    @Deprecated
     static public ResultSet makeSorted(ResultSet resultSet, 
List<SortCondition> conditions) {
         return new SortedResultSet(resultSet, conditions);
     }

Modified: 
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/TextOutput.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/TextOutput.java?rev=1469022&r1=1469021&r2=1469022&view=diff
==============================================================================
--- 
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/TextOutput.java
 (original)
+++ 
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/TextOutput.java
 Wed Apr 17 18:46:51 2013
@@ -25,6 +25,7 @@ import java.util.Iterator ;
 
 import com.hp.hpl.jena.query.QuerySolution ;
 import com.hp.hpl.jena.query.ResultSet ;
+import com.hp.hpl.jena.query.ResultSetFactory ;
 import com.hp.hpl.jena.rdf.model.RDFNode ;
 import com.hp.hpl.jena.shared.PrefixMapping ;
 import com.hp.hpl.jena.sparql.core.Prologue ;
@@ -145,7 +146,7 @@ public class TextOutput extends OutputBa
             //return ;
         }
 
-        ResultSetRewindable resultSetRewindable = new ResultSetMem(resultSet) ;
+        ResultSetRewindable resultSetRewindable = 
ResultSetFactory.makeRewindable(resultSet) ; 
         
         int numCols = resultSetRewindable.getResultVars().size() ;
         int[] colWidths = colWidths(resultSetRewindable) ;