Skip to content
This repository was archived by the owner on Oct 8, 2020. It is now read-only.

Commit 9b6d125

Browse files
GezimSejdiuGezimSejdiu
committed
Merge branch 'release/0.5.0'
2 parents 278f6ef + 79f77ea commit 9b6d125

60 files changed

Lines changed: 2211 additions & 83 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pom.xml‎

Lines changed: 34 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>net.sansa-stack</groupId>
66
<artifactId>sansa-query-parent_2.11</artifactId>
7-
<version>0.4.0</version>
7+
<version>0.5.0</version>
88
<packaging>pom</packaging>
99

1010
<name>SANSA Stack - Query Layer - Parent</name>
@@ -23,19 +23,20 @@
2323
<maven.compiler.target>1.8</maven.compiler.target>
2424
<encoding>UTF-8</encoding>
2525

26-
<sansa.version>0.4.0</sansa.version>
26+
<sansa.rdf.version>0.5.0</sansa.rdf.version>
27+
<sansa.datalake.version>0.1.0</sansa.datalake.version>
2728

2829
<scala.version>2.11.11</scala.version>
2930
<scala.binary.version>2.11</scala.binary.version>
3031
<scala.classifier>${scala.binary.version}</scala.classifier>
3132

3233
<scala.version.suffix>_${scala.binary.version}</scala.version.suffix>
3334

34-
<spark.version>2.3.1</spark.version>
35-
<flink.version>1.5.0</flink.version>
35+
<spark.version>2.4.0</spark.version>
36+
<flink.version>1.7.0</flink.version>
3637

37-
<jena.version>3.7.0</jena.version>
38-
<jsa.subversion>3</jsa.subversion>
38+
<jena.version>3.9.0</jena.version>
39+
<jsa.subversion>1</jsa.subversion>
3940

4041
<jsa.version>${jena.version}-${jsa.subversion}</jsa.version>
4142
<scalastyle.config.path>${project.basedir}/scalastyle-config.xml</scalastyle.config.path>
@@ -211,19 +212,19 @@
211212
<dependency>
212213
<groupId>${project.groupId}</groupId>
213214
<artifactId>sansa-rdf-common${scala.version.suffix}</artifactId>
214-
<version>${sansa.version}</version>
215+
<version>${sansa.rdf.version}</version>
215216
</dependency>
216217

217218
<dependency>
218219
<groupId>${project.groupId}</groupId>
219220
<artifactId>sansa-rdf-spark${scala.version.suffix}</artifactId>
220-
<version>${sansa.version}</version>
221+
<version>${sansa.rdf.version}</version>
221222
</dependency>
222223

223224
<dependency>
224225
<groupId>${project.groupId}</groupId>
225226
<artifactId>sansa-rdf-flink${scala.version.suffix}</artifactId>
226-
<version>${sansa.version}</version>
227+
<version>${sansa.rdf.version}</version>
227228
</dependency>
228229

229230

@@ -233,6 +234,12 @@
233234
<version>${project.version}</version>
234235
</dependency>
235236

237+
<dependency>
238+
<groupId>${project.groupId}</groupId>
239+
<artifactId>sansa-datalake-spark${scala.version.suffix}</artifactId>
240+
<version>${sansa.datalake.version}</version>
241+
</dependency>
242+
236243
<dependency>
237244
<groupId>org.apache.spark</groupId>
238245
<artifactId>spark-graphx_${scala.binary.version}</artifactId>
@@ -300,6 +307,12 @@
300307
<version>19.0</version>
301308
</dependency>
302309

310+
<dependency>
311+
<groupId>org.apache.commons</groupId>
312+
<artifactId>commons-compress</artifactId>
313+
<version>1.18</version>
314+
</dependency>
315+
303316
<dependency>
304317
<groupId>org.apache.jena</groupId>
305318
<artifactId>apache-jena-libs</artifactId>
@@ -360,6 +373,18 @@
360373
<version>4.12</version>
361374
</dependency>
362375

376+
<!-- Ontop -->
377+
<dependency>
378+
<groupId>it.unibz.inf.ontop</groupId>
379+
<artifactId>ontop-owlapi</artifactId>
380+
<version>3.0.0-beta-2</version>
381+
</dependency>
382+
<dependency>
383+
<groupId>it.unibz.inf.ontop</groupId>
384+
<artifactId>ontop-system-sql-owlapi</artifactId>
385+
<version>3.0.0-beta-2</version>
386+
</dependency>
387+
363388

364389
</dependencies>
365390
</dependencyManagement>

‎sansa-query-common/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>net.sansa-stack</groupId>
99
<artifactId>sansa-query-parent_2.11</artifactId>
10-
<version>0.4.0</version>
10+
<version>0.5.0</version>
1111
</parent>
1212

1313
<dependencies>

‎sansa-query-flink/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>net.sansa-stack</groupId>
99
<artifactId>sansa-query-parent_2.11</artifactId>
10-
<version>0.4.0</version>
10+
<version>0.5.0</version>
1111
</parent>
1212

1313

‎sansa-query-flink/src/main/scala/net/sansa_stack/query/flink/sparqlify/BasicTableInfoProviderFlink.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import org.apache.flink.table.api.scala.BatchTableEnvironment
1212
class BasicTableInfoProviderFlink(flinkTable: BatchTableEnvironment)
1313
extends BasicTableInfoProvider {
1414
override def getBasicTableInfo(queryString: String): BasicTableInfo = {
15-
val table = flinkTable.sql(queryString)
15+
val table = flinkTable.sqlQuery(queryString)
1616
val schema = table.getSchema
1717
val types = schema.getTypes
1818
val names = schema.getColumnNames

‎sansa-query-flink/src/main/scala/net/sansa_stack/query/flink/sparqlify/QueryExecutionSparqlifyFlink.scala‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import org.aksw.jena_sparql_api.core.{ QueryExecutionBaseSelect, QueryExecutionF
1010
import org.aksw.jena_sparql_api.utils.ResultSetUtils
1111
import org.aksw.sparqlify.core.domain.input.SparqlSqlStringRewrite
1212
import org.aksw.sparqlify.core.interfaces.SparqlSqlStringRewriter
13-
import org.apache.flink .api.java.typeutils.runtime.kryo.KryoSerializer
13+
import org.apache.flink.api.java.typeutils.runtime.kryo.KryoSerializer
1414
import org.apache.flink.api.scala.{ ExecutionEnvironment, _ }
1515
import org.apache.flink.table.api.scala.{ BatchTableEnvironment, _ }
1616
import org.apache.flink.types.Row
@@ -45,6 +45,9 @@ class QueryExecutionSparqlifyFlink(
4545

4646
override def getTimeout1(): Long = -1
4747

48+
override def execJson(): org.apache.jena.atlas.json.JsonArray = throw new UnsupportedOperationException
49+
override def execJsonItems(): java.util.Iterator[org.apache.jena.atlas.json.JsonObject] = throw new UnsupportedOperationException
50+
4851
}
4952

5053
object QueryExecutionSparqlifyFlink {
@@ -55,7 +58,7 @@ object QueryExecutionSparqlifyFlink {
5558

5659
println("SQL Query: " + sqlQueryStr)
5760

58-
val dataset = flinkTable.sql(sqlQueryStr)
61+
val dataset = flinkTable.sqlQuery(sqlQueryStr)
5962
// System.out.println("SqlQueryStr: " + sqlQueryStr);
6063
// System.out.println("VarDef: " + rewrite.getVarDefinition());
6164
val rowMapper = new FlinkRowMapperSparqlify(varDef, dataset.getSchema.getColumnNames)

sansa-query-flink/src/test/java/net/sansa_stack/query/flink/playground/TestCalciteJoin.java renamed to sansa-query-flink/src/test/java/net/sansa_stack/query/flink/playground/CalciteJoinTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.junit.Test;
1414

1515

16-
public class TestCalciteJoin {
16+
public class CalciteJoinTests {
1717
public static class Triple {
1818
public String s;
1919
public String p;

sansa-query-flink/src/test/java/net/sansa_stack/query/flink/test/TestCalciteJoin.java renamed to sansa-query-flink/src/test/java/net/sansa_stack/query/flink/test/CalciteJoinTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.junit.Test;
1212

1313

14-
public class TestCalciteJoin {
14+
public class CalciteJoinTests {
1515
public static class Triple {
1616
public String s;
1717
public String p;

sansa-query-flink/src/test/scala/net/sansa_stack/query/flink/sparqlify/TestRdfPartitionFlink.scala renamed to sansa-query-flink/src/test/scala/net/sansa_stack/query/flink/sparqlify/RdfPartitionFlinkTests.scala

File renamed without changes.

sansa-query-flink/src/test/scala/net/sansa_stack/query/flink/sparqlify/TestRdfTerm.scala renamed to sansa-query-flink/src/test/scala/net/sansa_stack/query/flink/sparqlify/RdfTermTests.scala

File renamed without changes.

‎sansa-query-spark/pom.xml‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>net.sansa-stack</groupId>
99
<artifactId>sansa-query-parent_2.11</artifactId>
10-
<version>0.4.0</version>
10+
<version>0.5.0</version>
1111
</parent>
1212

1313
<dependencies>
@@ -39,6 +39,11 @@
3939
<version>1.0</version>
4040
</dependency>
4141

42+
<dependency>
43+
<groupId>${project.groupId}</groupId>
44+
<artifactId>sansa-datalake-spark${scala.version.suffix}</artifactId>
45+
</dependency>
46+
4247
<!-- Override transitive tdb version via litmus -->
4348
<dependency>
4449
<groupId>org.apache.jena</groupId>
@@ -69,7 +74,24 @@
6974
<artifactId>spark-testing-base_${scala.binary.version}</artifactId>
7075
<scope>test</scope>
7176
</dependency>
72-
77+
78+
<!-- Ontop -->
79+
<dependency>
80+
<groupId>it.unibz.inf.ontop</groupId>
81+
<artifactId>ontop-owlapi</artifactId>
82+
<version>3.0.0-beta-2</version>
83+
</dependency>
84+
<dependency>
85+
<groupId>it.unibz.inf.ontop</groupId>
86+
<artifactId>ontop-system-sql-owlapi</artifactId>
87+
<version>3.0.0-beta-2</version>
88+
</dependency>
89+
90+
<dependency>
91+
<groupId>io.netty</groupId>
92+
<artifactId>netty-all</artifactId>
93+
<version>4.1.17.Final</version>
94+
</dependency>
7395
</dependencies>
7496

7597
<build>

0 commit comments

Comments
 (0)