Skip to content

armgit / dbx

Public Imported from GitHub
0

25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。

feat(oceanbase-oracle): split execution time from client wait

efeire33afb0b4323b
diff --git a/agents/common/src/main/java/com/dbx/agent/AbstractJdbcAgent.java b/agents/common/src/main/java/com/dbx/agent/AbstractJdbcAgent.java
index 72141f56b0..4412834396 100644
--- a/agents/common/src/main/java/com/dbx/agent/AbstractJdbcAgent.java
+++ b/agents/common/src/main/java/com/dbx/agent/AbstractJdbcAgent.java
@@ -595,6 +595,10 @@ public abstract class AbstractJdbcAgent extends BaseDatabaseAgent {
protected void beforeQueryExecution(Connection connection, int timeoutSecs) throws Exception {
}
+ /** Called for each session RPC before its SQL can replace the connection's last trace ID. */
+ protected void beforeAgentMethod(String method, String querySessionId) {
+ }
+
protected boolean advancePastUpdateCounts() {
return false;
}
diff --git a/agents/common/src/main/java/com/dbx/agent/JdbcExecutor.java b/agents/common/src/main/java/com/dbx/agent/JdbcExecutor.java
index 09ccfebef4..a7eff9772c 100644
--- a/agents/common/src/main/java/com/dbx/agent/JdbcExecutor.java
+++ b/agents/common/src/main/java/com/dbx/agent/JdbcExecutor.java
@@ -37,6 +37,11 @@ public final class JdbcExecutor {
return AgentExecutionContext.jdbcExecutor();
}
+ public static int statementMaxRows(int maxRows) {
+ int effectiveMaxRows = Math.max(maxRows, 1);
+ return effectiveMaxRows == Integer.MAX_VALUE ? Integer.MAX_VALUE : effectiveMaxRows + 1;
+ }
+
public QueryResult execute(Connection conn, String sql, String schema, Function<String, String> setSchemaSql) {
return execute(conn, sql, schema, setSchemaSql, DEFAULT_MAX_ROWS, null, this::defaultResultValue);
}
@@ -141,7 +146,7 @@ public final class JdbcExecutor {
activeStatements.add(stmt);
try {
int effectiveMaxRows = Math.max(maxRows, 1);
- stmt.setMaxRows(effectiveMaxRows + 1);
+ stmt.setMaxRows(statementMaxRows(maxRows));
applyQueryTimeout(stmt, timeoutSecs);
if (fetchSize != null && fetchSize > 0) {
stmt.setFetchSize(fetchSize);
@@ -734,7 +739,7 @@ public final class JdbcExecutor {
while (rows.size() < effectivePageSize && session.rowsRead < session.maxRows) {
if (!session.resultSet.next()) {
closeSession(targetSessions, session.id);
- return new QueryPageResult(session.columns, session.columnTypes, rows, 0L, executionTimeMs, false, null, false);
+ return sessionPageResult(session, rows, executionTimeMs, false, null, false);
}
rows.add(rowValues(session.resultSet, session.valueReader, session.sqlTypeByIndex, session.typeNameByIndex));
session.rowsRead += 1;
@@ -743,21 +748,34 @@ public final class JdbcExecutor {
if (session.rowsRead >= session.maxRows) {
boolean truncated = session.resultSet.next();
closeSession(targetSessions, session.id);
- return new QueryPageResult(session.columns, session.columnTypes, rows, 0L, executionTimeMs, truncated, null, false);
+ return sessionPageResult(session, rows, executionTimeMs, truncated, null, false);
}
boolean hasMore = session.resultSet.next();
if (!hasMore) {
closeSession(targetSessions, session.id);
- return new QueryPageResult(session.columns, session.columnTypes, rows, 0L, executionTimeMs, false, null, false);
+ return sessionPageResult(session, rows, executionTimeMs, false, null, false);
}
session.pendingRow = rowValues(session.resultSet, session.valueReader, session.sqlTypeByIndex, session.typeNameByIndex);
session.rowsRead += 1;
- return new QueryPageResult(session.columns, session.columnTypes, rows, 0L, executionTimeMs, false, session.id, true);
+ return sessionPageResult(session, rows, executionTimeMs, false, session.id, true);
});
}
+ private static QueryPageResult sessionPageResult(
+ QuerySession session,
+ List<List<Object>> rows,
+ long executionTimeMs,
+ boolean truncated,
+ String sessionId,
+ boolean hasMore
+ ) {
+ QueryPageResult result = new QueryPageResult(session.columns, session.columnTypes, rows, 0L, executionTimeMs, truncated, sessionId, hasMore);
+ result.setCursor_rows_read(session.rowsRead);
+ return result;
+ }
+
private void closeAllSessions(ConcurrentHashMap<String, QuerySession> targetSessions) {
List<String> ids = new ArrayList<>(targetSessions.keySet());
for (String id : ids) {
diff --git a/agents/common/src/main/java/com/dbx/agent/JsonRpcServer.java b/agents/common/src/main/java/com/dbx/agent/JsonRpcServer.java
index 88b2a2b34c..ee252726b6 100644
--- a/agents/common/src/main/java/com/dbx/agent/JsonRpcServer.java
+++ b/agents/common/src/main/java/com/dbx/agent/JsonRpcServer.java
@@ -151,6 +151,9 @@ public final class JsonRpcServer {
}
private Object dispatch(String method, JsonObject params) throws Exception {
+ if (agent instanceof AbstractJdbcAgent observingAgent) {
+ observingAgent.beforeAgentMethod(method, stringOrNull(params, "sessionId"));
+ }
if (AgentProtocol.METHOD_HANDSHAKE.equals(method)) {
return AgentProtocol.handshakeResult();
}
diff --git a/agents/common/src/main/java/com/dbx/agent/QueryPageResult.java b/agents/common/src/main/java/com/dbx/agent/QueryPageResult.java
index ad1c4315fc..bfee05d6ea 100644
--- a/agents/common/src/main/java/com/dbx/agent/QueryPageResult.java
+++ b/agents/common/src/main/java/com/dbx/agent/QueryPageResult.java
@@ -12,6 +12,9 @@ public final class QueryPageResult {
private List<List<Object>> rows;
private long affected_rows;
private long execution_time_ms;
+ private Long server_execute_time_us;
+ /** Number of rows read by this JDBC cursor across all pages; never sent over JSON RPC. */
+ private transient long cursor_rows_read;
private boolean truncated;
private String session_id;
private boolean has_more;
@@ -97,6 +100,14 @@ public final class QueryPageResult {
return execution_time_ms;
}
+ public Long getServer_execute_time_us() {
+ return server_execute_time_us;
+ }
+
+ public long getCursor_rows_read() {
+ return cursor_rows_read;
+ }
+
public boolean getTruncated() {
return truncated;
}
@@ -140,6 +151,14 @@ public final class QueryPageResult {
this.execution_time_ms = execution_time_ms;
}
+ public void setServer_execute_time_us(Long server_execute_time_us) {
+ this.server_execute_time_us = server_execute_time_us;
+ }
+
+ public void setCursor_rows_read(long cursor_rows_read) {
+ this.cursor_rows_read = cursor_rows_read;
+ }
+
public void setTruncated(boolean truncated) {
this.truncated = truncated;
}
@@ -159,6 +178,7 @@ public final class QueryPageResult {
QueryPageResult that = (QueryPageResult) other;
return affected_rows == that.affected_rows
&& execution_time_ms == that.execution_time_ms
+ && Objects.equals(server_execute_time_us, that.server_execute_time_us)
&& truncated == that.truncated
&& has_more == that.has_more
&& Objects.equals(columns, that.columns)
@@ -171,7 +191,7 @@ public final class QueryPageResult {
@Override
public int hashCode() {
- return Objects.hash(columns, column_types, spatial_columns, spatial_values, rows, affected_rows, execution_time_ms, truncated, session_id, has_more);
+ return Objects.hash(columns, column_types, spatial_columns, spatial_values, rows, affected_rows, execution_time_ms, server_execute_time_us, truncated, session_id, has_more);
}
@Override
@@ -183,6 +203,7 @@ public final class QueryPageResult {
+ ", rows=" + rows
+ ", affected_rows=" + affected_rows
+ ", execution_time_ms=" + execution_time_ms
+ + ", server_execute_time_us=" + server_execute_time_us
+ ", truncated=" + truncated
+ ", session_id=" + session_id
+ ", has_more=" + has_more
diff --git a/agents/common/src/main/java/com/dbx/agent/QueryResult.java b/agents/common/src/main/java/com/dbx/agent/QueryResult.java
index 8b61b29f66..e45fdb91b5 100644
--- a/agents/common/src/main/java/com/dbx/agent/QueryResult.java
+++ b/agents/common/src/main/java/com/dbx/agent/QueryResult.java
@@ -17,6 +17,7 @@ public final class QueryResult {
private List<List<Object>> rows;
private long affected_rows;
private long execution_time_ms;
+ private Long server_execute_time_us;
private boolean truncated;
public QueryResult() {
@@ -84,6 +85,10 @@ public final class QueryResult {
return execution_time_ms;
}
+ public Long getServer_execute_time_us() {
+ return server_execute_time_us;
+ }
+
public boolean getTruncated() {
return truncated;
}
@@ -119,6 +124,10 @@ public final class QueryResult {
this.execution_time_ms = execution_time_ms;
}
+ public void setServer_execute_time_us(Long server_execute_time_us) {
+ this.server_execute_time_us = server_execute_time_us;
+ }
+
public void setTruncated(boolean truncated) {
this.truncated = truncated;
}
@@ -190,6 +199,7 @@ public final class QueryResult {
QueryResult that = (QueryResult) other;
return affected_rows == that.affected_rows
&& execution_time_ms == that.execution_time_ms
+ && Objects.equals(server_execute_time_us, that.server_execute_time_us)
&& truncated == that.truncated
&& Objects.equals(columns, that.columns)
&& Objects.equals(column_types, that.column_types)
@@ -200,7 +210,7 @@ public final class QueryResult {
@Override
public int hashCode() {
- return Objects.hash(columns, column_types, spatial_columns, spatial_values, rows, affected_rows, execution_time_ms, truncated);
+ return Objects.hash(columns, column_types, spatial_columns, spatial_values, rows, affected_rows, execution_time_ms, server_execute_time_us, truncated);
}
@Override
@@ -212,6 +222,7 @@ public final class QueryResult {
+ ", rows=" + rows
+ ", affected_rows=" + affected_rows
+ ", execution_time_ms=" + execution_time_ms
+ + ", server_execute_time_us=" + server_execute_time_us
+ ", truncated=" + truncated
+ ")";
}
diff --git a/agents/common/src/test/java/com/dbx/agent/CommonJavaCompatibilityTest.java b/agents/common/src/test/java/com/dbx/agent/CommonJavaCompatibilityTest.java
index ea9a24058e..fcb31e5a20 100644
--- a/agents/common/src/test/java/com/dbx/agent/CommonJavaCompatibilityTest.java
+++ b/agents/common/src/test/java/com/dbx/agent/CommonJavaCompatibilityTest.java
@@ -1,6 +1,7 @@
package com.dbx.agent;
import com.google.gson.JsonArray;
+import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import org.junit.jupiter.api.Test;
@@ -34,6 +35,17 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
class CommonJavaCompatibilityTest {
+ @Test
+ void emitsOptionalServerAuditTimeWithoutLeakingCursorBookkeeping() {
+ Gson gson = new Gson();
+ QueryPageResult page = new QueryPageResult();
+ assertFalse(gson.toJsonTree(page).getAsJsonObject().has("server_execute_time_us"));
+ page.setServer_execute_time_us(370L);
+ page.setCursor_rows_read(500);
+ assertEquals(370L, gson.toJsonTree(page).getAsJsonObject().get("server_execute_time_us").getAsLong());
+ assertFalse(gson.toJsonTree(page).getAsJsonObject().has("cursor_rows_read"));
+ }
+
@Test
void definesSharedAgentProtocolContract() {
assertEquals("handshake", AgentProtocol.METHOD_HANDSHAKE);
diff --git a/agents/common/src/test/java/com/dbx/agent/JdbcExecutorTest.java b/agents/common/src/test/java/com/dbx/agent/JdbcExecutorTest.java
index 6f19c26393..11637f24bf 100644
--- a/agents/common/src/test/java/com/dbx/agent/JdbcExecutorTest.java
+++ b/agents/common/src/test/java/com/dbx/agent/JdbcExecutorTest.java
@@ -26,6 +26,14 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
class JdbcExecutorTest {
+ @Test
+ void statementRowLimitIncludesOverflowProbeWithoutIntegerOverflow() {
+ assertEquals(2, JdbcExecutor.statementMaxRows(0));
+ assertEquals(JdbcExecutor.DEFAULT_MAX_ROWS + 1,
+ JdbcExecutor.statementMaxRows(JdbcExecutor.DEFAULT_MAX_ROWS));
+ assertEquals(Integer.MAX_VALUE, JdbcExecutor.statementMaxRows(Integer.MAX_VALUE));
+ }
+
@Test
void blobResultValuesPreferBlobObjectsWhenGetBytesFails() throws Exception {
ResultSet rs = resultSet(
diff --git a/agents/drivers/oceanbase-oracle/src/main/java/com/dbx/agent/oceanbaseoracle/OceanBaseOracleAgent.java b/agents/drivers/oceanbase-oracle/src/main/java/com/dbx/agent/oceanbaseoracle/OceanBaseOracleAgent.java
index d5dbcedf8a..08b090cd0d 100644
--- a/agents/drivers/oceanbase-oracle/src/main/java/com/dbx/agent/oceanbaseoracle/OceanBaseOracleAgent.java
+++ b/agents/drivers/oceanbase-oracle/src/main/java/com/dbx/agent/oceanbaseoracle/OceanBaseOracleAgent.java
@@ -1,10 +1,12 @@
package com.dbx.agent.oceanbaseoracle;
import com.dbx.agent.ColumnInfo;
+import com.dbx.agent.AgentProtocol;
import com.dbx.agent.ConfiguredJdbcAgent;
import com.dbx.agent.ConnectParams;
import com.dbx.agent.DatabaseInfo;
import com.dbx.agent.DdlBuilder;
+import com.dbx.agent.ExecuteQueryOptions;
import com.dbx.agent.ForeignKeyInfo;
import com.dbx.agent.IndexInfo;
import com.dbx.agent.JdbcAgentProfile;
@@ -16,12 +18,17 @@ import com.dbx.agent.ObjectInfo;
import com.dbx.agent.ObjectSource;
import com.dbx.agent.OracleObjectPrivilege;
import com.dbx.agent.PartitionInfo;
+import com.dbx.agent.QueryPageOptions;
+import com.dbx.agent.QueryPageResult;
+import com.dbx.agent.QueryResult;
import com.dbx.agent.TableInfo;
import com.dbx.agent.TriggerInfo;
import java.sql.Connection;
+import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
+import java.sql.Statement;
import java.sql.Types;
import java.util.ArrayDeque;
import java.util.ArrayList;
@@ -51,6 +58,9 @@ public final class OceanBaseOracleAgent extends ConfiguredJdbcAgent {
"GGSYS", "FLOWS_FILES", "APEX_PUBLIC_USER", "GSMROOTUSER", "SYSRAC"
);
private boolean queryTimeoutChanged;
+ private String auditEligibleCursorId;
+ private static final String SQL_AUDIT_BY_TRACE = "SELECT EXECUTE_TIME, RETURN_ROWS FROM SYS.GV$OB_SQL_AUDIT "
+ + "WHERE TRACE_ID = ? AND IS_INNER_SQL = 0 AND IS_EXECUTOR_RPC = 0 AND ROWNUM <= 2";
public static final JdbcAgentProfile OCEANBASE_ORACLE_PROFILE = new JdbcAgentProfile(
"com.oceanbase.jdbc.Driver",
@@ -70,6 +80,97 @@ public final class OceanBaseOracleAgent extends ConfiguredJdbcAgent {
super(OCEANBASE_ORACLE_PROFILE);
}
+ @Override
+ public QueryResult executeQuery(String sql, String schema, ExecuteQueryOptions options) {
+ auditEligibleCursorId = null;
+ QueryResult result = super.executeQuery(sql, schema, options);
+ if (!result.getTruncated() && !result.getColumns().isEmpty()) {
+ result.setServer_execute_time_us(availableServerExecuteTimeUs(
+ result.getRows().size(), JdbcExecutor.statementMaxRows(options.getMaxRows())
+ ));
+ }
+ return result;
+ }
+
+ @Override
+ public QueryPageResult executeQueryPage(String sql, String schema, QueryPageOptions options) {
+ auditEligibleCursorId = null;
+ QueryPageResult result = super.executeQueryPage(sql, schema, options);
+ if (result.getHas_more()) {
+ auditEligibleCursorId = result.getSession_id();
+ return result;
+ }
+ return withCompletedCursorServerTiming(result);
+ }
+
+ @Override
+ public QueryPageResult fetchQueryPage(String sessionId, int pageSize) {
+ boolean auditEligible = sessionId != null && sessionId.equals(auditEligibleCursorId);
+ QueryPageResult result = super.fetchQueryPage(sessionId, pageSize);
+ if (!result.getHas_more()) auditEligibleCursorId = null;
+ return auditEligible ? withCompletedCursorServerTiming(result) : result;
+ }
+
+ @Override
+ protected void beforeAgentMethod(String method, String querySessionId) {
+ if (!AgentProtocol.METHOD_FETCH_QUERY_PAGE.equals(method)
+ || auditEligibleCursorId == null
+ || !auditEligibleCursorId.equals(querySessionId)) {
+ auditEligibleCursorId = null;
+ }
+ }
+
+ private QueryPageResult withCompletedCursorServerTiming(QueryPageResult result) {
+ // JdbcExecutor closes the ResultSet and Statement before returning a terminal
+ // page. Never issue audit SQL while Connector/J still owns an open cursor.
+ if (!result.getHas_more() && !result.getTruncated() && !result.getColumns().isEmpty()) {
+ result.setServer_execute_time_us(availableServerExecuteTimeUs(result.getCursor_rows_read(), 0));
+ }
+ return result;
+ }
+
+ private Long availableServerExecuteTimeUs(long expectedRows, int statementMaxRows) {
+ try {
+ return serverExecuteTimeUs(requireConnected(), expectedRows, statementMaxRows);
+ } catch (RuntimeException ignored) {
+ return null;
+ }
+ }
+
+ static Long serverExecuteTimeUs(Connection connection, long expectedRows, int statementMaxRows) {
+ try {
+ String traceId;
+ try (Statement statement = connection.createStatement()) {
+ // Connector/J resets the session's SQL_SELECT_LIMIT in execute prolog
+ // when this differs from the previous statement. That SET would
+ // replace the query's LAST_TRACE_ID before we can read it.
+ statement.setMaxRows(statementMaxRows);
+ statement.setQueryTimeout(1);
+ try (ResultSet traces = statement.executeQuery("SELECT LAST_TRACE_ID() FROM DUAL")) {
+ traceId = traces.next() ? traces.getString(1) : null;
+ }
+ }
+ if (traceId == null || traceId.isBlank()) return null;
+ try (PreparedStatement statement = connection.prepareStatement(SQL_AUDIT_BY_TRACE)) {
+ statement.setMaxRows(statementMaxRows);
+ statement.setQueryTimeout(1);
+ statement.setString(1, traceId);
+ try (ResultSet audit = statement.executeQuery()) {
+ if (!audit.next()) return null;
+ long executionUs = audit.getLong(1);
+ if (audit.wasNull() || executionUs < 0) return null;
+ long returnedRows = audit.getLong(2);
+ if (audit.wasNull() || returnedRows != expectedRows || audit.next()) return null;
+ return executionUs;
+ }
+ }
+ } catch (SQLException | RuntimeException ignored) {
+ // SQL Audit can be disabled, unavailable to this account, or evicted.
+ // The user's query result remains valid; no wall-clock substitute is used.
+ return null;
+ }
+ }
+
@Override
protected String buildJdbcUrl(ConnectParams params) {
return buildUrl(params);
diff --git a/agents/drivers/oceanbase-oracle/src/test/java/com/dbx/agent/oceanbaseoracle/OceanBaseOracleAgentTest.java b/agents/drivers/oceanbase-oracle/src/test/java/com/dbx/agent/oceanbaseoracle/OceanBaseOracleAgentTest.java
index 701706a80d..9eaed4693e 100644
--- a/agents/drivers/oceanbase-oracle/src/test/java/com/dbx/agent/oceanbaseoracle/OceanBaseOracleAgentTest.java
+++ b/agents/drivers/oceanbase-oracle/src/test/java/com/dbx/agent/oceanbaseoracle/OceanBaseOracleAgentTest.java
@@ -1,5 +1,6 @@
package com.dbx.agent.oceanbaseoracle;
+import com.dbx.agent.AgentProtocol;
import com.dbx.agent.ColumnInfo;
import com.dbx.agent.ConnectParams;
import com.dbx.agent.ExecuteQueryOptions;
@@ -7,6 +8,7 @@ import com.dbx.agent.MetadataListConstraints;
import com.dbx.agent.ObjectInfo;
import com.dbx.agent.ObjectSource;
import com.dbx.agent.QueryPageOptions;
+import com.dbx.agent.QueryPageResult;
import com.dbx.agent.QueryResult;
import com.dbx.agent.TableInfo;
import com.dbx.agent.test.TestSupport;
@@ -133,6 +135,68 @@ class OceanBaseOracleAgentTest {
Assertions.assertThrows(IllegalArgumentException.class, () -> OceanBaseOracleAgent.queryTimeoutSql(-1));
}
+ @Test
+ void readsServerExecutionOnlyFromOneMatchingAuditRow() {
+ List<String> statements = new ArrayList<>();
+ List<String> parameters = new ArrayList<>();
+ List<Integer> maxRows = new ArrayList<>();
+ Assertions.assertEquals(370L, OceanBaseOracleAgent.serverExecuteTimeUs(
+ auditTimingConnection(1, 500, false, statements, parameters, maxRows), 500, 1001
+ ));
+ Assertions.assertEquals(List.of(1001, 1001), maxRows,
+ "trace and audit statements must preserve the target statement's session row limit");
+ Assertions.assertEquals(List.of("trace-1"), parameters);
+ Assertions.assertTrue(statements.get(1).contains("IS_INNER_SQL = 0 AND IS_EXECUTOR_RPC = 0"));
+ Assertions.assertEquals(null, OceanBaseOracleAgent.serverExecuteTimeUs(auditTimingConnection(0, 500, false, new ArrayList<>(), new ArrayList<>(), new ArrayList<>()), 500, 0));
+ Assertions.assertEquals(null, OceanBaseOracleAgent.serverExecuteTimeUs(auditTimingConnection(2, 500, false, new ArrayList<>(), new ArrayList<>(), new ArrayList<>()), 500, 0));
+ Assertions.assertEquals(null, OceanBaseOracleAgent.serverExecuteTimeUs(auditTimingConnection(1, 1, false, new ArrayList<>(), new ArrayList<>(), new ArrayList<>()), 500, 0));
+ Assertions.assertEquals(null, OceanBaseOracleAgent.serverExecuteTimeUs(auditTimingConnection(1, 500, true, new ArrayList<>(), new ArrayList<>(), new ArrayList<>()), 500, 0));
+ }
+
+
+ @Test
+ void doesNotAuditAnOpenCursorAfterAnotherSessionMethodCanReplaceItsTrace() {
+ int[] row = {-1};
+ ResultSetMetaData meta = proxy(ResultSetMetaData.class, (method, args) -> {
+ if ("getColumnCount".equals(method.getName())) return 1;
+ if ("getColumnLabel".equals(method.getName())) return "N";
+ if ("getColumnType".equals(method.getName())) return Types.INTEGER;
+ if ("getColumnTypeName".equals(method.getName())) return "NUMBER";
+ return defaultValue(method.getReturnType());
+ });
+ ResultSet cursor = proxy(ResultSet.class, (method, args) -> {
+ if ("next".equals(method.getName())) return ++row[0] < 2;
+ if ("getMetaData".equals(method.getName())) return meta;
+ if ("getObject".equals(method.getName()) || "getInt".equals(method.getName())) return row[0] + 1;
+ return defaultValue(method.getReturnType());
+ });
+ int[] statementsCreated = {0};
+ Statement statement = proxy(Statement.class, (method, args) -> {
+ if ("execute".equals(method.getName())) return !String.valueOf(args[0]).startsWith("ALTER SESSION");
+ if ("getResultSet".equals(method.getName())) return cursor;
+ return defaultValue(method.getReturnType());
+ });
+ Connection connection = proxy(Connection.class, (method, args) -> {
+ if ("createStatement".equals(method.getName())) {
+ statementsCreated[0]++;
+ return statement;
+ }
+ if ("isClosed".equals(method.getName())) return false;
+ return defaultValue(method.getReturnType());
+ });
+ OceanBaseOracleAgent agent = new OceanBaseOracleAgent();
+ TestSupport.setPrivateConnection(agent, connection);
+ QueryPageResult first = agent.executeQueryPage("SELECT N FROM T", null, new QueryPageOptions(1, null, 10, 5));
+ Assertions.assertTrue(first.getHas_more());
+ Assertions.assertEquals(2, statementsCreated[0]);
+
+ agent.beforeAgentMethod(AgentProtocol.METHOD_LIST_TABLES, null);
+ QueryPageResult last = agent.fetchQueryPage(first.getSession_id(), 1);
+ Assertions.assertFalse(last.getHas_more());
+ Assertions.assertNull(last.getServer_execute_time_us());
+ Assertions.assertEquals(2, statementsCreated[0], "no LAST_TRACE_ID query may run for an invalidated cursor");
+ }
+
@Test
void treatsZeroQueryTimeoutAsUnlimitedForOceanBaseSession() {
List<String> sql = new ArrayList<>();
@@ -1198,6 +1262,50 @@ class OceanBaseOracleAgentTest {
});
}
+ private static Connection auditTimingConnection(int auditRows, long returnedRows, boolean denied,
+ List<String> sql, List<String> parameters, List<Integer> maxRows) {
+ ResultSet trace = resultSet(new String[]{"TRACE_ID"}, new Object[][]{{"trace-1"}});
+ int[] auditIndex = {-1};
+ ResultSet audit = proxy(ResultSet.class, (method, args) -> {
+ switch (method.getName()) {
+ case "next":
+ auditIndex[0]++;
+ return auditIndex[0] < auditRows;
+ case "getLong":
+ return ((Number) args[0]).intValue() == 1 ? 370L : returnedRows;
+ default:
+ return defaultValue(method.getReturnType());
+ }
+ });
+ Statement traceStatement = proxy(Statement.class, (method, args) -> {
+ if ("setQueryTimeout".equals(method.getName())) Assertions.assertEquals(1, args[0]);
+ if ("setMaxRows".equals(method.getName())) maxRows.add((Integer) args[0]);
+ if ("executeQuery".equals(method.getName())) {
+ sql.add(String.valueOf(args[0]));
+ return trace;
+ }
+ return defaultValue(method.getReturnType());
+ });
+ PreparedStatement auditStatement = proxy(PreparedStatement.class, (method, args) -> {
+ if ("setQueryTimeout".equals(method.getName())) Assertions.assertEquals(1, args[0]);
+ if ("setMaxRows".equals(method.getName())) maxRows.add((Integer) args[0]);
+ if ("setString".equals(method.getName())) parameters.add(String.valueOf(args[1]));
+ if ("executeQuery".equals(method.getName())) {
+ if (denied) throw new SQLException("audit access denied", "42000", 1044);
+ return audit;
+ }
+ return defaultValue(method.getReturnType());
+ });
+ return proxy(Connection.class, (method, args) -> {
+ if ("createStatement".equals(method.getName())) return traceStatement;
+ if ("prepareStatement".equals(method.getName())) {
+ sql.add(String.valueOf(args[0]));
+ return auditStatement;
+ }
+ return defaultValue(method.getReturnType());
+ });
+ }
+
private static ResultSet blobResultSet() {
String[] columns = {"PAYLOAD", "EMPTY_PAYLOAD", "DESCRIPTION"};
int[] sqlTypes = {Types.BLOB, Types.BLOB, Types.VARCHAR};
diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue
index be120b9379..036e9c350b 100644
--- a/apps/desktop/src/components/grid/DataGrid.vue
+++ b/apps/desktop/src/components/grid/DataGrid.vue
@@ -3,6 +3,7 @@ import { applyDdlStoragePreference } from "@/lib/sql/ddlStorage";
import DdlStorageToggle from "@/components/objects/DdlStorageToggle.vue";
import { useUpdateBlocker } from "@/lib/app/updatePreparation";
+import { useResultViewUpdateTiming } from "@/composables/useResultViewUpdateTiming";
import { computed, nextTick, onMounted, onUnmounted, onActivated, onDeactivated, ref, shallowRef, toRaw, useSlots, watch, defineAsyncComponent, type Component, type CSSProperties } from "vue";
import { useI18n } from "vue-i18n";
import {
@@ -6532,6 +6533,11 @@ let canvasPixelRatioMediaQuery: MediaQueryList | null = null;
let canvasPixelRatioMediaQueryCleanup: (() => void) | null = null;
let dataGridIsActive = true;
let canvasRuntime: DataGridCanvasRuntime;
+const { elapsedMs: resultViewUpdateMs, canvasDrawCompleted: completeResultCanvasDraw } = useResultViewUpdateTiming(
+ () => props.result,
+ () => resolvedDatabaseType.value === "oceanbase-oracle" && isResultsContext.value,
+ () => (useCanvasGridRows.value ? "canvas" : "dom"),
+);
watch(
() => [totalWidth.value, displayRowCount.value, useCanvasGridRows.value, props.result.columns.join("\u0000")],
@@ -7228,7 +7234,8 @@ function drawCanvasGrid() {
const scroller = canvasScrollerElement();
if (!canvas || !scroller || !useCanvasGridRows.value) return;
- drawCanvasDataGrid({
+ const drawnResult = props.result;
+ const drawn = drawCanvasDataGrid({
canvas,
scroller,
width: Math.max(1, canvasSurfaceWidth.value || scroller.clientWidth),
@@ -7271,7 +7278,9 @@ function drawCanvasGrid() {
flatteningMultiLineEnabled: flatteningMultiLineEnabled.value,
showWhitespace: showWhitespaceEnabled.value,
});
+ if (!drawn) return;
flipCanvasSurface();
+ completeResultCanvasDraw(drawnResult);
}
function flipCanvasSurface() {
@@ -13658,7 +13667,13 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val
</span>
<span v-if="showTruncationWarning" class="shrink-0 text-amber-500 text-xs">(truncated)</span>
<span v-if="!hasData" class="shrink-0">{{ t("grid.rowsAffected", { count: result.affected_rows }) }}</span>
- <span class="shrink-0">{{ result.execution_time_ms }}ms</span>
+ <template v-if="resolvedDatabaseType === 'oceanbase-oracle' && isResultsContext">
+ <span class="shrink-0" :title="t('grid.serverExecuteTimeHint')">{{ result.server_execute_time_us !== undefined ? t("grid.serverExecuteTime", { us: result.server_execute_time_us }) : t("grid.serverExecuteTimeUnavailable") }}</span>
+ <span class="shrink-0" :title="t('grid.agentExecuteTimeHint')">{{ t("grid.agentExecuteTime", { ms: result.execution_time_ms }) }}</span>
+ <span v-if="result.client_request_wait_ms !== undefined" class="shrink-0" :title="t('grid.clientRequestWaitHint')">{{ t("grid.clientRequestWait", { ms: result.client_request_wait_ms }) }}</span>
+ <span v-if="resultViewUpdateMs !== undefined" class="shrink-0" :title="t('grid.resultViewUpdateHint')">{{ t("grid.resultViewUpdate", { ms: resultViewUpdateMs }) }}</span>
+ </template>
+ <span v-else class="shrink-0">{{ result.execution_time_ms }}ms</span>
<template v-if="editable && hasDataGridSaveTarget">
<span v-if="hasPendingChanges" class="shrink-0 text-foreground">
diff --git a/apps/desktop/src/composables/__tests__/useResultViewUpdateTiming.spec.ts b/apps/desktop/src/composables/__tests__/useResultViewUpdateTiming.spec.ts
new file mode 100644
index 0000000000..60bc23c2ea
--- /dev/null
+++ b/apps/desktop/src/composables/__tests__/useResultViewUpdateTiming.spec.ts
@@ -0,0 +1,157 @@
+// @vitest-environment happy-dom
+
+import { createApp, defineComponent, h, nextTick, onMounted, onUpdated, ref } from "vue";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { useResultViewUpdateTiming } from "../useResultViewUpdateTiming";
+
+const mounted: Array<ReturnType<typeof createApp>> = [];
+
+afterEach(() => {
+ mounted.splice(0).forEach((app) => app.unmount());
+ document.body.innerHTML = "";
+ vi.restoreAllMocks();
+});
+
+describe("useResultViewUpdateTiming", () => {
+ it("measures through the Vue DOM update and replaces the value for a new result", async () => {
+ let clock = 100;
+ vi.spyOn(performance, "now").mockImplementation(() => clock);
+ const result = ref({ id: 1 });
+ const host = document.createElement("div");
+ document.body.append(host);
+ const app = createApp(
+ defineComponent({
+ setup() {
+ const { elapsedMs } = useResultViewUpdateTiming(
+ () => result.value,
+ () => true,
+ () => "dom",
+ );
+ onMounted(() => {
+ clock = 119;
+ });
+ onUpdated(() => {
+ if (result.value.id === 2 && clock === 130) clock = 147;
+ });
+ return () => h("div", [h("span", String(result.value.id)), h("output", elapsedMs.value ?? "pending")]);
+ },
+ }),
+ );
+ mounted.push(app);
+ app.mount(host);
+ await nextTick();
+ await nextTick();
+ expect(host.querySelector("output")?.textContent).toBe("19");
+
+ clock = 130;
+ result.value = { id: 2 };
+ await nextTick();
+ await nextTick();
+ await nextTick();
+ expect(host.querySelector("span")?.textContent).toBe("2");
+ expect(host.querySelector("output")?.textContent).toBe("17");
+ });
+
+ it("waits for a successful Canvas draw and rejects draws for stale results", async () => {
+ let clock = 10;
+ vi.spyOn(performance, "now").mockImplementation(() => clock);
+ const result = ref({ id: 1 });
+ const mode = ref<"dom" | "canvas">("canvas");
+ let canvasDrawCompleted!: (drawnResult: { id: number }) => void;
+ const host = document.createElement("div");
+ document.body.append(host);
+ const app = createApp(
+ defineComponent({
+ setup() {
+ const timing = useResultViewUpdateTiming(
+ () => result.value,
+ () => true,
+ () => mode.value,
+ );
+ canvasDrawCompleted = timing.canvasDrawCompleted;
+ return () => h("output", timing.elapsedMs.value ?? "pending");
+ },
+ }),
+ );
+ mounted.push(app);
+ app.mount(host);
+ await nextTick();
+ await nextTick();
+ expect(host.textContent).toBe("pending");
+
+ const staleResult = result.value;
+ result.value = { id: 2 };
+ canvasDrawCompleted(staleResult);
+ clock = 20;
+ await nextTick();
+ await nextTick();
+ expect(host.textContent).toBe("pending");
+ clock = 35;
+ canvasDrawCompleted(result.value);
+ await nextTick();
+ expect(host.textContent).toBe("15");
+
+ mode.value = "dom";
+ await nextTick();
+ await nextTick();
+ await nextTick();
+ expect(host.textContent).toBe("0");
+ });
+
+ it("suppresses measurements while disabled", async () => {
+ const result = ref({ id: 1 });
+ const enabled = ref(false);
+ const host = document.createElement("div");
+ document.body.append(host);
+ const app = createApp(
+ defineComponent({
+ setup() {
+ const timing = useResultViewUpdateTiming(
+ () => result.value,
+ () => enabled.value,
+ () => "canvas",
+ );
+ return () => h("output", timing.elapsedMs.value ?? "pending");
+ },
+ }),
+ );
+ mounted.push(app);
+ app.mount(host);
+ enabled.value = true;
+ await nextTick();
+ expect(host.textContent).toBe("pending");
+ enabled.value = false;
+ await nextTick();
+ expect(host.textContent).toBe("pending");
+ });
+
+ it("does not finish a stale DOM tick after switching to Canvas or after unmount", async () => {
+ const result = ref({ id: 1 });
+ const mode = ref<"dom" | "canvas">("dom");
+ let timing!: ReturnType<typeof useResultViewUpdateTiming<{ id: number }>>;
+ const host = document.createElement("div");
+ document.body.append(host);
+ const app = createApp(
+ defineComponent({
+ setup() {
+ timing = useResultViewUpdateTiming(
+ () => result.value,
+ () => true,
+ () => mode.value,
+ );
+ return () => h("output", timing.elapsedMs.value ?? "pending");
+ },
+ }),
+ );
+ mounted.push(app);
+ app.mount(host);
+ mode.value = "canvas";
+ await nextTick();
+ await nextTick();
+ expect(host.textContent).toBe("pending");
+
+ app.unmount();
+ timing.canvasDrawCompleted(result.value);
+ expect(timing.elapsedMs.value).toBeUndefined();
+ });
+});
diff --git a/apps/desktop/src/composables/useResultViewUpdateTiming.ts b/apps/desktop/src/composables/useResultViewUpdateTiming.ts
new file mode 100644
index 0000000000..0673955f9d
--- /dev/null
+++ b/apps/desktop/src/composables/useResultViewUpdateTiming.ts
@@ -0,0 +1,59 @@
+import { computed, nextTick, onActivated, onDeactivated, onUnmounted, ref, shallowRef, watch } from "vue";
+
+type ViewMode = "dom" | "canvas";
+
+/** Times the grid's DOM update or synchronous Canvas draw, excluding screen paint. */
+export function useResultViewUpdateTiming<T extends object>(result: () => T, enabled: () => boolean, mode: () => ViewMode) {
+ const lastMeasurement = shallowRef<{ result: T; mode: ViewMode; elapsedMs: number } | null>(null);
+ const active = ref(true);
+ let generation = 0;
+ let pending: { result: T; mode: ViewMode; startedAt: number; generation: number } | null = null;
+
+ function finish(current: T, currentMode: ViewMode, expectedGeneration: number) {
+ if (!active.value || !enabled() || result() !== current || mode() !== currentMode) return;
+ if (!pending || pending.result !== current || pending.mode !== currentMode || pending.generation !== expectedGeneration) return;
+ lastMeasurement.value = { result: current, mode: currentMode, elapsedMs: Math.max(0, Math.round(performance.now() - pending.startedAt)) };
+ pending = null;
+ }
+
+ function start(current: T, currentMode: ViewMode, isEnabled: boolean) {
+ const currentGeneration = ++generation;
+ lastMeasurement.value = null;
+ pending = active.value && isEnabled ? { result: current, mode: currentMode, startedAt: performance.now(), generation: currentGeneration } : null;
+ if (pending && currentMode === "dom") void nextTick(() => finish(current, "dom", currentGeneration));
+ }
+
+ watch(
+ () => [result(), mode(), enabled()] as const,
+ ([current, currentMode, isEnabled]) => start(current, currentMode, isEnabled),
+ { immediate: true },
+ );
+
+ onDeactivated(() => {
+ active.value = false;
+ generation++;
+ pending = null;
+ lastMeasurement.value = null;
+ });
+ onActivated(() => {
+ if (!active.value) {
+ active.value = true;
+ start(result(), mode(), enabled());
+ }
+ });
+ onUnmounted(() => {
+ active.value = false;
+ generation++;
+ pending = null;
+ });
+
+ return {
+ elapsedMs: computed(() => {
+ const measured = lastMeasurement.value;
+ return active.value && enabled() && measured?.result === result() && measured.mode === mode() ? measured.elapsedMs : undefined;
+ }),
+ canvasDrawCompleted: (drawnResult: T) => {
+ if (pending?.mode === "canvas") finish(drawnResult, "canvas", pending.generation);
+ },
+ };
+}
diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts
index 147db36ec1..6679588d43 100644
--- a/apps/desktop/src/i18n/locales/en.ts
+++ b/apps/desktop/src/i18n/locales/en.ts
@@ -1900,6 +1900,16 @@ export default {
calculateTotalRowsInline: "(count total rows)",
calculateTotalRowsFailed: "Count failed: {message}",
rowsAffected: "{count} rows affected",
+ agentExecuteTime: "Execution: {ms} ms",
+ serverExecuteTime: "Database execution: {us} µs",
+ serverExecuteTimeUnavailable: "Database execution: unavailable",
+ serverExecuteTimeHint:
+ "OceanBase SQL Audit EXECUTE_TIME measures server plan execution. A JDBC cursor shows its completed statement sample; independent page queries show the sum only when every page is sampled. This overlaps with execution and wait timings. Unavailable while a cursor remains open or when audit data cannot be read or matched.",
+ agentExecuteTimeHint: "Agent time from schema setup through JDBC execute. Excludes row fetching; not database server execution time.",
+ clientRequestWait: "Wait: {ms} ms",
+ clientRequestWaitHint: "Desktop time from query request dispatch until the full result payload arrives. Includes fetching, the optional server audit lookup, and transport; excludes SQL preparation and grid rendering. Summed across loaded pages.",
+ resultViewUpdate: "Grid update: {ms} ms",
+ resultViewUpdateHint: "Time from the grid observing this result until its DOM update completes or a Canvas draw is submitted. Excludes GPU compositing and screen presentation.",
querySuccess: "Query executed successfully",
noRows: "No data",
noRowsDescription: "This result set has no records.",
diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts
index 83aa3d8003..08c69f712c 100644
--- a/apps/desktop/src/i18n/locales/es.ts
+++ b/apps/desktop/src/i18n/locales/es.ts
@@ -1802,6 +1802,17 @@ export default withEnglishFallback({
noNumericData: "No hay datos numéricos disponibles para graficar",
},
grid: {
+ agentExecuteTime: "Ejecución: {ms} ms",
+ serverExecuteTime: "Ejecución en BD: {us} µs",
+ serverExecuteTimeUnavailable: "Ejecución en BD: no disponible",
+ serverExecuteTimeHint:
+ "EXECUTE_TIME de OceanBase SQL Audit mide la ejecución del plan en el servidor. Los cursores JDBC muestran la muestra al finalizar la sentencia original; la paginación con consultas independientes solo muestra la suma si todas las páginas tienen muestras. Se solapa con los tiempos de ejecución y espera. No está disponible si el cursor sigue abierto o si los datos de auditoría no se pueden leer o asociar.",
+ agentExecuteTimeHint: "Tiempo del Agent desde la configuración del esquema hasta que retorna JDBC execute. No incluye la lectura de filas ni equivale al tiempo de ejecución del servidor de base de datos.",
+ clientRequestWait: "Espera: {ms} ms",
+ clientRequestWaitHint:
+ "Tiempo desde que la aplicación de escritorio envía la consulta hasta que recibe el resultado completo. Incluye la lectura de filas, la consulta de auditoría del servidor cuando está disponible y la transferencia; excluye la preparación del SQL y el renderizado de la tabla. Se suma entre las páginas cargadas.",
+ resultViewUpdate: "Actualización de tabla: {ms} ms",
+ resultViewUpdateHint: "Tiempo desde que la tabla recibe este resultado hasta que termina la actualización del DOM o se envía el dibujo de Canvas. Excluye la composición de GPU y la presentación en pantalla.",
rows: "{count} filas",
totalRows: "Total {count} filas",
loadedRows: "{count} filas cargadas",
diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.ts
index b1513f4fb0..a22a4224aa 100644
--- a/apps/desktop/src/i18n/locales/it.ts
+++ b/apps/desktop/src/i18n/locales/it.ts
@@ -1799,6 +1799,17 @@ export default withEnglishFallback({
noNumericData: "Nessun dato numerico disponibile per il grafico",
},
grid: {
+ agentExecuteTime: "Esecuzione: {ms} ms",
+ serverExecuteTime: "Esecuzione DB: {us} µs",
+ serverExecuteTimeUnavailable: "Esecuzione DB: non disponibile",
+ serverExecuteTimeHint:
+ "EXECUTE_TIME di OceanBase SQL Audit misura l'esecuzione del piano sul server. I cursori JDBC mostrano il campione al termine dell'istruzione originale; la paginazione con query indipendenti mostra la somma solo se tutte le pagine hanno un campione. Si sovrappone ai tempi di esecuzione e attesa. Non è disponibile se il cursore è ancora aperto o se i dati di audit non possono essere letti o associati.",
+ agentExecuteTimeHint: "Tempo dell'Agent dall'impostazione dello schema al ritorno di JDBC execute. Esclude la lettura delle righe e non equivale al tempo di esecuzione del server di database.",
+ clientRequestWait: "Attesa: {ms} ms",
+ clientRequestWaitHint:
+ "Tempo dall'invio della query dall'applicazione desktop alla ricezione del risultato completo. Include la lettura delle righe, la query di audit del server quando disponibile e il trasferimento; esclude la preparazione SQL e il rendering della tabella. Viene sommato tra le pagine caricate.",
+ resultViewUpdate: "Aggiornamento tabella: {ms} ms",
+ resultViewUpdateHint: "Tempo dalla ricezione del risultato da parte della tabella al completamento dell'aggiornamento DOM o all'invio del disegno Canvas. Esclude la composizione GPU e la visualizzazione sullo schermo.",
rows: "{count} righe",
totalRows: "Totale {count} righe",
loadedRows: "{count} righe caricate",
diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.ts
index a54270dddf..7bbbd41551 100644
--- a/apps/desktop/src/i18n/locales/ja.ts
+++ b/apps/desktop/src/i18n/locales/ja.ts
@@ -1821,6 +1821,16 @@ export default withEnglishFallback({
noNumericData: "グラフ化できる数値データがありません",
},
grid: {
+ agentExecuteTime: "実行時間:{ms} ms",
+ serverExecuteTime: "DB 実行:{us} µs",
+ serverExecuteTimeUnavailable: "DB 実行:取得不可",
+ serverExecuteTimeHint:
+ "OceanBase SQL Audit の EXECUTE_TIME はサーバーでの実行計画の処理時間です。JDBC カーソルでは元の文の終了後に取得したサンプルを表示します。ページごとに独立した SQL を実行する場合は、すべてのページのサンプルがあるときだけ合計を表示します。実行時間や待機時間と範囲が重複します。カーソルが終了していない場合や、監査データの取得・関連付けができない場合は取得不可となります。",
+ agentExecuteTimeHint: "スキーマの設定から JDBC execute が戻るまでの Agent の処理時間です。行の取得は含まず、データベースサーバーだけの実行時間ではありません。",
+ clientRequestWait: "待機時間:{ms} ms",
+ clientRequestWaitHint: "デスクトップ側がクエリ要求を送信してから結果全体を受信するまでの時間です。行の取得、利用可能な場合のサーバー監査クエリ、転送を含み、SQL の準備とテーブル描画は含みません。複数ページを読み込んだ場合は各ページの待機時間を合計します。",
+ resultViewUpdate: "テーブル更新:{ms} ms",
+ resultViewUpdateHint: "テーブルが今回の結果を受け取ってから DOM 更新が完了するか Canvas の描画が送信されるまでの時間です。GPU 合成と画面への実際の表示は含みません。",
rows: "{count}行",
totalRows: "{count}件表示",
loadedRows: "{count}件読み込み済み",
diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.ts
index 59f3fc168c..4cc75f1a46 100644
--- a/apps/desktop/src/i18n/locales/ko.ts
+++ b/apps/desktop/src/i18n/locales/ko.ts
@@ -1750,6 +1750,16 @@ export default withEnglishFallback({
noNumericData: "차트에 사용할 숫자 데이터가 없습니다",
},
grid: {
+ agentExecuteTime: "실행 시간: {ms} ms",
+ serverExecuteTime: "DB 실행: {us} µs",
+ serverExecuteTimeUnavailable: "DB 실행: 사용 불가",
+ serverExecuteTimeHint:
+ "OceanBase SQL Audit의 EXECUTE_TIME은 서버에서 실행 계획을 수행한 시간입니다. JDBC 커서는 원래 구문이 끝난 후의 샘플을 표시하며, 페이지별 독립 SQL은 모든 페이지에 샘플이 있을 때만 합계를 표시합니다. 실행 시간 및 대기 시간과 측정 범위가 겹칩니다. 커서가 끝나지 않았거나 감사 데이터를 읽거나 연결할 수 없으면 사용할 수 없습니다.",
+ agentExecuteTimeHint: "스키마 설정부터 JDBC execute가 반환될 때까지의 Agent 처리 시간입니다. 행 가져오기는 포함하지 않으며 데이터베이스 서버만의 실행 시간은 아닙니다.",
+ clientRequestWait: "대기 시간: {ms} ms",
+ clientRequestWaitHint: "데스크톱에서 쿼리 요청을 보낸 시점부터 전체 결과를 받을 때까지의 시간입니다. 행 가져오기, 사용 가능한 경우의 서버 감사 조회 및 전송을 포함하며 SQL 준비와 테이블 렌더링은 제외합니다. 여러 페이지를 불러오면 각 페이지의 대기 시간을 합산합니다.",
+ resultViewUpdate: "테이블 갱신: {ms} ms",
+ resultViewUpdateHint: "테이블이 이번 결과를 받은 시점부터 DOM 갱신이 완료되거나 Canvas 그리기가 제출될 때까지의 시간입니다. GPU 합성과 실제 화면 표시는 포함하지 않습니다.",
rows: "{count}행",
totalRows: "전체 {count}행",
loadedRows: "{count}행 로드됨",
diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.ts
index 3a27815804..b90bc0caa2 100644
--- a/apps/desktop/src/i18n/locales/pt-BR.ts
+++ b/apps/desktop/src/i18n/locales/pt-BR.ts
@@ -1801,6 +1801,17 @@ export default withEnglishFallback({
noNumericData: "Nenhum dado numérico disponível para gerar o gráfico",
},
grid: {
+ agentExecuteTime: "Execução: {ms} ms",
+ serverExecuteTime: "Execução no BD: {us} µs",
+ serverExecuteTimeUnavailable: "Execução no BD: indisponível",
+ serverExecuteTimeHint:
+ "EXECUTE_TIME do OceanBase SQL Audit mede a execução do plano no servidor. Os cursores JDBC mostram a amostra após o término da instrução original; a paginação com consultas independentes só mostra a soma quando todas as páginas têm amostras. Há sobreposição com os tempos de execução e espera. Indisponível enquanto o cursor não terminar ou quando os dados de auditoria não puderem ser lidos ou associados.",
+ agentExecuteTimeHint: "Tempo do Agent desde a configuração do esquema até o retorno de JDBC execute. Exclui a leitura de linhas e não equivale ao tempo de execução do servidor de banco de dados.",
+ clientRequestWait: "Espera: {ms} ms",
+ clientRequestWaitHint:
+ "Tempo entre o envio da consulta pelo aplicativo desktop e o recebimento do resultado completo. Inclui a leitura de linhas, a consulta de auditoria do servidor quando disponível e a transferência; exclui a preparação do SQL e a renderização da tabela. Soma os tempos de espera das páginas carregadas.",
+ resultViewUpdate: "Atualização da tabela: {ms} ms",
+ resultViewUpdateHint: "Tempo desde que a tabela recebe este resultado até a conclusão da atualização do DOM ou o envio do desenho no Canvas. Exclui a composição da GPU e a exibição na tela.",
rows: "{count} linhas",
totalRows: "Total de {count} linhas",
loadedRows: "{count} linhas carregadas",
diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts
index 26457ff851..278db4a70d 100644
--- a/apps/desktop/src/i18n/locales/zh-CN.ts
+++ b/apps/desktop/src/i18n/locales/zh-CN.ts
@@ -1813,6 +1813,15 @@ export default withEnglishFallback({
calculateTotalRowsInline: "(统计总行数)",
calculateTotalRowsFailed: "统计失败:{message}",
rowsAffected: "影响 {count} 行",
+ agentExecuteTime: "执行耗时:{ms} 毫秒",
+ serverExecuteTime: "数据库执行:{us} 微秒",
+ serverExecuteTimeUnavailable: "数据库执行:不可用",
+ serverExecuteTimeHint: "OceanBase SQL Audit EXECUTE_TIME 表示服务端执行计划的耗时。JDBC 游标显示原语句结束后的样本;独立分页 SQL 仅在各页均有样本时显示总和。与执行耗时和等待耗时范围重叠。游标未结束或审计数据无法读取、关联时不可用。",
+ agentExecuteTimeHint: "从设置 schema 到 JDBC execute 返回的 Agent 耗时;不含取行,并非数据库服务端纯执行时间。",
+ clientRequestWait: "等待耗时:{ms} 毫秒",
+ clientRequestWaitHint: "桌面端发出查询请求至收到完整结果的耗时,包含取行、可用时的服务端审计查询和传输,不含 SQL 准备与表格渲染;加载多页时累加各页等待时间。",
+ resultViewUpdate: "表格更新:{ms} 毫秒",
+ resultViewUpdateHint: "从表格接收到本次结果,到 DOM 更新完成或 Canvas 绘制提交;不含 GPU 合成及屏幕实际呈现。",
querySuccess: "查询执行成功",
noRows: "暂无数据",
noRowsDescription: "当前结果集没有任何记录。",
diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.ts
index 85740b8610..bd0817e35d 100644
--- a/apps/desktop/src/i18n/locales/zh-TW.ts
+++ b/apps/desktop/src/i18n/locales/zh-TW.ts
@@ -1821,6 +1821,15 @@ export default withEnglishFallback({
calculateTotalRowsInline: "(統計總筆數)",
calculateTotalRowsFailed: "統計失敗:{message}",
rowsAffected: "影響 {count} 筆",
+ agentExecuteTime: "執行耗時:{ms} 毫秒",
+ serverExecuteTime: "資料庫執行:{us} 微秒",
+ serverExecuteTimeUnavailable: "資料庫執行:無法取得",
+ serverExecuteTimeHint: "OceanBase SQL Audit EXECUTE_TIME 表示伺服端執行計畫的耗時。JDBC 游標顯示原語句結束後的樣本;獨立分頁 SQL 僅在各頁均有樣本時顯示總和。與執行耗時和等待耗時範圍重疊。游標尚未結束或稽核資料無法讀取、關聯時無法取得。",
+ agentExecuteTimeHint: "從設定 schema 到 JDBC execute 返回的 Agent 耗時;不含讀取資料列,並非資料庫伺服端純執行時間。",
+ clientRequestWait: "等待耗時:{ms} 毫秒",
+ clientRequestWaitHint: "桌面端送出查詢請求至收到完整結果的耗時,包含讀取資料列、可用時的伺服端稽核查詢與傳輸,不含 SQL 準備與表格呈現;載入多頁時累加各頁等待時間。",
+ resultViewUpdate: "表格更新:{ms} 毫秒",
+ resultViewUpdateHint: "從表格接收到本次結果,到 DOM 更新完成或 Canvas 繪製提交;不含 GPU 合成及螢幕實際呈現。",
querySuccess: "查詢執行成功",
noRows: "暫無資料",
noRowsDescription: "目前結果集沒有任何記錄。",
diff --git a/apps/desktop/src/lib/__tests__/dataGrid/canvasDataGridRendererFrozen.spec.ts b/apps/desktop/src/lib/__tests__/dataGrid/canvasDataGridRendererFrozen.spec.ts
index ce3c1e9d1d..ebd94bb2ce 100644
--- a/apps/desktop/src/lib/__tests__/dataGrid/canvasDataGridRendererFrozen.spec.ts
+++ b/apps/desktop/src/lib/__tests__/dataGrid/canvasDataGridRendererFrozen.spec.ts
@@ -146,6 +146,28 @@ describe("drawCanvasDataGrid with frozen columns", () => {
expect(resolveCanvasBackingStoreMetrics({ width: 801, height: 399, pixelRatio: 5 })).toEqual({ pixelWidth: 3204, pixelHeight: 1596, scaleX: 4, scaleY: 4, measured: false });
});
+ it("reports a completed draw only after obtaining a Canvas context", () => {
+ const canvas = createMockCanvas();
+ const options = createBaseOptions({ canvas, rowCount: 0, rowAt: () => undefined });
+ const fillRect = vi.fn();
+ vi.spyOn(canvas, "getContext")
+ .mockReturnValueOnce(null)
+ .mockReturnValueOnce(
+ new Proxy(
+ {},
+ {
+ get: (_target, key) => (key === "fillRect" ? fillRect : key === "measureText" ? () => ({ width: 0 }) : () => {}),
+ set: () => true,
+ },
+ ) as unknown as CanvasRenderingContext2D,
+ );
+
+ expect(drawCanvasDataGrid(options)).toBe(false);
+ expect(fillRect).not.toHaveBeenCalled();
+ expect(drawCanvasDataGrid(options)).toBe(true);
+ expect(fillRect).toHaveBeenCalled();
+ });
+
it("draws without errors when frozenColumnCount is 0", () => {
const canvas = createMockCanvas();
const options = createBaseOptions({ canvas, frozenColumnCount: 0 });
diff --git a/apps/desktop/src/lib/__tests__/tabs/tabResultCache.spec.ts b/apps/desktop/src/lib/__tests__/tabs/tabResultCache.spec.ts
index 79fda6b2e7..6d1a0f648d 100644
--- a/apps/desktop/src/lib/__tests__/tabs/tabResultCache.spec.ts
+++ b/apps/desktop/src/lib/__tests__/tabs/tabResultCache.spec.ts
@@ -81,6 +81,8 @@ describe("tab result cache statement execution metadata", () => {
rows: [[1]],
affected_rows: 0,
execution_time_ms: 1,
+ server_execute_time_us: 370,
+ client_request_wait_ms: 45,
statement_index: 0,
sourceStatement: "SELECT 1",
},
@@ -101,6 +103,7 @@ describe("tab result cache statement execution metadata", () => {
const restored = decodeTabResultSnapshot(encoded);
expect(restored?.resultEditorFingerprint).toBe("15:0123456789abcdef");
+ expect(restored?.results?.[0]).toMatchObject({ server_execute_time_us: 370, client_request_wait_ms: 45 });
expect(restored?.results?.map((result) => ({ statementIndex: result.statement_index, error: result.execution_error }))).toEqual([
{ statementIndex: 0, error: undefined },
{ statementIndex: 1, error: true },
diff --git a/apps/desktop/src/lib/dataGrid/canvasDataGridRenderer.ts b/apps/desktop/src/lib/dataGrid/canvasDataGridRenderer.ts
index 4bf60ef864..717466d54b 100644
--- a/apps/desktop/src/lib/dataGrid/canvasDataGridRenderer.ts
+++ b/apps/desktop/src/lib/dataGrid/canvasDataGridRenderer.ts
@@ -324,7 +324,7 @@ function resolveCanvasRenderState(canvas: HTMLCanvasElement, isDark: boolean, st
return state;
}
-export function drawCanvasDataGrid(options: DrawCanvasDataGridOptions) {
+export function drawCanvasDataGrid(options: DrawCanvasDataGridOptions): boolean {
const {
canvas,
scroller,
@@ -387,7 +387,7 @@ export function drawCanvasDataGrid(options: DrawCanvasDataGridOptions) {
if (canvas.style.height !== canvasHeight) canvas.style.height = canvasHeight;
const ctx = canvas.getContext("2d");
- if (!ctx) return;
+ if (!ctx) return false;
ctx.setTransform(scaleX, 0, 0, scaleY, 0, 0);
ctx.imageSmoothingEnabled = false;
ctx.clearRect(0, 0, width, height);
@@ -742,4 +742,5 @@ export function drawCanvasDataGrid(options: DrawCanvasDataGridOptions) {
}
ctx.restore();
}
+ return true;
}
diff --git a/apps/desktop/src/lib/tabs/tabResultCache.ts b/apps/desktop/src/lib/tabs/tabResultCache.ts
index 4e4afea4da..adce58e6de 100644
--- a/apps/desktop/src/lib/tabs/tabResultCache.ts
+++ b/apps/desktop/src/lib/tabs/tabResultCache.ts
@@ -69,6 +69,8 @@ interface ColumnarQueryResult {
mongo_copy_documents?: unknown[];
affected_rows: number;
execution_time_ms: number;
+ server_execute_time_us?: number;
+ client_request_wait_ms?: number;
truncated?: boolean;
has_more?: boolean;
sourceLabel?: string;
@@ -355,6 +357,8 @@ function stripSessionIds(result: QueryResult | undefined): QueryResult | undefin
mongo_copy_documents: result.mongo_copy_documents ? clonePlain(result.mongo_copy_documents) : undefined,
affected_rows: result.affected_rows,
execution_time_ms: result.execution_time_ms,
+ server_execute_time_us: result.server_execute_time_us,
+ client_request_wait_ms: result.client_request_wait_ms,
truncated: result.truncated,
session_id: undefined,
has_more: result.has_more,
@@ -400,6 +404,8 @@ function toColumnarResult(result: QueryResult | undefined): ColumnarQueryResult
mongo_copy_documents: result.mongo_copy_documents ? clonePlain(result.mongo_copy_documents) : undefined,
affected_rows: result.affected_rows,
execution_time_ms: result.execution_time_ms,
+ server_execute_time_us: result.server_execute_time_us,
+ client_request_wait_ms: result.client_request_wait_ms,
truncated: result.truncated,
has_more: result.has_more,
sourceLabel: result.sourceLabel,
@@ -426,6 +432,8 @@ function fromColumnarResult(result: ColumnarQueryResult | undefined): QueryResul
mongo_copy_documents: result.mongo_copy_documents ? clonePlain(result.mongo_copy_documents) : undefined,
affected_rows: result.affected_rows,
execution_time_ms: result.execution_time_ms,
+ server_execute_time_us: result.server_execute_time_us,
+ client_request_wait_ms: result.client_request_wait_ms,
truncated: result.truncated,
session_id: undefined,
has_more: result.has_more,
diff --git a/apps/desktop/src/stores/__tests__/queryStore.multiStatementError.spec.ts b/apps/desktop/src/stores/__tests__/queryStore.multiStatementError.spec.ts
index d7489a0d50..63eae634a7 100644
--- a/apps/desktop/src/stores/__tests__/queryStore.multiStatementError.spec.ts
+++ b/apps/desktop/src/stores/__tests__/queryStore.multiStatementError.spec.ts
@@ -1,6 +1,7 @@
import { createPinia, setActivePinia } from "pinia";
import { isActiveResultLoading } from "@/lib/sql/queryExecutionState";
import { BackendErrorException } from "@/lib/backend/errorUtils";
+import type { QueryResult } from "@/types/database";
import { beforeEach, describe, expect, it, vi } from "vitest";
const mocks = vi.hoisted(() => ({
@@ -157,6 +158,35 @@ describe("queryStore multi-statement errors", () => {
});
});
+ it.each(["oceanbase-oracle", "mysql"] as const)("measures complete result wait only for a single %s query result", async (databaseType) => {
+ mocks.getConnectionConfig.mockReturnValue({
+ id: "timing-1",
+ name: "Timing",
+ db_type: databaseType,
+ database: "APP",
+ query_timeout_secs: 30,
+ });
+ let clock = 100;
+ vi.spyOn(performance, "now").mockImplementation(() => clock);
+ const pending = deferred<QueryResult[]>();
+ mocks.executeMulti.mockReturnValue(pending.promise);
+ const { useQueryStore } = await import("@/stores/queryStore");
+ const store = useQueryStore();
+ const tabId = store.createTab("timing-1", "APP", "Query", "query", "APP");
+ try {
+ const execution = store.executeTabSql(tabId, "SELECT VALUE FROM T");
+ await vi.waitFor(() => expect(mocks.executeMulti).toHaveBeenCalledTimes(1));
+ clock = 145;
+ pending.resolve([{ columns: ["VALUE"], rows: [[1]], affected_rows: 0, execution_time_ms: 12 }]);
+ await execution;
+ const result = store.tabs.find((item) => item.id === tabId)?.result;
+ expect(result?.execution_time_ms).toBe(12);
+ expect(result?.client_request_wait_ms).toBe(databaseType === "oceanbase-oracle" ? 45 : undefined);
+ } finally {
+ vi.restoreAllMocks();
+ }
+ });
+
it("opens the first error result from a mixed result batch", async () => {
const structuredError = structuredTimeoutError();
mocks.executeMulti.mockResolvedValue([
diff --git a/apps/desktop/src/stores/__tests__/queryStore.spatialMetadata.spec.ts b/apps/desktop/src/stores/__tests__/queryStore.spatialMetadata.spec.ts
index 384df5e2ab..37b61e19e4 100644
--- a/apps/desktop/src/stores/__tests__/queryStore.spatialMetadata.spec.ts
+++ b/apps/desktop/src/stores/__tests__/queryStore.spatialMetadata.spec.ts
@@ -14,6 +14,18 @@ function make(rows: number, spatial?: QueryResult["spatial_columns"]): QueryResu
}
describe("appendQueryResultSegment spatial merge", () => {
+ it("sums client request wait across loaded pages", () => {
+ const previous = { ...make(1), client_request_wait_ms: 45 };
+ const segment = { ...make(1), client_request_wait_ms: 30 };
+ const merged = appendQueryResultSegment(previous, segment, 100);
+ expect(merged.client_request_wait_ms).toBe(75);
+ expect(merged.rows).toHaveLength(2);
+ });
+ it("does not report a partial wait when either loaded page lacks a sample", () => {
+ const sampled = { ...make(1), client_request_wait_ms: 40 };
+ expect(appendQueryResultSegment(make(1), sampled, 100).client_request_wait_ms).toBeUndefined();
+ expect(appendQueryResultSegment(sampled, make(1), 100).client_request_wait_ms).toBeUndefined();
+ });
it("keeps the first non-null SRID per column across pages", () => {
const previous = make(2, [{ column_index: 0, srid: 4326 }]);
const segment = make(2, [{ column_index: 0, srid: 3857 }]);
@@ -60,3 +72,19 @@ describe("appendQueryResultSegment spatial merge", () => {
expect(() => appendQueryResultSegment(previous, segment, 100)).toThrow("relation missing_table does not exist");
});
});
+
+describe("appendQueryResultSegment OceanBase audit timing", () => {
+ it("uses the terminal audit for the whole JDBC cursor without summing page samples", () => {
+ const first = { ...make(100), session_id: "cursor-1", has_more: true };
+ const last = { ...make(50), server_execute_time_us: 370, has_more: false };
+ expect(appendQueryResultSegment(first, last, 1000).server_execute_time_us).toBe(370);
+ });
+
+ it("sums independent SQL pages only when each page has an audit sample", () => {
+ const first = { ...make(100), server_execute_time_us: 200 };
+ const sampledNext = { ...make(100), server_execute_time_us: 150 };
+ expect(appendQueryResultSegment(first, sampledNext, 1000).server_execute_time_us).toBe(350);
+ expect(appendQueryResultSegment(make(100), sampledNext, 1000).server_execute_time_us).toBeUndefined();
+ expect(appendQueryResultSegment(first, make(100), 1000).server_execute_time_us).toBeUndefined();
+ });
+});
diff --git a/apps/desktop/src/stores/queryStore.ts b/apps/desktop/src/stores/queryStore.ts
index 4308e96030..add358969d 100644
--- a/apps/desktop/src/stores/queryStore.ts
+++ b/apps/desktop/src/stores/queryStore.ts
@@ -312,6 +312,10 @@ export function appendQueryResultSegment(previous: QueryResult, segment: QueryRe
mongo_documents: appendParallelValues(previous.mongo_documents, segment.mongo_documents),
mongo_copy_documents: appendParallelValues(previous.mongo_copy_documents, segment.mongo_copy_documents),
execution_time_ms: (previous.execution_time_ms ?? 0) + (segment.execution_time_ms ?? 0),
+ // A JDBC cursor's terminal page audits the entire original statement.
+ // Independent page SQLs need every page sampled before a total is shown.
+ server_execute_time_us: previous.session_id ? segment.server_execute_time_us : previous.server_execute_time_us !== undefined && segment.server_execute_time_us !== undefined ? previous.server_execute_time_us + segment.server_execute_time_us : undefined,
+ client_request_wait_ms: previous.client_request_wait_ms !== undefined && segment.client_request_wait_ms !== undefined ? previous.client_request_wait_ms + segment.client_request_wait_ms : undefined,
has_more: previous.rows.length + appendedRowCount >= maxRows ? false : segment.has_more,
});
}
@@ -6433,6 +6437,7 @@ export const useQueryStore = defineStore("query", () => {
let useAgentResultSession = false;
let paginationRowNumberColumn: string | undefined;
let executionDispatched = false;
+ let clientRequestStartedAt: number | undefined;
let producedResult = false;
const resumedExecutionTarget = batchResume?.batch.executionTarget;
const executionConnectionId = resumedExecutionTarget?.connectionId ?? options?.executionTarget?.connectionId ?? tab.connectionId;
@@ -7266,6 +7271,7 @@ export const useQueryStore = defineStore("query", () => {
clientSession: Boolean(executionClientSessionId),
});
executionDispatched = true;
+ if (effectiveDbType === "oceanbase-oracle" && tab.mode === "query") clientRequestStartedAt = performance.now();
if (useAgentResultSession && tab.mode === "query" && typeof pageOffset === "number" && pageOffset > 0 && !options?.pagination?.sessionId && !(tab.batchSqlExecution && tab.batchSqlExecution.total > 1)) {
return (async () => {
let sessionId: string | undefined;
@@ -7338,6 +7344,7 @@ export const useQueryStore = defineStore("query", () => {
} else {
queryExecutionLog("info", "execute-in-txn:invoke", { traceId, txnSessionId: tab.txnSessionId, elapsed: elapsed() });
executionDispatched = true;
+ if (effectiveDbType === "oceanbase-oracle" && tab.mode === "query") clientRequestStartedAt = performance.now();
// Only an initial manual execution classifies the user SQL (sticky
// proven-read-only dialects). A later cursor-page fetch must neither
// set nor clear the sticky bit.
@@ -7386,6 +7393,11 @@ export const useQueryStore = defineStore("query", () => {
void api.cancelQuery(executionId).catch((error) => queryExecutionLog("warn", "frontend-timeout:cancel-failed", { traceId, error }));
});
if (findExecutionTab(id) !== tab || tab.executionId !== executionId || manualTransactionTargetEpoch(tab) !== executionTargetEpoch) return false;
+ // A single result has an unambiguous request boundary. This includes fetch and
+ // transport, but excludes SQL preparation and the grid's later render work.
+ if (clientRequestStartedAt !== undefined && responseResults.length === 1 && !responseResults[0]?.execution_error) {
+ responseResults[0]!.client_request_wait_ms = Math.max(0, Math.round(performance.now() - clientRequestStartedAt));
+ }
const annotatedResults = annotateQueryResultSources(markQueryResultsRowsRaw(responseResults), queryBaseSql, sourceLabelDatabase, effectiveDbType, options?.sourceOffset, sqlStatementParameterOptions, sqlToExecute, options?.sourceOffset === undefined ? undefined : tab.sql);
const results = offsetBatchQueryResultIndexes(annotatedResults.results, batchResume?.startStatementIndex ?? 0);
if (paginationRowNumberColumn && results.length === 1) {
diff --git a/apps/desktop/src/types/database.ts b/apps/desktop/src/types/database.ts
index 5638513c0b..5a3e0201fb 100644
--- a/apps/desktop/src/types/database.ts
+++ b/apps/desktop/src/types/database.ts
@@ -1136,6 +1136,10 @@ export interface QueryResult {
mongo_copy_documents?: unknown[];
affected_rows: number;
execution_time_ms: number;
+ /** OceanBase SQL Audit EXECUTE_TIME for a completed statement, in microseconds. */
+ server_execute_time_us?: number;
+ /** Desktop wait from query request dispatch to the complete result payload; summed across appended pages. OceanBase Oracle query tabs only. */
+ client_request_wait_ms?: number;
/** Whether a backend-reported result total is exact. */
total_is_exact?: boolean;
truncated?: boolean;
diff --git a/crates/dbx-cli/src/main.rs b/crates/dbx-cli/src/main.rs
index e42eaea097..58a971de0c 100644
--- a/crates/dbx-cli/src/main.rs
+++ b/crates/dbx-cli/src/main.rs
@@ -1076,6 +1076,7 @@ mod tests {
rows: Vec::new(),
affected_rows: 2,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -1151,6 +1152,7 @@ mod tests {
rows: Vec::new(),
affected_rows: 1,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
diff --git a/crates/dbx-core/src/ai/agent_tools.rs b/crates/dbx-core/src/ai/agent_tools.rs
index db0ecc2b77..284480d52c 100644
--- a/crates/dbx-core/src/ai/agent_tools.rs
+++ b/crates/dbx-core/src/ai/agent_tools.rs
@@ -1835,6 +1835,7 @@ for line in sys.stdin:
rows,
affected_rows,
execution_time_ms: 1,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
diff --git a/crates/dbx-core/src/connection/mod.rs b/crates/dbx-core/src/connection/mod.rs
index 1c111fa133..010313d561 100644
--- a/crates/dbx-core/src/connection/mod.rs
+++ b/crates/dbx-core/src/connection/mod.rs
@@ -7067,6 +7067,7 @@ mod tests {
rows: vec![vec![serde_json::json!("M")]],
affected_rows: 0,
execution_time_ms: 1,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
diff --git a/crates/dbx-core/src/data/table_export.rs b/crates/dbx-core/src/data/table_export.rs
index c405bbb23b..8113dd2ba4 100644
--- a/crates/dbx-core/src/data/table_export.rs
+++ b/crates/dbx-core/src/data/table_export.rs
@@ -691,6 +691,7 @@ async fn fetch_table_export_batch(
rows: Vec::new(),
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
diff --git a/crates/dbx-core/src/data/transfer.rs b/crates/dbx-core/src/data/transfer.rs
index ee9a1e9d53..36c90305c0 100644
--- a/crates/dbx-core/src/data/transfer.rs
+++ b/crates/dbx-core/src/data/transfer.rs
@@ -10774,6 +10774,7 @@ CREATE TABLE "Other"."prefix""Source"."NAME" ("ID" INT);"#;
rows,
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
diff --git a/crates/dbx-core/src/query/mod.rs b/crates/dbx-core/src/query/mod.rs
index 1bee16daf0..d4d7be3de5 100644
--- a/crates/dbx-core/src/query/mod.rs
+++ b/crates/dbx-core/src/query/mod.rs
@@ -3788,6 +3788,7 @@ fn error_query_result(message: String) -> db::QueryResult {
rows: vec![vec![serde_json::Value::String(message)]],
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -3806,6 +3807,7 @@ fn empty_query_result(execution_time_ms: u128) -> db::QueryResult {
rows: vec![],
affected_rows: 0,
execution_time_ms,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -4065,6 +4067,7 @@ async fn execute_statements_inner(
rows: vec![],
affected_rows: total_affected,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -4674,6 +4677,7 @@ async fn exec_tx_pg_inner(
rows: vec![],
affected_rows: total_affected,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -4767,6 +4771,7 @@ async fn exec_tx_mysql_inner(
rows: vec![],
affected_rows: total_affected,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -4959,6 +4964,7 @@ async fn exec_tx_sqlite_inner(
rows: vec![],
affected_rows: total_affected,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -5042,6 +5048,7 @@ async fn exec_tx_explicit_inner(
rows: vec![],
affected_rows: total_affected,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -6149,6 +6156,7 @@ async fn execute_manual_txn_postgres_statement(
rows: vec![],
affected_rows: affected,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -6192,6 +6200,7 @@ async fn execute_manual_txn_mysql_statement(
rows: data,
affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated,
session_id: None,
has_more: false,
@@ -6211,6 +6220,7 @@ async fn execute_manual_txn_mysql_statement(
rows: vec![],
affected_rows,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -6267,6 +6277,7 @@ pub async fn commit_manual_transaction(state: &AppState, txn_session_id: &str) -
rows: vec![],
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -6296,6 +6307,7 @@ pub async fn rollback_manual_transaction(state: &AppState, txn_session_id: &str)
rows: vec![],
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -8425,6 +8437,7 @@ for line in sys.stdin:
rows: vec![vec![serde_json::json!(2)]],
affected_rows: 0,
execution_time_ms: 4,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -8699,6 +8712,7 @@ for line in sys.stdin:
rows: vec![vec![serde_json::json!(value)]],
affected_rows: 0,
execution_time_ms: 1,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -9754,6 +9768,7 @@ for line in sys.stdin:
rows: vec![],
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -9779,6 +9794,7 @@ for line in sys.stdin:
rows: vec![],
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -11074,6 +11090,7 @@ for line in sys.stdin:
]],
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -11111,6 +11128,7 @@ for line in sys.stdin:
],
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -11178,6 +11196,7 @@ for line in sys.stdin:
],
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -11217,6 +11236,7 @@ for line in sys.stdin:
rows: vec![vec![serde_json::json!("0x0102030405"), serde_json::json!("B:4:5")]],
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -11248,6 +11268,7 @@ for line in sys.stdin:
],
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -11286,6 +11307,7 @@ for line in sys.stdin:
],
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -11318,6 +11340,7 @@ for line in sys.stdin:
rows: Vec::new(),
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
diff --git a/crates/dbx-core/src/query/mongo_ops.rs b/crates/dbx-core/src/query/mongo_ops.rs
index fb34c12587..db32304509 100644
--- a/crates/dbx-core/src/query/mongo_ops.rs
+++ b/crates/dbx-core/src/query/mongo_ops.rs
@@ -1288,6 +1288,7 @@ fn query_result(columns: Vec<String>, rows: Vec<Vec<serde_json::Value>>, affecte
rows,
affected_rows,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
diff --git a/crates/dbx-core/src/schema/kingbase.rs b/crates/dbx-core/src/schema/kingbase.rs
index 8f676cc753..0ef460a31f 100644
--- a/crates/dbx-core/src/schema/kingbase.rs
+++ b/crates/dbx-core/src/schema/kingbase.rs
@@ -205,6 +205,7 @@ mod tests {
]],
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
diff --git a/crates/dbx-core/src/schema/mod.rs b/crates/dbx-core/src/schema/mod.rs
index 24292e88a9..87060045c5 100644
--- a/crates/dbx-core/src/schema/mod.rs
+++ b/crates/dbx-core/src/schema/mod.rs
@@ -3210,6 +3210,7 @@ mod tests {
rows,
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -4078,6 +4079,7 @@ done
]],
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -4105,6 +4107,7 @@ done
]],
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -4129,6 +4132,7 @@ done
rows: vec![vec![serde_json::json!("users"), serde_json::json!("CREATE TABLE `users` (`id` bigint);\n")]],
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -4157,6 +4161,7 @@ done
]],
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -4184,6 +4189,7 @@ done
]],
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -5154,6 +5160,7 @@ for line in sys.stdin:
],
affected_rows: 0,
execution_time_ms: 1,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -5202,6 +5209,7 @@ for line in sys.stdin:
],
affected_rows: 0,
execution_time_ms: 1,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -5385,6 +5393,7 @@ for line in sys.stdin:
rows: vec![vec![serde_json::json!("Customer table")]],
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -5403,6 +5412,7 @@ for line in sys.stdin:
rows: vec![vec![serde_json::json!(" ")]],
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -5439,6 +5449,7 @@ for line in sys.stdin:
],
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -5633,6 +5644,7 @@ for line in sys.stdin:
],
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -5738,6 +5750,7 @@ for line in sys.stdin:
],
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
diff --git a/crates/dbx-core/src/schema/table_structure_sql/sqlite_rebuild.rs b/crates/dbx-core/src/schema/table_structure_sql/sqlite_rebuild.rs
index 8e4e84a93f..326d932243 100644
--- a/crates/dbx-core/src/schema/table_structure_sql/sqlite_rebuild.rs
+++ b/crates/dbx-core/src/schema/table_structure_sql/sqlite_rebuild.rs
@@ -684,6 +684,7 @@ fn execute_change_transaction(
rows: Vec::new(),
affected_rows: 0,
execution_time_ms: started_at.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
diff --git a/crates/dbx-drivers/src/db/clickhouse_driver.rs b/crates/dbx-drivers/src/db/clickhouse_driver.rs
index a14c6f8488..3208903353 100644
--- a/crates/dbx-drivers/src/db/clickhouse_driver.rs
+++ b/crates/dbx-drivers/src/db/clickhouse_driver.rs
@@ -588,6 +588,7 @@ fn limited_query_result(result: ChJsonResult, execution_time_ms: u128, max_rows:
rows,
affected_rows: 0,
execution_time_ms,
+ server_execute_time_us: None,
truncated,
session_id: None,
has_more: false,
@@ -845,6 +846,7 @@ pub async fn execute_query_with_max_rows(
rows: vec![],
affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
diff --git a/crates/dbx-drivers/src/db/cloudflare_d1/mod.rs b/crates/dbx-drivers/src/db/cloudflare_d1/mod.rs
index 5fd4736958..0faaacfcd7 100644
--- a/crates/dbx-drivers/src/db/cloudflare_d1/mod.rs
+++ b/crates/dbx-drivers/src/db/cloudflare_d1/mod.rs
@@ -362,6 +362,7 @@ fn query_result(
rows: result.rows,
affected_rows,
execution_time_ms,
+ server_execute_time_us: None,
truncated,
session_id: None,
has_more: false,
diff --git a/crates/dbx-drivers/src/db/dynamodb_driver.rs b/crates/dbx-drivers/src/db/dynamodb_driver.rs
index 196a813a6b..01d8bfa89d 100644
--- a/crates/dbx-drivers/src/db/dynamodb_driver.rs
+++ b/crates/dbx-drivers/src/db/dynamodb_driver.rs
@@ -571,6 +571,7 @@ fn document_query_result(result: DocumentQueryResult, started: Instant) -> Query
rows,
affected_rows: 0,
execution_time_ms: started.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated,
session_id: None,
has_more: false,
@@ -589,6 +590,7 @@ fn affected_query_result(affected_rows: u64, started: Instant) -> QueryResult {
rows: Vec::new(),
affected_rows,
execution_time_ms: started.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
diff --git a/crates/dbx-drivers/src/db/elasticsearch_driver.rs b/crates/dbx-drivers/src/db/elasticsearch_driver.rs
index 5c972e91b4..0a95115537 100644
--- a/crates/dbx-drivers/src/db/elasticsearch_driver.rs
+++ b/crates/dbx-drivers/src/db/elasticsearch_driver.rs
@@ -2355,6 +2355,7 @@ fn parse_elasticsearch_response_with_sql_parser(
rows,
affected_rows: row_count,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -2381,6 +2382,7 @@ fn parse_elasticsearch_response_with_sql_parser(
rows,
affected_rows: row_count,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -2553,6 +2555,7 @@ fn raw_json_response_result(
rows: vec![vec![serde_json::Value::Number(status.into()), serde_json::Value::String(body_text.into())]],
affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -2620,6 +2623,7 @@ fn parse_elasticsearch_rest_response_with_sql_parser(
rows,
affected_rows,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -3129,6 +3133,7 @@ pub fn parse_tabular_sql_response(
.and_then(serde_json::Value::as_u64)
.unwrap_or(rows.len() as u64),
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: body.get("cursor").and_then(|cursor| cursor.as_str()).map(str::to_string),
has_more: body.get("cursor").and_then(|cursor| cursor.as_str()).is_some(),
diff --git a/crates/dbx-drivers/src/db/influxdb3_driver.rs b/crates/dbx-drivers/src/db/influxdb3_driver.rs
index 7c707010e8..c8667fae0f 100644
--- a/crates/dbx-drivers/src/db/influxdb3_driver.rs
+++ b/crates/dbx-drivers/src/db/influxdb3_driver.rs
@@ -366,6 +366,7 @@ fn build_query_result(rows: Vec<serde_json::Value>, start: Instant) -> QueryResu
rows: out_rows,
affected_rows: affected,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
diff --git a/crates/dbx-drivers/src/db/influxdb_driver.rs b/crates/dbx-drivers/src/db/influxdb_driver.rs
index 5cbb854b2c..b651ce721c 100644
--- a/crates/dbx-drivers/src/db/influxdb_driver.rs
+++ b/crates/dbx-drivers/src/db/influxdb_driver.rs
@@ -514,6 +514,7 @@ pub async fn execute_query(client: &InfluxdbClient, database: &str, sql: &str) -
affected_rows: rows.len() as u64,
rows,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -530,6 +531,7 @@ pub async fn execute_query(client: &InfluxdbClient, database: &str, sql: &str) -
rows: vec![],
affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -729,6 +731,7 @@ fn parse_flux_csv(text: &str, start: Instant) -> Result<QueryResult, String> {
affected_rows: rows.len() as u64,
rows,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
diff --git a/crates/dbx-drivers/src/db/meilisearch_driver.rs b/crates/dbx-drivers/src/db/meilisearch_driver.rs
index 7680c141ce..ef52327eff 100644
--- a/crates/dbx-drivers/src/db/meilisearch_driver.rs
+++ b/crates/dbx-drivers/src/db/meilisearch_driver.rs
@@ -1888,6 +1888,7 @@ fn raw_response_result(status: u16, body: String, start: Instant, truncated: boo
rows: vec![vec![Value::Number(status.into()), Value::String(body)]],
affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated,
session_id: None,
has_more: false,
diff --git a/crates/dbx-drivers/src/db/mysql.rs b/crates/dbx-drivers/src/db/mysql.rs
index 63a07a759e..0424123dc1 100644
--- a/crates/dbx-drivers/src/db/mysql.rs
+++ b/crates/dbx-drivers/src/db/mysql.rs
@@ -4553,6 +4553,7 @@ async fn execute_result_set_with_text_protocol_on_conn(
rows: vec![],
affected_rows,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -4595,6 +4596,7 @@ async fn execute_result_set_with_text_protocol_on_conn(
rows: result_rows,
affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated,
session_id: None,
has_more: false,
@@ -4687,6 +4689,7 @@ async fn execute_result_set_with_text_protocol_on_conn(
rows: result_rows,
affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated,
session_id: None,
has_more: false,
@@ -4815,6 +4818,7 @@ async fn execute_result_sets_with_text_protocol_on_conn(
rows,
affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated,
session_id: None,
has_more: false,
@@ -4841,6 +4845,7 @@ async fn execute_result_sets_with_text_protocol_on_conn(
rows: vec![],
affected_rows,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -5022,6 +5027,7 @@ async fn execute_result_set_with_prepared_protocol_on_conn(
rows: result_rows,
affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated,
session_id: None,
has_more: false,
@@ -5497,6 +5503,7 @@ pub async fn execute_query_on_conn_with_limits_progress(
rows: vec![],
affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -5534,6 +5541,7 @@ pub async fn execute_query_on_conn_with_limits_progress(
rows: vec![],
affected_rows,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -5662,6 +5670,7 @@ pub async fn execute_non_result_batch_on_conn(
rows: vec![],
affected_rows: result.affected_rows(),
execution_time_ms: elapsed_ms.saturating_sub(previous_elapsed_ms),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
diff --git a/crates/dbx-drivers/src/db/postgres.rs b/crates/dbx-drivers/src/db/postgres.rs
index f1be33a087..c0a719bb3d 100644
--- a/crates/dbx-drivers/src/db/postgres.rs
+++ b/crates/dbx-drivers/src/db/postgres.rs
@@ -1959,6 +1959,7 @@ async fn execute_select_prepared(
rows: result_rows,
affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated,
session_id: None,
has_more: false,
@@ -2054,6 +2055,7 @@ async fn execute_select_text(
rows: result_rows,
affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated,
session_id: None,
has_more: false,
@@ -7606,6 +7608,7 @@ pub async fn execute_query_with_max_rows(
rows: vec![],
affected_rows: affected,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -8432,6 +8435,7 @@ async fn execute_query_with_max_rows_inner(
rows: vec![],
affected_rows: affected,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -13997,6 +14001,7 @@ mod tests {
]],
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
diff --git a/crates/dbx-drivers/src/db/rqlite_driver.rs b/crates/dbx-drivers/src/db/rqlite_driver.rs
index 7538eade78..8eb6f75795 100644
--- a/crates/dbx-drivers/src/db/rqlite_driver.rs
+++ b/crates/dbx-drivers/src/db/rqlite_driver.rs
@@ -314,6 +314,7 @@ pub async fn execute_query_with_max_rows(
rows: vec![],
affected_rows,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -367,6 +368,7 @@ fn query_result_from_rqlite_result(
rows: result.values,
affected_rows: 0,
execution_time_ms,
+ server_execute_time_us: None,
truncated,
session_id: None,
has_more: false,
diff --git a/crates/dbx-drivers/src/db/sqlite.rs b/crates/dbx-drivers/src/db/sqlite.rs
index adf409bd38..1775839240 100644
--- a/crates/dbx-drivers/src/db/sqlite.rs
+++ b/crates/dbx-drivers/src/db/sqlite.rs
@@ -2947,6 +2947,7 @@ fn execute_query_blocking(
rows: result_rows,
affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated,
session_id: None,
has_more: false,
@@ -2964,6 +2965,7 @@ fn execute_query_blocking(
rows: vec![],
affected_rows: conn.changes(),
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
diff --git a/crates/dbx-drivers/src/db/sqlite_worker.rs b/crates/dbx-drivers/src/db/sqlite_worker.rs
index 7640482a84..deb6247081 100644
--- a/crates/dbx-drivers/src/db/sqlite_worker.rs
+++ b/crates/dbx-drivers/src/db/sqlite_worker.rs
@@ -114,6 +114,7 @@ impl SqliteWorkerClient {
rows: rows.unwrap_or_default(),
affected_rows: affected_rows.unwrap_or(0),
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: truncated.unwrap_or(false),
session_id: None,
has_more: false,
diff --git a/crates/dbx-drivers/src/db/sqlserver.rs b/crates/dbx-drivers/src/db/sqlserver.rs
index 8e556824c9..f9c8915c14 100644
--- a/crates/dbx-drivers/src/db/sqlserver.rs
+++ b/crates/dbx-drivers/src/db/sqlserver.rs
@@ -695,6 +695,7 @@ fn server_messages_query_result(messages: Vec<String>, start: Instant) -> Option
rows: vec![],
affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -767,6 +768,7 @@ async fn collect_first_result_limited(
rows,
affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated,
session_id: None,
has_more: false,
@@ -1686,6 +1688,7 @@ fn push_sqlserver_result_set(results: &mut Vec<QueryResult>, result: Option<SqlS
rows: result.rows,
affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: result.truncated,
session_id: None,
has_more: false,
@@ -1744,6 +1747,7 @@ fn push_sqlserver_ordered_events(
rows: vec![],
affected_rows,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -3369,6 +3373,7 @@ async fn execute_query_with_max_rows_inner(
rows: vec![],
affected_rows: result.rows_affected().iter().sum::<u64>(),
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -3414,6 +3419,7 @@ pub async fn execute_batch_with_max_rows_metadata(
rows: vec![],
affected_rows: result.rows_affected().iter().sum::<u64>(),
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -3508,6 +3514,7 @@ pub async fn execute_simple_batch_with_max_rows_metadata(
rows: vec![],
affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -3934,6 +3941,7 @@ mod tests {
rows: vec![],
affected_rows: 0,
execution_time_ms: 1,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -3958,6 +3966,7 @@ mod tests {
rows: vec![],
affected_rows: 0,
execution_time_ms: 1,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -3977,6 +3986,7 @@ mod tests {
rows: vec![vec![serde_json::json!(1)]],
affected_rows: 0,
execution_time_ms: 1,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -4729,6 +4739,7 @@ mod tests {
rows: vec![vec![serde_json::json!("app_user"), serde_json::json!("8")]],
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -5101,6 +5112,7 @@ mod tests {
rows: vec![vec![serde_json::json!(42), serde_json::json!(101)]],
affected_rows: 0,
execution_time_ms: 1,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
diff --git a/crates/dbx-drivers/src/db/turso_driver.rs b/crates/dbx-drivers/src/db/turso_driver.rs
index f2c229641b..912b749a0f 100644
--- a/crates/dbx-drivers/src/db/turso_driver.rs
+++ b/crates/dbx-drivers/src/db/turso_driver.rs
@@ -363,6 +363,7 @@ pub async fn execute_query_with_max_rows(
rows: vec![],
affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -385,6 +386,7 @@ pub async fn execute_query_with_max_rows(
rows: vec![],
affected_rows,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -404,6 +406,7 @@ pub async fn execute_query_with_max_rows(
rows: vec![],
affected_rows: affected,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -585,6 +588,7 @@ fn query_result_from_turso_result(
rows: result.values,
affected_rows: 0,
execution_time_ms,
+ server_execute_time_us: None,
truncated,
session_id: None,
has_more: false,
diff --git a/crates/dbx-drivers/src/db/vector_driver.rs b/crates/dbx-drivers/src/db/vector_driver.rs
index 724045675c..c8bb1295ef 100644
--- a/crates/dbx-drivers/src/db/vector_driver.rs
+++ b/crates/dbx-drivers/src/db/vector_driver.rs
@@ -922,6 +922,7 @@ fn json_to_query_result(status: u16, body: Value, start: Instant) -> QueryResult
]],
affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -956,6 +957,7 @@ fn values_to_query_result(items: Vec<Value>, start: Instant) -> QueryResult {
affected_rows: rows.len() as u64,
rows,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
diff --git a/crates/dbx-drivers/src/db/victoriametrics_driver.rs b/crates/dbx-drivers/src/db/victoriametrics_driver.rs
index d86a89663a..876c182037 100644
--- a/crates/dbx-drivers/src/db/victoriametrics_driver.rs
+++ b/crates/dbx-drivers/src/db/victoriametrics_driver.rs
@@ -353,6 +353,7 @@ fn series_result_to_query_result(series: Vec<SeriesResult>, start: Instant) -> Q
affected_rows: rows.len() as u64,
rows,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
spatial_columns: vec![],
spatial_values: vec![],
truncated: false,
@@ -390,6 +391,7 @@ fn simple_result(rows: Vec<Vec<Value>>, value_type: &str, start: Instant) -> Que
affected_rows: rows.len() as u64,
rows,
execution_time_ms: start.elapsed().as_millis(),
+ server_execute_time_us: None,
spatial_columns: vec![],
spatial_values: vec![],
truncated: false,
diff --git a/crates/dbx-mcp/src/backend.rs b/crates/dbx-mcp/src/backend.rs
index a02d0785b1..da02fa2468 100644
--- a/crates/dbx-mcp/src/backend.rs
+++ b/crates/dbx-mcp/src/backend.rs
@@ -2434,6 +2434,7 @@ fn query_result(columns: Vec<String>, rows: Vec<Vec<Value>>, affected_rows: u64)
rows,
affected_rows,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
diff --git a/crates/dbx-mcp/src/server.rs b/crates/dbx-mcp/src/server.rs
index c292e0cf4e..2b52d23912 100644
--- a/crates/dbx-mcp/src/server.rs
+++ b/crates/dbx-mcp/src/server.rs
@@ -3735,6 +3735,7 @@ mod tests {
rows: vec![],
affected_rows: 0,
execution_time_ms: 1,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -6099,6 +6100,7 @@ mod tests {
rows: vec![],
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -6130,6 +6132,7 @@ mod tests {
rows: vec![],
affected_rows: 2,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
diff --git a/crates/dbx-types/src/types.rs b/crates/dbx-types/src/types.rs
index d9a41f08a3..5c07982814 100644
--- a/crates/dbx-types/src/types.rs
+++ b/crates/dbx-types/src/types.rs
@@ -429,6 +429,10 @@ pub struct QueryResult {
pub rows: Vec<Vec<serde_json::Value>>,
pub affected_rows: u64,
pub execution_time_ms: u128,
+ /// OceanBase SQL Audit EXECUTE_TIME in microseconds. Absent when the
+ /// completed statement cannot be correlated to one audit row.
+ #[serde(default)]
+ pub server_execute_time_us: Option<u64>,
#[serde(default)]
pub truncated: bool,
#[serde(default)]
@@ -469,6 +473,7 @@ impl Serialize for QueryResult {
+ usize::from(!self.spatial_columns.is_empty())
+ usize::from(!self.spatial_values.is_empty())
+ usize::from(self.elasticsearch_raw_body.is_some())
+ + usize::from(self.server_execute_time_us.is_some())
+ usize::from(!self.messages.is_empty());
let mut state = serializer.serialize_struct("QueryResult", field_count)?;
state.serialize_field("columns", &self.columns)?;
@@ -483,6 +488,9 @@ impl Serialize for QueryResult {
state.serialize_field("rows", &JsSafeRows(&self.rows))?;
state.serialize_field("affected_rows", &self.affected_rows)?;
state.serialize_field("execution_time_ms", &self.execution_time_ms)?;
+ if let Some(server_execute_time_us) = &self.server_execute_time_us {
+ state.serialize_field("server_execute_time_us", server_execute_time_us)?;
+ }
state.serialize_field("truncated", &self.truncated)?;
state.serialize_field("session_id", &self.session_id)?;
state.serialize_field("has_more", &self.has_more)?;
@@ -1100,6 +1108,7 @@ mod tests {
]],
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,
@@ -1206,6 +1215,19 @@ mod tests {
assert_eq!(serialized["session_id"], serde_json::Value::Null);
}
+ #[test]
+ fn query_result_server_execution_microseconds_survive_agent_and_ui_wire() {
+ let mut result = bigint_result_sample();
+ let without_audit = serde_json::to_value(&result).unwrap();
+ assert!(without_audit.get("server_execute_time_us").is_none());
+ assert_eq!(serde_json::from_value::<super::QueryResult>(without_audit).unwrap().server_execute_time_us, None);
+
+ result.server_execute_time_us = Some(370);
+ let audited = serde_json::to_value(&result).unwrap();
+ assert_eq!(audited["server_execute_time_us"], 370);
+ assert_eq!(serde_json::from_value::<super::QueryResult>(audited).unwrap().server_execute_time_us, Some(370));
+ }
+
/// Numeric cells nested inside JSON-typed columns must not lose precision
/// either, matching `db::json_value_for_js` recursion.
#[test]
diff --git a/crates/dbx-web/src/routes/query.rs b/crates/dbx-web/src/routes/query.rs
index 81f23feaba..7764dda897 100644
--- a/crates/dbx-web/src/routes/query.rs
+++ b/crates/dbx-web/src/routes/query.rs
@@ -1331,6 +1331,7 @@ mod tests {
rows: vec![vec![serde_json::json!("relation customer_orders does not exist")]],
affected_rows: 0,
execution_time_ms: 0,
+ server_execute_time_us: None,
truncated: false,
session_id: None,
has_more: false,