Commit 06496962 authored by tristaZero's avatar tristaZero
Browse files

use selectStatement.getDistinctSelectItem().isPresent()

parent ab34df0b

sharding-core/src/main/java/io/shardingsphere/core/merger/dql/DQLMergeEngine.java

+2 −2
Original line number Diff line number Diff line
@@ -69,8 +69,8 @@ public final class DQLMergeEngine implements MergeEngine { 
        if (!selectStatement.getAggregationDistinctSelectItems().isEmpty()) {

            return getDividedQueryResults(new AggregationDistinctQueryResult(queryResults, selectStatement));

        }

        if (!selectStatement.getDistinctSelectItems().isEmpty()) {

            return getDividedQueryResults(new DistinctQueryResult(queryResults, new ArrayList<>(selectStatement.getDistinctSelectItems().get(0).getDistinctColumnLabels())));

        if (selectStatement.getDistinctSelectItem().isPresent()) {

            return getDividedQueryResults(new DistinctQueryResult(queryResults, new ArrayList<>(selectStatement.getDistinctSelectItem().get().getDistinctColumnLabels())));

        }

        return queryResults;

    }