Skip to content

Commit 177eaac

Browse files
BiteTheDDDDtCopilot
andcommitted
[fix](fe) Fix remote Flight SQL result receiver initialization
### What problem does this PR solve? Issue Number: None Related PR: None Problem Summary: Arrow Flight SQL queries that return results from BE do not create local result receivers. The old coordinator still initialized ResultReceiverConsumer with an empty receiver list, which failed with ArrayBlockingQueue(0), and the new coordinator still created unnecessary local receivers for remote result mode. ### Release note Fix Arrow Flight SQL query execution when results are returned from BE. ### Check List (For Author) - Test: Unit Test - Ran org.apache.doris.qe.ResultReceiverConsumerTest - Ran FE checkstyle for fe-core - Behavior changed: No - Does this need documentation: No Co-authored-by: Copilot <[email protected]>
1 parent 429c095 commit 177eaac

3 files changed

Lines changed: 19 additions & 2 deletions

File tree

‎fe/fe-core/src/main/java/org/apache/doris/qe/ResultReceiverConsumer.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,18 @@ public ResultReceiverConsumer(List<ResultReceiver> resultReceivers, long timeout
8282
ReceiverContext context = new ReceiverContext(resultReceivers.get(i), i);
8383
contexts.add(context);
8484
}
85-
this.readyOffsets = new ArrayBlockingQueue<>(resultReceivers.size());
85+
this.readyOffsets = new ArrayBlockingQueue<>(Math.max(1, resultReceivers.size()));
8686
timeoutTs = timeoutDeadline;
8787
}
8888

8989
public boolean isEos() {
90-
return finishedReceivers == contexts.size();
90+
return !contexts.isEmpty() && finishedReceivers == contexts.size();
9191
}
9292

9393
public RowBatch getNext(Status status) throws TException, InterruptedException, ExecutionException, UserException {
94+
if (contexts.isEmpty()) {
95+
throw new UserException("There is no receiver.");
96+
}
9497
if (!futureInitialized) {
9598
futureInitialized = true;
9699
for (ReceiverContext context : contexts) {

‎fe/fe-core/src/main/java/org/apache/doris/qe/runtime/QueryProcessor.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,14 @@ public static QueryProcessor build(CoordinatorContext coordinatorContext) {
8686
}
8787

8888
boolean regenerateInstanceId = coordinatorContext.connectContext.consumeNeedRegenerateQueryId();
89+
boolean returnResultFromLocal = coordinatorContext.connectContext.isReturnResultFromLocal();
8990
for (AssignedJob topInstance : distinctWorkerJobs.values()) {
9091
if (regenerateInstanceId) {
9192
topInstance.resetInstanceId(coordinatorContext.connectContext.nextInstanceId());
9293
}
94+
if (!returnResultFromLocal) {
95+
continue;
96+
}
9397
DistributedPlanWorker topWorker = topInstance.getAssignedWorker();
9498
TNetworkAddress execBeAddr = new TNetworkAddress(topWorker.host(), topWorker.brpcPort());
9599
receivers.add(

‎fe/fe-core/src/test/java/org/apache/doris/qe/ResultReceiverConsumerTest.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,16 @@ public class ResultReceiverConsumerTest {
3636
private ResultReceiver receiver2 = Mockito.mock(ResultReceiver.class);
3737
private ResultReceiver receiver3 = Mockito.mock(ResultReceiver.class);
3838

39+
@Test
40+
public void testEmptyReceiversForRemoteResult() throws Exception {
41+
ResultReceiverConsumer consumer = new ResultReceiverConsumer(Lists.newArrayList(),
42+
System.currentTimeMillis() + 3600);
43+
Status status = new Status();
44+
45+
Assert.assertFalse(consumer.isEos());
46+
Assertions.assertThrows(UserException.class, () -> consumer.getNext(status));
47+
}
48+
3949
@Test
4050
public void testEosHandling() throws Exception {
4151
ResultReceiverConsumer consumer = new ResultReceiverConsumer(

0 commit comments

Comments
 (0)