Tools/SCViewer
11
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix Sonarlint warnings

Browse Source
This commit is contained in:
Eyck Jentzsch
2021-01-08 20:50:24 +01:00
parent af388b2462
commit 90f45c698f
3 changed files with 56 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.java
View File

@ -16,6 +16,9 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@ -99,25 +102,25 @@ public class TextDbLoader implements IWaveformDbLoader{
if(file.length() < 75000000*(gzipped?1:10) || "memory".equals(System.getProperty("ScvBackingDB", "file")))
mapDb = DBMaker
.memoryDirectDB()
.allocateStartSize(512*1024*1024)
.allocateIncrement(128*1024*1024)
.allocateStartSize(512l*1024l*1024l)
.allocateIncrement(128l*1024l*1024l)
.cleanerHackEnable()
.make();
else {
File mapDbFile;
try {
mapDbFile = File.createTempFile("."+file.getName(), ".mapdb", null /*file.parentFile*/);
Files.delete(Paths.get(mapDbFile.getPath()));
} catch (IOException e1) {
return false;
}
mapDbFile.delete(); // we just need a file name
mapDb = DBMaker
.fileDB(mapDbFile)
.fileMmapEnable() // Always enable mmap
.fileMmapEnableIfSupported()
.fileMmapPreclearDisable()
.allocateStartSize(512*1024*1024)
.allocateIncrement(128*1024*1024)
.allocateStartSize(512l*1024l*1024l)
.allocateIncrement(128l*1024l*1024l)
.cleanerHackEnable()
.make();
mapDbFile.deleteOnExit();
@ -134,6 +137,7 @@ public class TextDbLoader implements IWaveformDbLoader{
}
for(TxStream stream:txStreams.values()) {
Thread t = new Thread() {
@Override
public void run() {
try {
stream.calculateConcurrency();
@ -145,7 +149,8 @@ public class TextDbLoader implements IWaveformDbLoader{
}
return true;
}
@Override
public void dispose() {
attrValues.clear();
relationTypes.clear();
@ -214,7 +219,7 @@ public class TextDbLoader implements IWaveformDbLoader{
}
void parseInput(InputStream inputStream) throws IOException{
reader = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
String curLine = reader.readLine();
String nextLine = null;
while((nextLine=reader.readLine())!=null && curLine!=null) {

12
plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxStream.java
View File

@ -31,6 +31,8 @@ class TxStream extends HierNode implements IWaveform {
private TextDbLoader loader;
final String kind;
private int maxConcurrency = 0;
private int concurrency = 0;
@ -53,6 +55,7 @@ class TxStream extends HierNode implements IWaveform {
super(name);
this.id=id;
this.loader=loader;
this.kind=kind;
}
List<ITxGenerator> getGenerators(){
@ -78,7 +81,7 @@ class TxStream extends HierNode implements IWaveform {
@Override
public NavigableMap<Long, IEvent[]> getEvents() {
if(!concurrencyCalculated) calculateConcurrency();
return (NavigableMap<Long, IEvent[]>)events;
return events;
}
@Override
@ -89,15 +92,16 @@ class TxStream extends HierNode implements IWaveform {
@Override
public boolean isSame(IWaveform other) {
return(other instanceof TxStream && this.getId()==other.getId());
return(other instanceof TxStream && this.getId().equals(other.getId()));
}
@Override
public IEvent[] getEventsBeforeTime(Long time) {
if(!concurrencyCalculated) calculateConcurrency();
if(!concurrencyCalculated)
calculateConcurrency();
Entry<Long, IEvent[]> e = events.floorEntry(time);
if(e==null)
return null;
return new IEvent[] {};
else
return events.floorEntry(time).getValue();
}