diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-11-10 20:23:53 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-11-10 20:25:24 +0100 |
commit | c272d764d842f04d864bcca5b57468ec7e8aad92 (patch) | |
tree | 5626b49fc39c09c479bd4867eaa1994e7b2bc194 /document/src/test | |
parent | 566108512ea68568354c6798180ff1a750c6b6aa (diff) |
GC dompression support in java.
Diffstat (limited to 'document/src/test')
3 files changed, 6 insertions, 77 deletions
diff --git a/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java b/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java index 5f283df9614..db877bb9712 100644 --- a/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java @@ -112,21 +112,11 @@ public class DocumentSerializationTestCase extends AbstractTypesTest { weightedSet.put(new StringFieldValue("Weighted 1"), 199); doc.setFieldValue("wsfield", weightedSet); - CompressionConfig noncomp = new CompressionConfig(); - CompressionConfig lz4comp = new CompressionConfig(CompressionType.LZ4); { - doc.getDataType().contentStruct().setCompressionConfig(noncomp); FileOutputStream fout = new FileOutputStream(path + "document-java-currentversion-uncompressed.dat", false); doc.serialize(fout); fout.close(); } - { - doc.getDataType().contentStruct().setCompressionConfig(lz4comp); - FileOutputStream fout = new FileOutputStream(path + "document-java-currentversion-lz4-9.dat", false); - doc.serialize(fout); - doc.getDataType().contentStruct().setCompressionConfig(noncomp); - fout.close(); - } } class TestDoc { diff --git a/document/src/test/java/com/yahoo/document/DocumentTestCase.java b/document/src/test/java/com/yahoo/document/DocumentTestCase.java index 5a694d21dd8..144c7d62894 100644 --- a/document/src/test/java/com/yahoo/document/DocumentTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocumentTestCase.java @@ -428,7 +428,7 @@ public class DocumentTestCase extends DocumentTestCaseBase { } } - class ModifyIteratorHandler extends FieldPathIteratorHandler { + static class ModifyIteratorHandler extends FieldPathIteratorHandler { public ModificationStatus doModify(FieldValue fv) { if (fv instanceof StringFieldValue) { @@ -444,7 +444,7 @@ public class DocumentTestCase extends DocumentTestCaseBase { } } - class AddIteratorHandler extends FieldPathIteratorHandler { + static class AddIteratorHandler extends FieldPathIteratorHandler { @SuppressWarnings("unchecked") public ModificationStatus doModify(FieldValue fv) { @@ -658,7 +658,7 @@ public class DocumentTestCase extends DocumentTestCaseBase { validateCppDoc(doc); } - public void validateCppDoc(Document doc) throws IOException { + public void validateCppDoc(Document doc) { validateCppDocNotMap(doc); MapFieldValue map = (MapFieldValue)doc.getFieldValue("mapfield"); assertEquals(map.get(new StringFieldValue("foo1")), new StringFieldValue("bar1")); @@ -666,7 +666,7 @@ public class DocumentTestCase extends DocumentTestCaseBase { } @SuppressWarnings("unchecked") - public void validateCppDocNotMap(Document doc) throws IOException { + public void validateCppDocNotMap(Document doc) { // in practice to validate v6 serialization assertEquals("id:ns:serializetest::http://test.doc.id/", doc.getId().toString()); assertEquals(new IntegerFieldValue(5), doc.getFieldValue("intfield")); @@ -694,7 +694,6 @@ public class DocumentTestCase extends DocumentTestCaseBase { } @Test - @SuppressWarnings("deprecation") public void testGenerateSerializedFile() throws IOException { docMan = setUpCppDocType(); @@ -744,18 +743,6 @@ public class DocumentTestCase extends DocumentTestCaseBase { FileOutputStream fos = new FileOutputStream("src/tests/data/serializejava.dat"); fos.write(buf.array(), 0, size); fos.close(); - - CompressionConfig noncomp = new CompressionConfig(); - CompressionConfig lz4comp = new CompressionConfig(CompressionType.LZ4); - - doc.getDataType().contentStruct().setCompressionConfig(lz4comp); - buf = new GrowableByteBuffer(size, 2.0f); - - doc.serialize(buf); - doc.getDataType().contentStruct().setCompressionConfig(noncomp); - fos = new FileOutputStream("src/tests/data/serializejava-compressed.dat"); - fos.write(buf.array(), 0, buf.position()); - fos.close(); } @Test @@ -801,53 +788,6 @@ public class DocumentTestCase extends DocumentTestCaseBase { } @Test - @SuppressWarnings("deprecation") - public void testSerializeDeserializeCompressed() { - setUpSertestDocType(); - Document doc = getSertestDocument(); - - CompressionConfig noncomp = new CompressionConfig(); - CompressionConfig lz4comp = new CompressionConfig(CompressionType.LZ4); - - doc.getDataType().contentStruct().setCompressionConfig(lz4comp); - - GrowableByteBuffer data = new GrowableByteBuffer(); - doc.serialize(data); - int size = doc.getSerializedSize(); - doc.getDataType().contentStruct().setCompressionConfig(noncomp); - - assertEquals(size, data.position()); - - data.flip(); - - try { - FileOutputStream fos = new FileOutputStream("src/test/files/testser.dat"); - fos.write(data.array(), 0, data.remaining()); - fos.close(); - } catch (Exception e) { - } - - Document doc2 = docMan.createDocument(data); - - assertEquals(doc.getFieldValue("mailid"), doc2.getFieldValue("mailid")); - assertEquals(doc.getFieldValue("date"), doc2.getFieldValue("date")); - assertEquals(doc.getFieldValue("from"), doc2.getFieldValue("from")); - assertEquals(doc.getFieldValue("to"), doc2.getFieldValue("to")); - assertEquals(doc.getFieldValue("subject"), doc2.getFieldValue("subject")); - assertEquals(doc.getFieldValue("body"), doc2.getFieldValue("body")); - assertEquals(doc.getFieldValue("attachmentcount"), doc2.getFieldValue("attachmentcount")); - assertEquals(doc.getFieldValue("attachments"), doc2.getFieldValue("attachments")); - byte[] docRawBytes = ((Raw)doc.getFieldValue("rawfield")).getByteBuffer().array(); - byte[] doc2RawBytes = ((Raw)doc2.getFieldValue("rawfield")).getByteBuffer().array(); - assertEquals(docRawBytes.length, doc2RawBytes.length); - for (int i = 0; i < docRawBytes.length; i++) { - assertEquals(docRawBytes[i], doc2RawBytes[i]); - } - assertEquals(doc.getFieldValue("weightedfield"), doc2.getFieldValue("weightedfield")); - assertEquals(doc.getFieldValue("mapfield"), doc2.getFieldValue("mapfield")); - } - - @Test public void testDeserialize() { setUpSertestDocType(); @@ -937,7 +877,7 @@ public class DocumentTestCase extends DocumentTestCaseBase { } @Test - public void testCompressionConfigured() { + public void testCompressionConfiguredIsIgnored() { int size_uncompressed; { @@ -966,7 +906,7 @@ public class DocumentTestCase extends DocumentTestCaseBase { doc.serialize(data); int size_compressed = data.position(); - assertTrue(size_compressed + " < " + size_uncompressed, size_compressed < size_uncompressed); + assertEquals(size_compressed, size_uncompressed); } @Test diff --git a/document/src/test/java/com/yahoo/document/serialization/VespaDocumentSerializerTestCase.java b/document/src/test/java/com/yahoo/document/serialization/VespaDocumentSerializerTestCase.java index 379089f1c79..ff66da9a3d7 100644 --- a/document/src/test/java/com/yahoo/document/serialization/VespaDocumentSerializerTestCase.java +++ b/document/src/test/java/com/yahoo/document/serialization/VespaDocumentSerializerTestCase.java @@ -68,7 +68,6 @@ public class VespaDocumentSerializerTestCase { CompressionFixture() { docType = new DocumentType("map_of_structs"); - docType.contentStruct().setCompressionConfig(new CompressionConfig(CompressionType.LZ4)); nestedType = new StructDataType("nested_type"); nestedType.addField(new Field("str", DataType.STRING)); |