Projects >> elasticsearch >>90f24c1a79705cdf63e232517b87905744ae5b3d

Chunk
Conflicting content 
                    point.resetLon(parser.doubleValue());
                    fieldName = currentFieldName.substring(0, currentFieldName.length() - GeoPointFieldMapper.Names.LON_SUFFIX.length());
                } else if (currentFieldName.endsWith(GeoPointFieldMapper.Names.GEOHASH_SUFFIX)) {
<<<<<<< HEAD
                    geohash = parser.text();
=======
                    point.resetFromGeoHash(parser.text());
>>>>>>> 40959068d5b47d60d45b9437a25cd8a7a289e9a1
                    fieldName = currentFieldName.substring(0, currentFieldName.length() - GeoPointFieldMapper.Names.GEOHASH_SUFFIX.length());
                } else if (parseContext.parseFieldMatcher().match(currentFieldName, NAME_FIELD)) {
                    queryName = parser.text();
Solution content 
                    point.resetLon(parser.doubleValue());
                    fieldName = currentFieldName.substring(0, currentFieldName.length() - GeoPointFieldMapper.Names.LON_SUFFIX.length());
                } else if (currentFieldName.endsWith(GeoPointFieldMapper.Names.GEOHASH_SUFFIX)) {
                    geohash = parser.text();
                    fieldName = currentFieldName.substring(0, currentFieldName.length() - GeoPointFieldMapper.Names.GEOHASH_SUFFIX.length());
                } else if (parseContext.parseFieldMatcher().match(currentFieldName, NAME_FIELD)) {
                    queryName = parser.text();
File
GeoDistanceRangeQueryParser.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
package org.elasticsearch.index.query;

<<<<<<< HEAD
import org.apache.lucene.search.Query;
import org.elasticsearch.Version;
import org.elasticsearch.common.geo.GeoHashUtils;
=======
>>>>>>> 40959068d5b47d60d45b9437a25cd8a7a289e9a1
import org.elasticsearch.common.geo.GeoPoint;
import org.elasticsearch.common.geo.GeoUtils;
import org.elasticsearch.common.io.stream.StreamInput;
Solution content 
package org.elasticsearch.index.query;

import org.apache.lucene.search.Query;
import org.elasticsearch.Version;
import org.elasticsearch.common.geo.GeoPoint;
import org.elasticsearch.common.geo.GeoUtils;
import org.elasticsearch.common.io.stream.StreamInput;
File
GeoPolygonQueryBuilder.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
            if (queryName != null) {
                builder.queryName(queryName);
            }
<<<<<<< HEAD
            if (boost != null) {
                builder.boost(boost);
=======

            Query filter;
            if (neighbors) {
                filter = create(parseContext, geoFieldType, geohash, XGeoHashUtils.addNeighbors(geohash, new ArrayList<>(8)));
            } else {
                filter = create(parseContext, geoFieldType, geohash, null);
>>>>>>> 40959068d5b47d60d45b9437a25cd8a7a289e9a1
            }
            return builder;
        }
Solution content 
            if (queryName != null) {
                builder.queryName(queryName);
            }
            if (boost != null) {
                builder.boost(boost);
            }
            return builder;
        }
File
GeohashCellQuery.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Chunk
Conflicting content 
package org.elasticsearch.index.query;

<<<<<<< HEAD
import com.google.common.base.Charsets;
import org.apache.lucene.search.Query;
=======
import java.nio.charset.StandardCharsets;
>>>>>>> 40959068d5b47d60d45b9437a25cd8a7a289e9a1
import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
Solution content 
package org.elasticsearch.index.query;

import org.apache.lucene.search.Query;
import java.nio.charset.StandardCharsets;
import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
File
WrapperQueryBuilder.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
     * Creates a query builder given a query provided as a string
     */
    public WrapperQueryBuilder(String source) {
<<<<<<< HEAD
        this.source = source.getBytes(Charsets.UTF_8);
=======
        this.source = source.getBytes(StandardCharsets.UTF_8);
        this.offset = 0;
        this.length = this.source.length;
>>>>>>> 40959068d5b47d60d45b9437a25cd8a7a289e9a1
    }

    /**
Solution content 
     * Creates a query builder given a query provided as a string
     */
    public WrapperQueryBuilder(String source) {
        this.source = source.getBytes(StandardCharsets.UTF_8);
    }

    /**
File
WrapperQueryBuilder.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
import org.elasticsearch.action.search.SearchPhaseExecutionException;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.search.SearchType;
<<<<<<< HEAD
=======
import org.elasticsearch.common.bytes.BytesArray;
import org.elasticsearch.common.collect.HppcMaps;
>>>>>>> 40959068d5b47d60d45b9437a25cd8a7a289e9a1
import org.elasticsearch.common.lucene.search.function.CombineFunction;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.TimeValue;
Solution content 
import org.elasticsearch.action.search.SearchPhaseExecutionException;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.search.SearchType;

import org.elasticsearch.common.bytes.BytesArray;
import org.elasticsearch.common.lucene.search.function.CombineFunction;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.TimeValue;
File
ChildQuerySearchIT.java
Developer's decision
Combination
Kind of conflict
Import