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

Commit 587c9d2

Browse files
Enabled Travis support
* added YAML file * enabled Scalastyle fail on error
1 parent 9ea180a commit 587c9d2

File tree

6 files changed

+40
-11
lines changed

6 files changed

+40
-11
lines changed

.travis.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
language: scala
2+
sudo: false
3+
cache:
4+
directories:
5+
- $HOME/.m2
6+
scala:
7+
- 2.11.11
8+
script:
9+
- mvn scalastyle:check
10+
- mvn test

pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@
7070
<scala.binary.version>2.11</scala.binary.version>
7171
<spark.version>2.3.1</spark.version>
7272
<flink.version>1.5.0</flink.version>
73-
<jena.version>3.6.0</jena.version>
73+
<jena.version>3.7.0</jena.version>
7474
<sansa.stack.version>0.3.1-SNAPSHOT</sansa.stack.version>
7575
<sansa.rdf.version>${sansa.stack.version}</sansa.rdf.version>
7676
<sansa.query.version>${sansa.stack.version}</sansa.query.version>
7777
<sansa.owl.version>${sansa.stack.version}</sansa.owl.version>
78-
<jsa.subversion>3</jsa.subversion>
78+
<jsa.subversion>1</jsa.subversion>
7979
<jsa.version>${jena.version}-${jsa.subversion}</jsa.version>
8080
<PermGen>64m</PermGen>
8181
<MaxPermGen>512m</MaxPermGen>
@@ -234,7 +234,7 @@
234234
<dependency>
235235
<groupId>org.scala-graph</groupId>
236236
<artifactId>graph-core_${scala.binary.version}</artifactId>
237-
<version>1.12.3</version>
237+
<version>1.12.5</version>
238238
</dependency>
239239
<dependency>
240240
<groupId>org.scala-graph</groupId>
@@ -266,7 +266,7 @@
266266
<dependency>
267267
<groupId>org.apache.calcite</groupId>
268268
<artifactId>calcite-core</artifactId>
269-
<version>1.13.0</version>
269+
<version>1.16.0</version>
270270
</dependency>
271271

272272
<!-- Test -->
@@ -285,13 +285,13 @@
285285
<dependency>
286286
<groupId>org.specs2</groupId>
287287
<artifactId>specs2-core_${scala.binary.version}</artifactId>
288-
<version>4.0.2</version>
288+
<version>4.2.0</version>
289289
<scope>test</scope>
290290
</dependency>
291291
<dependency>
292292
<groupId>org.specs2</groupId>
293293
<artifactId>specs2-junit_${scala.binary.version}</artifactId>
294-
<version>4.0.2</version>
294+
<version>4.2.0</version>
295295
<scope>test</scope>
296296
</dependency>
297297

@@ -563,7 +563,7 @@
563563
<version>1.0.0</version>
564564
<configuration>
565565
<verbose>false</verbose>
566-
<failOnViolation>false</failOnViolation>
566+
<failOnViolation>true</failOnViolation>
567567
<includeTestSourceDirectory>true</includeTestSourceDirectory>
568568
<failOnWarning>false</failOnWarning>
569569
<sourceDirectory>${project.basedir}/src/main/scala</sourceDirectory>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import java.util.concurrent.Executor
88

99
import org.apache.calcite.adapter.java.JavaTypeFactory
1010
import org.apache.calcite.config.CalciteConnectionConfig
11-
import org.apache.calcite.jdbc.CalciteConnection
11+
import org.apache.calcite.jdbc.{CalciteConnection, CalcitePrepare}
1212
import org.apache.calcite.linq4j.tree.Expression
1313
import org.apache.calcite.linq4j.{Enumerator, Queryable}
1414
import org.apache.calcite.schema.SchemaPlus
@@ -150,4 +150,6 @@ class SimpleCalciteConnection extends CalciteConnection{
150150
override def execute[T](expression: Expression, `type`: Type): T = null.asInstanceOf[T]
151151

152152
override def executeQuery[T](queryable: Queryable[T]): Enumerator[T] = null
153+
154+
override def createPrepareContext(): CalcitePrepare.Context = null
153155
}

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
package net.sansa_stack.inference.rules.plan
22

3+
import java.util.Properties
4+
5+
import org.apache.calcite.config.{CalciteConnectionConfig, CalciteConnectionConfigImpl, CalciteConnectionProperty}
36
import org.apache.calcite.jdbc.CalciteSchema
47
import org.apache.calcite.plan.{Context, RelOptCluster, RelOptPlanner, RelOptSchema}
58
import org.apache.calcite.prepare.CalciteCatalogReader
69
import org.apache.calcite.rex.RexBuilder
710
import org.apache.calcite.schema.SchemaPlus
11+
import org.apache.calcite.sql.parser.SqlParser
812
import org.apache.calcite.tools.Frameworks.PlannerAction
913
import org.apache.calcite.tools.{FrameworkConfig, Frameworks, RelBuilder}
1014

@@ -56,11 +60,18 @@ object SimpleRelBuilder {
5660
val calciteSchema = CalciteSchema.from(config.getDefaultSchema)
5761
val relOptSchema = new CalciteCatalogReader(
5862
calciteSchema,
59-
config.getParserConfig.caseSensitive(),
6063
defaultRelOptSchema.getSchemaPaths.get(0),
61-
typeFactory)
64+
typeFactory,
65+
connectionConfig(config.getParserConfig))
6266

6367
new SimpleRelBuilder(config.getContext, cluster, relOptSchema)
6468
}
6569

70+
def connectionConfig(parserConfig : SqlParser.Config): CalciteConnectionConfig = {
71+
val prop = new Properties()
72+
prop.setProperty(CalciteConnectionProperty.CASE_SENSITIVE.camelName,
73+
String.valueOf(parserConfig.caseSensitive))
74+
new CalciteConnectionConfigImpl(prop)
75+
}
76+
6677
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ import java.util
55
import scala.collection.JavaConverters._
66

77
import org.apache.calcite.DataContext
8+
import org.apache.calcite.config.CalciteConnectionConfig
89
import org.apache.calcite.linq4j.{Enumerable, Linq4j}
910
import org.apache.calcite.rel.`type`.{RelDataType, RelDataTypeFactory, RelProtoDataType}
1011
import org.apache.calcite.rex.RexNode
1112
import org.apache.calcite.schema.Schema.TableType
1213
import org.apache.calcite.schema._
14+
import org.apache.calcite.sql.{SqlCall, SqlNode}
1315
import org.apache.calcite.sql.`type`.SqlTypeName
1416

1517
/**
@@ -53,6 +55,10 @@ class TriplesTableFactory extends TableFactory[Table] {
5355

5456
override def getRowType(typeFactory: RelDataTypeFactory): RelDataType = protoRowType.apply(typeFactory)
5557

58+
override def isRolledUp(s: String): Boolean = false
5659

60+
override def rolledUpColumnValidInsideAgg(s: String, sqlCall: SqlCall, sqlNode: SqlNode,
61+
calciteConnectionConfig: CalciteConnectionConfig): Boolean = false
5762
}
63+
5864
}

sansa-inference-spark/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
<groupId>com.holdenkarau</groupId>
160160
<artifactId>spark-testing-base_${scala.binary.version}</artifactId>
161161
<!--version>${spark.version}_0.7.1</version-->
162-
<version>2.2.0_0.8.0</version>
162+
<version>2.3.0_0.9.0</version>
163163
<scope>test</scope>
164164
</dependency>
165165
<dependency>

0 commit comments

Comments
 (0)