Merge pull request #242 from sxci/hash_record_file_name

longbai · web-flow · commit d82fc2988d6d · 2017-01-10T17:30:12.000+08:00
记录文件名称使用 sha1，缩减文件名长度
diff --git a/src/main/java/com/qiniu/storage/ResumeUploader.java b/src/main/java/com/qiniu/storage/ResumeUploader.java
@@ -68,6 +68,14 @@ public final class ResumeUploader {
     }
 
     public Response upload() throws QiniuException {
+        try {
+            return upload0();
+        } finally {
+            close();
+        }
+    }
+
+    private Response upload0() throws QiniuException {
         if (host == null) {
             this.host = configuration.upHost(upToken);
         }
diff --git a/src/main/java/com/qiniu/storage/StreamUploader.java b/src/main/java/com/qiniu/storage/StreamUploader.java
@@ -46,6 +46,14 @@ public final class StreamUploader {
     }
 
     public Response upload() throws QiniuException {
+        try {
+            return upload0();
+        } finally {
+            close();
+        }
+    }
+
+    private Response upload0() throws QiniuException {
         if (host == null) {
             this.host = configuration.upHost(upToken);
         }
diff --git a/src/main/java/com/qiniu/storage/persistent/FileRecorder.java b/src/main/java/com/qiniu/storage/persistent/FileRecorder.java
@@ -1,12 +1,12 @@
 package com.qiniu.storage.persistent;
 
 import com.qiniu.storage.Recorder;
-import com.qiniu.util.UrlSafeBase64;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.security.MessageDigest;
 import java.util.Date;
 
 /**
@@ -53,7 +53,7 @@ public FileRecorder(File directory) throws IOException {
      */
     @Override
     public void set(String key, byte[] data) {
-        File f = new File(directory, UrlSafeBase64.encodeToString(key));
+        File f = new File(directory, hash(key));
         FileOutputStream fo = null;
         try {
             fo = new FileOutputStream(f);
@@ -77,7 +77,7 @@ public void set(String key, byte[] data) {
      */
     @Override
     public byte[] get(String key) {
-        File f = new File(directory, UrlSafeBase64.encodeToString(key));
+        File f = new File(directory, hash(key));
         if (!f.exists()) {
             return null;
         }
@@ -119,12 +119,28 @@ private boolean outOfDate(File f) {
      */
     @Override
     public void del(String key) {
-        File f = new File(directory, UrlSafeBase64.encodeToString(key));
+        File f = new File(directory, hash(key));
         f.delete();
     }
 
     @Override
     public String recorderKeyGenerate(String key, File file) {
-        return key + "_._" + file.getName();
+        return key + "_._" + file.getAbsolutePath();
+    }
+
+    private static String hash(String base) {
+        try {
+            MessageDigest digest = MessageDigest.getInstance("SHA-1");
+            byte[] hash = digest.digest(base.getBytes());
+            StringBuffer hexString = new StringBuffer();
+
+            for (int i = 0; i < hash.length; i++) {
+                hexString.append(Integer.toString((hash[i] & 0xff) + 0x100, 16).substring(1));
+            }
+            return hexString.toString();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        return null;
     }
 }
diff --git a/src/test/java/com/qiniu/storage/RecordUploadTest.java b/src/test/java/com/qiniu/storage/RecordUploadTest.java
@@ -8,13 +8,13 @@
 import com.qiniu.http.Response;
 import com.qiniu.storage.persistent.FileRecorder;
 import com.qiniu.util.Etag;
-import com.qiniu.util.UrlSafeBase64;
 import org.junit.Test;
 
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.security.MessageDigest;
 import java.util.Date;
 import java.util.Random;
 
@@ -201,7 +201,7 @@ public void testLastModify() throws IOException {
         fr.set(key, data);
         byte[] data2 = fr.get(key);
 
-        File recoderFile = new File(folder, UrlSafeBase64.encodeToString(key));
+        File recoderFile = new File(folder, hash(key));
 
         long m1 = recoderFile.lastModified();
 
@@ -232,6 +232,23 @@ public void testLastModify() throws IOException {
         assertTrue(m4 > m1);
     }
 
+    // copied from FileRecorder
+    private static String hash(String base) {
+        try {
+            MessageDigest digest = MessageDigest.getInstance("SHA-1");
+            byte[] hash = digest.digest(base.getBytes());
+            StringBuffer hexString = new StringBuffer();
+
+            for (int i = 0; i < hash.length; i++) {
+                hexString.append(Integer.toString((hash[i] & 0xff) + 0x100, 16).substring(1));
+            }
+            return hexString.toString();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        return null;
+    }
+
     class Up {
         private final File file;
         private final String key;
diff --git a/src/test/java/com/qiniu/storage/ResumeUploadTest.java b/src/test/java/com/qiniu/storage/ResumeUploadTest.java
@@ -40,7 +40,7 @@ public void testXVar() throws IOException {
             StringMap m = res.jsonToMap();
             assertEquals("foo_val", m.get("foo"));
         } catch (QiniuException e) {
-            assertEquals("", e.response.bodyString());
+            assertEquals("", e.response == null ? "e.response is null" : e.response.bodyString());
             fail();
         } finally {
             TempFile.remove(f);
@@ -69,7 +69,7 @@ private void template(int size, boolean https) throws IOException {
             assertEquals(String.valueOf(f.length()), ret.fsize);
             assertEquals(etag, ret.hash);
         } catch (QiniuException e) {
-            assertEquals("", e.response.bodyString());
+            assertEquals("", e.response == null ? "e.response is null" : e.response.bodyString());
             fail();
         }
         TempFile.remove(f);
diff --git a/src/test/java/com/qiniu/storage/StreamUploadTest.java b/src/test/java/com/qiniu/storage/StreamUploadTest.java
@@ -44,7 +44,7 @@ public void testXVar() throws IOException {
             StringMap m = res.jsonToMap();
             assertEquals("foo_val", m.get("foo"));
         } catch (QiniuException e) {
-            assertEquals("", e.response.bodyString());
+            assertEquals("", e.response == null ? "e.response is null" : e.response.bodyString());
             fail();
         } finally {
             TempFile.remove(f);
@@ -74,7 +74,7 @@ private void template(int size, boolean https) throws IOException {
             assertEquals(mime, ret.mimeType);
             assertEquals(etag, ret.hash);
         } catch (QiniuException e) {
-            assertEquals("", e.response.bodyString());
+            assertEquals("", e.response == null ? "e.response is null" : e.response.bodyString());
             fail();
         }
         TempFile.remove(f);

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,14 @@ public final class ResumeUploader {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`public Response upload() throws QiniuException {`
	`71`	`+ try {`
	`72`	`+ return upload0();`
	`73`	`+ } finally {`
	`74`	`+ close();`
	`75`	`+ }`
	`76`	`+ }`
	`77`	`+`
	`78`	`+ private Response upload0() throws QiniuException {`
`71`	`79`	`if (host == null) {`
`72`	`80`	`this.host = configuration.upHost(upToken);`
`73`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,14 @@ public final class StreamUploader {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public Response upload() throws QiniuException {`
	`49`	`+ try {`
	`50`	`+ return upload0();`
	`51`	`+ } finally {`
	`52`	`+ close();`
	`53`	`+ }`
	`54`	`+ }`
	`55`	`+`
	`56`	`+ private Response upload0() throws QiniuException {`
`49`	`57`	`if (host == null) {`
`50`	`58`	`this.host = configuration.upHost(upToken);`
`51`	`59`	`}`