[Bigdata-commit] SF.net SVN: bigdata:[4254] branches/QUADS_QUERY_BRANCH/bigdata/src/java/com /bigdata/bop

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

Revision: 4254
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4254&view=rev
Author:   thompsonbry
Date:     2011-02-27 21:11:03 +0000 (Sun, 27 Feb 2011)

Log Message:
-----------
Modified the SPARQL Constraint operator to handle nested type errors.

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/constraint/Constraint.java
    branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph/PartitionedJoinGroup.java

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/constraint/Constraint.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/constraint/Constraint.java	2011-02-27 15:09:56 UTC (rev 4253)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/constraint/Constraint.java	2011-02-27 21:11:03 UTC (rev 4254)
@@ -81,19 +81,27 @@
 
     public boolean accept(final IBindingSet bs) {
     	
-    	try {
+//    	try {
     		
     		// evaluate the BVE operator
     		return ((BooleanValueExpression) get(0)).get(bs);
-    		
-    	} catch (Exception ex) {
-    		
-    		// trap the type error and filter out the solution
-    		if (log.isInfoEnabled())
-    			log.info("discarding solution due to error: " + bs);
-    		return false;
-    		
-    	}
+
+//		} catch (Throwable t) {
+//
+//			if (InnerCause.isInnerCause(t, SparqlTypeErrorException.class)) {
+//
+//				// trap the type error and filter out the solution
+//				if (log.isInfoEnabled())
+//					log.info("discarding solution due to type error: " + bs
+//							+ " : " + t);
+//				
+//				return false;
+//
+//			}
+//
+//			throw new RuntimeException(t);
+//
+//    	}
     	
     }
     

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph/PartitionedJoinGroup.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph/PartitionedJoinGroup.java	2011-02-27 15:09:56 UTC (rev 4253)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph/PartitionedJoinGroup.java	2011-02-27 21:11:03 UTC (rev 4254)
@@ -1061,6 +1061,8 @@
                         }) //
         );
 
+//        final PipelineOp queryOp = lastOp;
+        
         return queryOp;
 
     }


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