You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/06/23 15:50:49 UTC
jena git commit: Add methods to ElementGroup to work with the group
elements.
Repository: jena
Updated Branches:
refs/heads/master c6bf61d90 -> 1d2794e78
Add methods to ElementGroup to work with the group elements.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/1d2794e7
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/1d2794e7
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/1d2794e7
Branch: refs/heads/master
Commit: 1d2794e787d268d15b52690717e223687c4a9419
Parents: c6bf61d
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Jun 23 14:01:51 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jun 23 14:01:51 2015 +0100
----------------------------------------------------------------------
.../apache/jena/sparql/algebra/OpAsQuery.java | 35 ++++++--------------
.../org/apache/jena/sparql/lang/ParserBase.java | 4 +--
.../apache/jena/sparql/lang/SyntaxVarScope.java | 4 +--
.../apache/jena/sparql/syntax/ElementGroup.java | 6 ++--
4 files changed, 18 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/1d2794e7/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpAsQuery.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpAsQuery.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpAsQuery.java
index 6e0c104..edb216c 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpAsQuery.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpAsQuery.java
@@ -315,21 +315,6 @@ public class OpAsQuery {
query.setLimit(level.opSlice.getLength()) ;
}
query.setResultVars() ;
-
-// // Fixup -- fixupSubQueryOfOne in processQueryPattern
-// // Simplify currentGroup if possible, primarily look for the case of a single sub-query
-// // which will mean we have an ElementGroup with a single item which is
-// ElementGroup eg = this.currentGroup ;
-// if (eg.getElements().size() == 1) {
-// Element e = eg.getElements().get(0);
-// if (e instanceof ElementSubQuery) {
-// query.setQueryPattern(e);
-// } else {
-// query.setQueryPattern(eg);
-// }
-// } else {
-// query.setQueryPattern(eg) ;
-// }
return query ;
}
@@ -375,9 +360,9 @@ public class OpAsQuery {
// Simplify currentGroup if possible, primarily look for the case of
// a single sub-query which will mean we have an ElementGroup with a single
// item which is ElementSubQuery.
- if ( eg.getElements().size() != 1 )
+ if ( eg.size() != 1 )
return eg ;
- Element e = eg.getElements().get(0) ;
+ Element e = eg.get(0) ;
if ( e instanceof ElementSubQuery )
return e ;
return eg ;
@@ -385,8 +370,8 @@ public class OpAsQuery {
Element asElement(Op op) {
ElementGroup g = asElementGroup(op) ;
- if ( g.getElements().size() == 1 )
- return g.getElements().get(0) ;
+ if ( g.size() == 1 )
+ return g.get(0) ;
return g ;
}
@@ -550,10 +535,10 @@ public class OpAsQuery {
Element eRight = eRightGroup ;
// Very special case. If the RHS is not something that risks
// reparsing into a copmbined element of a group, strip the group-of-one.
- if ( eRightGroup.getElements().size() == 1 ) {
+ if ( eRightGroup.size() == 1 ) {
// This always was a {} around it but it's unnecessary in a group of one.
- if ( eRightGroup.getElements().get(0) instanceof ElementSubQuery )
- eRight = eRightGroup.getElements().get(0) ;
+ if ( eRightGroup.get(0) instanceof ElementSubQuery )
+ eRight = eRightGroup.get(0) ;
}
ElementGroup g = currentGroup() ;
@@ -876,10 +861,10 @@ public class OpAsQuery {
private Element lastElement() {
ElementGroup g = currentGroup ;
- if ( g == null || g.getElements().size() == 0 )
+ if ( g == null || g.size() == 0 )
return null ;
- int len = g.getElements().size() ;
- return g.getElements().get(len - 1) ;
+ int len = g.size() ;
+ return g.get(len - 1) ;
}
private void startSubGroup() {
http://git-wip-us.apache.org/repos/asf/jena/blob/1d2794e7/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserBase.java
index acdd397..a9d961e 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserBase.java
@@ -126,9 +126,9 @@ public class ParserBase
protected Element compressGroupOfOneGroup(ElementGroup elg)
{
// remove group of one group.
- if ( elg.getElements().size() == 1 )
+ if ( elg.size() == 1 )
{
- Element e1 = elg.getElements().get(0) ;
+ Element e1 = elg.get(0) ;
if ( e1 instanceof ElementGroup )
return e1 ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/1d2794e7/jena-arq/src/main/java/org/apache/jena/sparql/lang/SyntaxVarScope.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/SyntaxVarScope.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/SyntaxVarScope.java
index 66a3fb7..90a1eba 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/SyntaxVarScope.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/SyntaxVarScope.java
@@ -253,9 +253,9 @@ public class SyntaxVarScope
// BIND scope rules
// (and service warning)
- for ( int i = 0 ; i < el.getElements().size() ; i++ )
+ for ( int i = 0 ; i < el.size() ; i++ )
{
- Element e = el.getElements().get(i) ;
+ Element e = el.get(i) ;
// Tests.
if ( e instanceof ElementBind )
{
http://git-wip-us.apache.org/repos/asf/jena/blob/1d2794e7/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementGroup.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementGroup.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementGroup.java
index 6e126b1..9ec1535 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementGroup.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementGroup.java
@@ -78,8 +78,10 @@ public class ElementGroup extends Element
public int mark() { return elements.size() ; }
- public List<Element> getElements() { return elements; }
- public boolean isEmpty() { return elements.size() == 0 ; }
+ public List<Element> getElements() { return elements; }
+ public boolean isEmpty() { return elements.size() == 0 ; }
+ public int size() { return elements.size() ; }
+ public Element get(int idx) { return elements.get(idx) ; }
@Override
public int hashCode()