Projects >> elasticsearch >>ff74e94260f482ed6a32ad33db6dba7de52e452f

Chunk
Conflicting content 
 */
package org.elasticsearch.common.unit;

<<<<<<< HEAD
import com.google.common.base.Preconditions;

=======
>>>>>>> d49800652587e0470892f9cbfe47f1cd0022179e
import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
Solution content 
 */
package org.elasticsearch.common.unit;

import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
File
Fuzziness.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.fielddata.FieldDataType;
<<<<<<< HEAD
import org.elasticsearch.index.mapper.MappedFieldType;
import org.elasticsearch.index.mapper.Mapper;
import org.elasticsearch.index.mapper.MapperParsingException;
import org.elasticsearch.index.mapper.MergeMappingException;
import org.elasticsearch.index.mapper.MergeResult;
import org.elasticsearch.index.mapper.MetadataFieldMapper;
import org.elasticsearch.index.mapper.ParseContext;
import org.elasticsearch.index.mapper.Uid;
import org.elasticsearch.index.query.QueryShardContext;
=======
import org.elasticsearch.index.mapper.*;
import org.elasticsearch.index.query.QueryParseContext;
>>>>>>> d49800652587e0470892f9cbfe47f1cd0022179e

import java.io.IOException;
import java.util.Collection;
Solution content 
import java.util.Collection;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.fielddata.FieldDataType;
import org.elasticsearch.index.mapper.MappedFieldType;
import org.elasticsearch.index.mapper.Mapper;
import org.elasticsearch.index.mapper.MapperParsingException;
import org.elasticsearch.index.mapper.MergeMappingException;
import org.elasticsearch.index.mapper.MergeResult;
import org.elasticsearch.index.mapper.MetadataFieldMapper;
import org.elasticsearch.index.mapper.ParseContext;
import org.elasticsearch.index.mapper.Uid;
import org.elasticsearch.index.query.QueryShardContext;

import java.io.IOException;
File
IdFieldMapper.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
package org.elasticsearch.index.query;

<<<<<<< HEAD
import org.elasticsearch.common.inject.Inject;
=======
import org.apache.lucene.queries.TermsQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.util.BytesRef;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.lucene.search.Queries;
import org.elasticsearch.common.util.iterable.Iterables;
>>>>>>> d49800652587e0470892f9cbfe47f1cd0022179e
import org.elasticsearch.common.xcontent.XContentParser;

import java.io.IOException;
Solution content 
package org.elasticsearch.index.query;

import org.elasticsearch.common.xcontent.XContentParser;

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

        if (seed == -1) {
<<<<<<< HEAD
            seed = Longs.hashCode(context.nowInMillis());
=======
            seed = hash(parseContext.nowInMillis());
>>>>>>> d49800652587e0470892f9cbfe47f1cd0022179e
        }
        final ShardId shardId = SearchContext.current().indexShard().shardId();
        final int salt = (shardId.index().name().hashCode() << 10) | shardId.id();
Solution content 
        }

        if (seed == -1) {
            seed = hash(context.nowInMillis());
        }
        final ShardId shardId = SearchContext.current().indexShard().shardId();
        final int salt = (shardId.index().name().hashCode() << 10) | shardId.id();
File
RandomScoreFunctionParser.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
import org.elasticsearch.index.query.MatchQueryBuilder.Operator;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.index.query.*;
<<<<<<< HEAD
import org.elasticsearch.index.query.IdsQueryBuilder;
import org.elasticsearch.index.query.MatchQueryBuilder;
import org.elasticsearch.index.search.MatchQuery.Type;
import org.elasticsearch.index.search.MatchQuery;
import org.elasticsearch.index.query.MultiMatchQueryBuilder;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
=======
import org.elasticsearch.index.query.MatchQueryBuilder.Type;
>>>>>>> d49800652587e0470892f9cbfe47f1cd0022179e
import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.builder.SearchSourceBuilder;
Solution content 
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.index.query.*;
import org.elasticsearch.index.query.IdsQueryBuilder;
import org.elasticsearch.index.query.MatchQueryBuilder;
import org.elasticsearch.index.search.MatchQuery.Type;
import org.elasticsearch.index.search.MatchQuery;
import org.elasticsearch.index.query.MultiMatchQueryBuilder;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.builder.SearchSourceBuilder;
File
HighlighterSearchIT.java
Developer's decision
Version 1
Kind of conflict
Import