Skip to content

branch-4.0: [fix](fe) Fix remote Flight SQL result receiver initialization #63136 #63154

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

Open
github-actions wants to merge 1 commit into
base: branch-4.0
Choose a base branch
from
Open

branch-4.0: [fix](fe) Fix remote Flight SQL result receiver initialization #63136 #63154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions fe/fe-core/src/main/java/org/apache/doris/qe/ResultReceiverConsumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,18 @@ public ResultReceiverConsumer(List<ResultReceiver> resultReceivers, long timeout
ReceiverContext context = new ReceiverContext(resultReceivers.get(i), i);
contexts.add(context);
}
this.readyOffsets = new ArrayBlockingQueue<>(resultReceivers.size());
this.readyOffsets = new ArrayBlockingQueue<>(Math.max(1, resultReceivers.size()));
timeoutTs = timeoutDeadline;
}

public boolean isEos() {
return finishedReceivers == contexts.size();
return !contexts.isEmpty() && finishedReceivers == contexts.size();
}

public RowBatch getNext(Status status) throws TException, InterruptedException, ExecutionException, UserException {
if (contexts.isEmpty()) {
throw new UserException("There is no receiver.");
}
if (!futureInitialized) {
futureInitialized = true;
for (ReceiverContext context : contexts) {
Expand Down
4 changes: 4 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/qe/runtime/QueryProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,14 @@ public static QueryProcessor build(CoordinatorContext coordinatorContext) {
}

boolean regenerateInstanceId = coordinatorContext.connectContext.consumeNeedRegenerateQueryId();
boolean returnResultFromLocal = coordinatorContext.connectContext.isReturnResultFromLocal();
for (AssignedJob topInstance : distinctWorkerJobs.values()) {
if (regenerateInstanceId) {
topInstance.resetInstanceId(coordinatorContext.connectContext.nextInstanceId());
}
if (!returnResultFromLocal) {
continue;
}
DistributedPlanWorker topWorker = topInstance.getAssignedWorker();
TNetworkAddress execBeAddr = new TNetworkAddress(topWorker.host(), topWorker.brpcPort());
receivers.add(
Expand Down
10 changes: 10 additions & 0 deletions fe/fe-core/src/test/java/org/apache/doris/qe/ResultReceiverConsumerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,16 @@ public class ResultReceiverConsumerTest {
@Injectable
private ResultReceiver receiver3;

@Test
public void testEmptyReceiversForRemoteResult() throws Exception {
ResultReceiverConsumer consumer = new ResultReceiverConsumer(Lists.newArrayList(),
System.currentTimeMillis() + 3600);
Status status = new Status();

Assert.assertFalse(consumer.isEos());
Assertions.assertThrows(UserException.class, () -> consumer.getNext(status));
}

@Test
public void testEosHandling() throws Exception {
ResultReceiverConsumer consumer = new ResultReceiverConsumer(
Expand Down
Loading