Skip to content

Commit 1d2b690

Browse files
authored
fix: ts-server+promBinOp bug fix (openGemini#603)
Signed-off-by: lihanxue <[email protected]>
1 parent 0af6e1c commit 1d2b690

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

engine/executor/pipeline_executor.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -1363,13 +1363,16 @@ func (builder *ExecutorBuilder) addColStoreReader(node *LogicalColumnStoreReader
13631363
}
13641364
}
13651365

1366-
func (builder *ExecutorBuilder) isMultiMstPlanNode(node hybridqp.QueryNode) bool {
1366+
func (builder *ExecutorBuilder) IsMultiMstPlanNode(node hybridqp.QueryNode) bool {
13671367
if _, ok := node.(*LogicalFullJoin); ok {
13681368
return true
13691369
}
13701370
if _, ok := node.(*LogicalSortAppend); ok {
13711371
return true
13721372
}
1373+
if _, ok := node.(*LogicalBinOp); ok {
1374+
return true
1375+
}
13731376
return false
13741377
}
13751378

@@ -1387,7 +1390,7 @@ func (builder *ExecutorBuilder) addDefaultNode(node hybridqp.QueryNode) (*Transf
13871390
continue
13881391
}
13891392
children = append(children, child)
1390-
if builder.isMultiMstPlanNode(node) {
1393+
if builder.IsMultiMstPlanNode(node) {
13911394
builder.NextMst()
13921395
}
13931396
}

engine/executor/pipeline_executor_test.go

+6
Original file line numberDiff line numberDiff line change
@@ -2109,3 +2109,9 @@ func TestExecutorBuilder_addPartitionExchange1(t *testing.T) {
21092109
pipelineExecutor := p.(*executor.PipelineExecutor)
21102110
require.Equal(t, pipelineExecutor.GetProcessors().Empty(), true)
21112111
}
2112+
2113+
func TestIsMultiMstPlanNode(t *testing.T) {
2114+
node := &executor.LogicalBinOp{}
2115+
builder := &executor.ExecutorBuilder{}
2116+
assert.Equal(t, builder.IsMultiMstPlanNode(node), true)
2117+
}

0 commit comments

Comments
 (0)