You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/05/11 10:19:08 UTC
[23/38] ignite git commit: master - minor fix for subqueries with
aggregates
master - minor fix for subqueries with aggregates
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b039d05a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b039d05a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b039d05a
Branch: refs/heads/ignite-5075
Commit: b039d05a34d8970ee3cbee5cf98ad9e5369772d2
Parents: d10091d
Author: Sergi Vladykin <se...@gmail.com>
Authored: Tue May 9 18:17:40 2017 +0300
Committer: Sergi Vladykin <se...@gmail.com>
Committed: Tue May 9 18:17:40 2017 +0300
----------------------------------------------------------------------
.../internal/processors/query/h2/sql/GridSqlQuerySplitter.java | 2 +-
.../internal/processors/query/IgniteSqlSplitterSelfTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b039d05a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index 2bac505..26c6b08 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
@@ -1743,7 +1743,7 @@ public class GridSqlQuerySplitter {
// If in SELECT clause we have a subquery expression with aggregate,
// we should not split it. Run the whole subquery on MAP stage.
- if (el instanceof GridSqlQuery)
+ if (el instanceof GridSqlSubquery)
return false;
for (int i = 0; i < el.size(); i++) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/b039d05a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
index 34101d2..ad1c8b8 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
@@ -306,7 +306,7 @@ public class IgniteSqlSplitterSelfTest extends GridCommonAbstractTest {
c1.put(new AffinityKey<>(2, orgId), new Person2(orgId, "Another Vasya"));
List<List<?>> rs = c1.query(new SqlFieldsQuery("select name, " +
- "(select count(1) from Person2 q where q.orgId = p.orgId) " +
+ "select count(1) from Person2 q where q.orgId = p.orgId " +
"from Person2 p order by name desc")).getAll();
assertEquals(2, rs.size());