Projects >> elasticsearch >>52be313c69de9358944943ef2df4b7e3cdd77b15

Chunk
Conflicting content 
        for (QueryBuilder queryBuilder : shouldClauses) {
            boolQuery.should(queryBuilder);
        }
<<<<<<< HEAD
        for (QueryBuilder queryBuilder : filterClauses) {
            boolQuery.filter(queryBuilder);
=======
        booleanQuery.setBoost(boost);
        booleanQuery = Queries.applyMinimumShouldMatch(booleanQuery, minimumShouldMatch);
        Query query = adjustPureNegative ? fixNegativeQueryIfNeeded(booleanQuery) : booleanQuery;
        if (queryName != null) {
            parseContext.addNamedQuery(queryName, query);
>>>>>>> 821021f0e478ca44d828e62c139ea19f0fd7290a
        }
        boolQuery.boost(boost);
        boolQuery.disableCoord(disableCoord);
Solution content 
        for (QueryBuilder queryBuilder : shouldClauses) {
            boolQuery.should(queryBuilder);
        }
        for (QueryBuilder queryBuilder : filterClauses) {
            boolQuery.filter(queryBuilder);
        }
        boolQuery.boost(boost);
        boolQuery.disableCoord(disableCoord);
File
BoolQueryParser.java
Developer's decision
Version 1
Kind of conflict
Other
Chunk
Conflicting content 
package org.elasticsearch.index.query;

<<<<<<< HEAD
import com.google.common.collect.ImmutableList;
=======
import com.google.common.collect.Iterables;

import org.apache.lucene.queries.TermsQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.util.BytesRef;
>>>>>>> 821021f0e478ca44d828e62c139ea19f0fd7290a
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.xcontent.XContentParser;
Solution content 
package org.elasticsearch.index.query;

import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.xcontent.XContentParser;
File
IdsQueryParser.java
Developer's decision
None
Kind of conflict
Import
Chunk
Conflicting content 
import java.io.IOException;
import java.util.ArrayList;
<<<<<<< HEAD
=======
import java.util.Collection;
import java.util.Collections;
>>>>>>> 821021f0e478ca44d828e62c139ea19f0fd7290a
import java.util.List;

/**
Solution content 
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

/**
File
IdsQueryParser.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
        qb.flags(flags).defaultOperator(defaultOperator).locale(locale).lowercaseExpandedTerms(lowercaseExpandedTerms);
        qb.lenient(lenient).analyzeWildcard(analyzeWildcard).boost(boost);

<<<<<<< HEAD
        return qb;
    }
=======
        if (minimumShouldMatch != null && query instanceof BooleanQuery) {
            query = Queries.applyMinimumShouldMatch((BooleanQuery) query, minimumShouldMatch);
        }

        if (query != null) {
            query.setBoost(boost);
        }
>>>>>>> 821021f0e478ca44d828e62c139ea19f0fd7290a

    @Override
    public SimpleQueryStringBuilder getBuilderPrototype() {
Solution content 
        qb.flags(flags).defaultOperator(defaultOperator).locale(locale).lowercaseExpandedTerms(lowercaseExpandedTerms);
        qb.lenient(lenient).analyzeWildcard(analyzeWildcard).boost(boost);

        return qb;
    }

    @Override
    public SimpleQueryStringBuilder getBuilderPrototype() {
File
SimpleQueryStringParser.java
Developer's decision
Version 1
Kind of conflict
Other
Chunk
Conflicting content 
     * values. Handles both submitting the template as part of the request as
     * well as referencing only the template name.
     *
<<<<<<< HEAD
     * @param context
=======
     * @param parseContext
>>>>>>> 821021f0e478ca44d828e62c139ea19f0fd7290a
     *            parse context containing the templated query.
     */
    @Override
Solution content 
     * values. Handles both submitting the template as part of the request as
     * well as referencing only the template name.
     *
     * @param context
     *            parse context containing the templated query.
     */
    @Override
File
TemplateQueryParser.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
            }
                            + "] within lookup element");
                }
<<<<<<< HEAD
=======
            query = Queries.applyMinimumShouldMatch(bq, minShouldMatch);
>>>>>>> 821021f0e478ca44d828e62c139ea19f0fd7290a
        }
        if (termsLookup.type() == null) {
            throw new QueryParsingException(parseContext, "[terms] query lookup element requires specifying the type");
Solution content 
                            + "] within lookup element");
                }
            }
        }
        if (termsLookup.type() == null) {
            throw new QueryParsingException(parseContext, "[terms] query lookup element requires specifying the type");
File
TermsQueryParser.java
Developer's decision
Version 1
Kind of conflict
Other
Chunk
Conflicting content 
import org.elasticsearch.common.lucene.search.function.ScoreFunction;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.fielddata.IndexNumericFieldData;
<<<<<<< HEAD
=======
import org.elasticsearch.index.fielddata.plain.DoubleArrayIndexFieldData;
import org.elasticsearch.index.mapper.FieldMapper;
>>>>>>> 821021f0e478ca44d828e62c139ea19f0fd7290a
import org.elasticsearch.index.mapper.MappedFieldType;
import org.elasticsearch.index.query.QueryShardContext;
import org.elasticsearch.index.query.QueryParseContext;
Solution content 
import org.elasticsearch.common.lucene.search.function.ScoreFunction;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.fielddata.IndexNumericFieldData;
import org.elasticsearch.index.mapper.MappedFieldType;
import org.elasticsearch.index.query.QueryShardContext;
import org.elasticsearch.index.query.QueryParseContext;
File
FieldValueFactorFunctionParser.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser;
<<<<<<< HEAD
import org.elasticsearch.index.query.QueryShardException;
=======
import org.elasticsearch.index.query.QueryParsingException;
import org.elasticsearch.search.internal.SearchContext;
>>>>>>> 821021f0e478ca44d828e62c139ea19f0fd7290a

import java.io.IOException;
Solution content 
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.query.QueryShardException;
import org.elasticsearch.search.internal.SearchContext;

import java.io.IOException;
File
GND.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
        }

        @Override
<<<<<<< HEAD
        public SignificanceHeuristic parse(XContentParser parser, ParseFieldMatcher parseFieldMatcher) throws IOException, QueryShardException {
=======
        public SignificanceHeuristic parse(XContentParser parser, ParseFieldMatcher parseFieldMatcher, SearchContext context)
                throws IOException, QueryParsingException {
>>>>>>> 821021f0e478ca44d828e62c139ea19f0fd7290a
            String givenName = parser.currentName();
            boolean backgroundIsSuperset = true;
            XContentParser.Token token = parser.nextToken();
Solution content 
        }

        @Override
        public SignificanceHeuristic parse(XContentParser parser, ParseFieldMatcher parseFieldMatcher, SearchContext context)
                throws IOException, QueryShardException {
            String givenName = parser.currentName();
            boolean backgroundIsSuperset = true;
            XContentParser.Token token = parser.nextToken();
File
GND.java
Developer's decision
Manual
Kind of conflict
Method signature
Chunk
Conflicting content 
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser;
<<<<<<< HEAD
import org.elasticsearch.index.query.QueryShardException;
=======
import org.elasticsearch.index.query.QueryParsingException;
import org.elasticsearch.search.internal.SearchContext;
>>>>>>> 821021f0e478ca44d828e62c139ea19f0fd7290a

import java.io.IOException;
Solution content 
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.query.QueryShardException;
import org.elasticsearch.search.internal.SearchContext;

import java.io.IOException;
File
JLHScore.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
    public static class JLHScoreParser implements SignificanceHeuristicParser {

        @Override
<<<<<<< HEAD
        public SignificanceHeuristic parse(XContentParser parser, ParseFieldMatcher parseFieldMatcher) throws IOException, QueryShardException {
=======
        public SignificanceHeuristic parse(XContentParser parser, ParseFieldMatcher parseFieldMatcher, SearchContext context)
                throws IOException, QueryParsingException {
>>>>>>> 821021f0e478ca44d828e62c139ea19f0fd7290a
            // move to the closing bracket
            if (!parser.nextToken().equals(XContentParser.Token.END_OBJECT)) {
                throw new ElasticsearchParseException("failed to parse [jhl] significance heuristic. expected an empty object, but found [{}] instead", parser.currentToken());
Solution content 
    public static class JLHScoreParser implements SignificanceHeuristicParser {

        @Override
        public SignificanceHeuristic parse(XContentParser parser, ParseFieldMatcher parseFieldMatcher, SearchContext context)
                throws IOException, QueryShardException {
            // move to the closing bracket
            if (!parser.nextToken().equals(XContentParser.Token.END_OBJECT)) {
                throw new ElasticsearchParseException("failed to parse [jhl] significance heuristic. expected an empty object, but found [{}] instead", parser.currentToken());
File
JLHScore.java
Developer's decision
Manual
Kind of conflict
Method signature
Chunk
Conflicting content 
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser;
<<<<<<< HEAD
import org.elasticsearch.index.query.QueryShardException;
=======
import org.elasticsearch.index.query.QueryParsingException;
import org.elasticsearch.search.internal.SearchContext;
>>>>>>> 821021f0e478ca44d828e62c139ea19f0fd7290a

import java.io.IOException;
Solution content 
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.query.QueryShardException;
import org.elasticsearch.search.internal.SearchContext;

import java.io.IOException;
File
NXYSignificanceHeuristic.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
    public static abstract class NXYParser implements SignificanceHeuristicParser {

        @Override
<<<<<<< HEAD
        public SignificanceHeuristic parse(XContentParser parser, ParseFieldMatcher parseFieldMatcher) throws IOException, QueryShardException {
=======
        public SignificanceHeuristic parse(XContentParser parser, ParseFieldMatcher parseFieldMatcher, SearchContext context)
                throws IOException, QueryParsingException {
>>>>>>> 821021f0e478ca44d828e62c139ea19f0fd7290a
            String givenName = parser.currentName();
            boolean includeNegatives = false;
            boolean backgroundIsSuperset = true;
Solution content 
    public static abstract class NXYParser implements SignificanceHeuristicParser {

        @Override
        public SignificanceHeuristic parse(XContentParser parser, ParseFieldMatcher parseFieldMatcher, SearchContext context)
                throws IOException, QueryShardException {
            String givenName = parser.currentName();
            boolean includeNegatives = false;
            boolean backgroundIsSuperset = true;
File
NXYSignificanceHeuristic.java
Developer's decision
Manual
Kind of conflict
Method signature
Chunk
Conflicting content 
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser;
<<<<<<< HEAD
import org.elasticsearch.index.query.QueryShardException;
=======
import org.elasticsearch.index.query.QueryParsingException;
import org.elasticsearch.search.internal.SearchContext;
>>>>>>> 821021f0e478ca44d828e62c139ea19f0fd7290a

import java.io.IOException;
Solution content 
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.query.QueryShardException;
import org.elasticsearch.search.internal.SearchContext;

import java.io.IOException;
File
PercentageScore.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
    public static class PercentageScoreParser implements SignificanceHeuristicParser {

        @Override
<<<<<<< HEAD
        public SignificanceHeuristic parse(XContentParser parser, ParseFieldMatcher parseFieldMatcher) throws IOException, QueryShardException {
=======
        public SignificanceHeuristic parse(XContentParser parser, ParseFieldMatcher parseFieldMatcher, SearchContext context)
                throws IOException, QueryParsingException {
>>>>>>> 821021f0e478ca44d828e62c139ea19f0fd7290a
            // move to the closing bracket
            if (!parser.nextToken().equals(XContentParser.Token.END_OBJECT)) {
                throw new ElasticsearchParseException("failed to parse [percentage] significance heuristic. expected an empty object, but got [{}] instead", parser.currentToken());
Solution content 
        public SignificanceHeuristic parse(XContentParser parser, ParseFieldMatcher parseFieldMatcher, SearchContext context)
    public static class PercentageScoreParser implements SignificanceHeuristicParser {

        @Override
                throws IOException, QueryShardException {
            // move to the closing bracket
            if (!parser.nextToken().equals(XContentParser.Token.END_OBJECT)) {
                throw new ElasticsearchParseException("failed to parse [percentage] significance heuristic. expected an empty object, but got [{}] instead", parser.currentToken());
File
PercentageScore.java
Developer's decision
Manual
Kind of conflict
Method signature
Chunk
Conflicting content 
import org.elasticsearch.common.logging.ESLoggerFactory;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser;
<<<<<<< HEAD
import org.elasticsearch.index.query.QueryShardException;
import org.elasticsearch.script.*;
=======
import org.elasticsearch.index.query.QueryParsingException;
import org.elasticsearch.script.ExecutableScript;
import org.elasticsearch.script.Script;
>>>>>>> 821021f0e478ca44d828e62c139ea19f0fd7290a
import org.elasticsearch.script.Script.ScriptField;
import org.elasticsearch.script.ScriptContext;
import org.elasticsearch.script.ScriptParameterParser;
Solution content 
import org.elasticsearch.common.logging.ESLoggerFactory;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.query.QueryShardException;
import org.elasticsearch.script.*;
import org.elasticsearch.script.Script.ScriptField;
File
ScriptHeuristic.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
        }

        @Override
<<<<<<< HEAD
        public SignificanceHeuristic parse(XContentParser parser, ParseFieldMatcher parseFieldMatcher) throws IOException, QueryShardException {
=======
        public SignificanceHeuristic parse(XContentParser parser, ParseFieldMatcher parseFieldMatcher, SearchContext context)
                throws IOException, QueryParsingException {
>>>>>>> 821021f0e478ca44d828e62c139ea19f0fd7290a
            String heuristicName = parser.currentName();
            Script script = null;
            XContentParser.Token token;
Solution content 
        }

        @Override
        public SignificanceHeuristic parse(XContentParser parser, ParseFieldMatcher parseFieldMatcher, SearchContext context)
                throws IOException, QueryShardException {
            String heuristicName = parser.currentName();
            Script script = null;
            XContentParser.Token token;
File
ScriptHeuristic.java
Developer's decision
Manual
Kind of conflict
Method signature
Chunk
Conflicting content 
        public static class SimpleHeuristicParser implements SignificanceHeuristicParser {

            @Override
<<<<<<< HEAD
            public SignificanceHeuristic parse(XContentParser parser, ParseFieldMatcher parseFieldMatcher) throws IOException, QueryShardException {
=======
            public SignificanceHeuristic parse(XContentParser parser, ParseFieldMatcher parseFieldMatcher, SearchContext context)
                    throws IOException, QueryParsingException {
>>>>>>> 821021f0e478ca44d828e62c139ea19f0fd7290a
                parser.nextToken();
                return new SimpleHeuristic();
            }
Solution content 
        public static class SimpleHeuristicParser implements SignificanceHeuristicParser {

            @Override
            public SignificanceHeuristic parse(XContentParser parser, ParseFieldMatcher parseFieldMatcher, SearchContext context)
                    throws IOException, QueryShardException {
                parser.nextToken();
                return new SimpleHeuristic();
            }
File
SignificantTermsSignificanceScoreIT.java
Developer's decision
Manual
Kind of conflict
Method signature