Return-Path: X-Original-To: apmail-clerezza-commits-archive@www.apache.org Delivered-To: apmail-clerezza-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 863DC11E4A for ; Fri, 16 May 2014 23:27:23 +0000 (UTC) Received: (qmail 21614 invoked by uid 500); 16 May 2014 10:16:37 -0000 Delivered-To: apmail-clerezza-commits-archive@clerezza.apache.org Received: (qmail 16693 invoked by uid 500); 16 May 2014 10:16:17 -0000 Mailing-List: contact commits-help@clerezza.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@clerezza.apache.org Delivered-To: mailing list commits@clerezza.apache.org Received: (qmail 14237 invoked by uid 99); 16 May 2014 10:16:10 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 May 2014 10:16:10 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 81DAA913B4F; Thu, 15 May 2014 14:15:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: misl@apache.org To: commits@clerezza.apache.org Message-Id: <947394bd4d1d456ab2b578dd4edec752@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: CLEREZZA-917: Added support for SPARQL Update Date: Thu, 15 May 2014 14:15:01 +0000 (UTC) Repository: clerezza Updated Branches: refs/heads/master ce92b088f -> cdb81c617 CLEREZZA-917: Added support for SPARQL Update Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/cdb81c61 Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/cdb81c61 Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/cdb81c61 Branch: refs/heads/master Commit: cdb81c6170df65e6898cf0c2e6a4788f038a1577 Parents: ce92b08 Author: Minto van der Sluis Authored: Thu May 15 16:14:25 2014 +0200 Committer: Minto van der Sluis Committed: Thu May 15 16:14:45 2014 +0200 ---------------------------------------------------------------------- .../rdf/jena/tdb/storage/BaseTdbTcProvider.java | 32 +++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/clerezza/blob/cdb81c61/rdf.jena.tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/BaseTdbTcProvider.java ---------------------------------------------------------------------- diff --git a/rdf.jena.tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/BaseTdbTcProvider.java b/rdf.jena.tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/BaseTdbTcProvider.java index 3de84f9..c8a7a5f 100644 --- a/rdf.jena.tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/BaseTdbTcProvider.java +++ b/rdf.jena.tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/BaseTdbTcProvider.java @@ -10,10 +10,14 @@ import org.apache.clerezza.rdf.jena.sparql.ResultSetWrapper; import org.apache.clerezza.rdf.jena.storage.JenaGraphAdaptor; import com.hp.hpl.jena.query.Dataset; +import com.hp.hpl.jena.query.QueryException; import com.hp.hpl.jena.query.QueryExecException; import com.hp.hpl.jena.query.QueryExecution; import com.hp.hpl.jena.query.QueryExecutionFactory; import com.hp.hpl.jena.query.QueryFactory; +import com.hp.hpl.jena.update.GraphStore; +import com.hp.hpl.jena.update.GraphStoreFactory; +import com.hp.hpl.jena.update.UpdateAction; import org.apache.clerezza.rdf.core.UriRef; abstract class BaseTdbTcProvider implements QueryableTcProvider{ @@ -41,12 +45,23 @@ abstract class BaseTdbTcProvider implements QueryableTcProvider{ @Override public QueryExecution run() { - com.hp.hpl.jena.query.Query jenaQuery = QueryFactory - .create(query); - return QueryExecutionFactory.create(jenaQuery, getDataset()); + try { + com.hp.hpl.jena.query.Query jenaQuery = QueryFactory + .create(query); + if (jenaQuery.isUnknownType()) { + return null; + } + return QueryExecutionFactory.create(jenaQuery, getDataset()); + } catch (QueryException ex) { + return null; + } } }); + if (qexec == null) { + return executeUpdate(query); + } + try { try { return new ResultSetWrapper(qexec.execSelect()); @@ -67,7 +82,6 @@ abstract class BaseTdbTcProvider implements QueryableTcProvider{ qexec.close(); } } - // ------------------------------------------------------------------------ // Getters / Setters @@ -83,4 +97,14 @@ abstract class BaseTdbTcProvider implements QueryableTcProvider{ public void setDataset(Dataset dataset) { this.dataset = dataset; } + + // ------------------------------------------------------------------------ + // Private methods + // ------------------------------------------------------------------------ + + private Object executeUpdate(String query) { + GraphStore graphStore = GraphStoreFactory.create(getDataset()) ; + UpdateAction.parseExecute(query, graphStore) ; + return true; + } }