From 9ef8df22f04d130122ce888e4057c422206fe5e6 Mon Sep 17 00:00:00 2001
From: zhx <zhx@haiyi.com>
Date: Thu, 23 Jul 2026 17:43:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mysql/migrations/015_task_resource_rewards.sql  | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/services/activity-service/deploy/mysql/migrations/015_task_resource_rewards.sql b/services/activity-service/deploy/mysql/migrations/015_task_resource_rewards.sql
index bbcfb70f..0159ac9b 100644
--- a/services/activity-service/deploy/mysql/migrations/015_task_resource_rewards.sql
+++ b/services/activity-service/deploy/mysql/migrations/015_task_resource_rewards.sql
@@ -1,7 +1,7 @@
 SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci;
 
--- 三张任务热表只在末尾追加定长字段和一个可空 JSON，MySQL 8 可使用 INSTANT/LOCK=NONE，
--- 避免迁移期间复制整表或阻塞任务事件、列表和领奖写入。
+-- 三张任务热表只在末尾追加定长字段和一个可空 JSON，MySQL 8 使用 INSTANT 元数据变更，
+-- 避免迁移期间复制整表；INSTANT 不与显式 LOCK 子句组合，执行时只持有短暂 metadata lock。
 ALTER TABLE task_definitions
   ADD COLUMN reward_type VARCHAR(32) NOT NULL DEFAULT 'wallet_asset' COMMENT '奖励类型：wallet_asset/resource/resource_group',
   ADD COLUMN reward_resource_id BIGINT NOT NULL DEFAULT 0 COMMENT '单资源奖励 ID',
@@ -9,8 +9,7 @@ ALTER TABLE task_definitions
   ADD COLUMN reward_quantity BIGINT NOT NULL DEFAULT 0 COMMENT '单资源奖励数量',
   ADD COLUMN reward_duration_ms BIGINT NOT NULL DEFAULT 0 COMMENT '单资源奖励有效期毫秒，0 为永久',
   ADD COLUMN reward_items_json JSON NULL COMMENT '钱包资源目录解析出的奖励展示快照',
-  ALGORITHM=INSTANT,
-  LOCK=NONE;
+  ALGORITHM=INSTANT;
 
 ALTER TABLE user_task_progress
   ADD COLUMN reward_type VARCHAR(32) NOT NULL DEFAULT 'wallet_asset' COMMENT '奖励类型快照',
@@ -19,8 +18,7 @@ ALTER TABLE user_task_progress
   ADD COLUMN reward_quantity BIGINT NOT NULL DEFAULT 0 COMMENT '单资源奖励数量快照',
   ADD COLUMN reward_duration_ms BIGINT NOT NULL DEFAULT 0 COMMENT '单资源奖励有效期快照',
   ADD COLUMN reward_items_json JSON NULL COMMENT '奖励展示快照',
-  ALGORITHM=INSTANT,
-  LOCK=NONE;
+  ALGORITHM=INSTANT;
 
 ALTER TABLE task_reward_claims
   ADD COLUMN reward_type VARCHAR(32) NOT NULL DEFAULT 'wallet_asset' COMMENT '奖励类型快照',
@@ -30,5 +28,4 @@ ALTER TABLE task_reward_claims
   ADD COLUMN reward_duration_ms BIGINT NOT NULL DEFAULT 0 COMMENT '单资源奖励有效期快照',
   ADD COLUMN reward_items_json JSON NULL COMMENT '奖励展示快照',
   ADD COLUMN wallet_resource_grant_id VARCHAR(96) NOT NULL DEFAULT '' COMMENT '钱包资源赠送 ID',
-  ALGORITHM=INSTANT,
-  LOCK=NONE;
+  ALGORITHM=INSTANT;