[Bigdata-commit] SF.net SVN: bigdata:[7810] branches/RDR/bigdata-rdf/src/java/com/bigdata/ rdf/rio/StatementBuffer.java

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

Revision: 7810
          http://bigdata.svn.sourceforge.net/bigdata/?rev=7810&view=rev
Author:   mrpersonick
Date:     2014-01-16 19:20:09 +0000 (Thu, 16 Jan 2014)
Log Message:
-----------
optimization: fix a poor usage of the reification vocabulary

Modified Paths:
--------------
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/rio/StatementBuffer.java

Modified: branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/rio/StatementBuffer.java
===================================================================
--- branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/rio/StatementBuffer.java	2014-01-15 17:54:57 UTC (rev 7809)
+++ branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/rio/StatementBuffer.java	2014-01-16 19:20:09 UTC (rev 7810)
@@ -27,11 +27,9 @@
 
 package com.bigdata.rdf.rio;
 
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.Map;
 import java.util.Set;
 
@@ -41,7 +39,7 @@
 import org.openrdf.model.Statement;
 import org.openrdf.model.URI;
 import org.openrdf.model.Value;
-import org.semanticweb.yars.nx.namespace.RDF;
+import org.openrdf.model.vocabulary.RDF;
 
 import com.bigdata.rdf.changesets.ChangeAction;
 import com.bigdata.rdf.changesets.ChangeRecord;
@@ -217,6 +215,15 @@
     }
 
     protected final BigdataValueFactory valueFactory;
+
+    /**
+     * Reification vocabulary.
+     */
+    private final BigdataURI RDF_SUBJECT;
+    private final BigdataURI RDF_PREDICATE;
+    private final BigdataURI RDF_OBJECT;
+    private final BigdataURI RDF_STATEMENT;
+    private final BigdataURI RDF_TYPE;
     
     /**
      * The maximum #of Statements, URIs, Literals, or BNodes that the buffer can
@@ -374,6 +381,25 @@
             
         }
         
+        this.RDF_SUBJECT = valueFactory.asValue(RDF.SUBJECT);
+        this.RDF_PREDICATE = valueFactory.asValue(RDF.PREDICATE);
+        this.RDF_OBJECT = valueFactory.asValue(RDF.OBJECT);
+        this.RDF_STATEMENT = valueFactory.asValue(RDF.STATEMENT);
+        this.RDF_TYPE = valueFactory.asValue(RDF.TYPE);
+        
+        if (distinct) {
+        	
+        	/*
+        	 * Get the reification vocabulary into the distinct term map.
+        	 */
+        	getDistinctTerm(RDF_SUBJECT);
+        	getDistinctTerm(RDF_PREDICATE);
+        	getDistinctTerm(RDF_OBJECT);
+        	getDistinctTerm(RDF_STATEMENT);
+        	getDistinctTerm(RDF_TYPE);
+        	
+        }
+        
     }
 
     /**
@@ -1270,21 +1296,21 @@
         if (distinct) {
             {
                 final BigdataValue tmp = getDistinctTerm((BigdataValue) s);
-                if (tmp != s) {
+                if (tmp != s && !equals(tmp, RDF_SUBJECT, RDF_PREDICATE, RDF_OBJECT, RDF_TYPE, RDF_STATEMENT)) {
                     duplicateS = true;
                 }
                 s = (Resource) tmp;
             }
             {
                 final BigdataValue tmp = getDistinctTerm((BigdataValue) p);
-                if (tmp != p) {
+                if (tmp != p && !equals(tmp, RDF_SUBJECT, RDF_PREDICATE, RDF_OBJECT, RDF_TYPE)) {
                     duplicateP = true;
                 }
                 p = (URI) tmp;
             }
             {
                 final BigdataValue tmp = getDistinctTerm((BigdataValue) o);
-                if (tmp != o) {
+                if (tmp != o && !equals(tmp, RDF_SUBJECT, RDF_PREDICATE, RDF_OBJECT, RDF_TYPE, RDF_STATEMENT)) {
                     duplicateO = true;
                 }
                 o = (Value) tmp;
@@ -1323,11 +1349,8 @@
                 
             	log.info(stmt);
             	
-            	if (s instanceof BNode && 
-            			(RDF.SUBJECT.toString().equals(p.toString()) || RDF.PREDICATE.toString().equals(p.toString()) || RDF.OBJECT.toString().equals(p.toString())) || 
-            			(RDF.STATEMENT.toString().equals(o.toString()) && RDF.TYPE.toString().equals(p.toString()))) {
-            		
-            		if (!(RDF.STATEMENT.toString().equals(o.toString()) && RDF.TYPE.toString().equals(p.toString()))) {
+            	if (s instanceof BNode &&
+        			equals((BigdataValue)p, RDF_SUBJECT, RDF_PREDICATE, RDF_OBJECT)) {
             			
             		final BigdataBNodeImpl sid = (BigdataBNodeImpl) s;
             		
@@ -1354,10 +1377,13 @@
             		
 	                if (log.isDebugEnabled()) 
 	                    log.debug("reified piece: "+stmt);
-	                
-            		}
 
-            	} else {
+	        	} else if (s instanceof BNode && 
+	     			   equals((BigdataValue)o, RDF_STATEMENT) && equals((BigdataValue)p, RDF_TYPE)) {
+		
+		     		// ignore this statement
+		     		
+	        	} else {
             	
 	                if (deferredStmts == null) {
 	
@@ -1492,6 +1518,41 @@
 
     }
     
+    private boolean equals(final BigdataValue v1, final BigdataValue... v2) {
+    	
+		if (v2.length == 1) {
+			
+			return _equals(v1, v2[0]);
+			
+		} else {
+			
+			for (BigdataValue v : v2) {
+				
+				if (_equals(v1, v))
+					return true;
+				
+			}
+			
+			return false;
+			
+		}
+
+    }
+    
+    private boolean _equals(final BigdataValue v1, final BigdataValue v2) {
+		
+    	if (distinct) {
+
+    		return v1 == v2;
+
+    	} else {
+    		
+    		return v1.equals(v2);
+    		
+    	}
+    	
+    }
+    
     private static class ReifiedStmt implements Statement {
 
     	/**

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