IGNITE-13915

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/rel/Inbox.java

@@ -108,6 +108,9 @@ public Inbox(
      * @param comp Optional comparator for merge exchange.
      */
     public void init(ExecutionContext<Row> ctx, RelDataType rowType, Collection<UUID> srcNodeIds, @Nullable Comparator<Row> comp) {
+        assert context().fragmentId() == ctx.fragmentId() : "different fragments unsupported: previous=" + context().fragmentId() +
+            " current=" + ctx.fragmentId();
+
         // It's important to set proper context here because
         // the one, that is created on a first message
         // received doesn't have all context variables in place.
@@ -187,6 +190,8 @@ public void onBatchReceived(UUID src, int batchId, boolean last, List<Row> rows)
     /** */
     private void doPush() {
         try {
+            checkState();
+
             push();
         }
         catch (Exception e) {

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/Fragment.java

@@ -67,16 +67,6 @@ public Fragment(long id, IgniteRel root, List<IgniteReceiver> remotes) {
         this(id, root, remotes, null, null);
     }
 
-    /**
-     * @param id Fragment id.
-     * @param root Root node of the fragment.
-     * @param remotes Remote sources of the fragment.
-     * @param rootSer Root serialized representation.
-     */
-    public Fragment(long id, IgniteRel root, List<IgniteReceiver> remotes, @Nullable String rootSer) {
-        this(id, root, remotes, rootSer, null);
-    }
-
     /** */
     Fragment(long id, IgniteRel root, List<IgniteReceiver> remotes, @Nullable String rootSer, @Nullable FragmentMapping mapping) {
         this.id = id;

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/QueryTemplate.java

@@ -119,7 +119,7 @@ else if (!fragment0.rootFragment()) {
                     sender = new IgniteSender(sender.getCluster(), sender.getTraitSet(),
                         sender.getInput(), sender.exchangeId(), newTargetId, sender.distribution());
 
-                    fragment0 = new Fragment(fragment0.fragmentId(), sender, fragment0.remotes(), fragment0.serialized());
+                    fragment0 = new Fragment(fragment0.fragmentId(), sender, fragment0.remotes());
                 }
             }