Skip to content

[fix](auditlog)Set sqlHash in executeInternalQuery #49984

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@
import com.google.protobuf.ByteString;
import com.google.protobuf.ProtocolStringList;
import lombok.Setter;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand Down Expand Up @@ -3512,6 +3513,9 @@ public List<ResultRow> executeInternalQuery() {
UUID uuid = UUID.randomUUID();
TUniqueId queryId = new TUniqueId(uuid.getMostSignificantBits(), uuid.getLeastSignificantBits());
context.setQueryId(queryId);
if (originStmt.originStmt != null) {
context.setSqlHash(DigestUtils.md5Hex(originStmt.originStmt));
}
try {
List<ResultRow> resultRows = new ArrayList<>();
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@
import org.apache.doris.catalog.Env;
import org.apache.doris.qe.AuditLogHelper;
import org.apache.doris.qe.AutoCloseConnectContext;
import org.apache.doris.qe.ConnectContext;
import org.apache.doris.qe.QueryState;
import org.apache.doris.qe.QueryState.MysqlStateType;
import org.apache.doris.qe.StmtExecutor;
import org.apache.doris.statistics.util.StatisticsUtil;

import org.apache.commons.codec.digest.DigestUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

Expand Down Expand Up @@ -127,7 +129,9 @@ protected void flushBuffer() {
}
insertStmt += values.toString();
try (AutoCloseConnectContext r = StatisticsUtil.buildConnectContext(false)) {
stmtExecutor = new StmtExecutor(r.connectContext, insertStmt);
ConnectContext context = r.connectContext;
context.setSqlHash(DigestUtils.md5Hex(insertStmt));
stmtExecutor = new StmtExecutor(context, insertStmt);
executeWithExceptionOnFail(stmtExecutor);
} catch (Exception t) {
throw new RuntimeException("Failed to analyze: " + t.getMessage());
Expand Down
21 changes: 21 additions & 0 deletions fe/fe-core/src/test/java/org/apache/doris/qe/StmtExecutorTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.apache.doris.analysis.ShowAuthorStmt;
import org.apache.doris.analysis.ShowStmt;
import org.apache.doris.analysis.SqlParser;
import org.apache.doris.analysis.StatementBase;
import org.apache.doris.analysis.UseStmt;
import org.apache.doris.catalog.Env;
import org.apache.doris.common.Config;
Expand All @@ -40,6 +41,7 @@
import org.apache.doris.metric.MetricRepo;
import org.apache.doris.mysql.MysqlChannel;
import org.apache.doris.mysql.MysqlSerializer;
import org.apache.doris.nereids.NereidsPlanner;
import org.apache.doris.planner.OriginalPlanner;
import org.apache.doris.qe.ConnectContext.ConnectType;
import org.apache.doris.rewrite.ExprRewriter;
Expand All @@ -51,6 +53,8 @@
import com.google.common.collect.Sets;
import java_cup.runtime.Symbol;
import mockit.Expectations;
import mockit.Mock;
import mockit.MockUp;
import mockit.Mocked;
import org.junit.Assert;
import org.junit.Before;
Expand Down Expand Up @@ -880,4 +884,21 @@ public void testBlockSqlAst(@Mocked UseStmt useStmt, @Mocked CreateFileStmt crea
executor.execute();
Assert.assertEquals(QueryState.MysqlStateType.OK, state.getStateType());
}

@Test
public void testSetSqlHash() {
StmtExecutor executor = new StmtExecutor(ctx, "select * from table1");
new MockUp<NereidsPlanner>() {
@Mock
public void plan(StatementBase queryStmt, org.apache.doris.thrift.TQueryOptions queryOptions) {
throw new RuntimeException();
}
};
try {
executor.executeInternalQuery();
} catch (Exception e) {
// do nothing
}
Assert.assertEquals("a8ec30e5ad0820f8c5bd16a82a4491ca", executor.getContext().getSqlHash());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -214,4 +214,31 @@ protected void syncLoadStats() {
Assertions.assertEquals(0, job.queryFinished.size());
}

@Test
public void testSetSqlHash(@Mocked AnalysisInfo info,
@Mocked OlapAnalysisTask task1, @Mocked OlapAnalysisTask task2) {
AnalysisJob job = new AnalysisJob(info, Collections.singletonList(task1));
job.queryFinished = new HashSet<>();
job.queryFinished.add(task2);
new MockUp<AnalysisJob>() {
@Mock
public void updateTaskState(AnalysisState state, String msg) {
}

@Mock
protected void executeWithExceptionOnFail(StmtExecutor stmtExecutor) throws Exception {

}

@Mock
protected void syncLoadStats() {
}
};
job.buf.add(new ColStatsData());
job.flushBuffer();
Assertions.assertEquals(0, job.queryFinished.size());
Assertions.assertEquals(0, job.buf.size());
Assertions.assertEquals("ffd6aa73b79f9228c737a6da0f4b2834", job.stmtExecutor.getContext().getSqlHash());
}

}
Loading