Projects >> elasticsearch >>dc0391273197ef0060d8d1da58d87f51dd9d9a93

Chunk
Conflicting content 
        }

        @Override
<<<<<<< HEAD
        protected Aggregator createUnmapped(AggregationContext aggregationContext, Aggregator parent, List reducers,
                Map metaData) throws IOException {
            final InternalAggregation aggregation = new InternalGeoHashGrid(name, requiredSize,
                    Collections. emptyList(), reducers, metaData);
            return new NonCollectingAggregator(name, aggregationContext, parent, reducers, metaData) {
=======
        protected Aggregator createUnmapped(AggregationContext aggregationContext, Aggregator parent, Map metaData) throws IOException {
            final InternalAggregation aggregation = new InternalGeoHashGrid(name, requiredSize, Collections.emptyList(), metaData);
            return new NonCollectingAggregator(name, aggregationContext, parent, metaData) {
                @Override
>>>>>>> a5ab49dc705d97860b46fbb9b05734a6e10b8ec9
                public InternalAggregation buildEmptyAggregation() {
                    return aggregation;
                }
Solution content 
        }

        @Override
        protected Aggregator createUnmapped(AggregationContext aggregationContext, Aggregator parent, List reducers,
                Map metaData) throws IOException {
            final InternalAggregation aggregation = new InternalGeoHashGrid(name, requiredSize,
                    Collections. emptyList(), reducers, metaData);
            return new NonCollectingAggregator(name, aggregationContext, parent, reducers, metaData) {
                public InternalAggregation buildEmptyAggregation() {
                    return aggregation;
                }
File
GeoHashGridParser.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
        return percent(key);
    }

<<<<<<< HEAD
    protected AbstractInternalPercentiles createReduced(String name, double[] keys, TDigestState merged, boolean keyed,
            List reducers, Map metaData) {
        return new InternalPercentileRanks(name, keys, merged, keyed, valueFormatter, reducers, metaData);
=======
    @Override
    protected AbstractInternalPercentiles createReduced(String name, double[] keys, TDigestState merged, boolean keyed, Map metaData) {
        return new InternalPercentileRanks(name, keys, merged, keyed, valueFormatter, metaData);
>>>>>>> a5ab49dc705d97860b46fbb9b05734a6e10b8ec9
    }

    @Override
Solution content 
        return percent(key);
    }

    @Override
    protected AbstractInternalPercentiles createReduced(String name, double[] keys, TDigestState merged, boolean keyed,
            List reducers, Map metaData) {
        return new InternalPercentileRanks(name, keys, merged, keyed, valueFormatter, reducers, metaData);
    }

    @Override
File
InternalPercentileRanks.java
Developer's decision
Combination
Kind of conflict
Annotation
Method invocation
Method signature
Return statement
Chunk
Conflicting content 
        return percentile(key);
    }

<<<<<<< HEAD
    protected AbstractInternalPercentiles createReduced(String name, double[] keys, TDigestState merged, boolean keyed,
            List reducers, Map metaData) {
        return new InternalPercentiles(name, keys, merged, keyed, valueFormatter, reducers, metaData);
=======
    @Override
    protected AbstractInternalPercentiles createReduced(String name, double[] keys, TDigestState merged, boolean keyed, Map metaData) {
        return new InternalPercentiles(name, keys, merged, keyed, valueFormatter, metaData);
>>>>>>> a5ab49dc705d97860b46fbb9b05734a6e10b8ec9
    }

    @Override
Solution content 
        return percentile(key);
    }

    @Override
    protected AbstractInternalPercentiles createReduced(String name, double[] keys, TDigestState merged, boolean keyed,
            List reducers, Map metaData) {
        return new InternalPercentiles(name, keys, merged, keyed, valueFormatter, reducers, metaData);
    }

    @Override
File
InternalPercentiles.java
Developer's decision
Combination
Kind of conflict
Annotation
Method invocation
Method signature
Return statement
Chunk
Conflicting content 
        this.searchHits = searchHits;
    }

<<<<<<< HEAD
    public InternalTopHits(String name, InternalSearchHits searchHits, List reducers, Map metaData) {
        super(name, reducers, metaData);
        this.searchHits = searchHits;
        this.topDocs = Lucene.EMPTY_TOP_DOCS;
    }

=======
>>>>>>> a5ab49dc705d97860b46fbb9b05734a6e10b8ec9

    @Override
    public Type type() {
Solution content 
        this.searchHits = searchHits;
    }

    @Override
    public Type type() {
File
InternalTopHits.java
Developer's decision
Version 2
Kind of conflict
Method declaration
Chunk
Conflicting content 
                } while (shardDocs[scoreDoc.shardIndex].scoreDocs[position] != scoreDoc);
                hits[i] = (InternalSearchHit) shardHits[scoreDoc.shardIndex].getAt(position);
            }
<<<<<<< HEAD
            return new InternalTopHits(name, new InternalSearchHits(hits, reducedTopDocs.totalHits, reducedTopDocs.getMaxScore()),
                    reducers(), getMetaData());
=======
            return new InternalTopHits(name, from, size, reducedTopDocs, new InternalSearchHits(hits, reducedTopDocs.totalHits, reducedTopDocs.getMaxScore()));
>>>>>>> a5ab49dc705d97860b46fbb9b05734a6e10b8ec9
        } catch (IOException e) {
            throw ExceptionsHelper.convertToElastic(e);
        }
Solution content 
        }
            throw ExceptionsHelper.convertToElastic(e);
                } while (shardDocs[scoreDoc.shardIndex].scoreDocs[position] != scoreDoc);
                hits[i] = (InternalSearchHit) shardHits[scoreDoc.shardIndex].getAt(position);
            }
            return new InternalTopHits(name, from, size, reducedTopDocs, new InternalSearchHits(hits, reducedTopDocs.totalHits,
                    reducedTopDocs.getMaxScore()),
                    reducers(), getMetaData());
        } catch (IOException e) {
File
InternalTopHits.java
Developer's decision
Manual
Kind of conflict
Method invocation
Return statement
Chunk
Conflicting content 
                    searchHitFields.sortValues(fieldDoc.fields);
                }
            }
<<<<<<< HEAD
            return new InternalTopHits(name, subSearchContext.from(), subSearchContext.size(), topDocs, fetchResult.hits(), reducers(),
                    metaData());
=======
            topHits = new InternalTopHits(name, subSearchContext.from(), subSearchContext.size(), topDocs, fetchResult.hits());
>>>>>>> a5ab49dc705d97860b46fbb9b05734a6e10b8ec9
        }
        return topHits;
    }
Solution content 
                    searchHitFields.sortValues(fieldDoc.fields);
                }
            }
            topHits = new InternalTopHits(name, subSearchContext.from(), subSearchContext.size(), topDocs, fetchResult.hits(), reducers(),
                    metaData());
        }
        return topHits;
    }
File
TopHitsAggregator.java
Developer's decision
Manual
Kind of conflict
Method invocation
Return statement
Variable
Chunk
Conflicting content 
    }

    @Override
<<<<<<< HEAD
    public InternalAggregation buildEmptyAggregation() {
        return new InternalTopHits(name, subSearchContext.from(), subSearchContext.size(), Lucene.EMPTY_TOP_DOCS,
                InternalSearchHits.empty(), reducers(), metaData());
=======
    public InternalTopHits buildEmptyAggregation() {
        TopDocs topDocs;
        if (subSearchContext.sort() != null) {
            topDocs = new TopFieldDocs(0, new FieldDoc[0], subSearchContext.sort().getSort(), Float.NaN);
        } else {
            topDocs = Lucene.EMPTY_TOP_DOCS;
        }
        return new InternalTopHits(name, subSearchContext.from(), subSearchContext.size(), topDocs, InternalSearchHits.empty());
>>>>>>> a5ab49dc705d97860b46fbb9b05734a6e10b8ec9
    }

    @Override
Solution content 
    }

    @Override
    public InternalTopHits buildEmptyAggregation() {
        TopDocs topDocs;
        if (subSearchContext.sort() != null) {
            topDocs = new TopFieldDocs(0, new FieldDoc[0], subSearchContext.sort().getSort(), Float.NaN);
        } else {
            topDocs = Lucene.EMPTY_TOP_DOCS;
        }
        return new InternalTopHits(name, subSearchContext.from(), subSearchContext.size(), topDocs, InternalSearchHits.empty(), reducers(), metaData());
    }

    @Override
File
TopHitsAggregator.java
Developer's decision
Manual
Kind of conflict
If statement
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
import org.elasticsearch.search.aggregations.bucket.significant.heuristics.GND;
import org.elasticsearch.search.aggregations.bucket.significant.heuristics.JLHScore;
import org.elasticsearch.search.aggregations.bucket.significant.heuristics.MutualInformation;
<<<<<<< HEAD
=======
import org.elasticsearch.search.aggregations.bucket.significant.heuristics.PercentageScore;
>>>>>>> a5ab49dc705d97860b46fbb9b05734a6e10b8ec9
import org.elasticsearch.search.aggregations.bucket.significant.heuristics.SignificanceHeuristic;
import org.elasticsearch.search.aggregations.bucket.significant.heuristics.SignificanceHeuristicBuilder;
import org.elasticsearch.search.aggregations.bucket.significant.heuristics.SignificanceHeuristicParser;
Solution content 
import org.elasticsearch.search.aggregations.bucket.significant.heuristics.GND;
import org.elasticsearch.search.aggregations.bucket.significant.heuristics.JLHScore;
import org.elasticsearch.search.aggregations.bucket.significant.heuristics.MutualInformation;
import org.elasticsearch.search.aggregations.bucket.significant.heuristics.PercentageScore;
import org.elasticsearch.search.aggregations.bucket.significant.heuristics.SignificanceHeuristic;
import org.elasticsearch.search.aggregations.bucket.significant.heuristics.SignificanceHeuristicBuilder;
import org.elasticsearch.search.aggregations.bucket.significant.heuristics.SignificanceHeuristicParser;
File
SignificanceHeuristicTests.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import org.elasticsearch.search.aggregations.bucket.significant.heuristics.SignificanceHeuristicParser;
import org.elasticsearch.search.aggregations.bucket.significant.heuristics.SignificanceHeuristicParserMapper;
import org.elasticsearch.search.aggregations.bucket.significant.heuristics.SignificanceHeuristicStreams;
<<<<<<< HEAD
import org.elasticsearch.search.aggregations.reducers.Reducer;
=======
>>>>>>> a5ab49dc705d97860b46fbb9b05734a6e10b8ec9
import org.elasticsearch.search.internal.SearchContext;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchTestCase;
Solution content 
import org.elasticsearch.search.aggregations.bucket.significant.heuristics.SignificanceHeuristicParser;
import org.elasticsearch.search.aggregations.bucket.significant.heuristics.SignificanceHeuristicParserMapper;
import org.elasticsearch.search.aggregations.bucket.significant.heuristics.SignificanceHeuristicStreams;
import org.elasticsearch.search.aggregations.reducers.Reducer;
import org.elasticsearch.search.internal.SearchContext;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchTestCase;
File
SignificanceHeuristicTests.java
Developer's decision
Version 1
Kind of conflict
Import