[Bigdata-commit] SF.net SVN: bigdata:[8125] branches/RDR/bigdata-rdf/src/java/com/bigdata/ rdf/graph/impl/bd/BigdataGASEngine.java

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

Revision: 8125
          http://sourceforge.net/p/bigdata/code/8125
Author:   mrpersonick
Date:     2014-04-17 14:54:41 +0000 (Thu, 17 Apr 2014)
Log Message:
-----------
fixed some bogus logic related to RDR

Modified Paths:
--------------
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/BigdataGASEngine.java

Modified: branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/BigdataGASEngine.java
===================================================================
--- branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/BigdataGASEngine.java	2014-04-17 04:24:36 UTC (rev 8124)
+++ branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/BigdataGASEngine.java	2014-04-17 14:54:41 UTC (rev 8125)
@@ -409,27 +409,39 @@
                     // Bind O for this key-range scan.
                     IVUtility.encode(keyBuilder, u);
 
-                } else {
+                } else if (!inEdges) {
 
                     /*
-                     * SPO(C) or OSP(C)
-                     * 
-                     * Note: For RDR link attribute access, the keys are formed
-                     * differently. Lower case letters are used for variables.
-                     * Upper case letters for constants.
-                     * 
-                     * For SPO(C): S:=SID(Spo(c)), P:=linkAttributeType (must
-                     * filter), O:=linkAttributeValue (read it off the index
-                     * when the filter is satisfied).
-                     * 
-                     * For OSP(C): OL=SID(Osp(c)), P:=linkAttributeType (must
-                     * filter), S:=linkAttributeValue (read it off the index
-                     * when the filter is satisfied).
-                     * 
-                     * TODO RDR should also be supported in the SAIL and RAM GAS
-                     * engine implementations. The statements about statements
-                     * would be modeled as reified statement models.
-                     */
+					 * SPO(C) or OSP(C)
+					 * 
+					 * Note: For RDR link attribute access, the keys are formed
+					 * differently. Lower case letters are used for variables.
+					 * Upper case letters for constants.
+					 * 
+					 * For SPO(C): S:=SID(Spo(c)), P:=linkAttributeType (must
+					 * filter), O:=linkAttributeValue (read it off the index
+					 * when the filter is satisfied).
+					 * 
+					 * For OSP(C): OL=SID(Osp(c)), P:=linkAttributeType (must
+					 * filter), S:=linkAttributeValue (read it off the index
+					 * when the filter is satisfied). WRONG WRONG WRONG 
+					 * linkAttributeValue will always always always be an O 
+					 * 
+					 * TODO RDR should also be supported in the SAIL and RAM GAS
+					 * engine implementations. The statements about statements
+					 * would be modeled as reified statement models.
+					 * 
+					 * TODO This logic is completely wrong for reverse
+					 * traversal. Sids are always stored in SPO order regardless
+					 * of what index they are in. So when we are traversing in
+					 * reverse, this logic will attempt to decode the reverse
+					 * links from the Sid in the OSP index but will instead find
+					 * nothing at all, because first of all the Sid is in the S
+					 * position of the link weight statement and secondly even
+					 * if it were in the O position (which its not), we would
+					 * end up with its forward links instead since the sid is
+					 * always stored in SPO order.
+					 */
 
                     keyOrder = getKeyOrder(kb, inEdges);
 
@@ -452,6 +464,33 @@
                     // Append [u] to the key.
                     IVUtility.encode(keyBuilder, u);
 
+                } else {
+                	
+                    keyOrder = getKeyOrder(kb, inEdges);
+
+                    ndx = kb.getSPORelation().getIndex(keyOrder);
+
+                    keyBuilder = ndx.getIndexMetadata().getKeyBuilder();
+
+                    keyBuilder.reset();
+
+                    /*
+                     * Just have to ignore it.  We need to introduce a join to
+                     * handle it.
+                     */
+//                    if (linkAttrTypeIV != null) {
+//                    
+//                        /*
+//                         * Restrict to the SID region of the index. See
+//                         * SidIV.encode().
+//                         */
+//                        keyBuilder.appendSigned(SidIV.toFlags());
+//                        
+//                    }
+
+                    // Append [u] to the key.
+                    IVUtility.encode(keyBuilder, u);
+                	
                 }
 
                 fromKey = keyBuilder.getKey();

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