Thread: [Bigdata-commit] SF.net SVN: bigdata:[7829] branches/RDR

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7829
          http://bigdata.svn.sourceforge.net/bigdata/?rev=7829&view=rev
Author:   mrpersonick
Date:     2014-01-26 20:37:25 +0000 (Sun, 26 Jan 2014)
Log Message:
-----------
major commit of RDR.  one step away from entirely removing the overloading of the context position for sids.  working checkpoint.

Modified Paths:
--------------
    branches/RDR/.classpath
    branches/RDR/bigdata/src/resources/logging/log4j.properties
    branches/RDR/bigdata-gas/src/test/com/bigdata/rdf/graph/data/smallGraph.ttl
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/internal/IVUtility.java
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/internal/LexiconConfiguration.java
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/model/BNodeContextFactory.java
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataBNode.java
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataBNodeImpl.java
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataStatementImpl.java
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValueFactory.java
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValueFactoryImpl.java
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValueImpl.java
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/rio/BasicRioLoader.java
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/rio/StatementBuffer.java
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/rio/ntriples/BigdataNTriplesParser.java
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/BigdataRDFXMLParser.java
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/rio/turtle/BigdataTurtleParser.java
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/history/HistoryIndexTupleSerializer.java
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/spo/ISPO.java
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPO.java
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPOTupleSerializer.java
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/store/AbstractTripleStore.java
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/graph/impl/bd/TestBFS.java
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/internal/TestEncodeDecodeKeys.java
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/internal/TestEncodeDecodeMixedIVs.java
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/rio/TestNTriplesWithSids.java
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/rio/TestRDFXMLInterchangeWithStatementIdentifiers.java
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/rio/TestStatementBuffer.java
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/optimizers/TestALPPinTrac773.java
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/optimizers/TestASTNamedSubqueryOptimizer.java
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/optimizers/TestASTUnionFiltersOptimizer.java
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPO.java
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPOTupleSerializer.java
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPOValueCoders.java
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/store/TestStatementIdentifiers.java
    branches/RDR/bigdata-sails/src/test/com/bigdata/rdf/sail/TestProvenanceQuery.java

Added Paths:
-----------
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/IPAddrIV.java

Modified: branches/RDR/.classpath
===================================================================

--- branches/RDR/.classpath	2014-01-24 23:39:36 UTC (rev 7828)
+++ branches/RDR/.classpath	2014-01-26 20:37:25 UTC (rev 7829)
@@ -33,7 +33,7 @@
 	<classpathentry kind="src" path="bigdata-gas/src/test"/>
 	<classpathentry exported="true" kind="lib" path="bigdata/lib/dsi-utils-1.0.6-020610.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata/lib/lgpl-utils-1.0.6-020610.jar"/>
-	<classpathentry kind="lib" path="bigdata-jini/lib/apache/zookeeper-3.3.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="bigdata-jini/lib/apache/zookeeper-3.3.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata/lib/jetty/jetty-continuation-7.2.2.v20101205.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata/lib/jetty/jetty-http-7.2.2.v20101205.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata/lib/jetty/jetty-io-7.2.2.v20101205.jar"/>
@@ -45,8 +45,8 @@
 	<classpathentry exported="true" kind="lib" path="bigdata/lib/jetty/jetty-webapp-7.2.2.v20101205.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata/lib/jetty/jetty-xml-7.2.2.v20101205.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata/lib/unimi/colt-1.2.0.jar"/>
-	<classpathentry kind="lib" path="bigdata/lib/icu/icu4j-4.8.jar"/>
-	<classpathentry kind="lib" path="bigdata/lib/icu/icu4j-charset-4.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="bigdata/lib/icu/icu4j-4.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="bigdata/lib/icu/icu4j-charset-4.8.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata/lib/junit-3.8.1.jar" sourcepath="/root/.m2/repository/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata-jini/lib/jini/lib/browser.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata-jini/lib/jini/lib/classserver.jar"/>
@@ -67,24 +67,24 @@
 	<classpathentry exported="true" kind="lib" path="bigdata/lib/unimi/fastutil-5.1.5.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata/lib/lucene/lucene-analyzers-3.0.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata/lib/lucene/lucene-core-3.0.0.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry exported="true" kind="lib" path="bigdata/lib/high-scale-lib-v1.1.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata/lib/junit-ext-1.1-b3-dev.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata-rdf/lib/slf4j-api-1.6.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata-rdf/lib/slf4j-log4j12-1.6.1.jar"/>
-	<classpathentry kind="lib" path="bigdata-sails/lib/httpcomponents/commons-codec-1.4.jar"/>
-	<classpathentry kind="lib" path="bigdata-sails/lib/httpcomponents/commons-logging-1.1.1.jar"/>
-	<classpathentry kind="lib" path="bigdata-sails/lib/httpcomponents/httpclient-4.1.3.jar"/>
-	<classpathentry kind="lib" path="bigdata-sails/lib/httpcomponents/httpclient-cache-4.1.3.jar"/>
-	<classpathentry kind="lib" path="bigdata-sails/lib/httpcomponents/httpcore-4.1.4.jar"/>
-	<classpathentry kind="lib" path="bigdata-sails/lib/httpcomponents/httpmime-4.1.3.jar"/>
-	<classpathentry kind="lib" path="bigdata-sails/lib/httpcomponents/commons-fileupload-1.2.2.jar"/>
-	<classpathentry kind="lib" path="bigdata-sails/lib/httpcomponents/commons-io-2.1.jar"/>
-	<classpathentry kind="lib" path="bigdata/lib/apache/log4j-1.2.17.jar"/>
-	<classpathentry kind="lib" path="bigdata-rdf/lib/openrdf-sesame-2.6.10-onejar.jar"/>
-	<classpathentry kind="lib" path="bigdata-rdf/lib/sesame-rio-testsuite-2.6.10.jar"/>
-	<classpathentry kind="lib" path="bigdata-sails/lib/sesame-sparql-testsuite-2.6.10.jar"/>
-	<classpathentry kind="lib" path="bigdata-sails/lib/sesame-store-testsuite-2.6.10.jar"/>
-	<classpathentry kind="lib" path="bigdata-rdf/lib/nxparser-1.2.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="bigdata-sails/lib/httpcomponents/commons-codec-1.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="bigdata-sails/lib/httpcomponents/commons-logging-1.1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="bigdata-sails/lib/httpcomponents/httpclient-4.1.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="bigdata-sails/lib/httpcomponents/httpclient-cache-4.1.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="bigdata-sails/lib/httpcomponents/httpcore-4.1.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="bigdata-sails/lib/httpcomponents/httpmime-4.1.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="bigdata-sails/lib/httpcomponents/commons-fileupload-1.2.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="bigdata-sails/lib/httpcomponents/commons-io-2.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="bigdata/lib/apache/log4j-1.2.17.jar"/>
+	<classpathentry exported="true" kind="lib" path="bigdata-rdf/lib/openrdf-sesame-2.6.10-onejar.jar"/>
+	<classpathentry exported="true" kind="lib" path="bigdata-rdf/lib/sesame-rio-testsuite-2.6.10.jar"/>
+	<classpathentry exported="true" kind="lib" path="bigdata-sails/lib/sesame-sparql-testsuite-2.6.10.jar"/>
+	<classpathentry exported="true" kind="lib" path="bigdata-sails/lib/sesame-store-testsuite-2.6.10.jar"/>
+	<classpathentry exported="true" kind="lib" path="bigdata-rdf/lib/nxparser-1.2.3.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: branches/RDR/bigdata/src/resources/logging/log4j.properties
===================================================================
--- branches/RDR/bigdata/src/resources/logging/log4j.properties	2014-01-24 23:39:36 UTC (rev 7828)
+++ branches/RDR/bigdata/src/resources/logging/log4j.properties	2014-01-26 20:37:25 UTC (rev 7829)
@@ -16,9 +16,13 @@
 log4j.logger.com.bigdata.rdf.store.DataLoader=INFO
 log4j.logger.com.bigdata.resources.AsynchronousOverflowTask=INFO
 
+#log4j.logger.com.bigdata.rdf.rio.StatementBuffer=ALL
+#log4j.logger.com.bigdata.rdf.sail.TestProvenanceQuery=ALL
+
 # Test suite loggers.
 #log4j.logger.junit=INFO
 #log4j.logger.com.bigdata.btree.AbstractBTreeTestCase=INFO
+log4j.logger.junit.framework.TestCase2=ERROR
 
 # dest1
 log4j.appender.dest1=org.apache.log4j.ConsoleAppender

Modified: branches/RDR/bigdata-gas/src/test/com/bigdata/rdf/graph/data/smallGraph.ttl
===================================================================
--- branches/RDR/bigdata-gas/src/test/com/bigdata/rdf/graph/data/smallGraph.ttl	2014-01-24 23:39:36 UTC (rev 7828)
+++ branches/RDR/bigdata-gas/src/test/com/bigdata/rdf/graph/data/smallGraph.ttl	2014-01-26 20:37:25 UTC (rev 7829)
@@ -1,19 +1,19 @@
-@prefix : <http://www.bigdata.com/> .
+@prefix bd: <http://www.bigdata.com/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 
 #: {
-   :Mike rdf:type foaf:Person .
-   :Bryan rdf:type foaf:Person .
-   :Martyn rdf:type foaf:Person .
+   bd:Mike rdf:type foaf:Person .
+   bd:Bryan rdf:type foaf:Person .
+   bd:Martyn rdf:type foaf:Person .
 
-   :Mike rdfs:label "Mike" .
-   :Bryan rdfs:label "Bryan" .
-   :DC rdfs:label "DC" .
+   bd:Mike rdfs:label "Mike" .
+   bd:Bryan rdfs:label "Bryan" .
+   bd:DC rdfs:label "DC" .
 
-   :Mike foaf:knows :Bryan .
-   :Bryan foaf:knows :Mike .
-   :Bryan foaf:knows :Martyn .
-   :Martyn foaf:knows :Bryan .
+   bd:Mike foaf:knows bd:Bryan .
+   bd:Bryan foaf:knows bd:Mike .
+   bd:Bryan foaf:knows bd:Martyn .
+   bd:Martyn foaf:knows bd:Bryan .
 #}

Modified: branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/internal/IVUtility.java
===================================================================
--- branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/internal/IVUtility.java	2014-01-24 23:39:36 UTC (rev 7828)
+++ branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/internal/IVUtility.java	2014-01-26 20:37:25 UTC (rev 7829)
@@ -35,6 +35,8 @@
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.UUID;
@@ -66,6 +68,7 @@
 import com.bigdata.rdf.internal.impl.literal.XSDUnsignedLongIV;
 import com.bigdata.rdf.internal.impl.literal.XSDUnsignedShortIV;
 import com.bigdata.rdf.internal.impl.uri.FullyInlineURIIV;
+import com.bigdata.rdf.internal.impl.uri.IPAddrIV;
 import com.bigdata.rdf.internal.impl.uri.PartlyInlineURIIV;
 import com.bigdata.rdf.internal.impl.uri.URIExtensionIV;
 import com.bigdata.rdf.internal.impl.uri.VocabURIByteIV;
@@ -437,7 +440,7 @@
             final ISPO spo = SPOKeyOrder.SPO.decodeKey(key, o);
             // all spos that have a sid are explicit
             spo.setStatementType(StatementEnum.Explicit);
-            spo.setStatementIdentifier(true);
+//            spo.setStatementIdentifier(true);
             // create a sid iv and return it
             return new SidIV(spo);
         }
@@ -535,6 +538,21 @@
         // The data type
         final DTE dte = AbstractIV.getDTE(flags);
         switch (dte) {
+        case XSDBoolean: {
+        	/*
+        	 * TODO Using XSDBoolean so that we can know how to decode this thing
+             * as an IPAddrIV.  We need to fix the Extension mechanism for URIs.
+             * Extension is already used above. 
+        	 */
+        	try {
+	        	final byte[] addr = new byte[4];
+	        	System.arraycopy(key, o, addr, 0, 4);
+	            final InetAddress ip = InetAddress.getByAddress(addr);
+	            return new IPAddrIV(ip);
+        	} catch (UnknownHostException ex) {
+        		throw new RuntimeException(ex);
+        	}
+        }
         case XSDByte: {
             final byte x = key[o];//KeyBuilder.decodeByte(key[o]);
             return new VocabURIByteIV<BigdataURI>(x);

Modified: branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/internal/LexiconConfiguration.java
===================================================================
--- branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/internal/LexiconConfiguration.java	2014-01-24 23:39:36 UTC (rev 7828)
+++ branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/internal/LexiconConfiguration.java	2014-01-26 20:37:25 UTC (rev 7829)
@@ -28,6 +28,7 @@
 package com.bigdata.rdf.internal;
 
 import java.math.BigInteger;
+import java.net.UnknownHostException;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.TimeZone;
@@ -58,6 +59,7 @@
 import com.bigdata.rdf.internal.impl.literal.XSDUnsignedLongIV;
 import com.bigdata.rdf.internal.impl.literal.XSDUnsignedShortIV;
 import com.bigdata.rdf.internal.impl.uri.FullyInlineURIIV;
+import com.bigdata.rdf.internal.impl.uri.IPAddrIV;
 import com.bigdata.rdf.internal.impl.uri.URIExtensionIV;
 import com.bigdata.rdf.lexicon.LexiconKeyOrder;
 import com.bigdata.rdf.model.BigdataBNode;
@@ -435,6 +437,22 @@
 	 */
     private IV<BigdataURI, ?> createInlineURIIV(final URI value) {
 
+    	try {
+    		
+    		final String s = value.stringValue();
+    		
+	    	if (s.startsWith(IPAddrIV.NAMESPACE)) {
+	    		
+	    		return new IPAddrIV(s.substring(IPAddrIV.NAMESPACE_LEN));
+	    		
+	    	}
+	    	
+    	} catch (UnknownHostException ex) { 
+    		
+    		log.warn("unknown host exception, will not inline: " + value);
+    		
+    	}
+    	
         if (maxInlineTextLength == 0) {
             
             return null;

Added: branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/IPAddrIV.java
===================================================================
--- branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/IPAddrIV.java	                        (rev 0)
+++ branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/IPAddrIV.java	2014-01-26 20:37:25 UTC (rev 7829)
@@ -0,0 +1,349 @@
+/**
+
+Copyright (C) SYSTAP, LLC 2006-2011.  All rights reserved.
+
+Contact:
+     SYSTAP, LLC
+     4501 Tower Road
+     Greensboro, NC 27410
+     lic...@bi...
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+package com.bigdata.rdf.internal.impl.uri;
+
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+import org.openrdf.model.URI;
+import org.openrdf.model.Value;
+
+import com.bigdata.btree.BytesUtil.UnsignedByteArrayComparator;
+import com.bigdata.btree.keys.IKeyBuilder;
+import com.bigdata.io.LongPacker;
+import com.bigdata.rdf.internal.DTE;
+import com.bigdata.rdf.internal.ILexiconConfiguration;
+import com.bigdata.rdf.internal.IV;
+import com.bigdata.rdf.internal.IVUtility;
+import com.bigdata.rdf.internal.VTE;
+import com.bigdata.rdf.internal.impl.AbstractInlineIV;
+import com.bigdata.rdf.lexicon.LexiconRelation;
+import com.bigdata.rdf.model.BigdataBNode;
+import com.bigdata.rdf.model.BigdataURI;
+import com.bigdata.rdf.model.BigdataValueFactory;
+import com.bigdata.rdf.spo.SPOKeyOrder;
+
+/**
+ * Internal value representing an inline IP address.  Uses the InetAddress
+ * class to represent the IP address and perform the translation to and from
+ * byte[], which is then used directly in the IV key (after the flags).
+ * <p>
+ * This internal value has a {@link VTE} of {@link VTE#URI}.
+ * <p>
+ * {@inheritDoc}
+ */
+public class IPAddrIV<V extends BigdataURI> extends AbstractInlineIV<V, InetAddress>
+        implements Serializable, URI {
+
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 685148537376856907L;
+	
+//	private static final transient Logger log = Logger.getLogger(SidIV.class);
+
+	public static final String NAMESPACE = "ip:/";
+	
+	public static final int NAMESPACE_LEN = NAMESPACE.length();
+	
+	/**
+	 * The inline IP address.
+	 */
+	private final InetAddress value;
+	
+	/**
+	 * The cached string representation of this IP.
+	 */
+	private transient String hostAddress;
+	
+	/**
+	 * The cached byte[] key for the encoding of this IV.
+	 */
+	private transient byte[] key;
+	
+	/**
+	 * The cached materialized BigdataValue for this InetAddress.
+	 */
+	private transient V uri;
+
+    public IV<V, InetAddress> clone(final boolean clearCache) {
+
+        final IPAddrIV<V> tmp = new IPAddrIV<V>(value);
+
+        // Propagate the cached byte[] key.
+        tmp.key = key;
+        
+        // Propagate the cached BigdataValue.
+        tmp.uri = uri;
+        
+        if (!clearCache) {
+
+            tmp.setValue(getValueCache());
+            
+        }
+        
+        return tmp;
+
+    }
+
+    /**
+	 * Ctor with internal value specified.
+	 */
+	public IPAddrIV(final InetAddress value) {
+
+        /*
+         * TODO Using XSDBoolean so that we can know how to decode this thing
+         * as an IPAddrIV.  We need to fix the Extension mechanism for URIs. 
+         */
+        super(VTE.URI, DTE.XSDBoolean);
+        
+        this.value = value;
+        
+    }
+
+    /**
+	 * Ctor with host address specified.
+	 */
+	public IPAddrIV(final String hostAddress) throws UnknownHostException {
+
+        /*
+         * Note: XSDBoolean happens to be assigned the code value of 0, which is
+         * the value we we want when the data type enumeration will be ignored.
+         */
+        super(VTE.URI, DTE.XSDBoolean);
+        
+        this.value = InetAddress.getByName(hostAddress);
+        this.hostAddress = hostAddress;
+        
+    }
+
+	/**
+	 * Returns the inline value.
+	 */
+	public InetAddress getInlineValue() throws UnsupportedOperationException {
+		return value;
+	}
+
+	/**
+	 * Returns the URI representation of this IV.
+	 */
+    public V asValue(final LexiconRelation lex) {
+    	if (uri == null) {
+	        uri = (V) lex.getValueFactory().createURI(getNamespace(), getLocalName());
+	        uri.setIV(this);
+    	}
+        return uri;
+    }
+
+    /**
+     * Return the byte length for the byte[] encoded representation of this
+     * internal value.  Depends on the byte length of the encoded inline value.
+     */
+	public int byteLength() {
+		return 1 + key().length;
+	}
+
+	public String toString() {
+		return "IP("+getLocalName()+")";
+	}
+	
+	public int hashCode() {
+		return value.hashCode();
+	}
+
+//    /**
+//     * Implements {@link BNode#getID()}.
+//     * <p>
+//     * This implementation uses the {@link BigInteger} class to create a unique
+//     * blank node ID based on the <code>unsigned byte[]</code> key of the inline
+//     * {@link SPO}.
+//     */
+//	@Override
+//	public String getID() {
+////		// just use the hash code.  can result in collisions
+////		return String.valueOf(hashCode());
+//		
+//		// create a big integer using the spo key.  should result in unique ids
+//		final byte[] key = key();
+//		final int signum = key.length > 0 ? 1 : 0;
+//		final BigInteger bi = new BigInteger(signum, key);
+//		return 's' + bi.toString();
+//	}
+
+	@Override
+	public String getNamespace() {
+		return NAMESPACE;
+	}
+	
+	@Override
+	public String getLocalName() {
+		if (hostAddress == null) {
+			hostAddress = value.getHostAddress();
+		}
+		return hostAddress;
+	}
+	
+	/**
+	 * Two {@link IPAddrIV} are equal if their InetAddresses are equal.
+	 */
+	public boolean equals(final Object o) {
+        if (this == o)
+            return true;
+        if (o instanceof IPAddrIV) {
+        		final InetAddress value2 = ((IPAddrIV<?>) o).value;
+        		return value.equals(value2);
+        }
+        return false;
+	}
+
+	public int _compareTo(IV o) {
+
+	    /*
+	     * Note: This works, but it might be more expensive.
+	     */
+	    return UnsignedByteArrayComparator.INSTANCE.compare(key(), ((IPAddrIV)o).key());
+
+	}
+	
+    /**
+     * Encode this internal value into the supplied key builder.  Emits the
+     * flags, following by the encoded byte[] representing the spo, in SPO
+     * key order.
+     * <p>
+     * {@inheritDoc}
+     */
+	@Override
+    public IKeyBuilder encode(final IKeyBuilder keyBuilder) {
+
+        // First emit the flags byte.
+        keyBuilder.appendSigned(flags());
+		
+		// Then append the InetAddress byte[].
+        keyBuilder.append(key());
+        
+        return keyBuilder;
+            
+    }
+    
+    private byte[] key() {
+
+        if (key == null) {
+        
+            key = value.getAddress();
+            
+        }
+
+        return key;
+        
+    }
+
+    /**
+     * Object provides serialization for {@link IPAddrIV} via the write-replace
+     * and read-replace pattern.
+     */
+    private static class IPAddrIVState implements Externalizable {
+
+        private static final long serialVersionUID = -1L;
+
+//        private byte flags;
+        private byte[] key;
+        
+        /**
+         * De-serialization constructor.
+         */
+        public IPAddrIVState() {
+            
+        }
+        
+        private IPAddrIVState(final IPAddrIV iv) {
+//            this.flags = flags;
+            this.key = iv.key();
+        }
+        
+        public void readExternal(ObjectInput in) throws IOException,
+                ClassNotFoundException {
+//            flags = in.readByte();
+            final int nbytes = LongPacker.unpackInt(in);
+            key = new byte[nbytes];
+            in.readFully(key);
+        }
+
+        public void writeExternal(ObjectOutput out) throws IOException {
+//            out.writeByte(flags);
+            LongPacker.packLong(out, key.length);
+            out.write(key);
+        }
+        
+        private Object readResolve() throws ObjectStreamException {
+
+        	try {
+        		
+	            final InetAddress value = InetAddress.getByAddress(key);
+	            
+	            return new IPAddrIV(value);
+	            
+        	} catch (UnknownHostException ex) {
+        		
+        		throw new RuntimeException(ex);
+        		
+        	}
+            
+        }
+
+    }
+    
+    private Object writeReplace() throws ObjectStreamException {
+        
+        return new IPAddrIVState(this);
+        
+    }
+    
+    /**
+     * Implements {@link Value#stringValue()}.
+     */
+    @Override
+    public String stringValue() {
+        
+        return getLocalName();
+
+    }
+
+    /**
+     * Does not need materialization to answer URI interface methods.
+     */
+	@Override
+	public boolean needsMaterialization() {
+		
+		return false;
+		
+	}
+
+
+}
\ No newline at end of file


Property changes on: branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/IPAddrIV.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/model/BNodeContextFactory.java
===================================================================
--- branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/model/BNodeContextFactory.java	2014-01-24 23:39:36 UTC (rev 7828)
+++ branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/model/BNodeContextFactory.java	2014-01-26 20:37:25 UTC (rev 7829)
@@ -89,6 +89,10 @@
         return valueFactory.createBNode(id);
     }
 
+	public BigdataBNode createBNode(BigdataStatement stmt) {
+        return valueFactory.createBNode(stmt);
+    }
+
 	public BigdataLiteral createLiteral(boolean arg0) {
         return valueFactory.createLiteral(arg0);
     }

Modified: branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataBNode.java
===================================================================
--- branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataBNode.java	2014-01-24 23:39:36 UTC (rev 7828)
+++ branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataBNode.java	2014-01-26 20:37:25 UTC (rev 7829)
@@ -67,4 +67,14 @@
 	 */
 	public boolean isStatementIdentifier();
 	
+	/**
+	 * Set the statement that this blank node models.
+	 */
+	public void setStatement(BigdataStatement stmt);
+	
+	/**
+	 * Get the statement that this blank node models.
+	 */
+	public BigdataStatement getStatement();
+	
 }

Modified: branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataBNodeImpl.java
===================================================================
--- branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataBNodeImpl.java	2014-01-24 23:39:36 UTC (rev 7828)
+++ branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataBNodeImpl.java	2014-01-26 20:37:25 UTC (rev 7829)
@@ -49,7 +49,10 @@
 
 import org.openrdf.model.BNode;
 
+import com.bigdata.rdf.internal.IV;
+import com.bigdata.rdf.internal.impl.bnode.SidIV;
 import com.bigdata.rdf.rio.StatementBuffer;
+import com.bigdata.rdf.rio.UnificationException;
 import com.bigdata.rdf.spo.SPO;
 import com.bigdata.rdf.store.AbstractTripleStore;
 
@@ -76,7 +79,7 @@
     private static final long serialVersionUID = 2675602437833048872L;
     
     private final String id;
-
+    
     /**
      * Boolean flag is set during conversion from an RDF interchange syntax
      * into the internal {@link SPO} model if the blank node is a statement
@@ -95,14 +98,45 @@
      */
     BigdataBNodeImpl(final BigdataValueFactory valueFactory, final String id) {
 
+        this(valueFactory, id, null);
+
+    }
+    
+    BigdataBNodeImpl(final BigdataValueFactory valueFactory, final String id, 
+    		final BigdataStatement stmt) {
+
         super(valueFactory, null);
 
         if (id == null)
             throw new IllegalArgumentException();
 
         this.id = id;
+        
+        this.sid = stmt;
+        if (stmt != null) {
+        	this.statementIdentifier = true;
+        }
 
     }
+    
+    @Override
+    public IV getIV() {
+    	
+    	if (super.iv == null && sid != null) {
+    		
+    		if (sid.getSubject() == this || sid.getObject() == this)
+    			throw new UnificationException("illegal self-referential sid");
+    		
+    		final IV s = sid.s();
+    		final IV p = sid.p();
+    		final IV o = sid.o();
+    		if (s != null && p != null && o != null) {
+    			setIV(new SidIV(new SPO(s, p, o)));
+    		}
+    	}
+    	
+    	return super.iv;
+    }
 
     public String toString() {
 
@@ -179,7 +213,7 @@
 	/**
 	 * Marks this as a blank node which models the specified statement.
 	 * 
-	 * @param stmt
+	 * @param sid
 	 *            The statement.
 	 */
 	final public void setStatement(final BigdataStatement sid) {

Modified: branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataStatementImpl.java
===================================================================
--- branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataStatementImpl.java	2014-01-24 23:39:36 UTC (rev 7828)
+++ branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataStatementImpl.java	2014-01-26 20:37:25 UTC (rev 7829)
@@ -63,6 +63,7 @@
     protected final BigdataURI p;
     protected final BigdataValue o;
     protected final BigdataResource c;
+    protected IV sid = null;
     private StatementEnum type;
     private boolean userFlag;
     private transient boolean override = false;
@@ -282,39 +283,51 @@
 
     }
 
-    public final void setStatementIdentifier(final boolean sidable) {
+//    public final void setStatementIdentifier(final boolean sidable) {
+//
+//        if (sidable && type != StatementEnum.Explicit) {
+//
+//            // Only allowed for explicit statements.
+//            throw new IllegalStateException();
+//
+//        }
+//
+////        if (c == null) {
+////        	
+////        	// this SHOULD not ever happen
+////        	throw new IllegalStateException();
+////        	
+////        }
+////        
+////        c.setIV(new SidIV(this));
+//        
+//        this.sid = new SidIV(this);
+//
+//    }
 
-        if (sidable && type != StatementEnum.Explicit) {
-
-            // Only allowed for explicit statements.
-            throw new IllegalStateException();
-
-        }
-
-        if (c == null) {
-        	
-        	// this SHOULD not ever happen
-        	throw new Illega...
 
[truncated message content]

Thread: [Bigdata-commit] SF.net SVN: bigdata:[7829] branches/RDR

Fast, scalable, robust graph database platform

bigdata-commit