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 2016/06/11 13:00:46 UTC
[1/5] jena git commit: Remove stray junk
Repository: jena
Updated Branches:
refs/heads/master d4d2dd40b -> 0f2a544a6
Remove stray junk
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ec6b4887
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ec6b4887
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ec6b4887
Branch: refs/heads/master
Commit: ec6b488784180fb5cde6f7267df4d3c3986fbf6f
Parents: d4d2dd4
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Jun 11 11:44:14 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Jun 11 11:44:14 2016 +0100
----------------------------------------------------------------------
jena-sdb/src/main/java/org/apache/jena/sdb/sql/JDBC.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/ec6b4887/jena-sdb/src/main/java/org/apache/jena/sdb/sql/JDBC.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/sql/JDBC.java b/jena-sdb/src/main/java/org/apache/jena/sdb/sql/JDBC.java
index f1da4bd..591aba1 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/sql/JDBC.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/sql/JDBC.java
@@ -126,10 +126,6 @@ public class JDBC
throw new SDBNotFoundException("Class.forName("+className+")", ex) ; }
}
- static private void loadClass1(String className) {
-
- }
-
public static String makeURL(String type, String host, String dbName)
{ return makeURL(type, host, dbName, null, null) ; }
[3/5] jena git commit: Typo
Posted by an...@apache.org.
Typo
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/41dd584b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/41dd584b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/41dd584b
Branch: refs/heads/master
Commit: 41dd584b66d76f99fd3004f234d124ca75a5a757
Parents: fef2fd0
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Jun 11 13:51:56 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Jun 11 13:51:56 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/jena/sdb/compiler/QueryCompilerMain.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/41dd584b/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/QueryCompilerMain.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/QueryCompilerMain.java b/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/QueryCompilerMain.java
index e01bb82..a2a2fb4 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/QueryCompilerMain.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/QueryCompilerMain.java
@@ -107,7 +107,7 @@ public abstract class QueryCompilerMain implements QueryCompiler
return null ;
}
- // Add the "bridge" that gets the lecical forms etc for the projected, or all, variables.
+ // Add the "bridge" that gets the lexical forms etc for the projected, or all, variables.
private class SqlNodesFinisher extends OpVisitorBase
{
private boolean justProjectVars ;
[4/5] jena git commit: Remove old, unnecessary workaround.
Posted by an...@apache.org.
Remove old, unnecessary workaround.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/5baef472
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/5baef472
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/5baef472
Branch: refs/heads/master
Commit: 5baef4722189eb4bc56d3428473526c2b6f7eabc
Parents: 41dd584
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Jun 11 13:53:09 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Jun 11 13:53:09 2016 +0100
----------------------------------------------------------------------
.../org/apache/jena/sdb/compiler/SDB_QC.java | 20 --------------------
1 file changed, 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/5baef472/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/SDB_QC.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/SDB_QC.java b/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/SDB_QC.java
index c35cf6c..32d1740 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/SDB_QC.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/SDB_QC.java
@@ -102,26 +102,6 @@ public class SDB_QC
// Project variables
List<Var> vars = toList(map(query.getResultVars().iterator(), Var::alloc)) ;
- if ( vars.size() == 0 )
- {
- // This works around a bug in ARQ 2.7.0 where a SPARQL/Update is made programmtically.
- // The query is not created fully - this worksaround that.
- // TODO Remove when ARQ 2.7.1/2.8.0 released.
- // Can occur with programmatically created patterns that are not fully setup.
- Query q2 = new Query() ;
- q2.setQueryPattern(query.getQueryPattern()) ;
- q2.setQuerySelectType() ;
- q2.setQueryResultStar(true) ;
- vars = toList(map(q2.getResultVars().iterator(), Var::alloc)) ;
- }
-
-
- if ( vars.size() == 0 )
- {
- // SELECT * {} or SPARQL Update with WHERE {}
- // LoggerFactory.getLogger(SDB_QC.class).warn("No project variables") ;
- }
-
// Add the ORDER BY variables
List<SortCondition> orderConditions = query.getOrderBy() ;
if ( orderConditions != null )
[2/5] jena git commit: Alignment on output
Posted by an...@apache.org.
Alignment on output
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/fef2fd0f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/fef2fd0f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/fef2fd0f
Branch: refs/heads/master
Commit: fef2fd0f23bf1eff05b6cca49e03b0eb3788ffa8
Parents: ec6b488
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Jun 11 13:00:32 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Jun 11 13:00:32 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/sdb/core/sqlnode/GenerateSQLVisitor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/fef2fd0f/jena-sdb/src/main/java/org/apache/jena/sdb/core/sqlnode/GenerateSQLVisitor.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/core/sqlnode/GenerateSQLVisitor.java b/jena-sdb/src/main/java/org/apache/jena/sdb/core/sqlnode/GenerateSQLVisitor.java
index 69b242c..9a895b4 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/core/sqlnode/GenerateSQLVisitor.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/core/sqlnode/GenerateSQLVisitor.java
@@ -415,7 +415,7 @@ public class GenerateSQLVisitor implements SqlNodeVisitor
out.print("( ") ;
- String sep = " AND " ;
+ String sep = " AND " ;
boolean first = true ;
boolean lastAnnotated = false ;
[5/5] jena git commit: JENA-1193: Do not attempt to project vars when
not at the top-level.
Posted by an...@apache.org.
JENA-1193: Do not attempt to project vars when not at the top-level.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0f2a544a
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0f2a544a
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0f2a544a
Branch: refs/heads/master
Commit: 0f2a544a6655b948c4a171a303442c767c2754a7
Parents: 5baef47
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Jun 11 13:58:54 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Jun 11 13:58:54 2016 +0100
----------------------------------------------------------------------
.../jena/sdb/compiler/QueryIterOpSQL.java | 43 ++++++++++++++------
.../apache/jena/sdb/compiler/SDBCompile.java | 3 +-
.../org/apache/jena/sdb/core/SDBRequest.java | 13 +++++-
3 files changed, 44 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/0f2a544a/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/QueryIterOpSQL.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/QueryIterOpSQL.java b/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/QueryIterOpSQL.java
index 958db93..e54b1ef 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/QueryIterOpSQL.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/QueryIterOpSQL.java
@@ -19,7 +19,9 @@
package org.apache.jena.sdb.compiler;
import org.apache.jena.atlas.io.IndentedWriter;
+import org.apache.jena.sdb.core.SDBRequest ;
import org.apache.jena.sdb.shared.SDBInternalError ;
+import org.apache.jena.shared.PrefixMapping ;
import org.apache.jena.sparql.algebra.Op ;
import org.apache.jena.sparql.core.Substitute ;
import org.apache.jena.sparql.engine.ExecutionContext ;
@@ -30,7 +32,11 @@ import org.apache.jena.sparql.engine.iterator.QueryIterRepeatApply ;
public class QueryIterOpSQL extends QueryIterRepeatApply
{
- private OpSQL opSQL ;
+ private final OpSQL opSQL ;
+ // Modifed to remove the query - after substitution, the query is no longer useful
+ // information. This also stops the bridge attempting to project variables -
+ // by this stage, we want all variables back.
+ private final SDBRequest request ;
public QueryIterOpSQL(OpSQL op,
QueryIterator input ,
@@ -38,16 +44,24 @@ public class QueryIterOpSQL extends QueryIterRepeatApply
{
super(input, context) ;
this.opSQL = op ;
+ SDBRequest req = op.getRequest() ;
+ if ( req == null )
+ this.request = null ;
+ else {
+ PrefixMapping pmap = req.getQuery() == null ? null : req.getQuery().getPrefixMapping() ;
+ this.request =
+ op.getRequest() == null
+ ? null
+ : new SDBRequest(op.getRequest().getStore(), pmap, context.getContext()) ;
+ }
}
@Override
- protected QueryIterator nextStage(Binding binding)
- {
+ protected QueryIterator nextStage(Binding binding) {
OpSQL execSQL = this.opSQL ;
- if ( binding != null && ! isRoot(binding) )
- {
- QueryCompiler qc = opSQL.getRequest().getStore().getQueryCompilerFactory().createQueryCompiler(opSQL.getRequest()) ;
+ if ( binding != null && ! isRoot(binding) ) {
+ QueryCompiler qc = opSQL.getRequest().getStore().getQueryCompilerFactory().createQueryCompiler(request) ;
Op op2 = Substitute.substitute(opSQL.getOriginal(), binding) ;
Op op = qc.compile(op2) ;
if ( op instanceof OpSQL )
@@ -57,16 +71,21 @@ public class QueryIterOpSQL extends QueryIterRepeatApply
}
return execSQL.exec(binding, getExecContext()) ;
+// QueryIterator qIter = execSQL.exec(binding, getExecContext()) ;
+// List<Binding> x = Iter.toList(qIter) ;
+// qIter = new QueryIterPlainWrapper(x.iterator(), getExecContext()) ;
+// System.out.println("SQL Eval:") ;
+// x.forEach(b -> System.out.println(" "+b) );
+// System.out.println() ;
+// return qIter ;
}
-
- private static boolean isRoot(Binding binding)
- {
- return ! binding.vars().hasNext() ;
+
+ private static boolean isRoot(Binding binding) {
+ return !binding.vars().hasNext() ;
}
@Override
- public void output(IndentedWriter out)
- {
+ public void output(IndentedWriter out) {
opSQL.output(out) ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/0f2a544a/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/SDBCompile.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/SDBCompile.java b/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/SDBCompile.java
index a437730..d9a4515 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/SDBCompile.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/SDBCompile.java
@@ -24,6 +24,7 @@ import org.apache.jena.sdb.SDB ;
import org.apache.jena.sdb.Store ;
import org.apache.jena.sdb.core.SDBRequest ;
import org.apache.jena.sdb.util.StoreUtils ;
+import org.apache.jena.shared.PrefixMapping ;
import org.apache.jena.sparql.algebra.Op ;
import org.apache.jena.sparql.core.Substitute ;
import org.apache.jena.sparql.engine.binding.Binding ;
@@ -42,7 +43,7 @@ public class SDBCompile
if ( context == null )
context = SDB.getContext() ;
- SDBRequest request = new SDBRequest(store, null, context) ;
+ SDBRequest request = new SDBRequest(store, (PrefixMapping)null, context) ;
return compile(store, op, null, context, request) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/0f2a544a/jena-sdb/src/main/java/org/apache/jena/sdb/core/SDBRequest.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/core/SDBRequest.java b/jena-sdb/src/main/java/org/apache/jena/sdb/core/SDBRequest.java
index c37c49c..434fbae 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/core/SDBRequest.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/core/SDBRequest.java
@@ -38,7 +38,7 @@ import org.apache.jena.sparql.util.Context ;
public class SDBRequest extends StoreHolder
{
private PrefixMapping prefixMapping ;
- private Query query ;
+ private final Query query ;
// Per request unique variables.
private VarAlloc varAlloc = new VarAlloc(AliasesSparql.VarBase) ;
@@ -46,7 +46,7 @@ public class SDBRequest extends StoreHolder
// Set in SDBCompile.compile
public boolean LeftJoinTranslation = true ; // Does the DB support general join expressions?
public boolean LimitOffsetTranslation = false ; // Does the DB grok the Limit/Offset SQL?
- public boolean DistinctTranslation = true ; // Some DBs can't do DISTINCt on CLOBS.
+ public boolean DistinctTranslation = true ; // Some DBs can't do DISTINCT on CLOBS.
private Context context ;
@@ -63,6 +63,15 @@ public class SDBRequest extends StoreHolder
this.context = new Context(context) ;
}
+ public SDBRequest(Store store, PrefixMapping prefixMapping, Context context) {
+ super(store) ;
+ this.query = null ;
+ this.prefixMapping = prefixMapping ;
+ if ( context == null )
+ context = SDB.getContext() ;
+ this.context = new Context(context) ;
+ }
+
public SDBRequest(Store store, Query query)
{
this(store, query, null) ;