Skip to content

Commit 25b9eb8

Browse files
committed
Remove databricks specific support
Signed-off-by: Paolo Di Tommaso <[email protected]>
1 parent e0337fe commit 25b9eb8

File tree

4 files changed

+3
-24
lines changed

4 files changed

+3
-24
lines changed

plugins/nf-sqldb/build.gradle

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ ext{
5656
}
5757

5858
dependencies {
59-
embeddedJar 'com.databricks:databricks-jdbc:0.9.8-oss'
60-
6159
compileOnly "io.nextflow:nextflow:$nextflowVersion"
6260
compileOnly 'org.slf4j:slf4j-api:2.0.7'
6361
compileOnly 'org.pf4j:pf4j:3.12.0'
@@ -70,8 +68,6 @@ dependencies {
7068
api 'org.xerial:sqlite-jdbc:3.47.0.0'
7169
api 'org.duckdb:duckdb_jdbc:0.10.2'
7270

73-
api files("$buildDir/filteredJars/databricks-jdbc-filtered-0.9.8-oss.jar")
74-
7571
// JDBC driver setup for AWS Athena - the 3rd party JAR are being downloaded and setup as gradle tasks below.
7672
// Reference https://docs.aws.amazon.com/athena/latest/ug/connect-with-jdbc.html
7773
api files('src/dist/lib/AthenaJDBC42_2.0.25.1001.jar')
@@ -132,20 +128,5 @@ task copyAthenDep(dependsOn: unzipAthenDep, type: Copy) {
132128
from file(new File(buildDir, '/downloads/unzip/awsathena/SimbaAthenaJDBC-2.0.25.1001/AthenaJDBC42_2.0.25.1001.jar'))
133129
into "src/dist/lib"
134130
}
135-
136-
// Task to create a filtered JAR
137-
task filteredJar(type: Jar) {
138-
from {
139-
zipTree(configurations.embeddedJar.singleFile).matching {
140-
exclude 'org/slf4j/**' // Exclude SLF4J classes
141-
}
142-
}
143-
archiveBaseName.set("databricks-jdbc-filtered")
144-
archiveVersion.set("0.9.8-oss")
145-
destinationDirectory.set(file("$buildDir/filteredJars"))
146-
}
147-
148131
project.copyPluginLibs.dependsOn('copyAthenDep')
149132
project.compileGroovy.dependsOn('copyAthenDep')
150-
project.compileGroovy.dependsOn('filteredJar')
151-
project.copyPluginLibs.dependsOn('filteredJar')

plugins/nf-sqldb/src/main/nextflow/sql/QueryHandler.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ class QueryHandler implements QueryOp<QueryHandler> {
5252
type_mapping.TINYINT = Byte
5353
type_mapping.SMALLINT = Short
5454
type_mapping.INTEGER = Integer
55-
type_mapping.BIGINT = Long
55+
type_mapping.BIGINT = Long
5656
type_mapping.REAL= Float
5757
type_mapping.FLOAT= Double
58-
type_mapping.DOUBLE = Double
59-
type_mapping.BINARY = byte[]
58+
type_mapping.DOUBLE = Double
59+
type_mapping.BINARY = byte[]
6060
type_mapping.VARBINARY = byte[]
6161
type_mapping.LONGVARBINARY= byte[]
6262
type_mapping.DATE = java.sql.Date

plugins/nf-sqldb/src/main/nextflow/sql/SqlPlugin.groovy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,5 @@ class SqlPlugin extends BasePlugin {
3131

3232
SqlPlugin(PluginWrapper wrapper) {
3333
super(wrapper)
34-
System.setProperty("com.databricks.jdbc.loggerImpl","SLF4JLOGGER")
3534
}
3635
}

plugins/nf-sqldb/src/main/nextflow/sql/config/DriverRegistry.groovy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ class DriverRegistry {
2525
drivers.'postgresql'= 'org.postgresql.Driver'
2626
drivers.'duckdb'= 'org.duckdb.DuckDBDriver'
2727
drivers.'awsathena'= 'com.simba.athena.jdbc.Driver'
28-
drivers.'databricks'= 'com.databricks.client.jdbc.Driver'
2928
}
3029

3130
void addDriver(String name, String driver){

0 commit comments

Comments
 (0)