From 4c0ee994a9c09a5562bc8d88f812626455d574a4 Mon Sep 17 00:00:00 2001
From: madixin <madixin@huawei.com>
Date: Sun, 5 May 2024 16:36:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E8=AF=B7=E6=B1=82=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=B9=B6=E8=A1=8C=E4=BB=8E64=E8=B0=83=E6=95=B4=E5=88=B08?=
 =?UTF-8?q?=EF=BC=8C=E5=87=8F=E5=B0=91=E5=AF=B9taskpool=20execute=E5=86=85?=
 =?UTF-8?q?=E5=AD=98=E6=B6=88=E8=80=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: madixin <madixin@huawei.com>
---
 CHANGELOG.md                             |  3 +++
 library/oh-package.json5                 |  2 +-
 library/src/main/ets/utils/FileCache.ets |  6 +++---
 library/src/main/ets/utils/FileUtils.ets | 18 +++++++-----------
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dccd758..e7dcbdb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
 
+## 3.0.0-rc.3
+- 将请求默认并行从64调整到8，减少对taskpool execute内存消耗
+
 ## 3.0.0-rc.2
 - 新增支持使用一个或多个图片变换，如模糊，高亮等
 
diff --git a/library/oh-package.json5 b/library/oh-package.json5
index 5958b89..fa111f0 100644
--- a/library/oh-package.json5
+++ b/library/oh-package.json5
@@ -14,7 +14,7 @@
   "main": "index.ets",
   "repository": "https://gitee.com/openharmony-tpc/ImageKnife",
   "type": "module",
-  "version": "3.0.0-rc.2",
+  "version": "3.0.0-rc.3",
   "dependencies": {
 
   },
diff --git a/library/src/main/ets/utils/FileCache.ets b/library/src/main/ets/utils/FileCache.ets
index f8439eb..19a616c 100644
--- a/library/src/main/ets/utils/FileCache.ets
+++ b/library/src/main/ets/utils/FileCache.ets
@@ -209,10 +209,10 @@ export class FileCache {
         break
       }
       let delkey = this.lruCache.keys()[0]
-      let data: ArrayBuffer | undefined = FileUtils.getInstance().readFileSync(this.path + delkey)
-      if (data !== undefined) {
+      let remove: number | undefined = this.lruCache.remove(delkey)
+      if (remove !== undefined) {
         FileUtils.getInstance().deleteFile(this.path + delkey)
-        this.removeMemorySize(data)
+        this.removeMemorySize(remove)
       }
       this.lruCache.remove(delkey)
     }
diff --git a/library/src/main/ets/utils/FileUtils.ets b/library/src/main/ets/utils/FileUtils.ets
index 1b8e94b..5f41dd1 100644
--- a/library/src/main/ets/utils/FileUtils.ets
+++ b/library/src/main/ets/utils/FileUtils.ets
@@ -57,18 +57,14 @@ export class FileUtils {
    * @param path
    * @returns
    */
-  async deleteFile(path: string): Promise<boolean> {
-    const isExist: boolean = await fs.access(path)
-    if (isExist) {
-      try {
-        await fs.unlink(path)
-      }
-      catch (err) {
-        LogUtil.error("FileUtils deleteFile failed: err msg=" + err.message + " err code=" + err.code);
-        return false
-      }
+  async deleteFile(path: string): Promise<void> {
+    // const isExist: boolean = await fs.access(path)
+    // if (isExist) {
+    try {
+      await fs.unlink(path)
+    } catch (err) {
+      LogUtil.error("FileUtils deleteFile failed: err msg=" + err.message + " err code=" + err.code);
     }
-    return true
   }
 
   /**