Skip to content
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.

Sign up for GitHub

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

[BugFix] use StmtExecutor::execute to forward statement on follower #56160

Merged
merged 4 commits into from
Feb 24, 2025
+32 −9
Merged

[BugFix] use StmtExecutor::execute to forward statement on follower #56160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
afd3288
use StmtExecutor::execute to forward statement on follower
murphyatwork Feb 21, 2025
e0b8610
fallback to old style
murphyatwork Feb 21, 2025
c5c153c
fix
murphyatwork Feb 24, 2025
255132c
fix test
murphyatwork Feb 24, 2025
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
16 changes: 11 additions & 5 deletions fe/fe-core/src/main/java/com/starrocks/load/pipe/filelist/RepoExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.starrocks.common.Status;
import com.starrocks.common.util.DebugUtil;
import com.starrocks.common.util.UUIDUtil;
import com.starrocks.http.HttpConnectContext;
import com.starrocks.qe.ConnectContext;
import com.starrocks.qe.StmtExecutor;
import com.starrocks.server.GlobalStateMgr;
Expand Down Expand Up @@ -60,18 +61,15 @@ private RepoExecutor() {
public void executeDML(String sql) {
ConnectContext prev = ConnectContext.get();
try {
ConnectContext context = createConnectContext();

ConnectContext context = createHttpConnectContext();
StatementBase parsedStmt = SqlParser.parseOneWithStarRocksDialect(sql, context.getSessionVariable());
Preconditions.checkState(parsedStmt instanceof DmlStmt, "the statement should be dml");
DmlStmt dmlStmt = (DmlStmt) parsedStmt;
ExecPlan execPlan = StatementPlanner.plan(parsedStmt, context, TResultSinkType.HTTP_PROTOCAL);
StmtExecutor executor = StmtExecutor.newInternalExecutor(context, parsedStmt);
context.setExecutor(executor);
context.setQueryId(UUIDUtil.genUUID());
AuditLog.getInternalAudit().info("RepoExecutor execute SQL | Query_id {} | SQL {}",
DebugUtil.printId(context.getQueryId()), sql);
executor.handleDMLStmt(execPlan, dmlStmt);
executor.execute();
} catch (Exception e) {
LOG.error("RepoExecutor execute SQL {} failed: {}", sql, e.getMessage(), e);
throw new SemanticException(String.format("execute sql failed: %s", e.getMessage()), e);
Expand Down Expand Up @@ -136,4 +134,12 @@ private static ConnectContext createConnectContext() {
return context;
}

private static HttpConnectContext createHttpConnectContext() {
HttpConnectContext context =
(HttpConnectContext) StatisticUtils.buildConnectContext(TResultSinkType.HTTP_PROTOCAL);
context.setThreadLocalInfo();
context.setNeedQueued(false);
return context;
}

}
22 changes: 21 additions & 1 deletion fe/fe-core/src/main/java/com/starrocks/statistic/StatisticUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,18 @@
import com.starrocks.common.util.DateUtils;
import com.starrocks.common.util.UUIDUtil;
import com.starrocks.connector.ConnectorPartitionTraits;
import com.starrocks.http.HttpConnectContext;
import com.starrocks.load.pipe.filelist.RepoExecutor;
import com.starrocks.qe.ConnectContext;
import com.starrocks.server.GlobalStateMgr;
import com.starrocks.server.WarehouseManager;
import com.starrocks.service.arrow.flight.sql.ArrowFlightSqlConnectContext;
import com.starrocks.sql.ast.ColumnDef;
import com.starrocks.sql.ast.UserIdentity;
import com.starrocks.sql.common.ErrorType;
import com.starrocks.sql.common.StarRocksPlannerException;
import com.starrocks.sql.optimizer.statistics.StatisticsEstimateCoefficient;
import com.starrocks.thrift.TResultSinkType;
import com.starrocks.transaction.InsertOverwriteJobStats;
import com.starrocks.transaction.TransactionState;
import com.starrocks.warehouse.Warehouse;
Expand Down Expand Up @@ -89,7 +92,24 @@ public class StatisticUtils {
.add("information_schema").build();

public static ConnectContext buildConnectContext() {
ConnectContext context = ConnectContext.buildInner();
return buildConnectContext(TResultSinkType.MYSQL_PROTOCAL);
}

public static ConnectContext buildConnectContext(TResultSinkType connectType) {
ConnectContext context;
switch (connectType) {
case MYSQL_PROTOCAL:
context = ConnectContext.buildInner();
break;
case HTTP_PROTOCAL:
context = new HttpConnectContext();
break;
case ARROW_FLIGHT_PROTOCAL:
context = new ArrowFlightSqlConnectContext();
break;
default:
throw new IllegalStateException("Unexpected value: " + connectType);
}
// Note: statistics query does not register query id to QeProcessorImpl::coordinatorMap,
// but QeProcessorImpl::reportExecStatus will check query id,
// So we must disable report query status from BE to FE
Expand Down
3 changes: 0 additions & 3 deletions fe/fe-core/src/test/java/com/starrocks/load/pipe/filelist/FileListRepoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import com.starrocks.load.pipe.PipeId;
import com.starrocks.qe.ConnectContext;
import com.starrocks.qe.StmtExecutor;
import com.starrocks.sql.analyzer.SemanticException;
import com.starrocks.sql.ast.DmlStmt;
import com.starrocks.sql.plan.ExecPlan;
import com.starrocks.system.SystemInfoService;
Expand Down Expand Up @@ -414,8 +413,6 @@ public void handleDMLStmt(ExecPlan execPlan, DmlStmt stmt) throws Exception {

Assert.assertTrue(executor.executeDQL("select now()").isEmpty());

Assert.assertThrows(SemanticException.class, () -> executor.executeDML("insert into a.b values (1) "));

Assert.assertThrows(RuntimeException.class, () -> executor.executeDDL("create table a (id int) "));
}

Expand Down
Loading