Skip to content

[ZEPPELIN-6084] Update jena-arq to 4.10 #4886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[ZEPPELIN-6084] Update jena-arq to 4.10 #4886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
063bd20
Update jena-arq to 4.10
Reamer Oct 28, 2024
6e7bf16
Correct tests for sparkqljenaengine
Reamer Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sparql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

<properties>
<interpreter.name>sparql</interpreter.name>
<jena.version>3.12.0</jena.version>
<jena.version>4.10.0</jena.version>
</properties>

<dependencies>
Expand Down
10 changes: 5 additions & 5 deletions sparql/src/main/java/org/apache/zeppelin/sparql/JenaInterpreter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

import org.apache.http.HttpStatus;

import org.apache.jena.atlas.web.HttpException;
import org.apache.jena.query.QueryExecution;
import org.apache.jena.query.QueryExecutionFactory;
import org.apache.jena.query.QueryParseException;
import org.apache.jena.query.ResultSet;
import org.apache.jena.query.ResultSetFormatter;
Expand Down Expand Up @@ -57,10 +57,10 @@ public JenaInterpreter(String serviceEndpoint, boolean replaceURIs, boolean remo

@Override
public InterpreterResult query(String query) {
LOGGER.info("SPARQL: Run Query '" + query + "' against " + serviceEndpoint);
LOGGER.info("SPARQL: Run Query '{}' against {}", query, serviceEndpoint);

try {
queryExecution = QueryExecutionFactory.sparqlService(serviceEndpoint, query);
queryExecution = QueryExecution.service(serviceEndpoint).query(query).build();
PrefixMapping prefixMapping = queryExecution.getQuery().getPrefixMapping();

// execute query and get Results
Expand All @@ -85,14 +85,14 @@ public InterpreterResult query(String query) {
InterpreterResult.Code.SUCCESS,
InterpreterResult.Type.TABLE,
tsv);
} catch (QueryParseException e) {
} catch (QueryParseException | HttpException e) {
LOGGER.error(e.toString());
return new InterpreterResult(
InterpreterResult.Code.ERROR,
"Error: " + e.getMessage());
} catch (QueryExceptionHTTP e) {
LOGGER.error(e.toString());
int responseCode = e.getResponseCode();
int responseCode = e.getStatusCode();

if (responseCode == HttpStatus.SC_UNAUTHORIZED) {
return new InterpreterResult(
Expand Down
6 changes: 3 additions & 3 deletions sparql/src/main/java/org/apache/zeppelin/sparql/SparqlInterpreter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ public class SparqlInterpreter extends Interpreter {

public static final String ENGINE_TYPE_JENA = "jena";

public SparqlEngine engine;
private SparqlEngine engine;

/**
* Sparql Engine Type.
*/
Expand Down Expand Up @@ -73,7 +73,7 @@ public void open() {

if (SparqlEngineType.JENA.toString().equals(engineType)) {
engine = new JenaInterpreter(serviceEndpoint, replaceURIs, removeDatatypes);
}
}
}

@Override
Expand Down
28 changes: 14 additions & 14 deletions sparql/src/test/java/org/apache/zeppelin/sparql/SparqlJenaEngineTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

package org.apache.zeppelin.sparql;

import org.apache.jena.fuseki.Fuseki;
import org.apache.jena.atlas.web.WebLib;
import org.apache.jena.fuseki.main.FusekiServer;
import org.apache.jena.fuseki.server.DataAccessPointRegistry;
import org.apache.jena.query.Dataset;
Expand Down Expand Up @@ -52,7 +52,7 @@ class SparqlJenaEngineTest {

@BeforeAll
public static void setUp() {
port = Fuseki.choosePort();
port = WebLib.choosePort();

Model model = ModelFactory.createDefaultModel();
model.read(DATA_FILE);
Expand Down Expand Up @@ -108,6 +108,11 @@ void testSuccessfulRawQuery() {
assertEquals(Code.SUCCESS, result.code());

final String expected = "?subject\t?predicate\t?object\n" +
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apparently the sorting has been changed a little. I hope it doesn't cause any problems.

"<http://example.org/#green-goblin>\t<http://xmlns.com/foaf/0.1/name>\t\"Green Goblin\"\n" +
"<http://example.org/#green-goblin>\t<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>" +
"\t<http://xmlns.com/foaf/0.1/Person>\n<http://example.org/#green-goblin>\t" +
"<http://www.perceive.net/schemas/relationship/enemyOf>\t" +
"<http://example.org/#spiderman>\n" +
"<http://example.org/#spiderman>\t<http://xmlns.com/foaf/0.1/name>" +
"\t\"Человек-паук\"@ru\n<http://example.org/#spiderman>\t" +
"<http://xmlns.com/foaf/0.1/name>\t\"Spiderman\"\n" +
Expand All @@ -116,12 +121,7 @@ void testSuccessfulRawQuery() {
"<http://www.perceive.net/schemas/relationship/enemyOf>\t" +
"<http://example.org/#green-goblin>\n<http://example.org/#spiderman>\t" +
"<http://example.org/stats#born>\t\"1962-10-15T14:00.00\"^^" +
"<http://www.w3.org/2001/XMLSchema#dateTime>\n<http://example.org/#green-goblin>\t" +
"<http://xmlns.com/foaf/0.1/name>\t\"Green Goblin\"\n" +
"<http://example.org/#green-goblin>\t" +
"<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>" +
"\t<http://xmlns.com/foaf/0.1/Person>\n<http://example.org/#green-goblin>\t" +
"<http://www.perceive.net/schemas/relationship/enemyOf>\t<http://example.org/#spiderman>\n";
"<http://www.w3.org/2001/XMLSchema#dateTime>\n";
assertEquals(expected, result.message().get(0).getData());
}

Expand All @@ -141,19 +141,19 @@ void testSuccessfulReplaceRemoveQuery() {
assertEquals(Code.SUCCESS, result.code());

final String expected = "?subject\t?predicate\t?object\n" +
"<http://example.org/#green-goblin>\t<foaf:name>\t\"Green Goblin\"\n" +
"<http://example.org/#green-goblin>\t" +
"<rdf:type>" +
"\t<foaf:Person>\n<http://example.org/#green-goblin>\t" +
"<rel:enemyOf>\t<http://example.org/#spiderman>\n" +
"<http://example.org/#spiderman>\t<foaf:name>" +
"\t\"Человек-паук\"@ru\n<http://example.org/#spiderman>\t" +
"<foaf:name>\t\"Spiderman\"\n" +
"<http://example.org/#spiderman>\t<rdf:type>" +
"\t<foaf:Person>\n<http://example.org/#spiderman>\t" +
"<rel:enemyOf>\t" +
"<http://example.org/#green-goblin>\n<http://example.org/#spiderman>\t" +
"<http://example.org/stats#born>\t1962-10-15T14:00.00\n" +
"<http://example.org/#green-goblin>\t<foaf:name>\t\"Green Goblin\"\n" +
"<http://example.org/#green-goblin>\t" +
"<rdf:type>" +
"\t<foaf:Person>\n<http://example.org/#green-goblin>\t" +
"<rel:enemyOf>\t<http://example.org/#spiderman>\n";
"<http://example.org/stats#born>\t1962-10-15T14:00.00\n";

assertEquals(expected, result.message().get(0).getData());
}
Expand Down
Loading