Skip to content
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

fix count return null #6118

Merged
merged 9 commits into from
Jun 19, 2020
Merged

fix count return null #6118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
84d91f2
fix count return null
kimmking Jun 18, 2020
7ed3fec
fix checkstyle
kimmking Jun 18, 2020
10854f9
fix unit test
kimmking Jun 18, 2020
ebc8ace
polish checkstyle
kimmking Jun 18, 2020
7c8ee94
polish code style
kimmking Jun 18, 2020
ec5f087
fix in getMemoryResultSetRows
kimmking Jun 19, 2020
04f526c
fix code style
kimmking Jun 19, 2020
8f2db0b
extract method
kimmking Jun 19, 2020
638b07b
fix codestyle
kimmking Jun 19, 2020
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
22 changes: 20 additions & 2 deletions .../java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByMemoryMergedResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.apache.shardingsphere.sql.parser.binder.segment.select.projection.impl.AggregationProjection;
import org.apache.shardingsphere.sql.parser.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.sql.parser.binder.statement.dml.SelectStatementContext;
import org.apache.shardingsphere.sql.parser.sql.constant.AggregationType;
import org.apache.shardingsphere.sql.parser.sql.segment.generic.table.SimpleTableSegment;
import org.apache.shardingsphere.infra.executor.sql.QueryResult;
import org.apache.shardingsphere.infra.merge.result.impl.memory.MemoryMergedResult;
Expand All @@ -39,6 +40,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
Expand Down Expand Up @@ -134,11 +136,27 @@ private boolean getValueCaseSensitiveFromTables(final QueryResult queryResult, f
}
return false;
}
private List<MemoryQueryResultRow> getMemoryResultSetRows(final SelectStatementContext selectStatementContext,

private List<MemoryQueryResultRow> getMemoryResultSetRows(final SelectStatementContext selectStatementContext,
final Map<GroupByValue, MemoryQueryResultRow> dataMap, final List<Boolean> valueCaseSensitive) {
if (dataMap.isEmpty()) {
Object[] data = generateReturnData(selectStatementContext);
return Collections.singletonList(new MemoryQueryResultRow(data));
}

List<MemoryQueryResultRow> result = new ArrayList<>(dataMap.values());
result.sort(new GroupByRowComparator(selectStatementContext, valueCaseSensitive));
return result;
}

private Object[] generateReturnData(final SelectStatementContext selectStatementContext) {
List projections = new LinkedList(selectStatementContext.getProjectionsContext().getProjections());
Object[] data = new Object[projections.size()];
for (int i = 0; i < projections.size(); i++) {
if (projections.get(i) instanceof AggregationProjection && AggregationType.COUNT == ((AggregationProjection) projections.get(i)).getType()) {
data[i] = 0;
}
}
return data;
}
}
1 change: 1 addition & 0 deletions ...a/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByMemoryMergedResultTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ public final class GroupByMemoryMergedResultTest {
public void assertNextForResultSetsAllEmpty() throws SQLException {
ShardingDQLResultMerger resultMerger = new ShardingDQLResultMerger(DatabaseTypes.getActualDatabaseType("MySQL"));
MergedResult actual = resultMerger.merge(Arrays.asList(createQueryResult(), createQueryResult(), createQueryResult()), createSelectStatementContext(), null);
assertTrue(actual.next());
assertFalse(actual.next());
}

Expand Down
2 changes: 2 additions & 0 deletions ...n/java/org/apache/shardingsphere/infra/merge/result/impl/memory/MemoryQueryResultRow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@
package org.apache.shardingsphere.infra.merge.result.impl.memory;

import com.google.common.base.Preconditions;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.executor.sql.QueryResult;

import java.sql.SQLException;

/**
* Memory query result row.
*/
@RequiredArgsConstructor
public final class MemoryQueryResultRow {

private final Object[] data;
Expand Down