From e7f6637398e518b6c7c130395bc3304290667cb5 Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Sun, 18 Aug 2024 17:16:14 +0800
Subject: [PATCH] :zap: Fix the RandString method cause the lag

---
 .idea/workspace.xml                  | 66 ++++++++++++++--------------
 pkg/internal/services/attachments.go |  2 +-
 pkg/internal/services/random_id.go   | 26 +++--------
 pkg/internal/services/recycler.go    |  3 +-
 4 files changed, 40 insertions(+), 57 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c43d0c7..ec9890f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,8 +4,10 @@
     <option name="autoReloadType" value="ALL" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="18dd0d68-b4b8-40db-9734-9119b5c848bd" name="更改" comment=":bug: Fix sql statement">
+    <list default="true" id="18dd0d68-b4b8-40db-9734-9119b5c848bd" name="更改" comment=":bug: Fix doesn't get has lifecycle settings buckets correctly">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/services/attachments.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/services/attachments.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/services/random_id.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/services/random_id.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pkg/internal/services/recycler.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/services/recycler.go" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -36,33 +38,33 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "DefaultGoTemplateProperty": "Go File",
-    "Go Build.Backend.executor": "Debug",
-    "Go 构建.Backend.executor": "Run",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.go.formatter.settings.were.checked": "true",
-    "RunOnceActivity.go.migrated.go.modules.settings": "true",
-    "RunOnceActivity.go.modules.automatic.dependencies.download": "true",
-    "RunOnceActivity.go.modules.go.list.on.any.changes.was.set": "true",
-    "git-widget-placeholder": "master",
-    "go.import.settings.migrated": "true",
-    "go.sdk.automatically.set": "true",
-    "last_opened_file_path": "/Users/littlesheep/Documents/Projects/Hydrogen/Paperclip/pkg/internal/grpc",
-    "node.js.detected.package.eslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "run.code.analysis.last.selected.profile": "pProject Default",
-    "settings.editor.selected.configurable": "preferences.pluginManager",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;DefaultGoTemplateProperty&quot;: &quot;Go File&quot;,
+    &quot;Go Build.Backend.executor&quot;: &quot;Debug&quot;,
+    &quot;Go 构建.Backend.executor&quot;: &quot;Run&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.go.formatter.settings.were.checked&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.go.migrated.go.modules.settings&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.go.modules.automatic.dependencies.download&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.go.modules.go.list.on.any.changes.was.set&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    &quot;go.import.settings.migrated&quot;: &quot;true&quot;,
+    &quot;go.sdk.automatically.set&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;/Users/littlesheep/Documents/Projects/Hydrogen/Paperclip/pkg/internal/grpc&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;run.code.analysis.last.selected.profile&quot;: &quot;pProject Default&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   },
-  "keyToStringList": {
-    "DatabaseDriversLRU": [
-      "postgresql"
+  &quot;keyToStringList&quot;: {
+    &quot;DatabaseDriversLRU&quot;: [
+      &quot;postgresql&quot;
     ]
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/pkg/internal/grpc" />
@@ -131,7 +133,8 @@
     <MESSAGE value=":bug: Fix migration issue on pools" />
     <MESSAGE value=":bug: Fix schedule deletion will delete referenced file" />
     <MESSAGE value=":bug: Fix sql statement" />
-    <option name="LAST_COMMIT_MESSAGE" value=":bug: Fix sql statement" />
+    <MESSAGE value=":bug: Fix doesn't get has lifecycle settings buckets correctly" />
+    <option name="LAST_COMMIT_MESSAGE" value=":bug: Fix doesn't get has lifecycle settings buckets correctly" />
   </component>
   <component name="VgoProject">
     <settings-migrated>true</settings-migrated>
@@ -140,14 +143,9 @@
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/pkg/internal/services/recycler.go</url>
-          <line>45</line>
-          <option name="timeStamp" value="4" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/pkg/internal/services/recycler.go</url>
-          <line>40</line>
-          <option name="timeStamp" value="5" />
+          <url>file://$PROJECT_DIR$/pkg/internal/services/attachments.go</url>
+          <line>62</line>
+          <option name="timeStamp" value="3" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
diff --git a/pkg/internal/services/attachments.go b/pkg/internal/services/attachments.go
index 00cf60c..0415a68 100644
--- a/pkg/internal/services/attachments.go
+++ b/pkg/internal/services/attachments.go
@@ -60,8 +60,8 @@ func CacheAttachment(id uint, item models.Attachment) {
 }
 
 func NewAttachmentMetadata(tx *gorm.DB, user models.Account, file *multipart.FileHeader, attachment models.Attachment) (models.Attachment, error) {
-	attachment.Rid = RandString(16)
 	attachment.Uuid = uuid.NewString()
+	attachment.Rid = RandString(16)
 	attachment.Size = file.Size
 	attachment.Name = file.Filename
 	attachment.AccountID = user.ID
diff --git a/pkg/internal/services/random_id.go b/pkg/internal/services/random_id.go
index b341c30..5c44a4d 100644
--- a/pkg/internal/services/random_id.go
+++ b/pkg/internal/services/random_id.go
@@ -2,30 +2,14 @@ package services
 
 import (
 	"math/rand"
-	"strings"
 )
 
-const letterBytes = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-const (
-	letterIdxBits = 6
-	letterIdxMask = 1<<letterIdxBits - 1
-	letterIdxMax  = 63 / letterIdxBits
-)
+var letters = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
 
 func RandString(length int) string {
-	builder := strings.Builder{}
-	builder.Grow(length)
-	for idx, cache, remain := length-1, rand.Int63(), letterIdxMax; idx >= 0; {
-		if remain == 0 {
-			cache, remain = rand.Int63(), letterIdxMax
-		}
-		if idx := int(cache & letterIdxMask); idx < len(letterBytes) {
-			builder.WriteByte(letterBytes[idx])
-			idx--
-		}
-		cache >>= letterIdxBits
-		remain--
+	builder := make([]rune, length)
+	for i := range builder {
+		builder[i] = letters[rand.Intn(len(letters))]
 	}
-
-	return builder.String()
+	return string(builder)
 }
diff --git a/pkg/internal/services/recycler.go b/pkg/internal/services/recycler.go
index 4134d71..28d4e5f 100644
--- a/pkg/internal/services/recycler.go
+++ b/pkg/internal/services/recycler.go
@@ -51,7 +51,8 @@ func RunMarkDeletionTask() {
 	for _, pool := range pendingPools {
 		lifecycle := fmt.Sprintf("%d seconds", *pool.Config.Data().ExistLifecycle)
 		tx := database.C.
-			Where("pool_id = ? AND created_at < NOW() - INTERVAL ?", pool.ID, lifecycle).
+			Where("pool_id = ?", pool.ID).
+			Where("created_at < NOW() - INTERVAL ?", lifecycle).
 			Updates(&models.Attachment{CleanedAt: lo.ToPtr(time.Now())})
 		log.Info().
 			Str("pool", pool.Alias).