You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by sa...@apache.org on 2012/11/29 23:43:46 UTC
svn commit: r1415420 [2/3] - in /jena/branches/streaming-update:
jena-arq/Grammar/ jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/
jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/arq/
jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_10/...
Modified: jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java?rev=1415420&r1=1415419&r2=1415420&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java Thu Nov 29 22:43:42 2012
@@ -1386,7 +1386,6 @@ public class ARQParser extends ARQParser
// SPARQL Update + transitional extensions for SPARQL/Update (the W3C submission)
// Update only entry point
-// Optional SEMICOLON
final public void Update() throws ParseException {
Prologue();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1406,17 +1405,24 @@ public class ARQParser extends ARQParser
Update1();
label_12:
while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case SEMICOLON:
+ if (jj_2_2(2147483647)) {
;
- break;
- default:
- jj_la1[38] = jj_gen;
+ } else {
break label_12;
}
jj_consume_token(SEMICOLON);
+ Prologue();
+ Update1();
+ }
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case SEMICOLON:
+ jj_consume_token(SEMICOLON);
+ Prologue();
+ break;
+ default:
+ jj_la1[38] = jj_gen;
+ ;
}
- Update();
break;
default:
jj_la1[39] = jj_gen;
@@ -1425,7 +1431,7 @@ public class ARQParser extends ARQParser
}
final public void Update1() throws ParseException {
- Update up ;
+ Update up = null ;
startUpdateOperation() ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LOAD:
@@ -1449,12 +1455,6 @@ public class ARQParser extends ARQParser
case CREATE:
up = Create();
break;
- case INSERT_DATA:
- up = InsertData();
- break;
- case DELETE_DATA:
- up = DeleteData();
- break;
case DELETE_WHERE:
up = DeleteWhere();
break;
@@ -1463,12 +1463,18 @@ public class ARQParser extends ARQParser
case WITH:
up = Modify();
break;
+ case INSERT_DATA:
+ InsertData();
+ break;
+ case DELETE_DATA:
+ DeleteData();
+ break;
default:
jj_la1[40] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- emitUpdate(up) ;
+ if (null != up) emitUpdate(up) ;
finishUpdateOperation() ;
}
@@ -1607,38 +1613,39 @@ public class ARQParser extends ARQParser
}
// #ifdef ARQ
-// void Meta() : { QuadDataAcc qd = new QuadDataAcc() ; }
+// void Meta() : { QuadDataAccSink qd = new QuadDataAccSink() ; }
// {
// <META>
// QuadData(qd)
// }
// #endif
- final public Update InsertData() throws ParseException {
- QuadDataAcc qd = new QuadDataAcc() ; Token t ;
+ final public void InsertData() throws ParseException {
+ QuadDataAccSink qd = getInsertDataSink() ; Token t ;
t = jj_consume_token(INSERT_DATA);
- startDataInsert(qd, t.beginLine, t.beginColumn) ;
+ int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
+ startDataInsert(qd, beginLine, beginColumn) ;
QuadData(qd);
- finishDataInsert(qd, t.beginLine, t.beginColumn) ;
- {if (true) return new UpdateDataInsert(qd) ;}
- throw new Error("Missing return statement in function");
+ finishDataInsert(qd, beginLine, beginColumn) ;
+ qd.close() ;
}
- final public Update DeleteData() throws ParseException {
- QuadDataAcc qd = new QuadDataAcc() ; Token t ;
+ final public void DeleteData() throws ParseException {
+ QuadDataAccSink qd = getDeleteDataSink() ; Token t ;
t = jj_consume_token(DELETE_DATA);
- startDataDelete(qd, t.beginLine, t.beginColumn) ;
+ int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
+ startDataDelete(qd, beginLine, beginColumn) ;
QuadData(qd);
- finishDataDelete(qd, t.beginLine, t.beginColumn) ;
- {if (true) return new UpdateDataDelete(qd) ;}
- throw new Error("Missing return statement in function");
+ finishDataDelete(qd, beginLine, beginColumn) ;
+ qd.close() ;
}
final public Update DeleteWhere() throws ParseException {
QuadAcc qp = new QuadAcc() ; Token t ;
t = jj_consume_token(DELETE_WHERE);
- startDeleteTemplate(qp, t.beginLine, t.beginColumn) ;
+ int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
+ startDeleteTemplate(qp, beginLine, beginColumn) ;
QuadPattern(qp);
- finishDeleteTemplate(qp, t.beginLine, t.beginColumn) ;
+ finishDeleteTemplate(qp, beginLine, beginColumn) ;
{if (true) return new UpdateDeleteWhere(qp) ;}
throw new Error("Missing return statement in function");
}
@@ -1702,18 +1709,20 @@ public class ARQParser extends ARQParser
final public void DeleteClause(UpdateModify up) throws ParseException {
QuadAcc qp = up.getDeleteAcc() ; Token t ;
t = jj_consume_token(DELETE);
- startDeleteTemplate(qp, t.beginLine, t.beginColumn) ;
+ int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
+ startDeleteTemplate(qp, beginLine, beginColumn) ;
QuadPattern(qp);
- finishDeleteTemplate(qp, t.beginLine, t.beginColumn) ;
+ finishDeleteTemplate(qp, beginLine, beginColumn) ;
up.setHasDeleteClause(true) ;
}
final public void InsertClause(UpdateModify up) throws ParseException {
QuadAcc qp = up.getInsertAcc() ; Token t ;
t = jj_consume_token(INSERT);
- startInsertTemplate(qp, t.beginLine, t.beginColumn) ;
+ int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
+ startInsertTemplate(qp, beginLine, beginColumn) ;
QuadPattern(qp);
- finishInsertTemplate(qp, t.beginLine, t.beginColumn) ;
+ finishInsertTemplate(qp, beginLine, beginColumn) ;
up.setHasInsertClause(true) ;
}
@@ -1811,13 +1820,13 @@ public class ARQParser extends ARQParser
}
//Ground data : As QuadPattern but don't allow variables.
- final public void QuadData(QuadDataAcc acc) throws ParseException {
+ final public void QuadData(QuadDataAccSink acc) throws ParseException {
jj_consume_token(LBRACE);
Quads(acc);
jj_consume_token(RBRACE);
}
- final public void Quads(QuadAcc acc) throws ParseException {
+ final public void Quads(QuadAccSink acc) throws ParseException {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IRIref:
case PNAME_NS:
@@ -1904,8 +1913,8 @@ public class ARQParser extends ARQParser
}
}
- final public void QuadsNotTriples(QuadAcc acc) throws ParseException {
- Node gn ; Node prev = acc.getGraph() ;
+ final public void QuadsNotTriples(QuadAccSink acc) throws ParseException {
+ Node gn ; Node prev = acc.getGraph() ;
jj_consume_token(GRAPH);
gn = VarOrIri();
setAccGraph(acc, gn) ;
@@ -1950,7 +1959,7 @@ public class ARQParser extends ARQParser
TriplesSameSubject(acc);
label_15:
while (true) {
- if (jj_2_2(2)) {
+ if (jj_2_3(2)) {
;
} else {
break label_15;
@@ -1972,11 +1981,12 @@ public class ARQParser extends ARQParser
final public Element GroupGraphPattern() throws ParseException {
Element el = null ; Token t ;
t = jj_consume_token(LBRACE);
+ int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SELECT:
- startSubSelect(t.beginLine, t.beginColumn) ;
+ startSubSelect(beginLine, beginColumn) ;
SubSelect();
- Query q = endSubSelect(t.beginLine, t.beginColumn) ;
+ Query q = endSubSelect(beginLine, beginColumn) ;
el = new ElementSubQuery(q) ;
break;
default:
@@ -2247,10 +2257,11 @@ public class ARQParser extends ARQParser
final public Element InlineData() throws ParseException {
ElementData el ; Token t ;
t = jj_consume_token(VALUES);
+ int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
el = new ElementData() ;
- startInlineData(el.getVars(), el.getRows(), t.beginLine, t.beginColumn) ;
+ startInlineData(el.getVars(), el.getRows(), beginLine, beginColumn) ;
DataBlock();
- finishInlineData(t.beginLine, t.beginColumn) ;
+ finishInlineData(beginLine, beginColumn) ;
{if (true) return el ;}
throw new Error("Missing return statement in function");
}
@@ -2314,13 +2325,13 @@ public class ARQParser extends ARQParser
}
final public void InlineDataFull() throws ParseException {
- Var v ; Node n ; Token t ;
+ Var v ; Node n ; Token t ; int beginLine; int beginColumn;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case NIL:
jj_consume_token(NIL);
break;
case LPAREN:
- t = jj_consume_token(LPAREN);
+ jj_consume_token(LPAREN);
label_18:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -2335,14 +2346,14 @@ public class ARQParser extends ARQParser
v = Var();
emitDataBlockVariable(v) ;
}
- t = jj_consume_token(RPAREN);
+ jj_consume_token(RPAREN);
break;
default:
jj_la1[75] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- t = jj_consume_token(LBRACE);
+ jj_consume_token(LBRACE);
label_19:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -2357,7 +2368,8 @@ public class ARQParser extends ARQParser
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LPAREN:
t = jj_consume_token(LPAREN);
- startDataBlockValueRow(t.beginLine, t.beginColumn) ;
+ beginLine = t.beginLine; beginColumn = t.beginColumn; t = null;
+ startDataBlockValueRow(beginLine, beginColumn) ;
label_20:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -2387,15 +2399,17 @@ public class ARQParser extends ARQParser
break label_20;
}
n = DataBlockValue();
- emitDataBlockValue(n, t.beginLine, t.beginColumn) ;
+ emitDataBlockValue(n, beginLine, beginColumn) ;
}
t = jj_consume_token(RPAREN);
- finishDataBlockValueRow(t.beginLine, t.beginColumn) ;
+ beginLine = t.beginLine; beginColumn = t.beginColumn; t = null;
+ finishDataBlockValueRow(beginLine, beginColumn) ;
break;
case NIL:
t = jj_consume_token(NIL);
- startDataBlockValueRow(t.beginLine, t.beginColumn) ;
- finishDataBlockValueRow(t.beginLine, t.beginColumn) ;
+ beginLine = t.beginLine; beginColumn = t.beginColumn; t = null;
+ startDataBlockValueRow(beginLine, beginColumn) ;
+ finishDataBlockValueRow(beginLine, beginColumn) ;
break;
default:
jj_la1[78] = jj_gen;
@@ -2403,7 +2417,7 @@ public class ARQParser extends ARQParser
throw new ParseException();
}
}
- t = jj_consume_token(RBRACE);
+ jj_consume_token(RBRACE);
}
final public Node DataBlockValue() throws ParseException {
@@ -2638,9 +2652,10 @@ public class ARQParser extends ARQParser
case DISTINCT:
t = jj_consume_token(DISTINCT);
distinct = true ;
+ int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
if ( ! allowAggregatesInExpressions )
throwParseException("Aggregate expression not legal at this point",
- t.beginLine, t.beginColumn) ;
+ beginLine, beginColumn) ;
break;
default:
jj_la1[82] = jj_gen;
@@ -2756,7 +2771,7 @@ public class ARQParser extends ARQParser
TriplesSameSubject(acc);
label_24:
while (true) {
- if (jj_2_3(2)) {
+ if (jj_2_4(2)) {
;
} else {
break label_24;
@@ -2909,9 +2924,8 @@ public class ARQParser extends ARQParser
final public void Object(Node s, Node p, Path path, TripleCollector acc) throws ParseException {
Node o ;
- int mark = acc.mark() ;
o = GraphNode(acc);
- insert(acc, mark, s, p, path, o) ;
+ insert(acc, s, p, path, o) ;
}
// -------- BGPs with paths.
@@ -3097,9 +3111,8 @@ public class ARQParser extends ARQParser
final public void ObjectPath(Node s, Node p, Path path, TripleCollector acc) throws ParseException {
Node o ;
- int mark = acc.mark() ;
o = GraphNodePath(acc);
- insert(acc, mark, s, p, path, o) ;
+ insert(acc, s, p, path, o) ;
}
// End paths stuff.
@@ -3519,18 +3532,18 @@ public class ARQParser extends ARQParser
// ------- RDF collections
final public Node Collection(TripleCollector acc) throws ParseException {
- Node listHead = nRDFnil ; Node lastCell = null ; int mark ; Node n ; Token t ;
+ Node listHead = nRDFnil ; Node lastCell = null ; Node n ; Token t ;
t = jj_consume_token(LPAREN);
+ int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
label_32:
while (true) {
- Node cell = createListNode( t.beginLine, t.beginColumn) ;
+ Node cell = createListNode( beginLine, beginColumn) ;
if ( listHead == nRDFnil )
listHead = cell ;
if ( lastCell != null )
insert(acc, lastCell, nRDFrest, cell) ;
- mark = acc.mark() ;
n = GraphNode(acc);
- insert(acc, mark, cell, nRDFfirst, n) ;
+ insert(acc, cell, nRDFfirst, n) ;
lastCell = cell ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IRIref:
@@ -3573,18 +3586,18 @@ public class ARQParser extends ARQParser
}
final public Node CollectionPath(TripleCollector acc) throws ParseException {
- Node listHead = nRDFnil ; Node lastCell = null ; int mark ; Node n ; Token t ;
+ Node listHead = nRDFnil ; Node lastCell = null ; Node n ; Token t ;
t = jj_consume_token(LPAREN);
+ int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
label_33:
while (true) {
- Node cell = createListNode( t.beginLine, t.beginColumn) ;
+ Node cell = createListNode( beginLine, beginColumn) ;
if ( listHead == nRDFnil )
listHead = cell ;
if ( lastCell != null )
insert(acc, lastCell, nRDFrest, cell) ;
- mark = acc.mark() ;
n = GraphNodePath(acc);
- insert(acc, mark, cell, nRDFfirst, n) ;
+ insert(acc, cell, nRDFfirst, n) ;
lastCell = cell ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IRIref:
@@ -4350,7 +4363,7 @@ public class ARQParser extends ARQParser
final public Expr BuiltInCall() throws ParseException {
Expr expr ; Expr expr1 = null ; Expr expr2 = null ;
- Node gn ; Token t ; ExprList a ;
+ Node gn ; ExprList a ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COUNT:
case MIN:
@@ -4729,14 +4742,14 @@ public class ARQParser extends ARQParser
{if (true) return new E_SameTerm(expr1, expr2) ;}
break;
case IS_IRI:
- t = jj_consume_token(IS_IRI);
+ jj_consume_token(IS_IRI);
jj_consume_token(LPAREN);
expr = Expression();
jj_consume_token(RPAREN);
{if (true) return new E_IsIRI(expr) ;}
break;
case IS_URI:
- t = jj_consume_token(IS_URI);
+ jj_consume_token(IS_URI);
jj_consume_token(LPAREN);
expr = Expression();
jj_consume_token(RPAREN);
@@ -5084,7 +5097,7 @@ public class ARQParser extends ARQParser
a.add(expr) ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SEMICOLON:
- if (jj_2_4(2)) {
+ if (jj_2_5(2)) {
jj_consume_token(SEMICOLON);
jj_consume_token(SEPARATOR);
jj_consume_token(EQ);
@@ -5427,582 +5440,548 @@ public class ARQParser extends ARQParser
finally { jj_save(3, xla); }
}
- private boolean jj_3R_118() {
- if (jj_scan_token(GROUP_CONCAT)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_117() {
- if (jj_scan_token(SAMPLE)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_116() {
- if (jj_scan_token(AVG)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_120() {
- if (jj_scan_token(LBRACE)) return true;
- return false;
- }
-
- private boolean jj_3R_115() {
- if (jj_scan_token(MAX)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_114() {
- if (jj_scan_token(MIN)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3_2() {
- if (jj_scan_token(DOT)) return true;
- if (jj_3R_41()) return true;
- return false;
- }
-
- private boolean jj_3R_113() {
- if (jj_scan_token(SUM)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_127() {
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_112() {
- if (jj_scan_token(COUNT)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_101() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_112()) {
- jj_scanpos = xsp;
- if (jj_3R_113()) {
- jj_scanpos = xsp;
- if (jj_3R_114()) {
- jj_scanpos = xsp;
- if (jj_3R_115()) {
- jj_scanpos = xsp;
- if (jj_3R_116()) {
- jj_scanpos = xsp;
- if (jj_3R_117()) {
- jj_scanpos = xsp;
- if (jj_3R_118()) return true;
- }
- }
- }
- }
- }
- }
- return false;
+ private boolean jj_2_5(int xla) {
+ jj_la = xla; jj_lastpos = jj_scanpos = token;
+ try { return !jj_3_5(); }
+ catch(LookaheadSuccess ls) { return true; }
+ finally { jj_save(4, xla); }
}
- private boolean jj_3R_109() {
+ private boolean jj_3R_111() {
if (jj_scan_token(NOT)) return true;
if (jj_scan_token(EXISTS)) return true;
return false;
}
- private boolean jj_3R_128() {
+ private boolean jj_3R_135() {
if (jj_scan_token(LBRACKET)) return true;
return false;
}
- private boolean jj_3R_108() {
+ private boolean jj_3R_110() {
if (jj_scan_token(EXISTS)) return true;
- if (jj_3R_120()) return true;
- return false;
- }
-
- private boolean jj_3R_124() {
- if (jj_3R_128()) return true;
+ if (jj_3R_124()) return true;
return false;
}
- private boolean jj_3_1() {
- if (jj_3R_40()) return true;
+ private boolean jj_3R_130() {
+ if (jj_3R_135()) return true;
return false;
}
- private boolean jj_3R_123() {
- if (jj_3R_127()) return true;
+ private boolean jj_3R_129() {
+ if (jj_3R_134()) return true;
return false;
}
- private boolean jj_3R_111() {
+ private boolean jj_3R_115() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_123()) {
+ if (jj_3R_129()) {
jj_scanpos = xsp;
- if (jj_3R_124()) return true;
+ if (jj_3R_130()) return true;
}
return false;
}
- private boolean jj_3R_106() {
+ private boolean jj_3R_108() {
if (jj_scan_token(REPLACE)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_105() {
+ private boolean jj_3R_107() {
if (jj_scan_token(SUBSTR)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_107() {
+ private boolean jj_3_1() {
+ if (jj_3R_40()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_109() {
if (jj_scan_token(REGEX)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_150() {
+ private boolean jj_3R_131() {
if (jj_scan_token(IRIref)) return true;
return false;
}
- private boolean jj_3R_98() {
- if (jj_3R_109()) return true;
+ private boolean jj_3R_99() {
+ if (jj_3R_111()) return true;
return false;
}
- private boolean jj_3R_97() {
- if (jj_3R_108()) return true;
+ private boolean jj_3R_98() {
+ if (jj_3R_110()) return true;
return false;
}
- private boolean jj_3R_149() {
+ private boolean jj_3R_156() {
if (jj_scan_token(ANON)) return true;
return false;
}
- private boolean jj_3R_96() {
- if (jj_3R_107()) return true;
+ private boolean jj_3R_97() {
+ if (jj_3R_109()) return true;
return false;
}
- private boolean jj_3R_95() {
+ private boolean jj_3R_96() {
if (jj_scan_token(IS_NUMERIC)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_148() {
+ private boolean jj_3R_155() {
if (jj_scan_token(BLANK_NODE_LABEL)) return true;
return false;
}
- private boolean jj_3R_139() {
+ private boolean jj_3R_146() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_148()) {
+ if (jj_3R_155()) {
jj_scanpos = xsp;
- if (jj_3R_149()) return true;
+ if (jj_3R_156()) return true;
}
return false;
}
- private boolean jj_3R_94() {
+ private boolean jj_3R_95() {
if (jj_scan_token(IS_LITERAL)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_93() {
- if (jj_scan_token(IS_BLANK)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ private boolean jj_3R_102() {
+ if (jj_3R_115()) return true;
return false;
}
- private boolean jj_3R_160() {
- if (jj_scan_token(PNAME_NS)) return true;
+ private boolean jj_3R_94() {
+ if (jj_scan_token(IS_BLANK)) return true;
+ if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_100() {
- if (jj_3R_111()) return true;
+ private boolean jj_3R_166() {
+ if (jj_scan_token(PNAME_NS)) return true;
return false;
}
- private boolean jj_3R_92() {
+ private boolean jj_3R_93() {
if (jj_scan_token(IS_URI)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_159() {
- if (jj_scan_token(PNAME_LN)) return true;
+ private boolean jj_3R_42() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_101()) {
+ jj_scanpos = xsp;
+ if (jj_3R_102()) return true;
+ }
return false;
}
- private boolean jj_3R_91() {
- if (jj_scan_token(IS_IRI)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ private boolean jj_3R_101() {
+ if (jj_3R_114()) return true;
return false;
}
- private boolean jj_3R_41() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_99()) {
- jj_scanpos = xsp;
- if (jj_3R_100()) return true;
- }
+ private boolean jj_3R_165() {
+ if (jj_scan_token(PNAME_LN)) return true;
return false;
}
- private boolean jj_3R_99() {
- if (jj_3R_110()) return true;
+ private boolean jj_3R_92() {
+ if (jj_scan_token(IS_IRI)) return true;
+ if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_151() {
+ private boolean jj_3R_157() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_159()) {
+ if (jj_3R_165()) {
jj_scanpos = xsp;
- if (jj_3R_160()) return true;
+ if (jj_3R_166()) return true;
}
return false;
}
- private boolean jj_3R_90() {
+ private boolean jj_3R_91() {
if (jj_scan_token(SAME_TERM)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_89() {
- if (jj_scan_token(STRDT)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ private boolean jj_3_4() {
+ if (jj_scan_token(DOT)) return true;
+ if (jj_3R_42()) return true;
return false;
}
- private boolean jj_3_3() {
- if (jj_scan_token(DOT)) return true;
- if (jj_3R_41()) return true;
+ private boolean jj_3R_90() {
+ if (jj_scan_token(STRDT)) return true;
+ if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_141() {
- if (jj_3R_151()) return true;
+ private boolean jj_3R_148() {
+ if (jj_3R_157()) return true;
return false;
}
- private boolean jj_3R_88() {
+ private boolean jj_3R_89() {
if (jj_scan_token(STRLANG)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_140() {
- if (jj_3R_150()) return true;
+ private boolean jj_3R_113() {
+ if (jj_3R_126()) return true;
return false;
}
- private boolean jj_3R_135() {
+ private boolean jj_3R_147() {
+ if (jj_3R_131()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_142() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_140()) {
+ if (jj_3R_147()) {
jj_scanpos = xsp;
- if (jj_3R_141()) return true;
+ if (jj_3R_148()) return true;
}
return false;
}
- private boolean jj_3R_87() {
+ private boolean jj_3R_88() {
if (jj_scan_token(IF)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_155() {
+ private boolean jj_3R_126() {
+ if (jj_scan_token(PREFIX)) return true;
+ if (jj_scan_token(PNAME_NS)) return true;
+ if (jj_3R_131()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_161() {
if (jj_scan_token(STRING_LITERAL_LONG2)) return true;
return false;
}
- private boolean jj_3R_154() {
+ private boolean jj_3R_160() {
if (jj_scan_token(STRING_LITERAL_LONG1)) return true;
return false;
}
- private boolean jj_3R_153() {
+ private boolean jj_3R_159() {
if (jj_scan_token(STRING_LITERAL2)) return true;
return false;
}
- private boolean jj_3R_152() {
+ private boolean jj_3R_158() {
if (jj_scan_token(STRING_LITERAL1)) return true;
return false;
}
- private boolean jj_3R_86() {
+ private boolean jj_3R_125() {
+ if (jj_scan_token(BASE)) return true;
+ if (jj_3R_131()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_87() {
if (jj_scan_token(CALL)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_142() {
+ private boolean jj_3R_149() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_152()) {
+ if (jj_3R_158()) {
jj_scanpos = xsp;
- if (jj_3R_153()) {
+ if (jj_3R_159()) {
jj_scanpos = xsp;
- if (jj_3R_154()) {
+ if (jj_3R_160()) {
jj_scanpos = xsp;
- if (jj_3R_155()) return true;
+ if (jj_3R_161()) return true;
}
}
}
return false;
}
- private boolean jj_3R_85() {
+ private boolean jj_3R_112() {
+ if (jj_3R_125()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_100() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_112()) {
+ jj_scanpos = xsp;
+ if (jj_3R_113()) return true;
+ }
+ return false;
+ }
+
+ private boolean jj_3R_41() {
+ Token xsp;
+ while (true) {
+ xsp = jj_scanpos;
+ if (jj_3R_100()) { jj_scanpos = xsp; break; }
+ }
+ return false;
+ }
+
+ private boolean jj_3R_86() {
if (jj_scan_token(COALESCE)) return true;
- if (jj_3R_104()) return true;
+ if (jj_3R_106()) return true;
return false;
}
- private boolean jj_3R_147() {
+ private boolean jj_3R_154() {
if (jj_scan_token(FALSE)) return true;
return false;
}
- private boolean jj_3R_84() {
+ private boolean jj_3R_85() {
if (jj_scan_token(VERSION)) return true;
if (jj_scan_token(NIL)) return true;
return false;
}
- private boolean jj_3R_83() {
+ private boolean jj_3R_84() {
if (jj_scan_token(SHA512)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_146() {
+ private boolean jj_3R_153() {
if (jj_scan_token(TRUE)) return true;
return false;
}
- private boolean jj_3R_138() {
+ private boolean jj_3R_145() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_146()) {
+ if (jj_3R_153()) {
jj_scanpos = xsp;
- if (jj_3R_147()) return true;
+ if (jj_3R_154()) return true;
}
return false;
}
- private boolean jj_3R_82() {
- if (jj_scan_token(SHA384)) return true;
+ private boolean jj_3R_123() {
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_81() {
- if (jj_scan_token(SHA256)) return true;
+ private boolean jj_3R_83() {
+ if (jj_scan_token(SHA384)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_119() {
+ private boolean jj_3R_82() {
+ if (jj_scan_token(SHA256)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_80() {
+ private boolean jj_3R_81() {
if (jj_scan_token(SHA1)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_79() {
+ private boolean jj_3R_80() {
if (jj_scan_token(MD5)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_169() {
+ private boolean jj_3R_175() {
if (jj_scan_token(DOUBLE_NEGATIVE)) return true;
return false;
}
- private boolean jj_3R_78() {
+ private boolean jj_3R_79() {
if (jj_scan_token(STRUUID)) return true;
if (jj_scan_token(NIL)) return true;
return false;
}
- private boolean jj_3R_168() {
+ private boolean jj_3R_174() {
if (jj_scan_token(DECIMAL_NEGATIVE)) return true;
return false;
}
- private boolean jj_3R_77() {
+ private boolean jj_3R_106() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_scan_token(165)) {
+ jj_scanpos = xsp;
+ if (jj_3R_123()) return true;
+ }
+ return false;
+ }
+
+ private boolean jj_3R_78() {
if (jj_scan_token(UUID)) return true;
if (jj_scan_token(NIL)) return true;
return false;
}
- private boolean jj_3R_167() {
+ private boolean jj_3R_173() {
if (jj_scan_token(INTEGER_NEGATIVE)) return true;
return false;
}
- private boolean jj_3R_158() {
+ private boolean jj_3R_164() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_167()) {
+ if (jj_3R_173()) {
jj_scanpos = xsp;
- if (jj_3R_168()) {
+ if (jj_3R_174()) {
jj_scanpos = xsp;
- if (jj_3R_169()) return true;
+ if (jj_3R_175()) return true;
}
}
return false;
}
- private boolean jj_3R_76() {
+ private boolean jj_3R_77() {
if (jj_scan_token(NOW)) return true;
if (jj_scan_token(NIL)) return true;
return false;
}
- private boolean jj_3R_134() {
+ private boolean jj_3R_141() {
if (jj_scan_token(NIL)) return true;
return false;
}
- private boolean jj_3R_104() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_scan_token(165)) {
- jj_scanpos = xsp;
- if (jj_3R_119()) return true;
- }
- return false;
- }
-
- private boolean jj_3R_75() {
+ private boolean jj_3R_76() {
if (jj_scan_token(TZ)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_74() {
+ private boolean jj_3R_75() {
if (jj_scan_token(TIMEZONE)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_133() {
- if (jj_3R_139()) return true;
+ private boolean jj_3R_140() {
+ if (jj_3R_146()) return true;
return false;
}
- private boolean jj_3R_73() {
+ private boolean jj_3R_74() {
if (jj_scan_token(SECONDS)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_166() {
+ private boolean jj_3R_172() {
if (jj_scan_token(DOUBLE_POSITIVE)) return true;
return false;
}
- private boolean jj_3R_132() {
- if (jj_3R_138()) return true;
+ private boolean jj_3R_139() {
+ if (jj_3R_145()) return true;
return false;
}
- private boolean jj_3R_72() {
+ private boolean jj_3R_73() {
if (jj_scan_token(MINUTES)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_165() {
+ private boolean jj_3R_171() {
if (jj_scan_token(DECIMAL_POSITIVE)) return true;
return false;
}
- private boolean jj_3R_131() {
- if (jj_3R_137()) return true;
+ private boolean jj_3R_138() {
+ if (jj_3R_144()) return true;
return false;
}
- private boolean jj_3R_71() {
+ private boolean jj_3R_72() {
if (jj_scan_token(HOURS)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_164() {
+ private boolean jj_3R_170() {
if (jj_scan_token(INTEGER_POSITIVE)) return true;
return false;
}
- private boolean jj_3R_157() {
+ private boolean jj_3R_163() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_164()) {
+ if (jj_3R_170()) {
jj_scanpos = xsp;
- if (jj_3R_165()) {
+ if (jj_3R_171()) {
jj_scanpos = xsp;
- if (jj_3R_166()) return true;
+ if (jj_3R_172()) return true;
}
}
return false;
}
- private boolean jj_3R_130() {
- if (jj_3R_136()) return true;
+ private boolean jj_3R_137() {
+ if (jj_3R_143()) return true;
return false;
}
- private boolean jj_3R_70() {
+ private boolean jj_3R_71() {
if (jj_scan_token(DAY)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_129() {
- if (jj_3R_135()) return true;
+ private boolean jj_3R_136() {
+ if (jj_3R_142()) return true;
return false;
}
- private boolean jj_3R_126() {
+ private boolean jj_3R_133() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_129()) {
+ if (jj_3R_136()) {
jj_scanpos = xsp;
- if (jj_3R_130()) {
+ if (jj_3R_137()) {
jj_scanpos = xsp;
- if (jj_3R_131()) {
+ if (jj_3R_138()) {
jj_scanpos = xsp;
- if (jj_3R_132()) {
+ if (jj_3R_139()) {
jj_scanpos = xsp;
- if (jj_3R_133()) {
+ if (jj_3R_140()) {
jj_scanpos = xsp;
- if (jj_3R_134()) return true;
+ if (jj_3R_141()) return true;
}
}
}
@@ -6011,29 +5990,29 @@ public class ARQParser extends ARQParser
return false;
}
- private boolean jj_3R_69() {
+ private boolean jj_3R_70() {
if (jj_scan_token(MONTH)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_68() {
+ private boolean jj_3R_69() {
if (jj_scan_token(YEAR)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_122() {
- if (jj_3R_126()) return true;
+ private boolean jj_3R_128() {
+ if (jj_3R_133()) return true;
return false;
}
- private boolean jj_3R_163() {
+ private boolean jj_3R_169() {
if (jj_scan_token(DOUBLE)) return true;
return false;
}
- private boolean jj_3R_125() {
+ private boolean jj_3R_132() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(13)) {
@@ -6043,250 +6022,243 @@ public class ARQParser extends ARQParser
return false;
}
- private boolean jj_3R_67() {
+ private boolean jj_3R_68() {
if (jj_scan_token(STRAFTER)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_162() {
+ private boolean jj_3R_168() {
if (jj_scan_token(DECIMAL)) return true;
return false;
}
- private boolean jj_3R_161() {
+ private boolean jj_3R_167() {
if (jj_scan_token(INTEGER)) return true;
return false;
}
- private boolean jj_3R_156() {
+ private boolean jj_3R_162() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_161()) {
+ if (jj_3R_167()) {
jj_scanpos = xsp;
- if (jj_3R_162()) {
+ if (jj_3R_168()) {
jj_scanpos = xsp;
- if (jj_3R_163()) return true;
+ if (jj_3R_169()) return true;
}
}
return false;
}
- private boolean jj_3R_66() {
+ private boolean jj_3R_67() {
if (jj_scan_token(STRBEFORE)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_65() {
+ private boolean jj_3R_66() {
if (jj_scan_token(STRENDS)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_145() {
- if (jj_3R_158()) return true;
+ private boolean jj_3R_152() {
+ if (jj_3R_164()) return true;
return false;
}
- private boolean jj_3R_64() {
+ private boolean jj_3R_65() {
if (jj_scan_token(STRSTARTS)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_144() {
- if (jj_3R_157()) return true;
+ private boolean jj_3R_151() {
+ if (jj_3R_163()) return true;
return false;
}
- private boolean jj_3R_143() {
- if (jj_3R_156()) return true;
+ private boolean jj_3R_150() {
+ if (jj_3R_162()) return true;
return false;
}
- private boolean jj_3R_63() {
+ private boolean jj_3R_64() {
if (jj_scan_token(CONTAINS)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_62() {
+ private boolean jj_3R_63() {
if (jj_scan_token(ENCODE_FOR_URI)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_61() {
+ private boolean jj_3R_62() {
if (jj_scan_token(LCASE)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_137() {
+ private boolean jj_3R_144() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_143()) {
+ if (jj_3R_150()) {
jj_scanpos = xsp;
- if (jj_3R_144()) {
+ if (jj_3R_151()) {
jj_scanpos = xsp;
- if (jj_3R_145()) return true;
+ if (jj_3R_152()) return true;
}
}
return false;
}
- private boolean jj_3R_121() {
- if (jj_3R_125()) return true;
+ private boolean jj_3R_127() {
+ if (jj_3R_132()) return true;
return false;
}
- private boolean jj_3R_60() {
+ private boolean jj_3R_61() {
if (jj_scan_token(UCASE)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_59() {
- if (jj_3R_106()) return true;
+ private boolean jj_3R_60() {
+ if (jj_3R_108()) return true;
return false;
}
- private boolean jj_3R_110() {
+ private boolean jj_3R_114() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_121()) {
+ if (jj_3R_127()) {
jj_scanpos = xsp;
- if (jj_3R_122()) return true;
+ if (jj_3R_128()) return true;
}
return false;
}
- private boolean jj_3R_58() {
+ private boolean jj_3R_59() {
if (jj_scan_token(STRLEN)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_57() {
- if (jj_3R_105()) return true;
+ private boolean jj_3R_58() {
+ if (jj_3R_107()) return true;
return false;
}
- private boolean jj_3R_56() {
+ private boolean jj_3R_57() {
if (jj_scan_token(CONCAT)) return true;
- if (jj_3R_104()) return true;
+ if (jj_3R_106()) return true;
return false;
}
- private boolean jj_3R_55() {
+ private boolean jj_3R_56() {
if (jj_scan_token(ROUND)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_54() {
+ private boolean jj_3R_55() {
if (jj_scan_token(FLOOR)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_53() {
+ private boolean jj_3R_54() {
if (jj_scan_token(CEIL)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_52() {
+ private boolean jj_3R_53() {
if (jj_scan_token(ABS)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_51() {
+ private boolean jj_3R_52() {
if (jj_scan_token(RAND)) return true;
if (jj_scan_token(NIL)) return true;
return false;
}
- private boolean jj_3R_103() {
+ private boolean jj_3R_105() {
if (jj_scan_token(NIL)) return true;
return false;
}
- private boolean jj_3R_136() {
- if (jj_3R_142()) return true;
+ private boolean jj_3R_143() {
+ if (jj_3R_149()) return true;
return false;
}
- private boolean jj_3R_102() {
+ private boolean jj_3R_104() {
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_50() {
+ private boolean jj_3R_51() {
if (jj_scan_token(BNODE)) return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_102()) {
+ if (jj_3R_104()) {
jj_scanpos = xsp;
- if (jj_3R_103()) return true;
+ if (jj_3R_105()) return true;
}
return false;
}
- private boolean jj_3R_49() {
+ private boolean jj_3R_50() {
if (jj_scan_token(URI)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_48() {
+ private boolean jj_3R_49() {
if (jj_scan_token(IRI)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_47() {
+ private boolean jj_3R_48() {
if (jj_scan_token(BOUND)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_46() {
+ private boolean jj_3R_47() {
if (jj_scan_token(DTYPE)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_45() {
+ private boolean jj_3R_46() {
if (jj_scan_token(LANGMATCHES)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_44() {
+ private boolean jj_3R_45() {
if (jj_scan_token(LANG)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_43() {
+ private boolean jj_3R_44() {
if (jj_scan_token(STR)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_42() {
- if (jj_3R_101()) return true;
- return false;
- }
-
private boolean jj_3R_40() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_42()) {
- jj_scanpos = xsp;
if (jj_3R_43()) {
jj_scanpos = xsp;
if (jj_3R_44()) {
@@ -6397,7 +6369,9 @@ public class ARQParser extends ARQParser
jj_scanpos = xsp;
if (jj_3R_97()) {
jj_scanpos = xsp;
- if (jj_3R_98()) return true;
+ if (jj_3R_98()) {
+ jj_scanpos = xsp;
+ if (jj_3R_99()) return true;
}
}
}
@@ -6457,12 +6431,148 @@ public class ARQParser extends ARQParser
return false;
}
- private boolean jj_3_4() {
+ private boolean jj_3R_43() {
+ if (jj_3R_103()) return true;
+ return false;
+ }
+
+ private boolean jj_3_5() {
if (jj_scan_token(SEMICOLON)) return true;
if (jj_scan_token(SEPARATOR)) return true;
return false;
}
+ private boolean jj_3R_122() {
+ if (jj_scan_token(GROUP_CONCAT)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_121() {
+ if (jj_scan_token(SAMPLE)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_120() {
+ if (jj_scan_token(AVG)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_119() {
+ if (jj_scan_token(MAX)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_118() {
+ if (jj_scan_token(MIN)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_124() {
+ if (jj_scan_token(LBRACE)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_117() {
+ if (jj_scan_token(SUM)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_134() {
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3_3() {
+ if (jj_scan_token(DOT)) return true;
+ if (jj_3R_42()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_116() {
+ if (jj_scan_token(COUNT)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3_2() {
+ if (jj_scan_token(SEMICOLON)) return true;
+ if (jj_3R_41()) return true;
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_scan_token(130)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(131)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(138)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(133)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(134)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(135)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(132)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(143)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(126)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(125)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(144)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(127)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(128)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(129)) return true;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ return false;
+ }
+
+ private boolean jj_3R_103() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_116()) {
+ jj_scanpos = xsp;
+ if (jj_3R_117()) {
+ jj_scanpos = xsp;
+ if (jj_3R_118()) {
+ jj_scanpos = xsp;
+ if (jj_3R_119()) {
+ jj_scanpos = xsp;
+ if (jj_3R_120()) {
+ jj_scanpos = xsp;
+ if (jj_3R_121()) {
+ jj_scanpos = xsp;
+ if (jj_3R_122()) return true;
+ }
+ }
+ }
+ }
+ }
+ }
+ return false;
+ }
+
/** Generated Token Manager. */
public ARQParserTokenManager token_source;
JavaCharStream jj_input_stream;
@@ -6512,7 +6622,7 @@ public class ARQParser extends ARQParser
private static void jj_la1_init_6() {
jj_la1_6 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x2,0x0,0x2,0x2,0x0,0x1,0x2,0x2,0x10,0x2,0x0,0x0,0x0,0x10,0x0,0x1,0x2,0x2,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
}
- final private JJCalls[] jj_2_rtns = new JJCalls[4];
+ final private JJCalls[] jj_2_rtns = new JJCalls[5];
private boolean jj_rescan = false;
private int jj_gc = 0;
@@ -6755,7 +6865,7 @@ public class ARQParser extends ARQParser
private void jj_rescan_token() {
jj_rescan = true;
- for (int i = 0; i < 4; i++) {
+ for (int i = 0; i < 5; i++) {
try {
JJCalls p = jj_2_rtns[i];
do {
@@ -6766,6 +6876,7 @@ public class ARQParser extends ARQParser
case 1: jj_3_2(); break;
case 2: jj_3_3(); break;
case 3: jj_3_4(); break;
+ case 4: jj_3_5(); break;
}
}
p = p.next;
Modified: jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_10/SPARQLParser10.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_10/SPARQLParser10.java?rev=1415420&r1=1415419&r2=1415420&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_10/SPARQLParser10.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_10/SPARQLParser10.java Thu Nov 29 22:43:42 2012
@@ -1076,9 +1076,8 @@ public class SPARQLParser10 extends SPAR
final public void Object(Node s, Node p, Path path, TripleCollector acc) throws ParseException {
Node o ;
- int mark = acc.mark() ;
o = GraphNode(acc);
- insert(acc, mark, s, p, path, o) ;
+ insert(acc, s, p, path, o) ;
}
final public Node Verb() throws ParseException {
@@ -1142,7 +1141,7 @@ public class SPARQLParser10 extends SPAR
// ------- RDF collections
final public Node Collection(TripleCollector acc) throws ParseException {
- Node listHead = nRDFnil ; Node lastCell = null ; int mark ; Node n ; Token t ;
+ Node listHead = nRDFnil ; Node lastCell = null ; Node n ; Token t ;
t = jj_consume_token(LPAREN);
label_15:
while (true) {
@@ -1151,9 +1150,8 @@ public class SPARQLParser10 extends SPAR
listHead = cell ;
if ( lastCell != null )
insert(acc, lastCell, nRDFrest, cell) ;
- mark = acc.mark() ;
n = GraphNode(acc);
- insert(acc, mark, cell, nRDFfirst, n) ;
+ insert(acc, cell, nRDFfirst, n) ;
lastCell = cell ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IRIref:
Modified: jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11.java?rev=1415420&r1=1415419&r2=1415420&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11.java Thu Nov 29 22:43:42 2012
@@ -1117,7 +1117,7 @@ public class SPARQLParser11 extends SPAR
}
final public void Update1() throws ParseException {
- Update up ;
+ Update up = null ;
startUpdateOperation() ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LOAD:
@@ -1141,12 +1141,6 @@ public class SPARQLParser11 extends SPAR
case CREATE:
up = Create();
break;
- case INSERT_DATA:
- up = InsertData();
- break;
- case DELETE_DATA:
- up = DeleteData();
- break;
case DELETE_WHERE:
up = DeleteWhere();
break;
@@ -1155,12 +1149,18 @@ public class SPARQLParser11 extends SPAR
case WITH:
up = Modify();
break;
+ case INSERT_DATA:
+ InsertData();
+ break;
+ case DELETE_DATA:
+ DeleteData();
+ break;
default:
jj_la1[38] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- emitUpdate(up) ;
+ if (null != up) emitUpdate(up) ;
finishUpdateOperation() ;
}
@@ -1299,38 +1299,39 @@ public class SPARQLParser11 extends SPAR
}
// #ifdef ARQ
-// void Meta() : { QuadDataAcc qd = new QuadDataAcc() ; }
+// void Meta() : { QuadDataAccSink qd = new QuadDataAccSink() ; }
// {
// <META>
// QuadData(qd)
// }
// #endif
- final public Update InsertData() throws ParseException {
- QuadDataAcc qd = new QuadDataAcc() ; Token t ;
+ final public void InsertData() throws ParseException {
+ QuadDataAccSink qd = getInsertDataSink() ; Token t ;
t = jj_consume_token(INSERT_DATA);
- startDataInsert(qd, t.beginLine, t.beginColumn) ;
+ int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
+ startDataInsert(qd, beginLine, beginColumn) ;
QuadData(qd);
- finishDataInsert(qd, t.beginLine, t.beginColumn) ;
- {if (true) return new UpdateDataInsert(qd) ;}
- throw new Error("Missing return statement in function");
+ finishDataInsert(qd, beginLine, beginColumn) ;
+ qd.close() ;
}
- final public Update DeleteData() throws ParseException {
- QuadDataAcc qd = new QuadDataAcc() ; Token t ;
+ final public void DeleteData() throws ParseException {
+ QuadDataAccSink qd = getDeleteDataSink() ; Token t ;
t = jj_consume_token(DELETE_DATA);
- startDataDelete(qd, t.beginLine, t.beginColumn) ;
+ int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
+ startDataDelete(qd, beginLine, beginColumn) ;
QuadData(qd);
- finishDataDelete(qd, t.beginLine, t.beginColumn) ;
- {if (true) return new UpdateDataDelete(qd) ;}
- throw new Error("Missing return statement in function");
+ finishDataDelete(qd, beginLine, beginColumn) ;
+ qd.close() ;
}
final public Update DeleteWhere() throws ParseException {
QuadAcc qp = new QuadAcc() ; Token t ;
t = jj_consume_token(DELETE_WHERE);
- startDeleteTemplate(qp, t.beginLine, t.beginColumn) ;
+ int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
+ startDeleteTemplate(qp, beginLine, beginColumn) ;
QuadPattern(qp);
- finishDeleteTemplate(qp, t.beginLine, t.beginColumn) ;
+ finishDeleteTemplate(qp, beginLine, beginColumn) ;
{if (true) return new UpdateDeleteWhere(qp) ;}
throw new Error("Missing return statement in function");
}
@@ -1394,18 +1395,20 @@ public class SPARQLParser11 extends SPAR
final public void DeleteClause(UpdateModify up) throws ParseException {
QuadAcc qp = up.getDeleteAcc() ; Token t ;
t = jj_consume_token(DELETE);
- startDeleteTemplate(qp, t.beginLine, t.beginColumn) ;
+ int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
+ startDeleteTemplate(qp, beginLine, beginColumn) ;
QuadPattern(qp);
- finishDeleteTemplate(qp, t.beginLine, t.beginColumn) ;
+ finishDeleteTemplate(qp, beginLine, beginColumn) ;
up.setHasDeleteClause(true) ;
}
final public void InsertClause(UpdateModify up) throws ParseException {
QuadAcc qp = up.getInsertAcc() ; Token t ;
t = jj_consume_token(INSERT);
- startInsertTemplate(qp, t.beginLine, t.beginColumn) ;
+ int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
+ startInsertTemplate(qp, beginLine, beginColumn) ;
QuadPattern(qp);
- finishInsertTemplate(qp, t.beginLine, t.beginColumn) ;
+ finishInsertTemplate(qp, beginLine, beginColumn) ;
up.setHasInsertClause(true) ;
}
@@ -1503,13 +1506,13 @@ public class SPARQLParser11 extends SPAR
}
//Ground data : As QuadPattern but don't allow variables.
- final public void QuadData(QuadDataAcc acc) throws ParseException {
+ final public void QuadData(QuadDataAccSink acc) throws ParseException {
jj_consume_token(LBRACE);
Quads(acc);
jj_consume_token(RBRACE);
}
- final public void Quads(QuadAcc acc) throws ParseException {
+ final public void Quads(QuadAccSink acc) throws ParseException {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IRIref:
case PNAME_NS:
@@ -1596,8 +1599,8 @@ public class SPARQLParser11 extends SPAR
}
}
- final public void QuadsNotTriples(QuadAcc acc) throws ParseException {
- Node gn ; Node prev = acc.getGraph() ;
+ final public void QuadsNotTriples(QuadAccSink acc) throws ParseException {
+ Node gn ; Node prev = acc.getGraph() ;
jj_consume_token(GRAPH);
gn = VarOrIri();
setAccGraph(acc, gn) ;
@@ -1686,11 +1689,12 @@ public class SPARQLParser11 extends SPAR
final public Element GroupGraphPattern() throws ParseException {
Element el = null ; Token t ;
t = jj_consume_token(LBRACE);
+ int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SELECT:
- startSubSelect(t.beginLine, t.beginColumn) ;
+ startSubSelect(beginLine, beginColumn) ;
SubSelect();
- Query q = endSubSelect(t.beginLine, t.beginColumn) ;
+ Query q = endSubSelect(beginLine, beginColumn) ;
el = new ElementSubQuery(q) ;
break;
default:
@@ -1949,10 +1953,11 @@ public class SPARQLParser11 extends SPAR
final public Element InlineData() throws ParseException {
ElementData el ; Token t ;
t = jj_consume_token(VALUES);
+ int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
el = new ElementData() ;
- startInlineData(el.getVars(), el.getRows(), t.beginLine, t.beginColumn) ;
+ startInlineData(el.getVars(), el.getRows(), beginLine, beginColumn) ;
DataBlock();
- finishInlineData(t.beginLine, t.beginColumn) ;
+ finishInlineData(beginLine, beginColumn) ;
{if (true) return el ;}
throw new Error("Missing return statement in function");
}
@@ -2016,13 +2021,13 @@ public class SPARQLParser11 extends SPAR
}
final public void InlineDataFull() throws ParseException {
- Var v ; Node n ; Token t ;
+ Var v ; Node n ; Token t ; int beginLine; int beginColumn;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case NIL:
jj_consume_token(NIL);
break;
case LPAREN:
- t = jj_consume_token(LPAREN);
+ jj_consume_token(LPAREN);
label_16:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -2037,14 +2042,14 @@ public class SPARQLParser11 extends SPAR
v = Var();
emitDataBlockVariable(v) ;
}
- t = jj_consume_token(RPAREN);
+ jj_consume_token(RPAREN);
break;
default:
jj_la1[74] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- t = jj_consume_token(LBRACE);
+ jj_consume_token(LBRACE);
label_17:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -2059,7 +2064,8 @@ public class SPARQLParser11 extends SPAR
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LPAREN:
t = jj_consume_token(LPAREN);
- startDataBlockValueRow(t.beginLine, t.beginColumn) ;
+ beginLine = t.beginLine; beginColumn = t.beginColumn; t = null;
+ startDataBlockValueRow(beginLine, beginColumn) ;
label_18:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -2089,15 +2095,17 @@ public class SPARQLParser11 extends SPAR
break label_18;
}
n = DataBlockValue();
- emitDataBlockValue(n, t.beginLine, t.beginColumn) ;
+ emitDataBlockValue(n, beginLine, beginColumn) ;
}
t = jj_consume_token(RPAREN);
- finishDataBlockValueRow(t.beginLine, t.beginColumn) ;
+ beginLine = t.beginLine; beginColumn = t.beginColumn; t = null;
+ finishDataBlockValueRow(beginLine, beginColumn) ;
break;
case NIL:
t = jj_consume_token(NIL);
- startDataBlockValueRow(t.beginLine, t.beginColumn) ;
- finishDataBlockValueRow(t.beginLine, t.beginColumn) ;
+ beginLine = t.beginLine; beginColumn = t.beginColumn; t = null;
+ startDataBlockValueRow(beginLine, beginColumn) ;
+ finishDataBlockValueRow(beginLine, beginColumn) ;
break;
default:
jj_la1[77] = jj_gen;
@@ -2105,7 +2113,7 @@ public class SPARQLParser11 extends SPAR
throw new ParseException();
}
}
- t = jj_consume_token(RBRACE);
+ jj_consume_token(RBRACE);
}
final public Node DataBlockValue() throws ParseException {
@@ -2309,9 +2317,10 @@ public class SPARQLParser11 extends SPAR
case DISTINCT:
t = jj_consume_token(DISTINCT);
distinct = true ;
+ int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
if ( ! allowAggregatesInExpressions )
throwParseException("Aggregate expression not legal at this point",
- t.beginLine, t.beginColumn) ;
+ beginLine, beginColumn) ;
break;
default:
jj_la1[81] = jj_gen;
@@ -2602,9 +2611,8 @@ public class SPARQLParser11 extends SPAR
final public void Object(Node s, Node p, Path path, TripleCollector acc) throws ParseException {
Node o ;
- int mark = acc.mark() ;
o = GraphNode(acc);
- insert(acc, mark, s, p, path, o) ;
+ insert(acc, s, p, path, o) ;
}
// -------- BGPs with paths.
@@ -2778,9 +2786,8 @@ public class SPARQLParser11 extends SPAR
final public void ObjectPath(Node s, Node p, Path path, TripleCollector acc) throws ParseException {
Node o ;
- int mark = acc.mark() ;
o = GraphNodePath(acc);
- insert(acc, mark, s, p, path, o) ;
+ insert(acc, s, p, path, o) ;
}
// End paths stuff.
@@ -3095,18 +3102,18 @@ public class SPARQLParser11 extends SPAR
// ------- RDF collections
final public Node Collection(TripleCollector acc) throws ParseException {
- Node listHead = nRDFnil ; Node lastCell = null ; int mark ; Node n ; Token t ;
+ Node listHead = nRDFnil ; Node lastCell = null ; Node n ; Token t ;
t = jj_consume_token(LPAREN);
+ int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
label_29:
while (true) {
- Node cell = createListNode( t.beginLine, t.beginColumn) ;
+ Node cell = createListNode( beginLine, beginColumn) ;
if ( listHead == nRDFnil )
listHead = cell ;
if ( lastCell != null )
insert(acc, lastCell, nRDFrest, cell) ;
- mark = acc.mark() ;
n = GraphNode(acc);
- insert(acc, mark, cell, nRDFfirst, n) ;
+ insert(acc, cell, nRDFfirst, n) ;
lastCell = cell ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IRIref:
@@ -3149,18 +3156,18 @@ public class SPARQLParser11 extends SPAR
}
final public Node CollectionPath(TripleCollector acc) throws ParseException {
- Node listHead = nRDFnil ; Node lastCell = null ; int mark ; Node n ; Token t ;
+ Node listHead = nRDFnil ; Node lastCell = null ; Node n ; Token t ;
t = jj_consume_token(LPAREN);
+ int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
label_30:
while (true) {
- Node cell = createListNode( t.beginLine, t.beginColumn) ;
+ Node cell = createListNode( beginLine, beginColumn) ;
if ( listHead == nRDFnil )
listHead = cell ;
if ( lastCell != null )
insert(acc, lastCell, nRDFrest, cell) ;
- mark = acc.mark() ;
n = GraphNodePath(acc);
- insert(acc, mark, cell, nRDFfirst, n) ;
+ insert(acc, cell, nRDFfirst, n) ;
lastCell = cell ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IRIref:
@@ -3922,7 +3929,7 @@ public class SPARQLParser11 extends SPAR
final public Expr BuiltInCall() throws ParseException {
Expr expr ; Expr expr1 = null ; Expr expr2 = null ;
- Node gn ; Token t ; ExprList a ;
+ Node gn ; ExprList a ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COUNT:
case MIN:
@@ -4273,14 +4280,14 @@ public class SPARQLParser11 extends SPAR
{if (true) return new E_SameTerm(expr1, expr2) ;}
break;
case IS_IRI:
- t = jj_consume_token(IS_IRI);
+ jj_consume_token(IS_IRI);
jj_consume_token(LPAREN);
expr = Expression();
jj_consume_token(RPAREN);
{if (true) return new E_IsIRI(expr) ;}
break;
case IS_URI:
- t = jj_consume_token(IS_URI);
+ jj_consume_token(IS_URI);
jj_consume_token(LPAREN);
expr = Expression();
jj_consume_token(RPAREN);
Added: jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/AbstractUpdateSink.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/AbstractUpdateSink.java?rev=1415420&view=auto
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/AbstractUpdateSink.java (added)
+++ jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/AbstractUpdateSink.java Thu Nov 29 22:43:42 2012
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hp.hpl.jena.sparql.modify;
+
+import com.hp.hpl.jena.graph.Node;
+import com.hp.hpl.jena.sparql.modify.request.UpdateWithUsing;
+import com.hp.hpl.jena.update.Update ;
+import com.hp.hpl.jena.update.UpdateException ;
+
+public abstract class AbstractUpdateSink implements UpdateSink
+{
+ protected final UsingList usingList;
+
+ public AbstractUpdateSink(UsingList usingList)
+ {
+ this.usingList = usingList;
+ }
+
+ public abstract void doSend(Update update);
+
+ @Override
+ public final void send(Update update)
+ {
+ // ---- check USING/USING NAMED/WITH not used.
+ // ---- update request to have USING/USING NAMED
+ if ( null != usingList && usingList.usingIsPresent() )
+ {
+ if ( update instanceof UpdateWithUsing )
+ {
+ UpdateWithUsing upu = (UpdateWithUsing)update ;
+ if ( upu.getUsing().size() != 0 || upu.getUsingNamed().size() != 0 || upu.getWithIRI() != null )
+ throw new UpdateException("SPARQL Update: Protocol using-graph-uri or using-named-graph-uri present where update request has USING, USING NAMED or WITH") ;
+ for ( Node node : usingList.getUsing() )
+ upu.addUsing(node) ;
+ for ( Node node : usingList.getUsingNamed() )
+ upu.addUsingNamed(node) ;
+ }
+ }
+
+ doSend(update);
+ }
+
+}
\ No newline at end of file
Modified: jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineBase.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineBase.java?rev=1415420&r1=1415419&r2=1415420&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineBase.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineBase.java Thu Nov 29 22:43:42 2012
@@ -30,12 +30,13 @@ import com.hp.hpl.jena.sparql.util.NodeF
import com.hp.hpl.jena.update.GraphStore ;
import com.hp.hpl.jena.update.UpdateRequest ;
-public abstract class UpdateEngineBase implements UpdateEngine
+public abstract class UpdateEngineBase implements UpdateEngine, UpdateEngineStreaming
{
protected final GraphStore graphStore ;
protected final Context context ;
protected final Binding startBinding ;
- protected UpdateRequest request ;
+ protected final UpdateRequest request ;
+ protected final UsingList usingList ;
public UpdateEngineBase(GraphStore graphStore,
UpdateRequest request,
@@ -53,10 +54,26 @@ public abstract class UpdateEngineBase i
}
this.startBinding = input ;
this.context.put(ARQConstants.sysCurrentUpdateRequest, request) ;
+ this.usingList = null;
}
- @Override
- public abstract void execute() ;
+ public UpdateEngineBase(GraphStore graphStore,
+ UsingList usingList,
+ Binding input,
+ Context context)
+ {
+ this.graphStore = graphStore ;
+ this.usingList = usingList ;
+ this.context = setupContext(context, graphStore) ;
+
+ if ( input == null )
+ {
+ Log.warn(this, "Null initial input") ;
+ input = BindingRoot.create() ;
+ }
+ this.startBinding = input ;
+ this.request = null;
+ }
// Put any
private static Context setupContext(Context context, DatasetGraph dataset)
Modified: jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineFactory.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineFactory.java?rev=1415420&r1=1415419&r2=1415420&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineFactory.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineFactory.java Thu Nov 29 22:43:42 2012
@@ -23,7 +23,11 @@ import com.hp.hpl.jena.sparql.util.Conte
import com.hp.hpl.jena.update.GraphStore ;
import com.hp.hpl.jena.update.UpdateRequest ;
-/** Interface for factories that accept and process SPARQL update requests */
+/**
+ * Interface for factories that accept and process SPARQL update requests.
+ * <p/>
+ * The streaming methods may be the only methods called when inside of a streaming-capable container, such as Fuseki. (TODO is this fair to implementers?)
+ */
public interface UpdateEngineFactory
{
/** Answer whether this factory can produce an UpdateEngine for the UpdateRequest and GraphStore */
@@ -31,4 +35,10 @@ public interface UpdateEngineFactory
/** Create the request - having returned true to accept, should not fail */
public UpdateEngine create(UpdateRequest request, GraphStore graphStore, Binding inputBinding, Context context) ;
+
+ /** Answer whether this factory can produce an UpdateEngineStreaming for the specified GraphStore */
+ public boolean acceptStreaming(GraphStore graphStore, Context context) ;
+
+ /** Create the streaming engine - having returned true to accept, should not fail */
+ public UpdateEngineStreaming createStreaming(UsingList usingList, GraphStore graphStore, Binding inputBinding, Context context);
}
Modified: jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineMain.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineMain.java?rev=1415420&r1=1415419&r2=1415420&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineMain.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineMain.java Thu Nov 29 22:43:42 2012
@@ -30,6 +30,9 @@ import com.hp.hpl.jena.update.UpdateRequ
* <p>
* Developers who only want to change/extend the processing of individual updates can easily
* </p>
+ * Important note for implementers extending this class: Your GraphStore implementation *must* be able to
+ * accept <code>null</code> as a parameter to {@link GraphStore#startRequest(UpdateRequest)} and
+ * {@link GraphStore#finishRequest(UpdateRequest)} (TODO: Revisit this decision)
*/
public class UpdateEngineMain extends UpdateEngineBase
{
@@ -44,6 +47,17 @@ public class UpdateEngineMain extends Up
{
super(graphStore, request, initialBinding, context) ;
}
+
+ /**
+ * Creates a new Update Engine
+ * @param graphStore Graph Store the updates operate over
+ * @param usingList Externally supplied using
+ * @param context Execution Context
+ */
+ public UpdateEngineMain(GraphStore graphStore, UsingList usingList, Binding initialBinding, Context context)
+ {
+ super(graphStore, usingList, initialBinding, context) ;
+ }
/**
* Executes the updates by creating a {@link UpdateVisitor} using the {@link #prepareWorker()} method and then using that to visit each update command in the Update Request
@@ -59,6 +73,24 @@ public class UpdateEngineMain extends Up
graphStore.finishRequest(request) ;
}
+ @Override
+ public void startRequest()
+ {
+ graphStore.startRequest(null); // TODO Must accept null as an argument here
+ }
+
+ @Override
+ public void finishRequest()
+ {
+ graphStore.finishRequest(null); // TODO Must accept null as an argument here
+ }
+
+ @Override
+ public UpdateSink getUpdateSink()
+ {
+ return new UpdateVisitorSink(this.prepareWorker(), usingList);
+ }
+
/**
* Creates the {@link UpdateVisitor} which will do the work of applying the updates
* @return The update visitor to be used to apply the updates
@@ -80,6 +112,18 @@ public class UpdateEngineMain extends Up
{
return new UpdateEngineMain(graphStore, request, inputBinding, context) ;
}
+
+ @Override
+ public boolean acceptStreaming(GraphStore graphStore, Context context)
+ {
+ return true ;
+ }
+
+ @Override
+ public UpdateEngineStreaming createStreaming(UsingList usingList, GraphStore graphStore, Binding initialBinding, Context context)
+ {
+ return new UpdateEngineMain(graphStore, usingList, initialBinding, context);
+ }
} ;
public static UpdateEngineFactory getFactory() { return factory ; }
Modified: jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineRegistry.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineRegistry.java?rev=1415420&r1=1415419&r2=1415420&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineRegistry.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineRegistry.java Thu Nov 29 22:43:42 2012
@@ -53,17 +53,23 @@ public class UpdateEngineRegistry
* @param graphStore The graph store
* @return A QueryExecutionFactory or null if none accept the request
*/
-
public static UpdateEngineFactory findFactory(UpdateRequest request, GraphStore graphStore, Context context)
{ return get().find(request, graphStore, context) ; }
+ /** Locate a suitable factory for this dataset from the default registry
+ *
+ * @param graphStore The graph store
+ * @return A QueryExecutionFactory or null if none accept the request
+ */
+ public static UpdateEngineFactory findStreamingFactory(GraphStore graphStore, Context context)
+ { return get().findStreaming(graphStore, context) ; }
+
/** Locate a suitable factory for this query and dataset
*
* @param request UpdateRequest
* @param graphStore A GraphStore
* @return A UpdateProcessorFactroy or null if none accept the request
*/
-
public UpdateEngineFactory find(UpdateRequest request, GraphStore graphStore, Context context)
{
for ( UpdateEngineFactory f : factories )
@@ -74,6 +80,21 @@ public class UpdateEngineRegistry
return null ;
}
+ /** Locate a suitable factory for this dataset
+ *
+ * @param graphStore A GraphStore
+ * @return A UpdateProcessorFactroy or null if none accept the request
+ */
+ public UpdateEngineFactory findStreaming(GraphStore graphStore, Context context)
+ {
+ for ( UpdateEngineFactory f : factories )
+ {
+ if ( f.acceptStreaming(graphStore, context) )
+ return f ;
+ }
+ return null ;
+ }
+
/** Add a QueryExecutionFactory to the default registry */
public static void addFactory(UpdateEngineFactory f) { get().add(f) ; }
Added: jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineStreaming.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineStreaming.java?rev=1415420&view=auto
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineStreaming.java (added)
+++ jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineStreaming.java Thu Nov 29 22:43:42 2012
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hp.hpl.jena.sparql.modify;
+
+public interface UpdateEngineStreaming
+{
+ public void startRequest();
+
+ public void finishRequest();
+
+ public UpdateSink getUpdateSink();
+}
Modified: jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineWorker.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineWorker.java?rev=1415420&r1=1415419&r2=1415420&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineWorker.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineWorker.java Thu Nov 29 22:43:42 2012
@@ -28,6 +28,7 @@ import org.apache.jena.atlas.data.DataBa
import org.apache.jena.atlas.data.ThresholdPolicy ;
import org.apache.jena.atlas.data.ThresholdPolicyFactory ;
import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.lib.Sink ;
import org.openjena.riot.SerializationFactoryFinder ;
import com.hp.hpl.jena.graph.Graph ;
@@ -37,6 +38,7 @@ import com.hp.hpl.jena.query.Query ;
import com.hp.hpl.jena.query.QueryExecutionFactory ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
+import com.hp.hpl.jena.sparql.SystemARQ ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.DatasetGraphWrapper ;
import com.hp.hpl.jena.sparql.core.DynamicDatasets ;
@@ -48,7 +50,21 @@ import com.hp.hpl.jena.sparql.graph.Grap
import com.hp.hpl.jena.sparql.graph.GraphOps ;
import com.hp.hpl.jena.sparql.graph.NodeTransform ;
import com.hp.hpl.jena.sparql.graph.NodeTransformLib ;
-import com.hp.hpl.jena.sparql.modify.request.* ;
+import com.hp.hpl.jena.sparql.modify.request.Target ;
+import com.hp.hpl.jena.sparql.modify.request.UpdateAdd ;
+import com.hp.hpl.jena.sparql.modify.request.UpdateBinaryOp ;
+import com.hp.hpl.jena.sparql.modify.request.UpdateClear ;
+import com.hp.hpl.jena.sparql.modify.request.UpdateCopy ;
+import com.hp.hpl.jena.sparql.modify.request.UpdateCreate ;
+import com.hp.hpl.jena.sparql.modify.request.UpdateDataDelete ;
+import com.hp.hpl.jena.sparql.modify.request.UpdateDataInsert ;
+import com.hp.hpl.jena.sparql.modify.request.UpdateDeleteWhere ;
+import com.hp.hpl.jena.sparql.modify.request.UpdateDrop ;
+import com.hp.hpl.jena.sparql.modify.request.UpdateDropClear ;
+import com.hp.hpl.jena.sparql.modify.request.UpdateLoad ;
+import com.hp.hpl.jena.sparql.modify.request.UpdateModify ;
+import com.hp.hpl.jena.sparql.modify.request.UpdateMove ;
+import com.hp.hpl.jena.sparql.modify.request.UpdateVisitor ;
import com.hp.hpl.jena.sparql.syntax.Element ;
import com.hp.hpl.jena.sparql.syntax.ElementGroup ;
import com.hp.hpl.jena.sparql.syntax.ElementNamedGraph ;
@@ -272,11 +288,57 @@ public class UpdateEngineWorker implemen
// ----
@Override
+ public Sink<Quad> getInsertDataSink()
+ {
+ return new Sink<Quad>()
+ {
+ @Override
+ public void send(Quad quad)
+ {
+ addToGraphStore(graphStore, quad);
+ }
+
+ @Override
+ public void flush()
+ {
+ SystemARQ.sync(graphStore);
+ }
+
+ @Override
+ public void close()
+ { }
+ };
+ }
+
+ @Override
public void visit(UpdateDataInsert update)
{
for ( Quad quad : update.getQuads() )
addToGraphStore(graphStore, quad) ;
}
+
+ @Override
+ public Sink<Quad> getDeleteDataSink()
+ {
+ return new Sink<Quad>()
+ {
+ @Override
+ public void send(Quad quad)
+ {
+ deleteFromGraphStore(graphStore, quad);
+ }
+
+ @Override
+ public void flush()
+ {
+ SystemARQ.sync(graphStore);
+ }
+
+ @Override
+ public void close()
+ { }
+ };
+ }
@Override
public void visit(UpdateDataDelete update)
Added: jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessorStreamingBase.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessorStreamingBase.java?rev=1415420&view=auto
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessorStreamingBase.java (added)
+++ jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessorStreamingBase.java Thu Nov 29 22:43:42 2012
@@ -0,0 +1,88 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hp.hpl.jena.sparql.modify;
+
+import com.hp.hpl.jena.query.QuerySolution ;
+import com.hp.hpl.jena.sparql.engine.binding.Binding ;
+import com.hp.hpl.jena.sparql.engine.binding.BindingFactory ;
+import com.hp.hpl.jena.sparql.engine.binding.BindingUtils ;
+import com.hp.hpl.jena.sparql.util.Context ;
+import com.hp.hpl.jena.update.GraphStore ;
+import com.hp.hpl.jena.update.UpdateProcessorStreaming ;
+
+/** Class to hold the general state of a update request execution.
+ * See query ExecutionContext
+ */
+public class UpdateProcessorStreamingBase implements UpdateProcessorStreaming
+{
+ protected Binding initialBinding = BindingFactory.root() ;
+ protected final GraphStore graphStore ;
+ protected final Context context ;
+
+ protected final UpdateEngineStreaming proc;
+
+ public UpdateProcessorStreamingBase(UsingList usingList, GraphStore graphStore, Context context, UpdateEngineFactory factory)
+ {
+ this.graphStore = graphStore ;
+ this.context = Context.setupContext(context, graphStore) ;
+
+ proc = factory.createStreaming(usingList, graphStore, initialBinding, context) ;
+ }
+
+ @Override
+ public void startRequest()
+ {
+ proc.startRequest();
+ }
+
+ @Override
+ public void finishRequest()
+ {
+ proc.finishRequest();
+ }
+
+ @Override
+ public UpdateSink getUpdateSink()
+ {
+ return proc.getUpdateSink();
+ }
+
+ @Override
+ public GraphStore getGraphStore()
+ {
+ return graphStore ;
+ }
+
+ @Override
+ public void setInitialBinding(QuerySolution binding)
+ {
+ setInitialBinding(BindingUtils.asBinding(binding)) ;
+ }
+
+ public void setInitialBinding(Binding binding)
+ {
+ initialBinding = binding ;
+ }
+
+ @Override
+ public Context getContext()
+ {
+ return context ;
+ }
+}