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 6fdebb586f..7b432daa9a 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 @@ -135,6 +135,7 @@ public class GridSqlQuerySplitter { * @param locSplit Local split flag. * @param extractor Partition extractor. */ + @SuppressWarnings("AssignmentOrReturnOfFieldWithMutableType") public GridSqlQuerySplitter( int paramsCnt, boolean collocatedGrpBy, @@ -1304,6 +1305,7 @@ public class GridSqlQuerySplitter { * @param cols Columns from SELECT clause. * @return Map of columns with types. */ + @SuppressWarnings("IfMayBeConditional") private LinkedHashMap collectColumns(List cols) { LinkedHashMap res = new LinkedHashMap<>(cols.size(), 1f, false); @@ -1723,10 +1725,8 @@ public class GridSqlQuerySplitter { if (hasDistinctAggregate) mapAgg = agg.child(); else { - mapAgg = SplitterUtils.aggregate(agg.distinct(), agg.type()) - .setGroupConcatSeparator(agg.getGroupConcatSeparator()) - .resultType(GridSqlType.STRING) - .addChild(agg.child()); + mapAgg = SplitterUtils.aggregate(agg.distinct(), agg.type()).resultType(GridSqlType.STRING) + .addChild(agg.child()); } rdcAgg = SplitterUtils.aggregate(false, GROUP_CONCAT)