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

[<mrp...@us...>]

Revision: 3626
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3626&view=rev
Author:   mrpersonick
Date:     2010-09-24 17:25:48 +0000 (Fri, 24 Sep 2010)

Log Message:
-----------
no longer punt to Sesame when exceptions are thrown from our query engine

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

Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataEvaluationStrategyImpl.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataEvaluationStrategyImpl.java	2010-09-24 17:18:40 UTC (rev 3625)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataEvaluationStrategyImpl.java	2010-09-24 17:25:48 UTC (rev 3626)
@@ -483,16 +483,18 @@
             
         } catch (Exception ex) {
             
-            // Use Sesame 2 evaluation
-
-            ex.printStackTrace();
+            throw new QueryEvaluationException(ex);
             
-            if (log.isInfoEnabled()) {
-                log.info("could not evaluate natively, punting to Sesame");
-            }
+//            // Use Sesame 2 evaluation
+//
+//            ex.printStackTrace();
+//            
+//            if (log.isInfoEnabled()) {
+//                log.info("could not evaluate natively, punting to Sesame");
+//            }
+//            
+//            return super.evaluate(union, bindings);
             
-            return super.evaluate(union, bindings);
-            
         }
         
     }
@@ -617,16 +619,18 @@
             
         } catch (Exception ex) {
             
-            // Use Sesame 2 evaluation
+            throw new QueryEvaluationException(ex);
             
-            ex.printStackTrace();
+//            // Use Sesame 2 evaluation
+//            
+//            ex.printStackTrace();
+//            
+//            if (log.isInfoEnabled()) {
+//                log.info("could not evaluate natively, punting to Sesame"); 
+//            }
+//
+//            return super.evaluate(join, bindings);
             
-            if (log.isInfoEnabled()) {
-                log.info("could not evaluate natively, punting to Sesame"); 
-            }
-
-            return super.evaluate(join, bindings);
-            
         }
         
     }
@@ -721,16 +725,18 @@
             
         } catch (Exception ex) {
             
-            // Use Sesame 2 evaluation
+            throw new QueryEvaluationException(ex);
             
-            ex.printStackTrace();
+//            // Use Sesame 2 evaluation
+//            
+//            ex.printStackTrace();
+//            
+//            if (log.isInfoEnabled()) {
+//                log.info("could not evaluate natively, punting to Sesame"); 
+//            }
+//
+//            return super.evaluate(join, bindings);
             
-            if (log.isInfoEnabled()) {
-                log.info("could not evaluate natively, punting to Sesame"); 
-            }
-
-            return super.evaluate(join, bindings);
-            
         }
         
     }


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