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

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

Revision: 3694
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3694&view=rev
Author:   mrpersonick
Date:     2010-09-30 14:54:59 +0000 (Thu, 30 Sep 2010)

Log Message:
-----------
rolling back changes to filters to handle solutions

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/inf/RdfTypeRdfsResourceFilter.java
    branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/rules/DoNotAddFilter.java
    branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/ExplicitSPOFilter.java
    branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/InGraphBinarySearchFilter.java
    branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/InGraphHashSetFilter.java
    branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/InferredSPOFilter.java
    branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/NoAxiomFilter.java
    branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPOFilter.java

Modified: branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/inf/RdfTypeRdfsResourceFilter.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/inf/RdfTypeRdfsResourceFilter.java	2010-09-30 14:18:41 UTC (rev 3693)
+++ branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/inf/RdfTypeRdfsResourceFilter.java	2010-09-30 14:54:59 UTC (rev 3694)
@@ -58,10 +58,8 @@
             
         }
         
-        final ISolution solution = (ISolution) o;
+        return accept((ISPO) o);
         
-        return accept((ISPO) solution.get());
-        
     }
 
     private boolean accept(final ISPO spo) {

Modified: branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/rules/DoNotAddFilter.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/rules/DoNotAddFilter.java	2010-09-30 14:18:41 UTC (rev 3693)
+++ branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/rules/DoNotAddFilter.java	2010-09-30 14:54:59 UTC (rev 3694)
@@ -132,10 +132,8 @@
             
         }
         
-        final ISolution solution = (ISolution) o;
+        return accept((ISPO) o);
         
-        return accept((ISPO) solution.get());
-        
     }
 
     private boolean accept(final ISPO o) {

Modified: branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/ExplicitSPOFilter.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/ExplicitSPOFilter.java	2010-09-30 14:18:41 UTC (rev 3693)
+++ branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/ExplicitSPOFilter.java	2010-09-30 14:54:59 UTC (rev 3694)
@@ -67,10 +67,8 @@
             
         }
         
-        final ISolution solution = (ISolution) o;
+        return accept((ISPO) o);
         
-        return accept((ISPO) solution.get());
-        
     }
 
     private boolean accept(final ISPO o) {

Modified: branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/InGraphBinarySearchFilter.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/InGraphBinarySearchFilter.java	2010-09-30 14:18:41 UTC (rev 3693)
+++ branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/InGraphBinarySearchFilter.java	2010-09-30 14:54:59 UTC (rev 3694)
@@ -87,10 +87,8 @@
             
         }
         
-        final ISolution solution = (ISolution) o;
+        return accept((ISPO) o);
         
-        return accept((ISPO) solution.get());
-        
     }
 
     private boolean accept(final ISPO o) {

Modified: branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/InGraphHashSetFilter.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/InGraphHashSetFilter.java	2010-09-30 14:18:41 UTC (rev 3693)
+++ branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/InGraphHashSetFilter.java	2010-09-30 14:54:59 UTC (rev 3694)
@@ -73,10 +73,8 @@
             
         }
         
-        final ISolution solution = (ISolution) o;
+        return accept((ISPO) o);
         
-        return accept((ISPO) solution.get());
-        
     }
 
     private boolean accept(final ISPO o) {

Modified: branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/InferredSPOFilter.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/InferredSPOFilter.java	2010-09-30 14:18:41 UTC (rev 3693)
+++ branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/InferredSPOFilter.java	2010-09-30 14:54:59 UTC (rev 3694)
@@ -70,10 +70,8 @@
             
         }
         
-        final ISolution solution = (ISolution) o;
+        return accept((ISPO) o);
         
-        return accept((ISPO) solution.get());
-        
     }
 
     private boolean accept(final ISPO o) {

Modified: branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/NoAxiomFilter.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/NoAxiomFilter.java	2010-09-30 14:18:41 UTC (rev 3693)
+++ branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/NoAxiomFilter.java	2010-09-30 14:54:59 UTC (rev 3694)
@@ -67,10 +67,8 @@
             
         }
         
-        final ISolution solution = (ISolution) o;
+        return accept((ISPO) o);
         
-        return accept((ISPO) solution.get());
-        
     }
 
     private boolean accept(final ISPO o) {

Modified: branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPOFilter.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPOFilter.java	2010-09-30 14:18:41 UTC (rev 3693)
+++ branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPOFilter.java	2010-09-30 14:54:59 UTC (rev 3694)
@@ -1,7 +1,6 @@
 package com.bigdata.rdf.spo;
 
 import com.bigdata.relation.accesspath.IElementFilter;
-import com.bigdata.relation.rule.eval.ISolution;
 
 public abstract class SPOFilter<E extends ISPO> implements IElementFilter<E> {
         
@@ -12,16 +11,8 @@
 
     public boolean canAccept(final Object o) {
         
-        if (o instanceof ISolution) {
-            
-            ISolution solution = (ISolution) o;
-            
-            return solution.get() instanceof ISPO;
-            
-        }
+        return o instanceof ISPO;
         
-        return false;
-        
     }
     
 }


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