Merge branch 'release/2.17.1'

doc/com.minres.scviewer.doc/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.17.0</version>
+		<version>2.17.1</version>
 		<relativePath>../..</relativePath>
 	</parent>
 

features/com.minres.scviewer.database.feature/pom.xml

@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.17.0</version>
+  	<version>2.17.1</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>3.0.0-SNAPSHOT</version>

features/com.minres.scviewer.e4.feature/pom.xml

@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.17.0</version>
+  	<version>2.17.1</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>1.1.0-SNAPSHOT</version>

features/com.minres.scviewer.e4.help.feature/pom.xml

@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.17.0</version>
+  	<version>2.17.1</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>1.0.0-SNAPSHOT</version>

features/com.minres.scviewer.e4.platform.feature/pom.xml

@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.17.0</version>
+  	<version>2.17.1</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>1.0.0-SNAPSHOT</version>

features/com.minres.scviewer.feature/pom.xml

@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.17.0</version>
+  	<version>2.17.1</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>1.1.0-SNAPSHOT</version>

features/com.minres.scviewer.ui.feature/pom.xml

@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.17.0</version>
+  	<version>2.17.1</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>1.1.0-SNAPSHOT</version>

plugins/com.minres.scviewer.database.ftr/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.17.0</version>
+		<version>2.17.1</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-plugin</packaging>

plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/FtrDbLoader.java

@@ -17,15 +17,13 @@ import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.channels.FileChannel;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.TreeMap;
 
+import org.apache.commons.compress.compressors.lz4.BlockLZ4CompressorInputStream;
 import org.eclipse.collections.impl.map.mutable.UnifiedMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -42,7 +40,6 @@ import com.minres.scviewer.database.RelationType;
 import com.minres.scviewer.database.RelationTypeFactory;
 import com.minres.scviewer.database.tx.ITx;
 import com.minres.scviewer.database.tx.ITxAttribute;
-import com.minres.scviewer.database.RelationType;
 
 import jacob.CborDecoder;
 import jacob.CborType;
@@ -202,9 +199,17 @@ public class FtrDbLoader implements IWaveformDbLoader {
 		try(FileInputStream fis = new FileInputStream(file)) {
 			FileChannel fc = fis.getChannel();
 			for (Long offset : fileOffsets) {
+				if(offset>=0) {
 					fc.position(offset);
 					CborDecoder parser = new CborDecoder(fis);
 					ret.add(parser.readByteString());
+				} else {
+					fc.position(-offset);
+					CborDecoder parser = new CborDecoder(fis);
+					BlockLZ4CompressorInputStream decomp = new BlockLZ4CompressorInputStream(new ByteArrayInputStream(parser.readByteString()));
+					ret.add(decomp.readAllBytes());
+					decomp.close();
+				}
 			}
 		} catch (Exception e) {
 			LOG.error("Error parsing file "+file.getName(), e);
@@ -317,7 +322,11 @@ public class FtrDbLoader implements IWaveformDbLoader {
 				while(next != null && !break_type.isEqualType(next)) {
 					long tag = readTag();
 					switch((int)tag) {
+<<<<<<< HEAD
 					case 6: // info
+=======
+					case 6: { // info
+>>>>>>> refs/heads/release/2.17.1
 						CborDecoder cbd = new CborDecoder(new ByteArrayInputStream(readByteString()));
 						long sz = cbd.readArrayLength();
 						assert(sz==3);
@@ -328,14 +337,29 @@ public class FtrDbLoader implements IWaveformDbLoader {
 						assert(epoch_tag==1);
 						cbd.readInt(); // epoch
 						break;
+					}
 					case 8: { // dictionary uncompressed
 						parseDict(new CborDecoder(new ByteArrayInputStream(readByteString())));
 						break;
 					}
+					case 9: { // dictionary compressed
+						long sz = readArrayLength();
+						assert(sz==2);
+						readInt(); // uncompressed size
+						parseDict(new CborDecoder(new BlockLZ4CompressorInputStream(new ByteArrayInputStream(readByteString()))));
+						break;
+					}
 					case 10: { // directory uncompressed
 						parseDir(new CborDecoder(new ByteArrayInputStream(readByteString())));
 						break;
 					}
+					case 11: { // directory compressed
+						long sz = readArrayLength();
+						assert(sz==2);
+						readInt(); // uncompressed size
+						parseDir(new CborDecoder(new BlockLZ4CompressorInputStream(new ByteArrayInputStream(readByteString()))));
+						break;
+					}
 					case 12: { //tx chunk uncompressed
 						long len = readArrayLength(); 
 						assert(len==2);
@@ -345,10 +369,29 @@ public class FtrDbLoader implements IWaveformDbLoader {
 						parseTx(txStream, txStream.fileOffsets.size()-1, readByteString());
 						break;
 					}
+					case 13: { //tx chunk compressed
+						long len = readArrayLength(); 
+						assert(len==3);
+						long stream_id = readInt();
+						readInt(); // uncompressed size
+						TxStream txStream = loader.txStreams.get(stream_id);
+						txStream.fileOffsets.add(0-inputStream.getChannel().position());
+						BlockLZ4CompressorInputStream decomp = new BlockLZ4CompressorInputStream(new ByteArrayInputStream(readByteString()));
+						parseTx(txStream, txStream.fileOffsets.size()-1, decomp.readAllBytes());
+						decomp.close();
+						break;
+					}
 					case 14: { // relations uncompressed
 						parseRel(new CborDecoder(new ByteArrayInputStream(readByteString())));
 						break;
 					}
+					case 15: { // relations uncompressed
+						long sz = readArrayLength();
+						assert(sz==2);
+						readInt(); // uncompressed size
+						parseRel(new CborDecoder(new BlockLZ4CompressorInputStream(new ByteArrayInputStream(readByteString()))));
+						break;
+					}
 					}
 					next = peekType();
 				}

plugins/com.minres.scviewer.database.sqlite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.17.0</version>
+  	<version>2.17.1</version>
 	<relativePath>../..</relativePath>
   </parent>
   <packaging>eclipse-plugin</packaging>

plugins/com.minres.scviewer.database.text/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.17.0</version>
+		<version>2.17.1</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-plugin</packaging>

plugins/com.minres.scviewer.database.ui.swt/pom.xml

@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.17.0</version>
+  	<version>2.17.1</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>4.0.0-SNAPSHOT</version>

plugins/com.minres.scviewer.database.vcd/pom.xml

@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.17.0</version>
+  	<version>2.17.1</version>
 	<relativePath>../..</relativePath>
   </parent>
   <packaging>eclipse-plugin</packaging>

plugins/com.minres.scviewer.database/pom.xml

@@ -4,7 +4,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.17.0</version>
+  	<version>2.17.1</version>
 	<relativePath>../..</relativePath>
   </parent>
   <packaging>eclipse-plugin</packaging>

plugins/com.minres.scviewer.e4.application.help/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SCViewer Help
 Bundle-SymbolicName: com.minres.scviewer.e4.application.help;singleton:=true
-Bundle-Version: 2.17.0
+Bundle-Version: 2.17.1
 Bundle-Vendor: MINRES Technologies GmbH
 Automatic-Module-Name: com.minres.scviewer.e4.application.help
 Bundle-RequiredExecutionEnvironment: JavaSE-11

plugins/com.minres.scviewer.e4.application.help/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.17.0</version>
+		<version>2.17.1</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-plugin</packaging>

plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.minres.scviewer.e4.application;singleton:=true
-Bundle-Version: 2.17.0
+Bundle-Version: 2.17.1
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: javax.inject;bundle-version="1.0.0",
  org.eclipse.core.runtime;bundle-version="3.11.1",

plugins/com.minres.scviewer.e4.application/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.17.0</version>
+		<version>2.17.1</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-plugin</packaging>

plugins/com.minres.scviewer.ui/pom.xml

@@ -4,7 +4,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.17.0</version>
+  	<version>2.17.1</version>
 	<relativePath>../..</relativePath>
   </parent>
   <packaging>eclipse-plugin</packaging>

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.minres.scviewer</groupId>
 	<artifactId>com.minres.scviewer.parent</artifactId>
-	<version>2.17.0</version>
+	<version>2.17.1</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>releng/com.minres.scviewer.target</module>
@@ -70,7 +70,7 @@
 						<artifact>
 							<groupId>com.minres.scviewer</groupId>
 							<artifactId>com.minres.scviewer.target</artifactId>
-							<version>2.17.0</version>
+							<version>2.17.1</version>
 						</artifact>
 					</target>
               		<executionEnvironment>org.eclipse.justj.openjdk.hotspot.jre.minimal-15</executionEnvironment>

products/com.minres.scviewer.e4.product/pom.xml

@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.17.0</version>
+		<version>2.17.1</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<artifactId>com.minres.scviewer.e4.product</artifactId>
-  	<version>2.17.0</version>
+  	<version>2.17.1</version>
 	<packaging>eclipse-repository</packaging>
 	<groupId>com.minres.scviewer</groupId>
 	<build>

products/com.minres.scviewer.e4.product/scviewer.product

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="SCViewer" uid="scviewer" id="com.minres.scviewer.e4.application.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="2.17.0" useFeatures="true" includeLaunchers="true" autoIncludeRequirements="true">
+<product name="SCViewer" uid="scviewer" id="com.minres.scviewer.e4.application.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="2.17.1" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -67,8 +67,8 @@
    </features>
 
    <configurations>
-      <plugin id="com.minres.scviewer.database.text" autoStart="true" startLevel="2" />
       <plugin id="com.minres.scviewer.database.ftr" autoStart="true" startLevel="2" />
+      <plugin id="com.minres.scviewer.database.text" autoStart="true" startLevel="2" />
       <plugin id="com.minres.scviewer.database.vcd" autoStart="true" startLevel="2" />
       <plugin id="org.apache.felix.scr" autoStart="true" startLevel="1" />
       <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
@@ -79,7 +79,7 @@
    </configurations>
 
    <repositories>
-      <repository location="http://https://minres.github.io/SCViewer/repository" enabled="true" />
+      <repository location="https://minres.github.io/SCViewer/repository" enabled="true" />
    </repositories>
 
    <preferencesInfo>

releng/com.minres.scviewer.target/pom.xml

@@ -12,7 +12,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.17.0</version>
+  	<version>2.17.1</version>
   	<relativePath>../..</relativePath>
   </parent>
 

releng/com.minres.scviewer.updateSite/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.17.0</version>
+		<version>2.17.1</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<build>

tests/com.minres.scviewer.database.test/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.17.0</version>
+		<version>2.17.1</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-test-plugin</packaging>

tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java

@@ -148,4 +148,38 @@ public class DatabaseServicesTest {
 			assertEquals(3, attr.size());
 		});
 	}
+	@Test
+	public void testCFtr() throws Exception {
+		File f = new File("inputs/my_db_c.ftr").getAbsoluteFile();
+		assertTrue(f.exists());
+		waveformDb.load(f);
+		assertNotNull(waveformDb);
+		List<IWaveform> waveforms =  waveformDb.getAllWaves();
+		assertEquals(8,  waveforms.size());
+		assertEquals(1,  waveformDb.getChildNodes().size());
+		for(IWaveform w:waveforms) {
+			if(w.getId()==1) {
+				assertEquals(2, w.getRowCount());
+			} else if(w.getId()==2l) {
+				assertEquals(1, w.getRowCount());
+			} else if(w.getId()==3l) {
+				assertEquals(1, w.getRowCount());
+			}
+		}
+		//waveforms.stream().filter(s -> s.getId()==1).collect(Collectors.toList());
+		waveforms.stream().filter(s -> s.getId()==1).forEach(s -> {
+			assertEquals(27, s.getEvents().size());
+		});
+		waveforms.stream().filter(s -> s.getId()==1).map(s -> s.getEventsAtTime(0)).forEach(el ->  {
+			assertEquals(1, el.length);
+			IEvent evt = el[0];
+			assertTrue(evt instanceof ITxEvent);
+			ITx tx = ((ITxEvent)evt).getTransaction();
+			assertNotNull(tx);
+			assertEquals(0, tx.getBeginTime());
+			assertEquals(280000000, tx.getEndTime());
+			List<ITxAttribute> attr = tx.getAttributes();
+			assertEquals(3, attr.size());
+		});
+	}
 }