You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by gv...@apache.org on 2020/09/19 22:55:30 UTC
[ignite] branch ignite-12248 updated: fix query returns partial
result
This is an automated email from the ASF dual-hosted git repository.
gvvinblade pushed a commit to branch ignite-12248
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/ignite-12248 by this push:
new 67901f9 fix query returns partial result
67901f9 is described below
commit 67901f94c00993efd3361aee5dda0fcd2696c253
Author: Igor Seliverstov <gv...@gmail.com>
AuthorDate: Sun Sep 20 01:55:14 2020 +0300
fix query returns partial result
---
.../ignite/internal/processors/query/calcite/exec/rel/Outbox.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/rel/Outbox.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/rel/Outbox.java
index 35e61f9..c5105f3 100644
--- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/rel/Outbox.java
+++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/rel/Outbox.java
@@ -26,7 +26,6 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.stream.Collectors;
-
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.processors.query.calcite.exec.ExchangeService;
import org.apache.ignite.internal.processors.query.calcite.exec.ExecutionContext;
@@ -156,8 +155,7 @@ public class Outbox<Row> extends AbstractNode<Row> implements Mailbox<Row>, Sing
waiting = -1;
- for (UUID node : dest.targets())
- getOrCreateBuffer(node).end();
+ flush();
}
catch (Exception e) {
onError(e);
@@ -264,6 +262,10 @@ public class Outbox<Row> extends AbstractNode<Row> implements Mailbox<Row>, Sing
if (waiting == 0)
source().request(waiting = IN_BUFFER_SIZE);
+ else if (waiting == -1) {
+ for (UUID node : dest.targets())
+ getOrCreateBuffer(node).end();
+ }
}
/** */