Merge pull request #412 from YangSen-qn/upload_gzip

bachue · web-flow · commit 31b88b0fb138 · 2020-08-21T13:08:10.000+08:00
version 8: uplog gzip
diff --git a/library/library.iml b/library/library.iml
@@ -31,16 +31,16 @@
     <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
diff --git a/library/src/androidTest/java/com/qiniu/android/GZipTest.java b/library/src/androidTest/java/com/qiniu/android/GZipTest.java
@@ -0,0 +1,50 @@
+package com.qiniu.android;
+
+import com.qiniu.android.utils.GZipUtil;
+import java.util.Arrays;
+
+public class GZipTest extends BaseTest {
+
+    public void testGZipString(){
+
+        String string = null;
+
+        byte[] gzip = GZipUtil.gZip(string);
+        assertTrue(gzip == null);
+
+        string = "";
+        gzip = GZipUtil.gZip(string);
+        assertTrue(Arrays.equals(gzip, string.getBytes()));
+
+
+        string = "ABCDEFG";
+        gzip = GZipUtil.gZip(string);
+
+        byte[] gUnzip = GZipUtil.gUnzip(gzip);
+        String stringGUnzip = new String(gUnzip);
+
+        assertTrue(string.equals(stringGUnzip));
+    }
+
+    public void testGZipByte(){
+
+        byte[] bytes = null;
+
+        byte[] gzip = GZipUtil.gZip(bytes);
+        assertTrue(gzip == null);
+
+        bytes = new byte[0];
+        gzip = GZipUtil.gZip(bytes);
+        assertTrue(Arrays.equals(bytes, gzip));
+
+
+        String string = "ABCDEFG";
+        bytes = string.getBytes();
+        gzip = GZipUtil.gZip(bytes);
+
+        byte[] gUnzip = GZipUtil.gUnzip(gzip);
+        String stringGUnzip = new String(gUnzip);
+
+        assertTrue(string.equals(stringGUnzip));
+    }
+}
diff --git a/library/src/main/java/com/qiniu/android/collect/UploadInfoReporter.java b/library/src/main/java/com/qiniu/android/collect/UploadInfoReporter.java
@@ -11,6 +11,7 @@
 
 import org.json.JSONObject;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -191,22 +192,29 @@ private byte[] getLogData(){
             return null;
         }
 
-        long length = recorderTempFile.length();
+        int fileSize = (int)recorderTempFile.length();
         RandomAccessFile randomAccessFile = null;
         byte[] data = null;
         try {
             randomAccessFile = new RandomAccessFile(recorderTempFile, "r");
-            data = new byte[(int)length];
-            randomAccessFile.read(data);
+            ByteArrayOutputStream out = new ByteArrayOutputStream(fileSize);
+            int len = 0;
+            byte[] buff = new byte[fileSize];
+            while ((len = randomAccessFile.read(buff)) >= 0){
+                out.write(buff, 0, len);
+            }
+            data = out.toByteArray();
         } catch (FileNotFoundException ignored) {
         } catch (IOException e) {
             data = null;
+        } finally {
+            if (randomAccessFile != null){
+                try {
+                    randomAccessFile.close();
+                } catch (IOException e){}
+            }
         }
-        if (randomAccessFile != null){
-            try {
-                randomAccessFile.close();
-            } catch (IOException e){}
-        }
+
         return data;
     }
 
diff --git a/library/src/main/java/com/qiniu/android/http/request/RequestTransaction.java b/library/src/main/java/com/qiniu/android/http/request/RequestTransaction.java
@@ -11,6 +11,7 @@
 import com.qiniu.android.storage.UpToken;
 import com.qiniu.android.storage.UploadOptions;
 import com.qiniu.android.utils.Crc32;
+import com.qiniu.android.utils.GZipUtil;
 import com.qiniu.android.utils.LogUtil;
 import com.qiniu.android.utils.StringUtils;
 import com.qiniu.android.utils.UrlSafeBase64;
@@ -352,7 +353,7 @@ public boolean shouldRetry(ResponseInfo responseInfo, JSONObject response) {
                 return !responseInfo.isOK();
             }
         };
-        regionRequest.post("/log/4", isAsync, logData, header, shouldRetryHandler, null, new HttpRegionRequest.RequestCompleteHandler() {
+        regionRequest.post("/log/4?compressed=gzip", isAsync, GZipUtil.gZip(logData), header, shouldRetryHandler, null, new HttpRegionRequest.RequestCompleteHandler() {
             @Override
             public void complete(ResponseInfo responseInfo, UploadRegionRequestMetrics requestMetrics, JSONObject response) {
                 completeHandler.complete(responseInfo, requestMetrics, response);
diff --git a/library/src/main/java/com/qiniu/android/utils/GZipUtil.java b/library/src/main/java/com/qiniu/android/utils/GZipUtil.java
@@ -0,0 +1,77 @@
+package com.qiniu.android.utils;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
+
+public class GZipUtil {
+
+    public static byte[] gZip(String string){
+        if (string == null){
+            return null;
+        }
+        return gZip(string.getBytes());
+    }
+
+    public static byte[] gZip(byte[] bytes){
+        if (bytes == null){
+            return null;
+        }
+        if (bytes.length == 0){
+            return bytes;
+        }
+
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        GZIPOutputStream gzip = null;
+        try {
+            gzip = new GZIPOutputStream(out);
+            gzip.write(bytes);
+        } catch (IOException e){
+        } finally {
+            if (gzip != null){
+                try {
+                    gzip.close();
+                } catch (IOException e){
+                }
+            }
+        }
+
+        return out.toByteArray();
+    }
+
+    public static byte[] gUnzip(byte[] bytes) {
+        if (bytes == null){
+            return null;
+        }
+        if (bytes.length == 0){
+            return bytes;
+        }
+
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        ByteArrayInputStream in = new ByteArrayInputStream(bytes);
+
+        GZIPInputStream gunzip = null;
+        try {
+            gunzip = new GZIPInputStream(in);
+            byte[] buffer = new byte[256];
+            int n;
+            while ((n = gunzip.read(buffer)) >= 0) {
+                out.write(buffer, 0, n);
+            }
+        } catch (IOException e) {
+        } finally {
+            if (gunzip != null) {
+                try {
+                    gunzip.close();
+                } catch (IOException e) {
+                }
+            }
+        }
+
+        return out.toByteArray();
+    }
+}
