Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[3688] branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java /com/bigdata/rdf
|
From: <mrp...@us...> - 2010-09-29 23:35:43
|
Revision: 3688
http://bigdata.svn.sourceforge.net/bigdata/?rev=3688&view=rev
Author: mrpersonick
Date: 2010-09-29 23:35:37 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
changed filters to work with ISolution instead of ISPO
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-29 22:50:32 UTC (rev 3687)
+++ branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/inf/RdfTypeRdfsResourceFilter.java 2010-09-29 23:35:37 UTC (rev 3688)
@@ -12,6 +12,7 @@
import com.bigdata.rdf.spo.ISPO;
import com.bigdata.rdf.spo.SPOFilter;
import com.bigdata.rdf.vocab.Vocabulary;
+import com.bigdata.relation.rule.eval.ISolution;
/**
* Filter matches <code>(x rdf:type rdfs:Resource).
@@ -57,9 +58,9 @@
}
- final ISPO spo = (ISPO) o;
+ final ISolution solution = (ISolution) o;
- return accept(spo);
+ return accept((ISPO) solution.get());
}
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-29 22:50:32 UTC (rev 3687)
+++ branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/rules/DoNotAddFilter.java 2010-09-29 23:35:37 UTC (rev 3688)
@@ -34,6 +34,7 @@
import com.bigdata.rdf.spo.ISPO;
import com.bigdata.rdf.spo.SPOFilter;
import com.bigdata.rdf.vocab.Vocabulary;
+import com.bigdata.relation.rule.eval.ISolution;
/**
* Filter keeps matched triple patterns generated OUT of the database.
@@ -121,15 +122,17 @@
}
public boolean isValid(Object o) {
-
+
if (!canAccept(o)) {
return true;
}
- return accept((ISPO) o);
+ final ISolution solution = (ISolution) 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-29 22:50:32 UTC (rev 3687)
+++ branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/ExplicitSPOFilter.java 2010-09-29 23:35:37 UTC (rev 3688)
@@ -32,6 +32,7 @@
import com.bigdata.rdf.model.StatementEnum;
import com.bigdata.relation.accesspath.IElementFilter;
+import com.bigdata.relation.rule.eval.ISolution;
/**
* Filter matches only {@link StatementEnum#Explicit} {@link ISPO}s.
@@ -66,8 +67,10 @@
}
- return accept((ISPO) o);
+ final ISolution solution = (ISolution) 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-29 22:50:32 UTC (rev 3687)
+++ branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/InGraphBinarySearchFilter.java 2010-09-29 23:35:37 UTC (rev 3688)
@@ -11,6 +11,7 @@
import com.bigdata.bop.constraint.INBinarySearch;
import com.bigdata.rdf.internal.IV;
import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.relation.rule.eval.ISolution;
/**
* "IN" filter for the context position based on a sorted long[] of the
@@ -86,8 +87,10 @@
}
- return accept((ISPO) o);
+ final ISolution solution = (ISolution) 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-29 22:50:32 UTC (rev 3687)
+++ branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/InGraphHashSetFilter.java 2010-09-29 23:35:37 UTC (rev 3688)
@@ -9,6 +9,7 @@
import com.bigdata.rdf.internal.IV;
import com.bigdata.rdf.model.BigdataURI;
import com.bigdata.rdf.store.IRawTripleStore;
+import com.bigdata.relation.rule.eval.ISolution;
/**
* "IN" filter for the context position based on a native long hash set
@@ -72,8 +73,10 @@
}
- return accept((ISPO) o);
+ final ISolution solution = (ISolution) 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-29 22:50:32 UTC (rev 3687)
+++ branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/InferredSPOFilter.java 2010-09-29 23:35:37 UTC (rev 3688)
@@ -33,6 +33,7 @@
import com.bigdata.rdf.model.StatementEnum;
import com.bigdata.relation.accesspath.IElementFilter;
+import com.bigdata.relation.rule.eval.ISolution;
/**
* Filter matches only {@link StatementEnum#Inferred} statements.
@@ -69,8 +70,10 @@
}
- return accept((ISPO) o);
+ final ISolution solution = (ISolution) 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-29 22:50:32 UTC (rev 3687)
+++ branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/NoAxiomFilter.java 2010-09-29 23:35:37 UTC (rev 3688)
@@ -31,6 +31,7 @@
import java.io.ObjectStreamException;
import com.bigdata.rdf.model.StatementEnum;
+import com.bigdata.relation.rule.eval.ISolution;
/**
* A filter that matches explicit or inferred statements but not those whose
@@ -66,8 +67,10 @@
}
- return accept((ISPO) o);
+ final ISolution solution = (ISolution) 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-29 22:50:32 UTC (rev 3687)
+++ branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPOFilter.java 2010-09-29 23:35:37 UTC (rev 3688)
@@ -1,6 +1,7 @@
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> {
@@ -11,8 +12,16 @@
public boolean canAccept(final Object o) {
- return o instanceof ISPO;
+ if (o instanceof ISolution) {
+
+ ISolution solution = (ISolution) o;
+
+ return solution.get() instanceof ISPO;
+
+ }
+ return false;
+
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
