Skip to content

IGNITE-12829: Custom GROUP_CONCAT separator is ignored. #7574

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

Merged
nizhikov merged 1 commit into from
Mar 26, 2020
Merged

IGNITE-12829: Custom GROUP_CONCAT separator is ignored. #7574

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
5 changes: 4 additions & 1 deletion ...rc/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1733,7 +1733,10 @@ private void splitAggregate(
if (hasDistinctAggregate)
mapAgg = agg.child();
else {
mapAgg = SplitterUtils.aggregate(agg.distinct(), agg.type()).resultType(GridSqlType.STRING)
mapAgg = SplitterUtils
.aggregate(agg.distinct(), agg.type())
.setGroupConcatSeparator(agg.getGroupConcatSeparator())
.resultType(GridSqlType.STRING)
.addChild(agg.child());
}

Expand Down
26 changes: 26 additions & 0 deletions .../java/org/apache/ignite/internal/processors/query/IgniteSqlGroupConcatCollocatedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.apache.ignite.internal.processors.query;

import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -113,6 +114,31 @@ public void testGroupConcatSimple() {
}
}

/**
*
*/
@Test
public void testGroupConcatSeparator() {
IgniteCache c = ignite(CLIENT).cache(CACHE_NAME);

List<List<Object>> res = c.query(
new SqlFieldsQuery("select grp, GROUP_CONCAT(str0 SEPARATOR '.') from Value WHERE id < ? group by grp")
.setCollocated(true).setArgs(KEY_BASE_FOR_DUPLICATES)).getAll();

List<List<Object>> expRes = Arrays.asList(
Arrays.asList(1, "A"),
Arrays.asList(2, "C.B"),
Arrays.asList(3, "E.D.F"),
Arrays.asList(4, "J.G.I.H"),
Arrays.asList(5, "O.L.N.K.M"),
Arrays.asList(6, "Q.S.U.P.R.T"));

assertEquals(res.size(), expRes.size());

for (int i = 0; i < res.size(); i++)
assertEqualsCollections(expRes.get(i), res.get(i));
}

/**
*
*/
Expand Down
25 changes: 25 additions & 0 deletions ...va/org/apache/ignite/internal/processors/query/IgniteSqlGroupConcatNotCollocatedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.apache.ignite.internal.processors.query;

import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.Callable;
Expand Down Expand Up @@ -96,6 +97,30 @@ public void testGroupConcatSimple() {
}
}

/**
*
*/
@Test
public void testGroupConcatSeparator() {
IgniteCache c = ignite(CLIENT).cache(CACHE_NAME);

List<List<Object>> res = c.query(
new SqlFieldsQuery("select grp, GROUP_CONCAT(str0 SEPARATOR '.') from Value group by grp")).getAll();

List<List<Object>> expRes = Arrays.asList(
Arrays.asList(1, "A"),
Arrays.asList(2, "C.B"),
Arrays.asList(3, "E.D.F"),
Arrays.asList(4, "J.G.I.H"),
Arrays.asList(5, "O.L.N.K.M"),
Arrays.asList(6, "Q.S.U.P.R.T"));

assertEquals(res.size(), expRes.size());

for (int i = 0; i < res.size(); i++)
assertEqualsCollections(expRes.get(i), res.get(i));
}

/**
*
*/
Expand Down