Projects >> graylog2-server >>4f79112ad49bbef626ef45679d54fe1268e144c1

Chunk
Conflicting content 
import static com.google.common.base.Strings.isNullOrEmpty;

public class StatisticalCountWidget extends SearchResultCountWidget {
<<<<<<< HEAD
    private static final Logger log = LoggerFactory.getLogger(StatisticalCountWidget.class);

    private final String statsFunction;
=======
    public enum StatisticalFunction {
        COUNT("count"),
        MEAN("mean"),
        STANDARD_DEVIATION("std_deviation"),
        MIN("min"),
        MAX("max"),
        SUM("sum"),
        VARIANCE("variance"),
        SUM_OF_SQUARES("squares"),
        CARDINALITY("cardinality");

        private final String function;

        StatisticalFunction(String function) {
            this.function = function;
        }

        @Override
        public String toString() {
            return this.function;
        }

        public static StatisticalFunction fromString(String function) {
            for (StatisticalFunction statisticalFunction : StatisticalFunction.values()) {
                if (statisticalFunction.toString().equals(function)) {
                    return statisticalFunction;
                }
            }

            throw new IllegalArgumentException("Statistic function " + function + " is not supported");
        }
    }

    private final StatisticalFunction statsFunction;
>>>>>>> 035ff3545c9252d62a75b50799730cafbdd1c645
    private final String field;
    private final String streamId;
Solution content 
import static com.google.common.base.Strings.isNullOrEmpty;

public class StatisticalCountWidget extends SearchResultCountWidget {
    private static final Logger log = LoggerFactory.getLogger(StatisticalCountWidget.class);

    public enum StatisticalFunction {
        COUNT("count"),
        MEAN("mean"),
        STANDARD_DEVIATION("std_deviation"),
        MIN("min"),
        MAX("max"),
        SUM("sum"),
        VARIANCE("variance"),
        SUM_OF_SQUARES("squares"),
        CARDINALITY("cardinality");

        private final String function;

        StatisticalFunction(String function) {
            this.function = function;
        }

        @Override
        public String toString() {
            return this.function;
        }

        public static StatisticalFunction fromString(String function) {
            for (StatisticalFunction statisticalFunction : StatisticalFunction.values()) {
                if (statisticalFunction.toString().equals(function)) {
                    return statisticalFunction;
                }
            }

            throw new IllegalArgumentException("Statistic function " + function + " is not supported");
        }
    }

    private final StatisticalFunction statsFunction;
    private final String field;
    private final String streamId;
File
StatisticalCountWidget.java
Developer's decision
Combination
Kind of conflict
Attribute
Enum declaration
Method invocation
Chunk
Conflicting content 
            } else {
                filter = null;
            }
<<<<<<< HEAD
            boolean needsCardinality = "cardinality".equals(statsFunction);
            boolean needsCount = "count".equals(statsFunction);
=======
            // if we only need the cardinality, we can skip calculating the extended stats and vice versa
            boolean isCardinalityFunction = statsFunction.equals(StatisticalFunction.CARDINALITY);
>>>>>>> 035ff3545c9252d62a75b50799730cafbdd1c645
            final FieldStatsResult fieldStatsResult =
                    getSearches().fieldStats(field,
                                             query,
Solution content 
            } else {
                filter = null;
            }
            boolean needsCardinality = statsFunction.equals(StatisticalFunction.CARDINALITY);
            boolean needsCount = statsFunction.equals(StatisticalFunction.COUNT);
            final FieldStatsResult fieldStatsResult =
                    getSearches().fieldStats(field,
                                             query,
File
StatisticalCountWidget.java
Developer's decision
Manual
Kind of conflict
Comment
Method invocation
Variable
Chunk
Conflicting content 
        }

        FilterAggregationBuilder builder = AggregationBuilders.filter(AGG_FILTER)
<<<<<<< HEAD
                .filter(standardFilters(range, filter));
        if (includeStats) {
=======
                .filter(standardAggregationFilters(range, filter));
        if (!onlyCardinality) {
>>>>>>> 035ff3545c9252d62a75b50799730cafbdd1c645
            builder.subAggregation(AggregationBuilders.extendedStats(AGG_EXTENDED_STATS).field(field));
        }
        if (includeCardinality) {
Solution content 
        }

        FilterAggregationBuilder builder = AggregationBuilders.filter(AGG_FILTER)
                .filter(standardAggregationFilters(range, filter));
        if (includeStats) {
            builder.subAggregation(AggregationBuilders.extendedStats(AGG_EXTENDED_STATS).field(field));
        }
        if (includeCardinality) {
File
Searches.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Variable