Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor out the serialization & deserialization

This commit is contained in:
Noble Paul 2016-09-06 11:39:04 +05:30
parent 757c245bee
commit 6ca9aeb510
1 changed files with 56 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.java
View File

@ -175,33 +175,36 @@ public class TestJavaBinCodec extends SolrTestCaseJ4 {
InputStream is = getClass().getResourceAsStream(SOLRJ_JAVABIN_BACKCOMPAT_BIN); InputStream is = getClass().getResourceAsStream(SOLRJ_JAVABIN_BACKCOMPAT_BIN);
List<Object> unmarshaledObj = (List<Object>) javabin.unmarshal(is); List<Object> unmarshaledObj = (List<Object>) javabin.unmarshal(is);
List<Object> matchObj = generateAllDataTypes(); List<Object> matchObj = generateAllDataTypes();
compareObjects(unmarshaledObj, matchObj);
assertEquals(unmarshaledObj.size(), matchObj.size());
for(int i=0; i < unmarshaledObj.size(); i++) {
if(unmarshaledObj.get(i) instanceof byte[] && matchObj.get(i) instanceof byte[]) {
byte[] b1 = (byte[]) unmarshaledObj.get(i);
byte[] b2 = (byte[]) matchObj.get(i);
assertTrue(Arrays.equals(b1, b2));
} else if(unmarshaledObj.get(i) instanceof SolrDocument && matchObj.get(i) instanceof SolrDocument ) {
assertTrue(compareSolrDocument(unmarshaledObj.get(i), matchObj.get(i)));
} else if(unmarshaledObj.get(i) instanceof SolrDocumentList && matchObj.get(i) instanceof SolrDocumentList ) {
assertTrue(compareSolrDocumentList(unmarshaledObj.get(i), matchObj.get(i)));
} else if(unmarshaledObj.get(i) instanceof SolrInputDocument && matchObj.get(i) instanceof SolrInputDocument) {
assertTrue(compareSolrInputDocument(unmarshaledObj.get(i), matchObj.get(i)));
} else if(unmarshaledObj.get(i) instanceof SolrInputField && matchObj.get(i) instanceof SolrInputField) {
assertTrue(assertSolrInputFieldEquals(unmarshaledObj.get(i), matchObj.get(i)));
} else {
assertEquals(unmarshaledObj.get(i), matchObj.get(i));
}
}
} catch (IOException e) { } catch (IOException e) {
throw e; throw e;
} }
} }
private void compareObjects(List unmarshaledObj, List matchObj) {
assertEquals(unmarshaledObj.size(), matchObj.size());
for (int i = 0; i < unmarshaledObj.size(); i++) {
if (unmarshaledObj.get(i) instanceof byte[] && matchObj.get(i) instanceof byte[]) {
byte[] b1 = (byte[]) unmarshaledObj.get(i);
byte[] b2 = (byte[]) matchObj.get(i);
assertTrue(Arrays.equals(b1, b2));
} else if (unmarshaledObj.get(i) instanceof SolrDocument && matchObj.get(i) instanceof SolrDocument) {
assertTrue(compareSolrDocument(unmarshaledObj.get(i), matchObj.get(i)));
} else if (unmarshaledObj.get(i) instanceof SolrDocumentList && matchObj.get(i) instanceof SolrDocumentList) {
assertTrue(compareSolrDocumentList(unmarshaledObj.get(i), matchObj.get(i)));
} else if (unmarshaledObj.get(i) instanceof SolrInputDocument && matchObj.get(i) instanceof SolrInputDocument) {
assertTrue(compareSolrInputDocument(unmarshaledObj.get(i), matchObj.get(i)));
} else if (unmarshaledObj.get(i) instanceof SolrInputField && matchObj.get(i) instanceof SolrInputField) {
assertTrue(assertSolrInputFieldEquals(unmarshaledObj.get(i), matchObj.get(i)));
} else {
assertEquals(unmarshaledObj.get(i), matchObj.get(i));
}
}
}
@Test @Test
public void testBackCompatForSolrDocumentWithChildDocs() throws IOException { public void testBackCompatForSolrDocumentWithChildDocs() throws IOException {
JavaBinCodec javabin = new JavaBinCodec(){ JavaBinCodec javabin = new JavaBinCodec(){
@ -267,14 +270,33 @@ public class TestJavaBinCodec extends SolrTestCaseJ4 {
} }
@Test @Test
public void testResponseChildDocuments() throws IOException { public void testAllTypes() throws IOException {
List<Object> obj = generateAllDataTypes();
compareObjects(
(List) getObject(getBytes(obj)),
(List) obj
);
}
private static Object serializeAndDeserialize(Object o) throws IOException {
return getObject(getBytes(o));
}
private static byte[] getBytes(Object o) throws IOException {
JavaBinCodec javabin = new JavaBinCodec(); JavaBinCodec javabin = new JavaBinCodec();
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();
javabin.marshal(generateSolrDocumentWithChildDocs(), baos); javabin.marshal(o, baos);
return baos.toByteArray();
}
SolrDocument result = (SolrDocument) javabin.unmarshal(new ByteArrayInputStream(baos.toByteArray())); private static Object getObject(byte[] bytes) throws IOException {
return new JavaBinCodec().unmarshal(new ByteArrayInputStream(bytes));
}
@Test
public void testResponseChildDocuments() throws IOException {
SolrDocument result = (SolrDocument) serializeAndDeserialize(generateSolrDocumentWithChildDocs());
assertEquals(2, result.size()); assertEquals(2, result.size());
assertEquals("1", result.getFieldValue("id")); assertEquals("1", result.getFieldValue("id"));
assertEquals("parentDocument", result.getFieldValue("subject")); assertEquals("parentDocument", result.getFieldValue("subject"));
@ -305,13 +327,11 @@ public class TestJavaBinCodec extends SolrTestCaseJ4 {
@Test @Test
public void testStringCaching() throws Exception { public void testStringCaching() throws Exception {
Map<String, Object> m = Utils.makeMap("key1", "val1", "key2", "val2"); Map<String, Object> m = Utils.makeMap("key1", "val1", "key2", "val2");
byte[] b1 = getBytes(m);//copy 1
byte[] b2 = getBytes(m);//copy 2
Map m1 = (Map) getObject(b1);
Map m2 = (Map) getObject(b1);
ByteArrayOutputStream os1 = new ByteArrayOutputStream();
new JavaBinCodec().marshal(m, os1);
Map m1 = (Map) new JavaBinCodec().unmarshal(new ByteArrayInputStream(os1.toByteArray()));
ByteArrayOutputStream os2 = new ByteArrayOutputStream();
new JavaBinCodec().marshal(m, os2);
Map m2 = (Map) new JavaBinCodec().unmarshal(new ByteArrayInputStream(os2.toByteArray()));
List l1 = new ArrayList<>(m1.keySet()); List l1 = new ArrayList<>(m1.keySet());
List l2 = new ArrayList<>(m2.keySet()); List l2 = new ArrayList<>(m2.keySet());
@ -346,8 +366,8 @@ public class TestJavaBinCodec extends SolrTestCaseJ4 {
}); });
m1 = (Map) new JavaBinCodec(null, stringCache).unmarshal(new ByteArrayInputStream(os1.toByteArray())); m1 = (Map) new JavaBinCodec(null, stringCache).unmarshal(new ByteArrayInputStream(b1));
m2 = (Map) new JavaBinCodec(null, stringCache).unmarshal(new ByteArrayInputStream(os2.toByteArray())); m2 = (Map) new JavaBinCodec(null, stringCache).unmarshal(new ByteArrayInputStream(b2));
l1 = new ArrayList<>(m1.keySet()); l1 = new ArrayList<>(m1.keySet());
l2 = new ArrayList<>(m2.keySet()); l2 = new ArrayList<>(m2.keySet());
assertTrue(l1.get(0).equals(l2.get(0))); assertTrue(l1.get(0).equals(l2.get(0)));
@ -359,26 +379,19 @@ public class TestJavaBinCodec extends SolrTestCaseJ4 {
} }
public void genBinaryFiles() throws IOException { public void genBinaryFiles() throws IOException {
JavaBinCodec javabin = new JavaBinCodec();
ByteArrayOutputStream os = new ByteArrayOutputStream();
Object data = generateAllDataTypes(); Object data = generateAllDataTypes();
byte[] out = getBytes(data);
javabin.marshal(data, os);
byte[] out = os.toByteArray();
FileOutputStream fs = new FileOutputStream(new File(BIN_FILE_LOCATION)); FileOutputStream fs = new FileOutputStream(new File(BIN_FILE_LOCATION));
BufferedOutputStream bos = new BufferedOutputStream(fs); BufferedOutputStream bos = new BufferedOutputStream(fs);
bos.write(out); bos.write(out);
bos.close(); bos.close();
//Binary file with child documents //Binary file with child documents
javabin = new JavaBinCodec();
SolrDocument sdoc = generateSolrDocumentWithChildDocs(); SolrDocument sdoc = generateSolrDocumentWithChildDocs();
os = new ByteArrayOutputStream();
javabin.marshal(sdoc, os);
fs = new FileOutputStream(new File(BIN_FILE_LOCATION_CHILD_DOCS)); fs = new FileOutputStream(new File(BIN_FILE_LOCATION_CHILD_DOCS));
bos = new BufferedOutputStream(fs); bos = new BufferedOutputStream(fs);
bos.write(os.toByteArray()); bos.write(getBytes(sdoc));
bos.close(); bos.close();
} }
@ -553,12 +566,7 @@ public class TestJavaBinCodec extends SolrTestCaseJ4 {
sdoc.put("some_boolean", ""+r.nextBoolean()); sdoc.put("some_boolean", ""+r.nextBoolean());
sdoc.put("another_boolean", ""+r.nextBoolean()); sdoc.put("another_boolean", ""+r.nextBoolean());
buffers[bufnum] = getBytes(sdoc);
JavaBinCodec javabin = new JavaBinCodec();
ByteArrayOutputStream os = new ByteArrayOutputStream();
javabin.marshal(sdoc, os);
os.toByteArray();
buffers[bufnum] = os.toByteArray();
} }
int ret = 0; int ret = 0;