Skip to content

Commit 71cfc08

Browse files
morningmanclaude
andcommitted
[chore](fe-core) remove the degenerate DeleteCommandContext + stale migration comments
DeleteCommandContext carried a single field -- a single-valued DeleteFileType enum (POSITION_DELETE) -- plus a dead toTFileContent() (zero production callers). No branch ever discriminated on the enum; the value was only threaded through the row-level DML plan builders, args, and sink nodes and displayed in toString(). Delete the whole class and un-thread it from RowLevelDmlArgs, DeleteFromCommand, UpdateCommand, the three ExternalRowLevel*PlanBuilder synthesizers, and the four Logical/PhysicalExternalRowLevel{Delete,Merge}Sink plan nodes (dropping it from their constructors, equals/hashCode, and toString). The real FE->BE delete-type is emitted by the iceberg connector's planWrite (TFileContent.POSITION_DELETES), unaffected. Also drop the stale internal migration-phase codenames from the row-level DML cluster comments (P6.6 / T07c / O5-2 / post-flip / post-cutover / pre-cutover) and fix the RowLevelDmlTransform.handles javadoc that still described the retired table-type check (it is a connector-capability probe today). Pure cleanup, no behavior change: compiles clean and the affected unit tests pass. Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]> Claude-Session: https://claude.ai/code/session_01SMtYwYyyubZZiC1odLZTG3
1 parent 554cad6 commit 71cfc08

22 files changed

Lines changed: 70 additions & 304 deletions

‎fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PhysicalPlanTranslator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ public PlanFragment visitPhysicalExternalRowLevelMergeSink(
593593
}
594594

595595
/**
596-
* Builds the plugin-driven sink for a post-flip iceberg row-level DML (DELETE / MERGE) whose target has
596+
* Builds the plugin-driven sink for an iceberg row-level DML (DELETE / MERGE) whose target has
597597
* been flipped to a {@link PluginDrivenExternalTable}. Mirrors {@link #visitPhysicalConnectorTableSink}'s
598598
* connector resolution (catalog -&gt; connector -&gt; metadata -&gt; pinned table handle) but threads the
599599
* given {@link WriteOperation} so the connector's {@code planWrite} dispatches to its DELETE / MERGE BE sink

‎fe/fe-core/src/main/java/org/apache/doris/nereids/rules/implementation/LogicalExternalRowLevelDeleteSinkToPhysicalExternalRowLevelDeleteSink.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ public Rule build() {
3939
sink.getTargetTable(),
4040
sink.getCols(),
4141
sink.getOutputExprs(),
42-
sink.getDeleteContext(),
4342
Optional.empty(),
4443
sink.getLogicalProperties(),
4544
null,

‎fe/fe-core/src/main/java/org/apache/doris/nereids/rules/implementation/LogicalExternalRowLevelMergeSinkToPhysicalExternalRowLevelMergeSink.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ public Rule build() {
3939
sink.getTargetTable(),
4040
sink.getCols(),
4141
sink.getOutputExprs(),
42-
sink.getDeleteContext(),
4342
Optional.empty(),
4443
sink.getLogicalProperties(),
4544
null,

‎fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/DeleteFromCommand.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
import org.apache.doris.nereids.trees.plans.Explainable;
7070
import org.apache.doris.nereids.trees.plans.Plan;
7171
import org.apache.doris.nereids.trees.plans.PlanType;
72-
import org.apache.doris.nereids.trees.plans.commands.delete.DeleteCommandContext;
7372
import org.apache.doris.nereids.trees.plans.commands.info.DMLCommandType;
7473
import org.apache.doris.nereids.trees.plans.logical.LogicalPlan;
7574
import org.apache.doris.nereids.trees.plans.logical.LogicalProject;
@@ -143,10 +142,8 @@ public void run(ConnectContext ctx, StmtExecutor executor) throws Exception {
143142
// Route row-level DML on external tables (e.g. iceberg) through the generic shell.
144143
Optional<RowLevelDmlTransform> transform = RowLevelDmlRegistry.find(table);
145144
if (transform.isPresent()) {
146-
DeleteCommandContext deleteCtx = new DeleteCommandContext();
147-
deleteCtx.setDeleteFileType(DeleteCommandContext.DeleteFileType.POSITION_DELETE);
148145
RowLevelDmlArgs args = RowLevelDmlArgs.forDelete(
149-
table, nameParts, tableAlias, isTempPart, partitions, logicalQuery, deleteCtx);
146+
table, nameParts, tableAlias, isTempPart, partitions, logicalQuery);
150147
new RowLevelDmlCommand(transform.get(), args, RowLevelDmlOp.DELETE).run(ctx, executor);
151148
return;
152149
}
@@ -501,10 +498,8 @@ public Plan getExplainPlan(ConnectContext ctx) {
501498
TableIf table = RelationUtil.getTable(qualifiedTableName, ctx.getEnv(), Optional.empty());
502499
Optional<RowLevelDmlTransform> transform = RowLevelDmlRegistry.find(table);
503500
if (transform.isPresent()) {
504-
DeleteCommandContext deleteCtx = new DeleteCommandContext();
505-
deleteCtx.setDeleteFileType(DeleteCommandContext.DeleteFileType.POSITION_DELETE);
506501
RowLevelDmlArgs args = RowLevelDmlArgs.forDelete(
507-
table, nameParts, tableAlias, isTempPart, partitions, logicalQuery, deleteCtx);
502+
table, nameParts, tableAlias, isTempPart, partitions, logicalQuery);
508503
return new RowLevelDmlCommand(transform.get(), args, RowLevelDmlOp.DELETE).getExplainPlan(ctx);
509504
}
510505
return completeQueryPlan(ctx, logicalQuery);

‎fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ExternalRowLevelDeletePlanBuilder.java‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.apache.doris.nereids.trees.expressions.NamedExpression;
2626
import org.apache.doris.nereids.trees.expressions.Slot;
2727
import org.apache.doris.nereids.trees.expressions.literal.TinyIntLiteral;
28-
import org.apache.doris.nereids.trees.plans.commands.delete.DeleteCommandContext;
2928
import org.apache.doris.nereids.trees.plans.commands.merge.MergeOperation;
3029
import org.apache.doris.nereids.trees.plans.logical.LogicalExternalRowLevelDeleteSink;
3130
import org.apache.doris.nereids.trees.plans.logical.LogicalPlan;
@@ -53,7 +52,7 @@
5352
* 2. Generate DeleteFile containing the matching rows
5453
* 3. Commit the DeleteFile to Iceberg table using RowDelta API
5554
*
56-
* The legacy Command execution half was removed as dead post-cutover code.
55+
* The legacy Command execution half was removed as dead code.
5756
*/
5857
public class ExternalRowLevelDeletePlanBuilder {
5958

@@ -62,7 +61,6 @@ public class ExternalRowLevelDeletePlanBuilder {
6261
protected final boolean isTempPart;
6362
protected final List<String> partitions;
6463
protected final LogicalPlan logicalQuery;
65-
protected final DeleteCommandContext deleteCtx;
6664

6765
/**
6866
* constructor
@@ -72,21 +70,19 @@ public ExternalRowLevelDeletePlanBuilder(
7270
String tableAlias,
7371
boolean isTempPart,
7472
List<String> partitions,
75-
LogicalPlan logicalQuery,
76-
DeleteCommandContext deleteCtx) {
73+
LogicalPlan logicalQuery) {
7774
this.nameParts = Utils.copyRequiredList(nameParts);
7875
this.tableAlias = tableAlias;
7976
this.isTempPart = isTempPart;
8077
this.partitions = Utils.copyRequiredList(partitions);
8178
this.logicalQuery = logicalQuery;
82-
this.deleteCtx = deleteCtx != null ? deleteCtx : new DeleteCommandContext();
8379
}
8480

8581
/**
8682
* Complete the query plan by adding necessary columns for position delete operation.
8783
* Select $row_id (file_path, row_position, partition info).
8884
*/
89-
// package-visible: the generic RowLevelDmlCommand shell delegates synthesis here (T07c).
85+
// package-visible: the generic RowLevelDmlCommand shell delegates synthesis here.
9086
LogicalPlan completeQueryPlan(ConnectContext ctx, LogicalPlan logicalQuery,
9187
ExternalTable icebergTable) {
9288
LogicalPlan queryPlan = buildPositionDeletePlan(ctx, logicalQuery, icebergTable);
@@ -109,7 +105,6 @@ LogicalPlan completeQueryPlan(ConnectContext ctx, LogicalPlan logicalQuery,
109105
icebergTable,
110106
icebergTable.getBaseSchema(true), // cols
111107
outputExprs, // outputExprs
112-
deleteCtx,
113108
Optional.empty(), // groupExpression
114109
Optional.empty(), // logicalProperties
115110
queryPlan // child
@@ -149,7 +144,4 @@ private LogicalPlan buildPositionDeletePlan(ConnectContext ctx, LogicalPlan logi
149144
return new LogicalProject<>(projectItems, planWithRowId);
150145
}
151146

152-
public DeleteCommandContext getDeleteCtx() {
153-
return deleteCtx;
154-
}
155147
}

‎fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ExternalRowLevelMergePlanBuilder.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import org.apache.doris.nereids.trees.expressions.literal.NullLiteral;
4444
import org.apache.doris.nereids.trees.expressions.literal.TinyIntLiteral;
4545
import org.apache.doris.nereids.trees.plans.JoinType;
46-
import org.apache.doris.nereids.trees.plans.commands.delete.DeleteCommandContext;
4746
import org.apache.doris.nereids.trees.plans.commands.merge.MergeMatchedClause;
4847
import org.apache.doris.nereids.trees.plans.commands.merge.MergeNotMatchedClause;
4948
import org.apache.doris.nereids.trees.plans.commands.merge.MergeOperation;
@@ -72,7 +71,7 @@
7271

7372
/**
7473
* Iceberg MERGE INTO plan synthesizer, invoked via IcebergRowLevelDmlTransform.synthesize
75-
* (legacy execution half removed as dead post-cutover code).
74+
* (legacy execution half removed as dead code).
7675
*/
7776
public class ExternalRowLevelMergePlanBuilder {
7877
private static final String BRANCH_LABEL = "__DORIS_ICEBERG_MERGE_INTO_BRANCH_LABEL__";
@@ -85,7 +84,6 @@ public class ExternalRowLevelMergePlanBuilder {
8584
private final Expression onClause;
8685
private final List<MergeMatchedClause> matchedClauses;
8786
private final List<MergeNotMatchedClause> notMatchedClauses;
88-
private final DeleteCommandContext deleteCtx;
8987

9088
/**
9189
* constructor.
@@ -107,7 +105,6 @@ public ExternalRowLevelMergePlanBuilder(List<String> targetNameParts, Optional<S
107105
Objects.requireNonNull(matchedClauses, "matchedClauses should not be null"));
108106
this.notMatchedClauses = Utils.fastToImmutableList(
109107
Objects.requireNonNull(notMatchedClauses, "notMatchedClauses should not be null"));
110-
this.deleteCtx = new DeleteCommandContext();
111108
}
112109

113110
private TableIf getTargetTable(ConnectContext ctx) {
@@ -381,7 +378,7 @@ private LogicalPlan buildMergeProjectPlan(ConnectContext ctx, ExternalTable iceb
381378
return plan;
382379
}
383380

384-
// package-visible: the generic RowLevelDmlCommand shell delegates synthesis here (T07c).
381+
// package-visible: the generic RowLevelDmlCommand shell delegates synthesis here.
385382
LogicalPlan buildMergePlan(ConnectContext ctx, ExternalTable icebergTable) {
386383
LogicalPlan projectPlan = buildMergeProjectPlan(ctx, icebergTable);
387384

@@ -401,7 +398,6 @@ LogicalPlan buildMergePlan(ConnectContext ctx, ExternalTable icebergTable) {
401398
icebergTable,
402399
icebergTable.getBaseSchema(true),
403400
outputExprs,
404-
deleteCtx,
405401
Optional.empty(),
406402
Optional.empty(),
407403
projectPlan);

‎fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ExternalRowLevelUpdatePlanBuilder.java‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.apache.doris.nereids.trees.expressions.NamedExpression;
3030
import org.apache.doris.nereids.trees.expressions.Slot;
3131
import org.apache.doris.nereids.trees.expressions.literal.TinyIntLiteral;
32-
import org.apache.doris.nereids.trees.plans.commands.delete.DeleteCommandContext;
3332
import org.apache.doris.nereids.trees.plans.commands.merge.MergeOperation;
3433
import org.apache.doris.nereids.trees.plans.logical.LogicalExternalRowLevelMergeSink;
3534
import org.apache.doris.nereids.trees.plans.logical.LogicalPlan;
@@ -50,7 +49,7 @@
5049
/**
5150
* Merge-plan synthesizer for UPDATE on Iceberg tables, invoked via
5251
* IcebergRowLevelDmlTransform.synthesize. The legacy Command execution half
53-
* was removed as dead post-cutover code.
52+
* was removed as dead code.
5453
*
5554
* UPDATE operations are implemented as a single scan + merge sink:
5655
* 1. Scan rows matching WHERE condition with row_id injected
@@ -64,7 +63,6 @@ public class ExternalRowLevelUpdatePlanBuilder {
6463
private final List<String> nameParts;
6564
private final String tableAlias;
6665
private final LogicalPlan logicalQuery;
67-
private final DeleteCommandContext deleteCtx;
6866

6967
/**
7068
* constructor
@@ -73,13 +71,11 @@ public ExternalRowLevelUpdatePlanBuilder(
7371
List<String> nameParts,
7472
String tableAlias,
7573
List<EqualTo> assignments,
76-
LogicalPlan logicalQuery,
77-
DeleteCommandContext deleteCtx) {
74+
LogicalPlan logicalQuery) {
7875
this.nameParts = Utils.copyRequiredList(nameParts);
7976
this.assignments = Utils.copyRequiredList(assignments);
8077
this.tableAlias = tableAlias;
8178
this.logicalQuery = logicalQuery;
82-
this.deleteCtx = deleteCtx != null ? deleteCtx : new DeleteCommandContext();
8379
}
8480

8581
@VisibleForTesting
@@ -109,7 +105,7 @@ LogicalPlan buildMergeProjectPlan(ConnectContext ctx, LogicalPlan logicalQuery,
109105
return new LogicalProject<>(projectItems, planWithRowId);
110106
}
111107

112-
// package-visible: the generic RowLevelDmlCommand shell delegates synthesis here (T07c).
108+
// package-visible: the generic RowLevelDmlCommand shell delegates synthesis here.
113109
LogicalPlan buildMergePlan(ConnectContext ctx, LogicalPlan logicalQuery,
114110
List<EqualTo> assignments, ExternalTable icebergTable) {
115111
String tableName = tableAlias != null
@@ -134,7 +130,6 @@ LogicalPlan buildMergePlan(ConnectContext ctx, LogicalPlan logicalQuery,
134130
icebergTable,
135131
icebergTable.getBaseSchema(true),
136132
outputExprs,
137-
deleteCtx,
138133
Optional.empty(),
139134
Optional.empty(),
140135
queryPlan);
@@ -175,7 +170,4 @@ List<NamedExpression> buildUpdateSelectItems(Map<String, Expression> colNameToEx
175170
return selectItems;
176171
}
177172

178-
public DeleteCommandContext getDeleteCtx() {
179-
return deleteCtx;
180-
}
181173
}

‎fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/IcebergRowLevelDmlTransform.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
* the corresponding {@code ExternalRowLevel*PlanBuilder} and calls its (package-visible) synthesis method, so
5959
* the synthesized {@code LogicalExternalRowLevel{Delete,Merge}Sink} tree is the generic row-level DML sink.
6060
* The per-executor-only bits (conflict-filter stash, finalize) are routed here via
61-
* {@code instanceof}-free op switches; the O5-2 exclusion predicate mirrors legacy
61+
* {@code instanceof}-free op switches; the exclusion predicate mirrors legacy
6262
* {@code IcebergConflictDetectionFilterUtils} (note the {@code equalsIgnoreCase} vs {@code equals} asymmetry).</p>
6363
*/
6464
public class IcebergRowLevelDmlTransform implements RowLevelDmlTransform {
@@ -73,7 +73,7 @@ public class IcebergRowLevelDmlTransform implements RowLevelDmlTransform {
7373
"$file_path", "$row_position", "$partition_spec_id", "$partition_data");
7474

7575
/**
76-
* Slots excluded from the O5-2 target-only write constraint: the synthetic {@code $row_id} column and
76+
* Slots excluded from the target-only write constraint: the synthetic {@code $row_id} column and
7777
* iceberg metadata columns. Mirrors legacy {@code IcebergConflictDetectionFilterUtils.isTargetOnlyPredicate}
7878
* exactly — keep the {@code equalsIgnoreCase} (rowid) vs {@code equals} (metadata) asymmetry.
7979
*/
@@ -152,12 +152,12 @@ public LogicalPlan synthesize(ConnectContext ctx, RowLevelDmlArgs args, RowLevel
152152
case DELETE:
153153
return new ExternalRowLevelDeletePlanBuilder(
154154
args.getNameParts(), args.getTableAlias(), args.isTempPart(),
155-
args.getPartitions(), args.getLogicalQuery(), args.getDeleteCtx())
155+
args.getPartitions(), args.getLogicalQuery())
156156
.completeQueryPlan(ctx, args.getLogicalQuery(), icebergTable);
157157
case UPDATE:
158158
return new ExternalRowLevelUpdatePlanBuilder(
159159
args.getNameParts(), args.getTableAlias(), args.getAssignments(),
160-
args.getLogicalQuery(), args.getDeleteCtx())
160+
args.getLogicalQuery())
161161
.buildMergePlan(ctx, args.getLogicalQuery(), args.getAssignments(), icebergTable);
162162
default:
163163
return new ExternalRowLevelMergePlanBuilder(
@@ -171,7 +171,7 @@ public LogicalPlan synthesize(ConnectContext ctx, RowLevelDmlArgs args, RowLevel
171171
public BaseExternalTableInsertExecutor newExecutor(ConnectContext ctx, TableIf table, String label,
172172
NereidsPlanner planner, boolean emptyInsert, RowLevelDmlOp op) {
173173
// The connector-driven executor opens an SPI ConnectorTransaction (non-null), which activates the
174-
// neutral O5-2 conflict path in RowLevelDmlCommand.applyWriteConstraintIfPresent. The op rides the
174+
// neutral conflict path in RowLevelDmlCommand.applyWriteConstraintIfPresent. The op rides the
175175
// sink's WriteOperation (set by the translator), so one executor serves DELETE/MERGE; no
176176
// InsertCommandContext is needed for a row-level write.
177177
return new PluginDrivenInsertExecutor(ctx, (PluginDrivenExternalTable) table, label, planner,

‎fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/RowLevelDmlArgs.java‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.apache.doris.catalog.TableIf;
2121
import org.apache.doris.nereids.trees.expressions.EqualTo;
2222
import org.apache.doris.nereids.trees.expressions.Expression;
23-
import org.apache.doris.nereids.trees.plans.commands.delete.DeleteCommandContext;
2423
import org.apache.doris.nereids.trees.plans.commands.merge.MergeMatchedClause;
2524
import org.apache.doris.nereids.trees.plans.commands.merge.MergeNotMatchedClause;
2625
import org.apache.doris.nereids.trees.plans.logical.LogicalPlan;
@@ -47,7 +46,6 @@ public final class RowLevelDmlArgs {
4746
private final List<String> nameParts;
4847
private final String tableAlias;
4948
private final LogicalPlan logicalQuery;
50-
private final DeleteCommandContext deleteCtx;
5149
// DELETE only
5250
private final boolean isTempPart;
5351
private final List<String> partitions;
@@ -64,15 +62,14 @@ public final class RowLevelDmlArgs {
6462
private final List<MergeNotMatchedClause> notMatchedClauses;
6563

6664
private RowLevelDmlArgs(TableIf table, List<String> nameParts, String tableAlias, LogicalPlan logicalQuery,
67-
DeleteCommandContext deleteCtx, boolean isTempPart, List<String> partitions, List<EqualTo> assignments,
65+
boolean isTempPart, List<String> partitions, List<EqualTo> assignments,
6866
List<String> targetNameParts, Optional<String> targetAlias, Optional<LogicalPlan> cte, LogicalPlan source,
6967
Expression onClause, List<MergeMatchedClause> matchedClauses,
7068
List<MergeNotMatchedClause> notMatchedClauses) {
7169
this.table = table;
7270
this.nameParts = nameParts;
7371
this.tableAlias = tableAlias;
7472
this.logicalQuery = logicalQuery;
75-
this.deleteCtx = deleteCtx;
7673
this.isTempPart = isTempPart;
7774
this.partitions = partitions;
7875
this.assignments = assignments;
@@ -87,23 +84,23 @@ private RowLevelDmlArgs(TableIf table, List<String> nameParts, String tableAlias
8784

8885
/** Arguments for a DELETE (mirrors the legacy {@code ExternalRowLevelDeletePlanBuilder} constructor inputs). */
8986
public static RowLevelDmlArgs forDelete(TableIf table, List<String> nameParts, String tableAlias,
90-
boolean isTempPart, List<String> partitions, LogicalPlan logicalQuery, DeleteCommandContext deleteCtx) {
91-
return new RowLevelDmlArgs(table, nameParts, tableAlias, logicalQuery, deleteCtx, isTempPart, partitions,
87+
boolean isTempPart, List<String> partitions, LogicalPlan logicalQuery) {
88+
return new RowLevelDmlArgs(table, nameParts, tableAlias, logicalQuery, isTempPart, partitions,
9289
null, null, null, null, null, null, null, null);
9390
}
9491

9592
/** Arguments for an UPDATE (mirrors the legacy {@code ExternalRowLevelUpdatePlanBuilder} constructor inputs). */
9693
public static RowLevelDmlArgs forUpdate(TableIf table, List<String> nameParts, String tableAlias,
97-
List<EqualTo> assignments, LogicalPlan logicalQuery, DeleteCommandContext deleteCtx) {
98-
return new RowLevelDmlArgs(table, nameParts, tableAlias, logicalQuery, deleteCtx, false, null,
94+
List<EqualTo> assignments, LogicalPlan logicalQuery) {
95+
return new RowLevelDmlArgs(table, nameParts, tableAlias, logicalQuery, false, null,
9996
assignments, null, null, null, null, null, null, null);
10097
}
10198

10299
/** Arguments for a MERGE INTO (mirrors the legacy {@code ExternalRowLevelMergePlanBuilder} constructor inputs). */
103100
public static RowLevelDmlArgs forMerge(TableIf table, List<String> targetNameParts, Optional<String> targetAlias,
104101
Optional<LogicalPlan> cte, LogicalPlan source, Expression onClause,
105102
List<MergeMatchedClause> matchedClauses, List<MergeNotMatchedClause> notMatchedClauses) {
106-
return new RowLevelDmlArgs(table, null, null, null, null, false, null, null,
103+
return new RowLevelDmlArgs(table, null, null, null, false, null, null,
107104
targetNameParts, targetAlias, cte, source, onClause, matchedClauses, notMatchedClauses);
108105
}
109106

@@ -123,10 +120,6 @@ public LogicalPlan getLogicalQuery() {
123120
return logicalQuery;
124121
}
125122

126-
public DeleteCommandContext getDeleteCtx() {
127-
return deleteCtx;
128-
}
129-
130123
public boolean isTempPart() {
131124
return isTempPart;
132125
}

‎fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/RowLevelDmlCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ static void beginTransactionAndFinalizeSink(RowLevelDmlTransform transform, RowL
147147
}
148148

149149
/**
150-
* O5-2 new write-constraint path. Dormant until P6.6: only fires when the executor exposes an SPI
150+
* Write-constraint path: only fires when the executor exposes an SPI
151151
* {@link ConnectorTransaction}. Today iceberg DELETE/MERGE run on the legacy {@code IcebergTransaction}
152152
* (the base {@code getConnectorTransactionOrNull()} returns {@code null}), so this is a no-op; the legacy
153153
* 3-hop conflict-detection path ({@link RowLevelDmlTransform#setupConflictDetection}) remains the live one.

0 commit comments

Comments
 (0)