You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2016/09/08 15:18:21 UTC
svn commit: r1759845 - in /uima/uimaj/trunk/uimaj-core/src:
main/java/org/apache/uima/cas/impl/CommonSerDes.java
test/java/org/apache/uima/util/CasIOUtilsTest.java
Author: schor
Date: Thu Sep 8 15:18:21 2016
New Revision: 1759845
URL: http://svn.apache.org/viewvc?rev=1759845&view=rev
Log:
[UIMA-5103] fix COMPRESSED_FILTERED_TS, add test case
Modified:
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonSerDes.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsTest.java
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonSerDes.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonSerDes.java?rev=1759845&r1=1759844&r2=1759845&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonSerDes.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonSerDes.java Thu Sep 8 15:18:21 2016
@@ -50,8 +50,9 @@ public class CommonSerDes {
* - bit in 0x01 position: on for binary non-delta (redundant)
* - bit in 0x02 position: on means delta, off - not delta
* - bit in 0x04 position: on means compressed, off means plain binary
- * - bit in 0x08 position: on means type system included
- * - bits 0xF8 reserved
+ * - bit in 0x08 position: on means type system + indexes def included
+ * - bit in 0x10 position: on means type system (only) included
+ * - bits 0xF0 reserved
*
* - byte in 0xFF 00 position: incrementing (starting w/ 0) version
*
@@ -97,6 +98,7 @@ public class CommonSerDes {
if (isDelta) v |= 0x02;
if (isCompressed) v |= 0x04;
if (typeSystemIndexDefIncluded) v |= 0x08;
+ if (typeSystemIncluded) v |= 0x10;
v |= (seqVersionNbr << 8);
if (isV3) v |= 0x010000;
@@ -195,6 +197,7 @@ public class CommonSerDes {
h.isDelta = (v & 2) != 0;
h.isCompressed = (v & 4) != 0;
h.typeSystemIndexDefIncluded = (v & 8) != 0;
+ h.typeSystemIncluded = (v & 16) != 0;
h.seqVersionNbr = (byte) ((v & 0xFF00) >> 8);
if (h.isCompressed) {
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsTest.java?rev=1759845&r1=1759844&r2=1759845&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsTest.java Thu Sep 8 15:18:21 2016
@@ -149,6 +149,10 @@ public class CasIOUtilsTest extends Test
public void testS6p() throws Exception {
testFormat(SerialFormat.COMPRESSED_FILTERED_TSI, "bins6p", false);
}
+
+ public void testS6pTs() throws Exception {
+ testFormat(SerialFormat.COMPRESSED_FILTERED_TS, "bins6pTs", false);
+ }
public void testS6pLenient() throws Exception {
testFormat(SerialFormat.COMPRESSED_FILTERED_TSI, "bins6", true);