[ignite] branch ignite-12248 updated: pending

[gvvinblade]

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 b85b901  pending
b85b901 is described below

commit b85b9013578a2c8623c0f33491860feae1f89e75
Author: Igor Seliverstov <gvvinbl...@gmail.com>
AuthorDate: Mon Nov 11 20:11:37 2019 +0300

    pending
---
 .../internal/processors/query/calcite/rule/IgniteFilterRule.java       | 3 ++-
 .../internal/processors/query/calcite/rule/IgniteProjectRule.java      | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rule/IgniteFilterRule.java
 
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rule/IgniteFilterRule.java
index 2ec33a06..3c3a5eb 100644
--- 
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rule/IgniteFilterRule.java
+++ 
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rule/IgniteFilterRule.java
@@ -17,6 +17,7 @@
 
 package org.apache.ignite.internal.processors.query.calcite.rule;
 
+import com.google.common.collect.ImmutableList;
 import org.apache.calcite.plan.RelOptRule;
 import org.apache.calcite.plan.RelOptRuleCall;
 import org.apache.calcite.plan.RelTraitSet;
@@ -49,6 +50,6 @@ public class IgniteFilterRule extends RelOptRule {
         RelOp<LogicalFilter, Boolean> transformOp = 
Commons.transformSubset(call, converted, IgniteFilter::create);
 
         if (!transformOp.go(filter))
-            call.transformTo(LogicalFilter.create(converted, 
filter.getCondition()));
+            call.transformTo(filter.copy(filter.getTraitSet(), 
ImmutableList.of(converted)));
     }
 }
diff --git 
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rule/IgniteProjectRule.java
 
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rule/IgniteProjectRule.java
index 4c2993e..9f7e3cc 100644
--- 
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rule/IgniteProjectRule.java
+++ 
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rule/IgniteProjectRule.java
@@ -17,6 +17,7 @@
 
 package org.apache.ignite.internal.processors.query.calcite.rule;
 
+import com.google.common.collect.ImmutableList;
 import org.apache.calcite.plan.RelOptRule;
 import org.apache.calcite.plan.RelOptRuleCall;
 import org.apache.calcite.plan.RelTraitSet;
@@ -49,6 +50,6 @@ public class IgniteProjectRule extends RelOptRule {
         RelOp<LogicalProject, Boolean> transformOp = 
Commons.transformSubset(call, converted, IgniteProject::create);
 
         if (!transformOp.go(project))
-            call.transformTo(LogicalProject.create(converted, 
project.getProjects(), project.getRowType()));
+            call.transformTo(project.copy(project.getTraitSet(), 
ImmutableList.of(converted)));
     }
 }