lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-09-20 22:39:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

decompress after decrypt if necessary

Browse Source 
skip any decompress error
This commit is contained in:
Chris Lu
2020-08-02 23:50:23 -07:00
parent 1b3a80dd3d
commit 0ed1f43d29
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
other/java/client/src/main/java/seaweedfs/client/Gzip.java
View File

@@ -18,14 +18,18 @@ public class Gzip {
return compressed; return compressed;
} }
public static byte[] decompress(byte[] compressed) throws IOException { public static byte[] decompress(byte[] compressed) {
ByteArrayInputStream bis = new ByteArrayInputStream(compressed); try {
GZIPInputStream gis = new GZIPInputStream(bis); ByteArrayInputStream bis = new ByteArrayInputStream(compressed);
return readAll(gis); GZIPInputStream gis = new GZIPInputStream(bis);
return readAll(gis);
} catch (Exception e) {
return compressed;
}
} }
private static byte[] readAll(InputStream input) throws IOException { private static byte[] readAll(InputStream input) throws IOException {
try( ByteArrayOutputStream output = new ByteArrayOutputStream()){ try (ByteArrayOutputStream output = new ByteArrayOutputStream()) {
byte[] buffer = new byte[4096]; byte[] buffer = new byte[4096];
int n; int n;
while (-1 != (n = input.read(buffer))) { while (-1 != (n = input.read(buffer))) {

4
other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java
View File

@@ -119,6 +119,10 @@ public class SeaweedRead {
} }
} }
if (chunkView.isCompressed) {
data = Gzip.decompress(data);
}
LOG.debug("doFetchFullChunkData fid:{} chunkData.length:{}", chunkView.fileId, data.length); LOG.debug("doFetchFullChunkData fid:{} chunkData.length:{}", chunkView.fileId, data.length);
return data; return data;