jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1569780 - in /jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer: StatsMatcher.java reorder/ReorderTransformationSubstitution.java
Date Wed, 19 Feb 2014 15:13:12 GMT
Author: andy
Date: Wed Feb 19 15:13:12 2014
New Revision: 1569780

URL: http://svn.apache.org/r1569780
Log:
Minor tidying.

Modified:
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/StatsMatcher.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/reorder/ReorderTransformationSubstitution.java

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/StatsMatcher.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/StatsMatcher.java?rev=1569780&r1=1569779&r2=1569780&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/StatsMatcher.java
(original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/StatsMatcher.java
Wed Feb 19 15:13:12 2014
@@ -73,9 +73,9 @@ public final class StatsMatcher
     }
 
     // General structure
-    List<Pattern> patterns = new ArrayList<Pattern>() ;
+    protected List<Pattern> patterns = new ArrayList<Pattern>() ;
     // Map keyed by P for faster lookup (if no P available, we'll use the full list).  
-    Map<Item, List<Pattern>> mapPatterns = new HashMap<Item,  List<Pattern>>()
;
+    protected Map<Item, List<Pattern>> mapPatterns = new HashMap<Item,  List<Pattern>>()
;
     
     // Default behaviour
     double DefaultMatch = NOMATCH ;
@@ -410,7 +410,7 @@ public final class StatsMatcher
                 continue ;
             if ( ! matchNode(pred, pattern.predItem, match) )
                 continue ;
-            if ( ! matchNode(obj, pattern.objItem, match) )
+            if ( ! matchNode(obj,  pattern.objItem,  match) )
                 continue ;
             // First match.
             return pattern.weight ;

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/reorder/ReorderTransformationSubstitution.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/reorder/ReorderTransformationSubstitution.java?rev=1569780&r1=1569779&r2=1569780&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/reorder/ReorderTransformationSubstitution.java
(original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/optimizer/reorder/ReorderTransformationSubstitution.java
Wed Feb 19 15:13:12 2014
@@ -243,9 +243,9 @@ public abstract class ReorderTransformat
      *    NUMERIC   Use value returned by {@link defaultWeight}
      * The default, default choice is LAST.   
      */
-    protected /*abstract*/ DefaultChoice defaultChoice(PatternTriple pt) { return null ;
} // return DefaultChoice.LAST ; }
+    protected DefaultChoice defaultChoice(PatternTriple pt) { return null ; } // return DefaultChoice.LAST
; }
     
-    protected /*abstract*/ double defaultWeight(PatternTriple pt) { return -1 ; }
+    protected double defaultWeight(PatternTriple pt) { return -1 ; }
 
     /** Update components to note any variables from triple */
     protected static void update(Triple triple, List<PatternTriple> components)



Mime
View raw message