From b1191ca3354dea2183862f7f2422833d20541819 Mon Sep 17 00:00:00 2001 From: Peter van 't Hof Date: Thu, 26 Jan 2017 15:29:45 +0100 Subject: [PATCH] Try setup with sqlite --- .../{JsonToHdf5.scala => SummaryToSqlite.scala} | 14 ++++++++++---- biopet-utils/pom.xml | 11 ++++++++--- .../sasc/biopet/utils/summary/db/Samples.scala | 13 +++++++++++++ 3 files changed, 31 insertions(+), 7 deletions(-) rename biopet-tools/src/main/scala/nl/lumc/sasc/biopet/tools/{JsonToHdf5.scala => SummaryToSqlite.scala} (75%) create mode 100644 biopet-utils/src/main/scala/nl/lumc/sasc/biopet/utils/summary/db/Samples.scala diff --git a/biopet-tools/src/main/scala/nl/lumc/sasc/biopet/tools/JsonToHdf5.scala b/biopet-tools/src/main/scala/nl/lumc/sasc/biopet/tools/SummaryToSqlite.scala similarity index 75% rename from biopet-tools/src/main/scala/nl/lumc/sasc/biopet/tools/JsonToHdf5.scala rename to biopet-tools/src/main/scala/nl/lumc/sasc/biopet/tools/SummaryToSqlite.scala index 74d8c17de..c8964ab43 100644 --- a/biopet-tools/src/main/scala/nl/lumc/sasc/biopet/tools/JsonToHdf5.scala +++ b/biopet-tools/src/main/scala/nl/lumc/sasc/biopet/tools/SummaryToSqlite.scala @@ -2,14 +2,16 @@ package nl.lumc.sasc.biopet.tools import java.io.File -import ncsa.hdf.`object`.h5.H5File -import nl.lumc.sasc.biopet.tools.GvcfToBed.Args +import slick.driver.H2Driver.api._ + +import scala.concurrent.ExecutionContext.Implicits.global + import nl.lumc.sasc.biopet.utils.{ConfigUtils, ToolCommand} /** * Created by pjvanthof on 26/01/2017. */ -object JsonToHdf5 extends ToolCommand { +object SummaryToSqlite extends ToolCommand { case class Args(inputJson: File = null, outputHdf5: File = null) extends AbstractArgs @@ -29,8 +31,12 @@ object JsonToHdf5 extends ToolCommand { val jsonMap = ConfigUtils.fileToConfigMap(cmdArgs.inputJson) - val hdf5 = new H5File(cmdArgs.outputHdf5.getAbsolutePath) + val db = Database.forURL(s"jdbc:sqlite:${cmdArgs.outputHdf5.getAbsolutePath}", driver = "org.sqlite.JDBC") + try { + + } finally db.close } + } diff --git a/biopet-utils/pom.xml b/biopet-utils/pom.xml index 868e17f68..b1a7d7705 100644 --- a/biopet-utils/pom.xml +++ b/biopet-utils/pom.xml @@ -31,9 +31,14 @@ - org.hdfgroup - hdf-java - 2.6.1 + com.typesafe.slick + slick_2.10 + 3.1.1 + + + org.slf4j + slf4j-nop + 1.6.4 colt diff --git a/biopet-utils/src/main/scala/nl/lumc/sasc/biopet/utils/summary/db/Samples.scala b/biopet-utils/src/main/scala/nl/lumc/sasc/biopet/utils/summary/db/Samples.scala new file mode 100644 index 000000000..4de0c20f3 --- /dev/null +++ b/biopet-utils/src/main/scala/nl/lumc/sasc/biopet/utils/summary/db/Samples.scala @@ -0,0 +1,13 @@ +package nl.lumc.sasc.biopet.utils.summary.db + +import slick.driver.H2Driver.api._ + +/** + * Created by pjvan_thof on 26-1-17. + */ +class Samples(tag: Tag) extends Table[(Int, String)](tag, "SUPPLIERS") { + def sampleId = column[Int]("sampleId", O.PrimaryKey) // This is the primary key column + def sampleName = column[String]("sampleName") + // Every table needs a * projection with the same type as the table's type parameter + def * = (sampleId, sampleName) +} \ No newline at end of file -- GitLab