From f69a6f2e89553539710163e7c74d5808275dba3c Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Mon, 27 Aug 2018 23:14:41 +0200
Subject: [PATCH] Removed jdbm

---
 .../database/text/TextDbLoader.groovy         | 23 +------------------
 .../scviewer/database/text/TxStream.groovy    |  5 ++--
 2 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy b/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy
index 2cc5045..969a275 100644
--- a/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy
+++ b/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy
@@ -13,8 +13,6 @@ package com.minres.scviewer.database.text;
 import java.nio.charset.CharsetDecoder;
 import java.util.Collection;
 import java.util.zip.GZIPInputStream
-import org.apache.jdbm.DB
-import org.apache.jdbm.DBMaker
 import groovy.io.FileType
 
 import com.minres.scviewer.database.AssociationType
@@ -32,8 +30,6 @@ public class TextDbLoader implements IWaveformDbLoader{
 
 	IWaveformDb db;
 
-	DB backingDb;
-
 	def streams = []
 
 	def relationTypes=[:]
@@ -65,20 +61,6 @@ public class TextDbLoader implements IWaveformDbLoader{
 		this.streams=[]
 		def gzipped = isGzipped(file)
 		if(isTxfile(gzipped?new GZIPInputStream(new FileInputStream(file)):new FileInputStream(file))){
-			if(true) {
-				def parentDir=file.absoluteFile.parent
-				def filename=file.name
-				new File(parentDir).eachFileRecurse (FileType.FILES) { f -> if(f.name=~/^\.${filename}/) f.delete() }
-				this.backingDb = DBMaker.openFile(parentDir+File.separator+"."+filename+"_bdb")
-						.deleteFilesAfterClose()
-						.useRandomAccessFile()
-						.setMRUCacheSize(4096) 
-						//.disableTransactions()
-						.disableLocking()
-						.make();
-			} else {
-				this.backingDb = DBMaker.openMemory().disableLocking().make()
-			}
 			parseInput(gzipped?new GZIPInputStream(new FileInputStream(file)):new FileInputStream(file))
 			calculateConcurrencyIndicees()
 			return true
@@ -140,7 +122,7 @@ public class TextDbLoader implements IWaveformDbLoader{
 				case "end_attribute":
 					if ((matcher = line =~ /^scv_tr_stream\s+\(ID (\d+),\s+name\s+"([^"]+)",\s+kind\s+"([^"]+)"\)$/)) {
 						def id = Integer.parseInt(matcher[0][1])
-						def stream = new TxStream(db, id, matcher[0][2], matcher[0][3], backingDb)
+						def stream = new TxStream(db, id, matcher[0][2], matcher[0][3])
 						streams<<stream
 						streamsById[id]=stream
 					} else if ((matcher = line =~ /^scv_tr_generator\s+\(ID\s+(\d+),\s+name\s+"([^"]+)",\s+scv_tr_stream\s+(\d+),$/)) {
@@ -202,9 +184,6 @@ public class TextDbLoader implements IWaveformDbLoader{
 
 			}
 			lineCnt++
-			if((lineCnt%1000) == 0) {
-				backingDb.commit()
-			}
 		}
 	}
 
diff --git a/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxStream.groovy b/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxStream.groovy
index c7d9728..59dfc4c 100644
--- a/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxStream.groovy
+++ b/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxStream.groovy
@@ -43,15 +43,14 @@ class TxStream extends HierNode implements ITxStream {
 	
 	private TreeMap<Long, List<ITxEvent>> events
 	
-	TxStream(IWaveformDb db, int id, String name, String kind, DB backingStore){
+	TxStream(IWaveformDb db, int id, String name, String kind){
 		super(name)
 		this.id=id
 		this.database=db
 		this.fullName=name
 		this.kind=kind
 		this.maxConcurrency=0
-		//events = new TreeMap<Long, List<ITxEvent>>()
-		events=backingStore.createTreeMap("stream-"+name)
+		events = new TreeMap<Long, List<ITxEvent>>()
 	}
 
 	List<ITxGenerator> getGenerators(){