[Bigdata-commit] SF.net SVN: bigdata:[4118] branches/QUADS_QUERY_BRANCH/bigdata-sails/src/ java/com/bigdata/rdf/sail/BigdataEvaluationStrategyImpl3.java

[<tho...@us...>]

Revision: 4118
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4118&view=rev
Author:   thompsonbry
Date:     2011-01-16 22:46:27 +0000 (Sun, 16 Jan 2011)

Log Message:
-----------
More work on [1].

[1] https://sourceforge.net/apps/trac/bigdata/ticket/230

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataEvaluationStrategyImpl3.java

Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataEvaluationStrategyImpl3.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataEvaluationStrategyImpl3.java	2011-01-16 22:45:32 UTC (rev 4117)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataEvaluationStrategyImpl3.java	2011-01-16 22:46:27 UTC (rev 4118)
@@ -516,11 +516,11 @@
         
     }
     
-    private CloseableIteration<BindingSet, QueryEvaluationException> 
+    CloseableIteration<BindingSet, QueryEvaluationException> 
 		evaluateNatively(final TupleExpr tupleExpr, final BindingSet bs) 
 		    throws QueryEvaluationException, UnsupportedOperatorException {
 		try {
-			return _evaluateNatively(tupleExpr, bs);
+			return doEvaluateNatively(tupleExpr, bs);
 		} catch (UnrecognizedValueException ex) {
 			if (log.isInfoEnabled()) {
 				log.info("unrecognized value in query: " + ex.getValue());
@@ -538,8 +538,8 @@
 		}
 	}
 
-    private CloseableIteration<BindingSet, QueryEvaluationException> 
-    	_evaluateNatively(final TupleExpr root, final BindingSet bs)
+    CloseableIteration<BindingSet, QueryEvaluationException> 
+    	doEvaluateNatively(final TupleExpr root, final BindingSet bs)
     		throws UnsupportedOperatorException, UnrecognizedValueException, 
     				QueryEvaluationException {
     	
@@ -713,7 +713,7 @@
 		/*
 		 * Begin native bigdata evaluation.
 		 */
-		CloseableIteration<BindingSet, QueryEvaluationException> result = _evaluateNatively(
+		CloseableIteration<BindingSet, QueryEvaluationException> result = doEvaluateNatively(
 				query, bs, queryEngine);// , sesameFilters);
 
 		/*
@@ -742,8 +742,8 @@
 
     }
     
-    private CloseableIteration<BindingSet, QueryEvaluationException> 
-		_evaluateNatively(final PipelineOp query, final BindingSet bs,
+    CloseableIteration<BindingSet, QueryEvaluationException> 
+		doEvaluateNatively(final PipelineOp query, final BindingSet bs,
 			final QueryEngine queryEngine 
 //			, final Collection<Filter> sesameFilters
 			) 
@@ -794,7 +794,7 @@
 	 * 
 	 * @throws QueryEvaluationException
 	 */
-	private CloseableIteration<BindingSet, QueryEvaluationException> wrapQuery(
+	CloseableIteration<BindingSet, QueryEvaluationException> wrapQuery(
 			final IRunningQuery runningQuery
 			) throws QueryEvaluationException {
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.