From da30adcc2e2b3e1ceb9c88be1f2ae7a4becf8147 Mon Sep 17 00:00:00 2001 From: jinye Date: Sat, 7 Nov 2026 08:51:40 +0800 Subject: [PATCH] refactor(managed-agent): fold the last CSI statement helper copies (#16503) The CSI ready admission and application progress stores kept their own copies of the 10 second query-timeout statement helper because #16485 was still editing the adjacent lines when #16486 introduced the shared helper. Both now use the shared one; the timeout is unchanged. Co-authored-by: Claude Opus 5.5 --- .../persistence/JdbcCsiApplicationProgress.java | 8 ++------ .../runtimebroker/persistence/JdbcCsiReadyAdmission.java | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/packages/managed-agent-server/persistence/src/main/java/com/alibaba/qwen/code/runtimebroker/persistence/JdbcCsiApplicationProgress.java b/packages/managed-agent-server/persistence/src/main/java/com/alibaba/qwen/code/runtimebroker/persistence/JdbcCsiApplicationProgress.java index 6780bd5e0dd..6017d1856ce 100644 --- a/packages/managed-agent-server/persistence/src/main/java/com/alibaba/qwen/code/runtimebroker/persistence/JdbcCsiApplicationProgress.java +++ b/packages/managed-agent-server/persistence/src/main/java/com/alibaba/qwen/code/runtimebroker/persistence/JdbcCsiApplicationProgress.java @@ -12,6 +12,8 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import java.time.Instant; +import static com.alibaba.qwen.code.runtimebroker.persistence.JdbcRepositorySupport.statement; + public final class JdbcCsiApplicationProgress { private JdbcCsiApplicationProgress() { } @@ -128,12 +130,6 @@ public final class JdbcCsiApplicationProgress { } } - private static PreparedStatement statement(Connection connection, String sql) throws SQLException { - PreparedStatement statement = connection.prepareStatement(sql); - statement.setQueryTimeout(10); - return statement; - } - private static void require(boolean condition) { if (!condition) { throw unavailable(); diff --git a/packages/managed-agent-server/persistence/src/main/java/com/alibaba/qwen/code/runtimebroker/persistence/JdbcCsiReadyAdmission.java b/packages/managed-agent-server/persistence/src/main/java/com/alibaba/qwen/code/runtimebroker/persistence/JdbcCsiReadyAdmission.java index 6cd465f5a19..183358c5a56 100644 --- a/packages/managed-agent-server/persistence/src/main/java/com/alibaba/qwen/code/runtimebroker/persistence/JdbcCsiReadyAdmission.java +++ b/packages/managed-agent-server/persistence/src/main/java/com/alibaba/qwen/code/runtimebroker/persistence/JdbcCsiReadyAdmission.java @@ -7,6 +7,8 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; +import static com.alibaba.qwen.code.runtimebroker.persistence.JdbcRepositorySupport.statement; + public final class JdbcCsiReadyAdmission { private JdbcCsiReadyAdmission() { } @@ -84,12 +86,6 @@ public final class JdbcCsiReadyAdmission { } } - private static PreparedStatement statement(Connection connection, String sql) throws SQLException { - PreparedStatement statement = connection.prepareStatement(sql); - statement.setQueryTimeout(10); - return statement; - } - private static void require(boolean condition) { if (!condition) { throw unavailable();