tyler.durden
/
snappy-java
mirror of https://github.com/xerial/snappy-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes #39. Comparing two native libraries directly without generating md5sum

This commit is contained in:
Taro L. Saito 2013-07-02 10:27:10 +09:00
parent 88275fb846
commit d7263cc36d
1 changed files with 52 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/main/java/org/xerial/snappy/SnappyLoader.java
View File

@ -24,13 +24,7 @@
//-------------------------------------- //--------------------------------------
package org.xerial.snappy; package org.xerial.snappy;
import java.io.BufferedInputStream; import java.io.*;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.net.URL; import java.net.URL;
@ -356,6 +350,25 @@ public class SnappyLoader
} }
} }
private static boolean contentsEquals(InputStream in1, InputStream in2) throws IOException {
if(!(in1 instanceof BufferedInputStream)) {
in1 = new BufferedInputStream(in1);
}
if(!(in2 instanceof BufferedInputStream)) {
in2 = new BufferedInputStream(in2);
}
int ch = in1.read();
while(ch != -1) {
int ch2 = in2.read();
if(ch != ch2)
return false;
ch = in1.read();
}
int ch2 = in2.read();
return ch2 == -1;
}
/** /**
* Extract the specified library file to the target folder * Extract the specified library file to the target folder
* *
@ -372,34 +385,46 @@ public class SnappyLoader
try { try {
if (extractedLibFile.exists()) { if (extractedLibFile.exists()) {
// test md5sum value // Compare the native library contents
String md5sum1 = md5sum(SnappyLoader.class.getResourceAsStream(nativeLibraryFilePath)); InputStream nativeIn = SnappyLoader.class.getResourceAsStream(nativeLibraryFilePath);
String md5sum2 = md5sum(new FileInputStream(extractedLibFile)); InputStream extractedLibIn = new FileInputStream(extractedLibFile);
try {
if (md5sum1.equals(md5sum2)) { if(contentsEquals(nativeIn, extractedLibIn)) {
return new File(targetFolder, extractedLibFileName); return new File(targetFolder, extractedLibFileName);
}
else {
// remove old native library file
boolean deletionSucceeded = extractedLibFile.delete();
if (!deletionSucceeded) {
throw new IOException("failed to remove existing native library file: "
+ extractedLibFile.getAbsolutePath());
} }
else {
// remove old native library file
boolean deletionSucceeded = extractedLibFile.delete();
if (!deletionSucceeded) {
throw new IOException("failed to remove existing native library file: "
+ extractedLibFile.getAbsolutePath());
}
}
}
finally {
if(nativeIn != null)
nativeIn.close();
if(extractedLibIn != null)
extractedLibIn.close();
} }
} }
// Extract a native library file into the target directory // Extract a native library file into the target directory
InputStream reader = SnappyLoader.class.getResourceAsStream(nativeLibraryFilePath); InputStream reader = SnappyLoader.class.getResourceAsStream(nativeLibraryFilePath);
FileOutputStream writer = new FileOutputStream(extractedLibFile); FileOutputStream writer = new FileOutputStream(extractedLibFile);
byte[] buffer = new byte[8192]; try {
int bytesRead = 0; byte[] buffer = new byte[8192];
while ((bytesRead = reader.read(buffer)) != -1) { int bytesRead = 0;
writer.write(buffer, 0, bytesRead); while ((bytesRead = reader.read(buffer)) != -1) {
writer.write(buffer, 0, bytesRead);
}
}
finally {
if(writer != null)
writer.close();
if(reader != null)
reader.close();
} }
writer.close();
reader.close();
// Set executable (x) flag to enable Java to load the native library // Set executable (x) flag to enable Java to load the native library
if (!System.getProperty("os.name").contains("Windows")) { if (!System.getProperty("os.name").contains("Windows")) {