Merge pull request #7 from SANSA-Stack/feature/travis-support

Enabled Travis support

Author: patrickwestphal

.travis.yml

@@ -0,0 +1,10 @@
+language: scala
+sudo: false
+cache:
+  directories:
+    - $HOME/.m2
+scala:
+  - 2.11.11
+script:
+  - mvn scalastyle:check
+  - mvn test

pom.xml

@@ -70,12 +70,12 @@
     <scala.binary.version>2.11</scala.binary.version>
     <spark.version>2.3.1</spark.version>
     <flink.version>1.5.0</flink.version>
-    <jena.version>3.6.0</jena.version>
+    <jena.version>3.7.0</jena.version>
     <sansa.stack.version>0.3.1-SNAPSHOT</sansa.stack.version>
     <sansa.rdf.version>${sansa.stack.version}</sansa.rdf.version>
     <sansa.query.version>${sansa.stack.version}</sansa.query.version>
     <sansa.owl.version>${sansa.stack.version}</sansa.owl.version>
-    <jsa.subversion>3</jsa.subversion>
+    <jsa.subversion>1</jsa.subversion>
     <jsa.version>${jena.version}-${jsa.subversion}</jsa.version>
     <PermGen>64m</PermGen>
     <MaxPermGen>512m</MaxPermGen>
@@ -234,7 +234,7 @@
       <dependency>
         <groupId>org.scala-graph</groupId>
         <artifactId>graph-core_${scala.binary.version}</artifactId>
-        <version>1.12.3</version>
+        <version>1.12.5</version>
       </dependency>
       <dependency>
         <groupId>org.scala-graph</groupId>
@@ -266,7 +266,7 @@
         <dependency>
             <groupId>org.apache.calcite</groupId>
             <artifactId>calcite-core</artifactId>
-            <version>1.13.0</version>
+            <version>1.16.0</version>
         </dependency>
 
       <!-- Test -->
@@ -285,13 +285,13 @@
       <dependency>
         <groupId>org.specs2</groupId>
         <artifactId>specs2-core_${scala.binary.version}</artifactId>
-        <version>4.0.2</version>
+        <version>4.2.0</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.specs2</groupId>
         <artifactId>specs2-junit_${scala.binary.version}</artifactId>
-        <version>4.0.2</version>
+        <version>4.2.0</version>
         <scope>test</scope>
       </dependency>
 
@@ -563,7 +563,7 @@
         <version>1.0.0</version>
         <configuration>
           <verbose>false</verbose>
-          <failOnViolation>false</failOnViolation>
+          <failOnViolation>true</failOnViolation>
           <includeTestSourceDirectory>true</includeTestSourceDirectory>
           <failOnWarning>false</failOnWarning>
           <sourceDirectory>${project.basedir}/src/main/scala</sourceDirectory>

sansa-inference-common/src/main/scala/net/sansa_stack/inference/rules/plan/SimpleCalciteConnection.scala

@@ -8,7 +8,7 @@ import java.util.concurrent.Executor
 
 import org.apache.calcite.adapter.java.JavaTypeFactory
 import org.apache.calcite.config.CalciteConnectionConfig
-import org.apache.calcite.jdbc.CalciteConnection
+import org.apache.calcite.jdbc.{CalciteConnection, CalcitePrepare}
 import org.apache.calcite.linq4j.tree.Expression
 import org.apache.calcite.linq4j.{Enumerator, Queryable}
 import org.apache.calcite.schema.SchemaPlus
@@ -150,4 +150,6 @@ class SimpleCalciteConnection extends CalciteConnection{
   override def execute[T](expression: Expression, `type`: Type): T = null.asInstanceOf[T]
 
   override def executeQuery[T](queryable: Queryable[T]): Enumerator[T] = null
+
+  override def createPrepareContext(): CalcitePrepare.Context = null
 }

sansa-inference-common/src/main/scala/net/sansa_stack/inference/rules/plan/SimpleRelBuilder.scala

@@ -1,10 +1,14 @@
 package net.sansa_stack.inference.rules.plan
 
+import java.util.Properties
+
+import org.apache.calcite.config.{CalciteConnectionConfig, CalciteConnectionConfigImpl, CalciteConnectionProperty}
 import org.apache.calcite.jdbc.CalciteSchema
 import org.apache.calcite.plan.{Context, RelOptCluster, RelOptPlanner, RelOptSchema}
 import org.apache.calcite.prepare.CalciteCatalogReader
 import org.apache.calcite.rex.RexBuilder
 import org.apache.calcite.schema.SchemaPlus
+import org.apache.calcite.sql.parser.SqlParser
 import org.apache.calcite.tools.Frameworks.PlannerAction
 import org.apache.calcite.tools.{FrameworkConfig, Frameworks, RelBuilder}
 
@@ -56,11 +60,18 @@ object SimpleRelBuilder {
     val calciteSchema = CalciteSchema.from(config.getDefaultSchema)
     val relOptSchema = new CalciteCatalogReader(
       calciteSchema,
-      config.getParserConfig.caseSensitive(),
       defaultRelOptSchema.getSchemaPaths.get(0),
-      typeFactory)
+      typeFactory,
+      connectionConfig(config.getParserConfig))
 
     new SimpleRelBuilder(config.getContext, cluster, relOptSchema)
   }
 
+  def connectionConfig(parserConfig : SqlParser.Config): CalciteConnectionConfig = {
+    val prop = new Properties()
+    prop.setProperty(CalciteConnectionProperty.CASE_SENSITIVE.camelName,
+      String.valueOf(parserConfig.caseSensitive))
+    new CalciteConnectionConfigImpl(prop)
+  }
+
 }

sansa-inference-common/src/main/scala/net/sansa_stack/inference/rules/plan/TriplesTableFactory.scala

@@ -5,11 +5,13 @@ import java.util
 import scala.collection.JavaConverters._
 
 import org.apache.calcite.DataContext
+import org.apache.calcite.config.CalciteConnectionConfig
 import org.apache.calcite.linq4j.{Enumerable, Linq4j}
 import org.apache.calcite.rel.`type`.{RelDataType, RelDataTypeFactory, RelProtoDataType}
 import org.apache.calcite.rex.RexNode
 import org.apache.calcite.schema.Schema.TableType
 import org.apache.calcite.schema._
+import org.apache.calcite.sql.{SqlCall, SqlNode}
 import org.apache.calcite.sql.`type`.SqlTypeName
 
 /**
@@ -53,6 +55,10 @@ class TriplesTableFactory extends TableFactory[Table] {
 
     override def getRowType(typeFactory: RelDataTypeFactory): RelDataType = protoRowType.apply(typeFactory)
 
+    override def isRolledUp(s: String): Boolean = false
 
+    override def rolledUpColumnValidInsideAgg(s: String, sqlCall: SqlCall, sqlNode: SqlNode,
+                                              calciteConnectionConfig: CalciteConnectionConfig): Boolean = false
   }
+
 }

sansa-inference-common/src/test/scala/net/sansa_stack/inference/common/DependencyGraphTest.scala

@@ -75,7 +75,7 @@ object DependencyGraphTest {
     }
 
 //    val names = Seq("rdfp13a", "rdfp13b", "rdfp13c", "rdfs5", "rdfs7") // property rules
-    val names = Seq("rdfp13a", "rdfp13b", "rdfp13c")//, "rdfs5", "rdfs7", "rdfp3", "rdfp4") // property rules + some instance rules
+    val names = Seq("rdfp13a", "rdfp13b", "rdfp13c")// , "rdfs5", "rdfs7", "rdfp3", "rdfp4") // property rules + some instance rules
 //    val names = Seq("rdfs5", "rdfs7", "rdfp3", "rdfp4") // property TC rule + some instance rules
 
     val minimizer = new DefaultRuleDependencyGraphMinimizer()

sansa-inference-spark/pom.xml

@@ -159,7 +159,7 @@
             <groupId>com.holdenkarau</groupId>
             <artifactId>spark-testing-base_${scala.binary.version}</artifactId>
             <!--version>${spark.version}_0.7.1</version-->
-            <version>2.2.0_0.8.0</version>
+            <version>2.3.0_0.9.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>