Projects >> lucene-solr >>42f1af8b29d14ae5a1e22ffcb8cf975bd9b2238c

Chunk
Conflicting content 
        throw new UnsupportedOperationException();
      }

<<<<<<< HEAD
  /** Returns, at indexing time, the boost factor as set by {@link #setBoost(float)}. 
   *
   * 
Note that once a document is indexed this value is no longer available
   * from the index.  At search time, for retrieved documents, this method always 
   * returns 1. This however does not mean that the boost value set at  indexing 
   * time was ignored - it was just combined with other indexing time factors and 
   * stored elsewhere, for better indexing and search performance. (For more 
   * information see the "norm(t,d)" part of the scoring formula in 
   * {@link org.apache.lucene.search.similarities.Similarity Similarity}.)
   *
   * @see #setBoost(float)
   */
  public float getBoost() {
    return boost;
=======
      @Override
      public IndexableField next() {
        return fields.get(fieldUpto++);
      }
    };
>>>>>>> aefe15aad9b8e234fcfffb3e13e51f36f16cbf9f
  }

  /**
Solution content 
        throw new UnsupportedOperationException();
      }

      @Override
      public IndexableField next() {
        return fields.get(fieldUpto++);
      }
    };
  }

  /**
File
Document.java
Developer's decision
Version 2
Kind of conflict
Annotation
Attribute
Comment
Method declaration
Method signature
Return statement
Chunk
Conflicting content 
import java.util.concurrent.atomic.AtomicInteger;

import org.apache.lucene.document.Document;
<<<<<<< HEAD
import org.apache.lucene.document.FieldSelector;
import org.apache.lucene.search.FieldCache; // javadocs
import org.apache.lucene.search.similarities.Similarity;
=======
>>>>>>> aefe15aad9b8e234fcfffb3e13e51f36f16cbf9f
import org.apache.lucene.index.codecs.Codec;
import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.index.codecs.PerDocValues;
Solution content 
import java.util.concurrent.atomic.AtomicInteger;

import org.apache.lucene.document.Document;
import org.apache.lucene.index.codecs.Codec;
import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.index.codecs.PerDocValues;
File
IndexReader.java
Developer's decision
Version 2
Kind of conflict
Comment
Import
Chunk
Conflicting content 
import java.io.IOException;

import org.apache.lucene.index.IndexReader.AtomicReaderContext;
<<<<<<< HEAD:lucene/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java
import org.apache.lucene.index.Term;
import org.apache.lucene.search.Explanation;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.PhraseQuery;
=======
>>>>>>> aefe15aad9b8e234fcfffb3e13e51f36f16cbf9f:lucene/src/java/org/apache/lucene/search/TFIDFSimilarity.java
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.TermContext;
import org.apache.lucene.util.SmallFloat;
Solution content 
import java.io.IOException;

import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.Explanation;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.PhraseQuery;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.TermContext;
import org.apache.lucene.util.SmallFloat;
File
TFIDFSimilarity.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import org.apache.lucene.document.Field;
import org.apache.lucene.document.StringField;
import org.apache.lucene.index.FieldInfo.IndexOptions;
<<<<<<< HEAD
import org.apache.lucene.search.similarities.SimilarityProvider;
=======
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.TextField;
import org.apache.lucene.search.SimilarityProvider;
>>>>>>> aefe15aad9b8e234fcfffb3e13e51f36f16cbf9f
import org.apache.lucene.store.Directory;

import static org.apache.lucene.util.LuceneTestCase.TEST_VERSION_CURRENT;
Solution content 
import org.apache.lucene.document.Field;
import org.apache.lucene.document.StringField;
import org.apache.lucene.index.FieldInfo.IndexOptions;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.TextField;
import org.apache.lucene.search.similarities.SimilarityProvider;
import org.apache.lucene.store.Directory;

import static org.apache.lucene.util.LuceneTestCase.TEST_VERSION_CURRENT;
File
DocHelper.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
 * limitations under the License.
 */

<<<<<<< HEAD
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.search.similarities.DefaultSimilarity;
=======
import java.io.*;
import java.util.*;

import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.DefaultSimilarity;
>>>>>>> aefe15aad9b8e234fcfffb3e13e51f36f16cbf9f
import org.apache.lucene.store.CompoundFileDirectory;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IndexInput;
Solution content 
 * limitations under the License.
 */

import java.io.*;
import java.util.*;

import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.similarities.DefaultSimilarity;
import org.apache.lucene.store.CompoundFileDirectory;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IndexInput;
File
TestIndexFileDeleter.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.FieldCache;
<<<<<<< HEAD
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.similarities.DefaultSimilarity;
import org.apache.lucene.search.similarities.Similarity;
=======
>>>>>>> aefe15aad9b8e234fcfffb3e13e51f36f16cbf9f
import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.LockObtainFailedException;
Solution content 
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.similarities.DefaultSimilarity;
import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.LockObtainFailedException;
File
TestIndexReader.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
 * limitations under the License.
 */

<<<<<<< HEAD
import org.apache.lucene.index.SegmentNorms;
import org.apache.lucene.search.similarities.DefaultSimilarity;
import org.apache.lucene.search.similarities.Similarity;
=======
import org.apache.lucene.search.DefaultSimilarity;
>>>>>>> aefe15aad9b8e234fcfffb3e13e51f36f16cbf9f
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.TextField;
Solution content 
 * limitations under the License.
 */

import org.apache.lucene.search.similarities.DefaultSimilarity;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.TextField;
File
TestIndexReaderClone.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
<<<<<<< HEAD
import org.apache.lucene.index.SegmentNorms;
import org.apache.lucene.search.similarities.DefaultSimilarity;
import org.apache.lucene.search.similarities.DefaultSimilarityProvider;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.search.similarities.SimilarityProvider;
=======
import org.apache.lucene.search.DefaultSimilarity;
import org.apache.lucene.search.DefaultSimilarityProvider;
import org.apache.lucene.search.Similarity;
import org.apache.lucene.search.SimilarityProvider;
>>>>>>> aefe15aad9b8e234fcfffb3e13e51f36f16cbf9f
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
Solution content 
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.similarities.DefaultSimilarity;
import org.apache.lucene.search.similarities.DefaultSimilarityProvider;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.search.similarities.SimilarityProvider;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
File
TestIndexReaderCloneNorms.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
<<<<<<< HEAD
>>>>>>> aefe15aad9b8e234fcfffb3e13e51f36f16cbf9f
import org.apache.lucene.document.Field;
=======
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.search.DefaultSimilarity;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.TermQuery;
Solution content 
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.TermQuery;
File
TestIndexReaderOnDiskFull.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
<<<<<<< HEAD
import org.apache.lucene.search.similarities.DefaultSimilarity;
import org.apache.lucene.search.similarities.DefaultSimilarityProvider;
import org.apache.lucene.search.similarities.Similarity;
=======
import org.apache.lucene.document.TextField;
import org.apache.lucene.search.DefaultSimilarity;
import org.apache.lucene.search.DefaultSimilarityProvider;
import org.apache.lucene.search.Similarity;
>>>>>>> aefe15aad9b8e234fcfffb3e13e51f36f16cbf9f
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
Solution content 
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.TextField;
import org.apache.lucene.search.similarities.DefaultSimilarity;
import org.apache.lucene.search.similarities.DefaultSimilarityProvider;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
File
TestMaxTermFrequency.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
<<<<<<< HEAD
import org.apache.lucene.search.similarities.DefaultSimilarity;
import org.apache.lucene.search.similarities.DefaultSimilarityProvider;
import org.apache.lucene.search.similarities.Similarity;
=======
import org.apache.lucene.document.TextField;
import org.apache.lucene.search.DefaultSimilarity;
import org.apache.lucene.search.DefaultSimilarityProvider;
import org.apache.lucene.search.Similarity;
>>>>>>> aefe15aad9b8e234fcfffb3e13e51f36f16cbf9f
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
Solution content 
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.TextField;
import org.apache.lucene.search.similarities.DefaultSimilarity;
import org.apache.lucene.search.similarities.DefaultSimilarityProvider;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
File
TestUniqueTermCount.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermFreqVector;
import org.apache.lucene.search.*;
<<<<<<< HEAD
import org.apache.lucene.search.similarities.DefaultSimilarity;
import org.apache.lucene.search.similarities.TFIDFSimilarity;
import org.apache.lucene.store.FSDirectory;
=======
>>>>>>> aefe15aad9b8e234fcfffb3e13e51f36f16cbf9f
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.CharsRef;
import org.apache.lucene.util.PriorityQueue;
Solution content 
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermFreqVector;
import org.apache.lucene.search.*;
import org.apache.lucene.search.similarities.DefaultSimilarity;
import org.apache.lucene.search.similarities.TFIDFSimilarity;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.CharsRef;
import org.apache.lucene.util.PriorityQueue;
File
MoreLikeThis.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
<<<<<<< HEAD
import org.apache.lucene.document.Fieldable;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.similarities.DefaultSimilarity;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.search.similarities.SimilarityProvider;
=======
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.DefaultSimilarity;
import org.apache.lucene.search.Similarity;
import org.apache.lucene.search.SimilarityProvider;
>>>>>>> aefe15aad9b8e234fcfffb3e13e51f36f16cbf9f
import org.apache.lucene.util.Version;
import org.apache.solr.common.ResourceLoader;
import org.apache.solr.common.SolrException;
Solution content 
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.similarities.DefaultSimilarity;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.search.similarities.SimilarityProvider;
import org.apache.lucene.util.Version;
import org.apache.solr.common.ResourceLoader;
import org.apache.solr.common.SolrException;
File
IndexSchema.java
Developer's decision
Combination
Kind of conflict
Import