diff --git a/be/src/vec/aggregate_functions/aggregate_function_collect.h b/be/src/vec/aggregate_functions/aggregate_function_collect.h index 68de426ea1fdcf..7a475b345ee39d 100644 --- a/be/src/vec/aggregate_functions/aggregate_function_collect.h +++ b/be/src/vec/aggregate_functions/aggregate_function_collect.h @@ -258,10 +258,10 @@ struct AggregateFunctionCollectListData { } max_size = rhs.max_size; - data->insert_range_from( - *rhs.data, 0, - std::min(assert_cast(max_size - size()), - rhs.size())); + data->insert_range_from(*rhs.data, 0, + std::min(assert_cast( + static_cast(max_size - size())), + rhs.size())); } else { data->insert_range_from(*rhs.data, 0, rhs.size()); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java b/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java index 6c94be89c91faa..94fb92812962ca 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java +++ b/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java @@ -1814,7 +1814,8 @@ protected void computeFragmentHosts() throws Exception { exchangeInstances = ConnectContext.get().getSessionVariable().getExchangeInstanceParallel(); } // when we use nested loop join do right outer / semi / anti join, the instance must be 1. - if (leftMostNode.getNumInstances() == 1) { + boolean isNereids = context != null && context.getState().isNereids(); + if (!isNereids && leftMostNode.getNumInstances() == 1) { exchangeInstances = 1; } // Using serial source means a serial source operator will be used in this fragment (e.g. data will be