You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2011/08/18 00:49:19 UTC
svn commit: r1158958 [2/3] - in /lucene/dev/branches/fieldtype_conflicted:
lucene/contrib/demo/src/java/org/apache/lucene/demo/
lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/
lucene/contrib/memory/src/java/org/apache/luce...
Modified: lucene/dev/branches/fieldtype_conflicted/modules/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLIndexer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/modules/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLIndexer.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/modules/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLIndexer.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/modules/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLIndexer.java Wed Aug 17 22:49:16 2011
@@ -6,8 +6,7 @@ import java.util.Random;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.Term;
@@ -174,8 +173,8 @@ public class MultiCLIndexer {
// create a plain Lucene document and add some regular Lucene fields
// to it
Document doc = new Document();
- doc.add(new Field(SimpleUtils.TITLE, docTitles[docNum], Store.YES, Index.ANALYZED));
- doc.add(new Field(SimpleUtils.TEXT, docTexts[docNum], Store.NO, Index.ANALYZED));
+ doc.add(new Field(SimpleUtils.TITLE, TextField.TYPE_STORED, docTitles[docNum]));
+ doc.add(new TextField(SimpleUtils.TEXT, docTexts[docNum]));
// finally add the document to the index
categoryDocBuilder.build(doc);
Modified: lucene/dev/branches/fieldtype_conflicted/modules/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleIndexer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/modules/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleIndexer.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/modules/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleIndexer.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/modules/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleIndexer.java Wed Aug 17 22:49:16 2011
@@ -5,8 +5,7 @@ import java.util.List;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
@@ -71,8 +70,8 @@ public class SimpleIndexer {
// create a plain Lucene document and add some regular Lucene fields to it
Document doc = new Document();
- doc.add(new Field(SimpleUtils.TITLE, SimpleUtils.docTitles[docNum], Store.YES, Index.ANALYZED));
- doc.add(new Field(SimpleUtils.TEXT, SimpleUtils.docTexts[docNum], Store.NO, Index.ANALYZED));
+ doc.add(new Field(SimpleUtils.TITLE, TextField.TYPE_STORED, SimpleUtils.docTitles[docNum]));
+ doc.add(new TextField(SimpleUtils.TEXT, SimpleUtils.docTexts[docNum]));
// invoke the category document builder for adding categories to the document and,
// as required, to the taxonomy index
Modified: lucene/dev/branches/fieldtype_conflicted/modules/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/modules/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/modules/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/modules/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java Wed Aug 17 22:49:16 2011
@@ -10,6 +10,8 @@ import java.util.Map.Entry;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.DocumentBuilder;
import org.apache.lucene.facet.index.attributes.CategoryAttribute;
@@ -183,7 +185,9 @@ public class CategoryDocumentBuilder imp
// Finally creating a suitable field with stream and adding it to a
// master field-list, used during the build process (see
// super.build())
- fieldList.add(new Field(e.getKey(), stream));
+ FieldType ft = new FieldType(TextField.TYPE_UNSTORED);
+ ft.setOmitNorms(true);
+ fieldList.add(new Field(e.getKey(), ft, stream));
}
return this;
@@ -289,7 +293,6 @@ public class CategoryDocumentBuilder imp
*/
public Document build(Document doc) {
for (Field f : fieldList) {
- f.setOmitNorms(true);
doc.add(f);
}
return doc;
Modified: lucene/dev/branches/fieldtype_conflicted/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/Consts.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/Consts.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/Consts.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/Consts.java Wed Aug 17 22:49:16 2011
@@ -1,6 +1,10 @@
package org.apache.lucene.facet.taxonomy.lucene;
+import java.io.IOException;
+
+import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.StoredFieldVisitor;
+import org.apache.lucene.store.IndexInput;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: lucene/dev/branches/fieldtype_conflicted/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyReader.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyReader.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyReader.java Wed Aug 17 22:49:16 2011
@@ -21,6 +21,7 @@ import org.apache.lucene.store.FSDirecto
import org.apache.lucene.facet.taxonomy.CategoryPath;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
+import org.apache.lucene.facet.taxonomy.lucene.Consts.LoadFullPathOnly;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.collections.LRUHashMap;
Modified: lucene/dev/branches/fieldtype_conflicted/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyWriter.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyWriter.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyWriter.java Wed Aug 17 22:49:16 2011
@@ -17,8 +17,9 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.FieldInfo.IndexOptions;
@@ -179,10 +180,12 @@ public class LuceneTaxonomyWriter implem
openLuceneIndex(directory, openMode);
reader = null;
- parentStreamField = new Field(Consts.FIELD_PAYLOADS, parentStream);
- parentStreamField.setOmitNorms(true);
- fullPathField = new Field(Consts.FULL, "", Store.YES, Index.NOT_ANALYZED_NO_NORMS);
- fullPathField.setIndexOptions(IndexOptions.DOCS_ONLY);
+ FieldType ft = new FieldType(TextField.TYPE_UNSTORED);
+ ft.setOmitNorms(true);
+ parentStreamField = new Field(Consts.FIELD_PAYLOADS, ft, parentStream);
+ FieldType ft2 = new FieldType(StringField.TYPE_STORED);
+ ft2.setIndexOptions(IndexOptions.DOCS_ONLY);
+ fullPathField = new Field(Consts.FULL, ft2, "");
this.nextID = indexWriter.maxDoc();
Modified: lucene/dev/branches/fieldtype_conflicted/modules/facet/src/test/org/apache/lucene/facet/FacetTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/modules/facet/src/test/org/apache/lucene/facet/FacetTestBase.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/modules/facet/src/test/org/apache/lucene/facet/FacetTestBase.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/modules/facet/src/test/org/apache/lucene/facet/FacetTestBase.java Wed Aug 17 22:49:16 2011
@@ -15,9 +15,7 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.document.Field.TermVector;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.IndexReader;
@@ -247,7 +245,7 @@ public abstract class FacetTestBase exte
CategoryDocumentBuilder builder = new CategoryDocumentBuilder(tw, iParams);
builder.setCategoryPaths(categories);
builder.build(d);
- d.add(new Field("content", content, Store.YES, Index.ANALYZED, TermVector.NO));
+ d.add(new Field("content", TextField.TYPE_STORED, content));
iw.addDocument(d);
}
Modified: lucene/dev/branches/fieldtype_conflicted/modules/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/modules/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/modules/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/modules/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java Wed Aug 17 22:49:16 2011
@@ -7,9 +7,7 @@ import java.util.Collection;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.document.Field.TermVector;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -130,8 +128,7 @@ public class FacetTestUtils {
cps.add(cp);
Document d = new Document();
new CategoryDocumentBuilder(tw, iParams).setCategoryPaths(cps).build(d);
- d.add(new Field("content", "alpha", Store.YES, Index.ANALYZED,
- TermVector.NO));
+ d.add(new Field("content", TextField.TYPE_STORED, "alpha"));
iw.addDocument(d);
}
Modified: lucene/dev/branches/fieldtype_conflicted/modules/facet/src/test/org/apache/lucene/facet/search/CategoryListIteratorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/modules/facet/src/test/org/apache/lucene/facet/search/CategoryListIteratorTest.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/modules/facet/src/test/org/apache/lucene/facet/search/CategoryListIteratorTest.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/modules/facet/src/test/org/apache/lucene/facet/search/CategoryListIteratorTest.java Wed Aug 17 22:49:16 2011
@@ -13,6 +13,7 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Payload;
import org.apache.lucene.index.RandomIndexWriter;
@@ -104,7 +105,7 @@ public class CategoryListIteratorTest ex
for (int i = 0; i < data.length; i++) {
dts.setIdx(i);
Document doc = new Document();
- doc.add(new Field("f", dts));
+ doc.add(new TextField("f", dts));
writer.addDocument(doc);
}
IndexReader reader = writer.getReader();
@@ -155,10 +156,10 @@ public class CategoryListIteratorTest ex
dts.setIdx(i);
Document doc = new Document();
if (i==0 || i == 2) {
- doc.add(new Field("f", dts)); // only docs 0 & 2 have payloads!
+ doc.add(new TextField("f", dts)); // only docs 0 & 2 have payloads!
}
dts2.setIdx(i);
- doc.add(new Field("f", dts2));
+ doc.add(new TextField("f", dts2));
writer.addDocument(doc);
writer.commit();
}
@@ -168,7 +169,7 @@ public class CategoryListIteratorTest ex
for (int i = 0; i < 10; ++i) {
Document d = new Document();
dts.setIdx(2);
- d.add(new Field("f", dts2));
+ d.add(new TextField("f", dts2));
writer.addDocument(d);
if (i %10 == 0) {
writer.commit();
Modified: lucene/dev/branches/fieldtype_conflicted/modules/facet/src/test/org/apache/lucene/facet/search/DrillDownTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/modules/facet/src/test/org/apache/lucene/facet/search/DrillDownTest.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/modules/facet/src/test/org/apache/lucene/facet/search/DrillDownTest.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/modules/facet/src/test/org/apache/lucene/facet/search/DrillDownTest.java Wed Aug 17 22:49:16 2011
@@ -7,8 +7,7 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriterConfig;
@@ -84,10 +83,10 @@ public class DrillDownTest extends Lucen
ArrayList<CategoryPath> paths = new ArrayList<CategoryPath>();
Document doc = new Document();
if (i % 2 == 0) { // 50
- doc.add(new Field("content", "foo", Store.NO, Index.ANALYZED));
+ doc.add(new TextField("content", "foo"));
}
if (i % 3 == 0) { // 33
- doc.add(new Field("content", "bar", Store.NO, Index.ANALYZED));
+ doc.add(new TextField("content", "bar"));
}
if (i % 4 == 0) { // 25
paths.add(new CategoryPath("a"));
Modified: lucene/dev/branches/fieldtype_conflicted/modules/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/modules/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/modules/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/modules/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java Wed Aug 17 22:49:16 2011
@@ -7,9 +7,7 @@ import java.util.List;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.document.Field.TermVector;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
@@ -335,7 +333,7 @@ public class TestTopKInEachNodeResultHan
cps.add(cp);
Document d = new Document();
new CategoryDocumentBuilder(tw, iParams).setCategoryPaths(cps).build(d);
- d.add(new Field("content", "alpha", Store.YES, Index.ANALYZED, TermVector.NO));
+ d.add(new Field("content", TextField.TYPE_STORED, "alpha"));
iw.addDocument(d);
}
Modified: lucene/dev/branches/fieldtype_conflicted/modules/facet/src/test/org/apache/lucene/facet/util/TestScoredDocIDsUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/modules/facet/src/test/org/apache/lucene/facet/util/TestScoredDocIDsUtils.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/modules/facet/src/test/org/apache/lucene/facet/util/TestScoredDocIDsUtils.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/modules/facet/src/test/org/apache/lucene/facet/util/TestScoredDocIDsUtils.java Wed Aug 17 22:49:16 2011
@@ -7,8 +7,8 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.RandomIndexWriter;
@@ -134,7 +134,7 @@ public class TestScoredDocIDsUtils exten
int docNum = it.getDocID();
assertNull(
"Deleted docs must not appear in the allDocsScoredDocIds set: " + docNum,
- reader.document(docNum).getFieldable("del"));
+ reader.document(docNum).getField("del"));
}
assertEquals("Wrong number of (live) documents", allDocs.size(), numIteratedDocs);
@@ -166,7 +166,7 @@ public class TestScoredDocIDsUtils exten
live != null && !live.get(docNum));
assertNull(
"Complement-Set must not contain docs from the original set (doc="+ docNum+")",
- reader.document(docNum).getFieldable("del"));
+ reader.document(docNum).getField("del"));
assertFalse(
"Complement-Set must not contain docs from the original set (doc="+docNum+")",
resultSet.fastGet(docNum));
@@ -189,8 +189,8 @@ public class TestScoredDocIDsUtils exten
protected final static String delTxt = "delete";
protected final static String alphaTxt = "alpha";
- private final static Field deletionMark = new Field(field, delTxt, Store.NO, Index.NOT_ANALYZED_NO_NORMS);
- private final static Field alphaContent = new Field(field, alphaTxt, Store.NO, Index.NOT_ANALYZED_NO_NORMS);
+ private final static Field deletionMark = new StringField(field, delTxt);
+ private final static Field alphaContent = new StringField(field, alphaTxt);
protected final int numDocs;
@@ -208,7 +208,9 @@ public class TestScoredDocIDsUtils exten
doc.add(deletionMark);
// Add a special field for docs that are marked for deletion. Later we
// assert that those docs are not returned by all-scored-doc-IDs.
- doc.add(new Field("del", Integer.toString(docNum), Store.YES, Index.NO));
+ FieldType ft = new FieldType();
+ ft.setStored(true);
+ doc.add(new Field("del", ft, Integer.toString(docNum)));
}
if (haveAlpha(docNum)) {
Modified: lucene/dev/branches/fieldtype_conflicted/modules/grouping/src/test/org/apache/lucene/search/grouping/TermAllGroupHeadsCollectorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/modules/grouping/src/test/org/apache/lucene/search/grouping/TermAllGroupHeadsCollectorTest.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/modules/grouping/src/test/org/apache/lucene/search/grouping/TermAllGroupHeadsCollectorTest.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/modules/grouping/src/test/org/apache/lucene/search/grouping/TermAllGroupHeadsCollectorTest.java Wed Aug 17 22:49:16 2011
@@ -21,6 +21,8 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.NumericField;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -47,57 +49,57 @@ public class TermAllGroupHeadsCollectorT
// 0
Document doc = new Document();
- doc.add(new Field(groupField, "author1", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("content", "random text", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("id", "1", Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS));
+ doc.add(newField(groupField, "author1", TextField.TYPE_STORED));
+ doc.add(newField("content", "random text", TextField.TYPE_STORED));
+ doc.add(newField("id", "1", StringField.TYPE_STORED));
w.addDocument(doc);
// 1
doc = new Document();
- doc.add(new Field(groupField, "author1", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("content", "some more random text blob", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("id", "2", Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS));
+ doc.add(newField(groupField, "author1", TextField.TYPE_STORED));
+ doc.add(newField("content", "some more random text blob", TextField.TYPE_STORED));
+ doc.add(newField("id", "2", StringField.TYPE_STORED));
w.addDocument(doc);
// 2
doc = new Document();
- doc.add(new Field(groupField, "author1", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("content", "some more random textual data", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("id", "3", Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS));
+ doc.add(newField(groupField, "author1", TextField.TYPE_STORED));
+ doc.add(newField("content", "some more random textual data", TextField.TYPE_STORED));
+ doc.add(newField("id", "3", StringField.TYPE_STORED));
w.addDocument(doc);
w.commit(); // To ensure a second segment
// 3
doc = new Document();
- doc.add(new Field(groupField, "author2", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("content", "some random text", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("id", "4", Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS));
+ doc.add(newField(groupField, "author2", TextField.TYPE_STORED));
+ doc.add(newField("content", "some random text", TextField.TYPE_STORED));
+ doc.add(newField("id", "4", StringField.TYPE_STORED));
w.addDocument(doc);
// 4
doc = new Document();
- doc.add(new Field(groupField, "author3", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("content", "some more random text", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("id", "5", Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS));
+ doc.add(newField(groupField, "author3", TextField.TYPE_STORED));
+ doc.add(newField("content", "some more random text", TextField.TYPE_STORED));
+ doc.add(newField("id", "5", StringField.TYPE_STORED));
w.addDocument(doc);
// 5
doc = new Document();
- doc.add(new Field(groupField, "author3", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("content", "random blob", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("id", "6", Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS));
+ doc.add(newField(groupField, "author3", TextField.TYPE_STORED));
+ doc.add(newField("content", "random blob", TextField.TYPE_STORED));
+ doc.add(newField("id", "6", StringField.TYPE_STORED));
w.addDocument(doc);
// 6 -- no author field
doc = new Document();
- doc.add(new Field("content", "random word stuck in alot of other text", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("id", "6", Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS));
+ doc.add(newField("content", "random word stuck in alot of other text", TextField.TYPE_STORED));
+ doc.add(newField("id", "6", StringField.TYPE_STORED));
w.addDocument(doc);
// 7 -- no author field
doc = new Document();
- doc.add(new Field("content", "random word stuck in alot of other text", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("id", "7", Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS));
+ doc.add(newField("content", "random word stuck in alot of other text", TextField.TYPE_STORED));
+ doc.add(newField("id", "7", StringField.TYPE_STORED));
w.addDocument(doc);
IndexSearcher indexSearcher = new IndexSearcher(w.getReader());
@@ -182,18 +184,18 @@ public class TermAllGroupHeadsCollectorT
Document doc = new Document();
Document docNoGroup = new Document();
- Field group = newField("group", "", Field.Index.NOT_ANALYZED);
+ Field group = newField("group", "", StringField.TYPE_UNSTORED);
doc.add(group);
- Field sort1 = newField("sort1", "", Field.Index.NOT_ANALYZED);
+ Field sort1 = newField("sort1", "", StringField.TYPE_UNSTORED);
doc.add(sort1);
docNoGroup.add(sort1);
- Field sort2 = newField("sort2", "", Field.Index.NOT_ANALYZED);
+ Field sort2 = newField("sort2", "", StringField.TYPE_UNSTORED);
doc.add(sort2);
docNoGroup.add(sort2);
- Field sort3 = newField("sort3", "", Field.Index.NOT_ANALYZED);
+ Field sort3 = newField("sort3", "", StringField.TYPE_UNSTORED);
doc.add(sort3);
docNoGroup.add(sort3);
- Field content = newField("content", "", Field.Index.ANALYZED);
+ Field content = newField("content", "", TextField.TYPE_UNSTORED);
doc.add(content);
docNoGroup.add(content);
NumericField id = new NumericField("id");
Modified: lucene/dev/branches/fieldtype_conflicted/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java Wed Aug 17 22:49:16 2011
@@ -25,12 +25,9 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.NumericField;
-<<<<<<<
import org.apache.lucene.index.FieldInfo.IndexOptions;
-=======
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
->>>>>>>
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -404,13 +401,10 @@ public class TestGrouping extends Lucene
//System.out.println("TEST: doc content=" + groupValue.content + " group=" + (groupValue.group == null ? "null" : groupValue.group.utf8ToString()) + " sort1=" + groupValue.sort1.utf8ToString() + " id=" + groupValue.id);
}
// So we can pull filter marking last doc in block:
-<<<<<<<
- final Field groupEnd = newField("groupend", "x", Field.Index.NOT_ANALYZED);
- groupEnd.setIndexOptions(IndexOptions.DOCS_ONLY);
- groupEnd.setOmitNorms(true);
-=======
- final Field groupEnd = newField("groupend", "x", StringField.TYPE_UNSTORED);
->>>>>>>
+ FieldType ft = new FieldType(StringField.TYPE_UNSTORED);
+ ft.setIndexOptions(IndexOptions.DOCS_ONLY);
+ ft.setOmitNorms(true);
+ final Field groupEnd = newField("groupend", "x", ft);
docs.get(docs.size()-1).add(groupEnd);
// Add as a doc block:
w.addDocuments(docs);
Modified: lucene/dev/branches/fieldtype_conflicted/modules/join/src/test/org/apache/lucene/search/TestBlockJoin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/modules/join/src/test/org/apache/lucene/search/TestBlockJoin.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/modules/join/src/test/org/apache/lucene/search/TestBlockJoin.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/modules/join/src/test/org/apache/lucene/search/TestBlockJoin.java Wed Aug 17 22:49:16 2011
@@ -24,6 +24,7 @@ import java.util.List;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.NumericField;
+import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -42,16 +43,16 @@ public class TestBlockJoin extends Lucen
// One resume...
private Document makeResume(String name, String country) {
Document resume = new Document();
- resume.add(newField("docType", "resume", Field.Index.NOT_ANALYZED));
- resume.add(newField("name", name, Field.Store.YES, Field.Index.NOT_ANALYZED));
- resume.add(newField("country", country, Field.Index.NOT_ANALYZED));
+ resume.add(newField("docType", "resume", StringField.TYPE_UNSTORED));
+ resume.add(newField("name", name, StringField.TYPE_STORED));
+ resume.add(newField("country", country, StringField.TYPE_UNSTORED));
return resume;
}
// ... has multiple jobs
private Document makeJob(String skill, int year) {
Document job = new Document();
- job.add(newField("skill", skill, Field.Store.YES, Field.Index.NOT_ANALYZED));
+ job.add(newField("skill", skill, StringField.TYPE_STORED));
job.add(new NumericField("year").setIntValue(year));
return job;
}
@@ -188,15 +189,15 @@ public class TestBlockJoin extends Lucen
for(int parentDocID=0;parentDocID<numParentDocs;parentDocID++) {
Document parentDoc = new Document();
Document parentJoinDoc = new Document();
- Field id = newField("parentID", ""+parentDocID, Field.Store.YES, Field.Index.NOT_ANALYZED);
+ Field id = newField("parentID", ""+parentDocID, StringField.TYPE_STORED);
parentDoc.add(id);
parentJoinDoc.add(id);
- parentJoinDoc.add(newField("isParent", "x", Field.Index.NOT_ANALYZED));
+ parentJoinDoc.add(newField("isParent", "x", StringField.TYPE_UNSTORED));
for(int field=0;field<parentFields.length;field++) {
if (random.nextDouble() < 0.9) {
Field f = newField("parent" + field,
parentFields[field][random.nextInt(parentFields[field].length)],
- Field.Index.NOT_ANALYZED);
+ StringField.TYPE_UNSTORED);
parentDoc.add(f);
parentJoinDoc.add(f);
}
@@ -215,7 +216,7 @@ public class TestBlockJoin extends Lucen
Document joinChildDoc = new Document();
joinDocs.add(joinChildDoc);
- Field childID = newField("childID", ""+childDocID, Field.Store.YES, Field.Index.NOT_ANALYZED);
+ Field childID = newField("childID", ""+childDocID, StringField.TYPE_STORED);
childDoc.add(childID);
joinChildDoc.add(childID);
@@ -223,7 +224,7 @@ public class TestBlockJoin extends Lucen
if (random.nextDouble() < 0.9) {
Field f = newField("child" + childFieldID,
childFields[childFieldID][random.nextInt(childFields[childFieldID].length)],
- Field.Index.NOT_ANALYZED);
+ StringField.TYPE_UNSTORED);
childDoc.add(f);
joinChildDoc.add(f);
}
Modified: lucene/dev/branches/fieldtype_conflicted/modules/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/modules/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/modules/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/modules/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java Wed Aug 17 22:49:16 2011
@@ -19,6 +19,7 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.Term;
@@ -706,10 +707,10 @@ public final class MoreLikeThis {
// field does not store term vector info
if (vector == null) {
Document d = ir.document(docNum);
- String text[] = d.getValues(fieldName);
- if (text != null) {
- for (int j = 0; j < text.length; j++) {
- addTermFrequencies(new StringReader(text[j]), termFreqMap, fieldName);
+ IndexableField fields[] = d.getFields(fieldName);
+ if (fields != null) {
+ for (int j = 0; j < fields.length; j++) {
+ addTermFrequencies(new StringReader(fields[j].stringValue()), termFreqMap, fieldName);
}
}
} else {
Modified: lucene/dev/branches/fieldtype_conflicted/modules/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/modules/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/modules/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/modules/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java Wed Aug 17 22:49:16 2011
@@ -4,13 +4,10 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-<<<<<<<
import org.apache.lucene.document.Fieldable;
-=======
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.RandomIndexWriter;
->>>>>>>
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.queries.function.valuesource.ByteFieldSource;
Modified: lucene/dev/branches/fieldtype_conflicted/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java Wed Aug 17 22:49:16 2011
@@ -194,8 +194,7 @@ public class TestNumericQueryParser exte
numericConfigMap.put(type.name(), new NumericConfig(PRECISION_STEP,
NUMBER_FORMAT, type));
- NumericField field = new NumericField(type.name(), PRECISION_STEP,
- Field.Store.YES, true);
+ NumericField field = new NumericField(type.name(), PRECISION_STEP, NumericField.TYPE_STORED);
numericFieldMap.put(type.name(), field);
doc.add(field);
@@ -204,8 +203,7 @@ public class TestNumericQueryParser exte
numericConfigMap.put(DATE_FIELD_NAME, new NumericConfig(PRECISION_STEP,
DATE_FORMAT, NumericField.DataType.LONG));
- NumericField dateField = new NumericField(DATE_FIELD_NAME, PRECISION_STEP,
- Field.Store.YES, true);
+ NumericField dateField = new NumericField(DATE_FIELD_NAME, PRECISION_STEP, NumericField.TYPE_STORED);
numericFieldMap.put(DATE_FIELD_NAME, dateField);
doc.add(dateField);
Modified: lucene/dev/branches/fieldtype_conflicted/modules/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/modules/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/modules/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/modules/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java Wed Aug 17 22:49:16 2011
@@ -28,11 +28,9 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-<<<<<<<
+import org.apache.lucene.document.FieldType;
import org.apache.lucene.index.FieldInfo.IndexOptions;
-=======
import org.apache.lucene.document.StringField;
->>>>>>>
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -611,13 +609,7 @@ public class SpellChecker implements jav
Document doc = new Document();
// the word field is never queried on... its indexed so it can be quickly
// checked for rebuild (and stored for retrieval). Doesn't need norms or TF/pos
-<<<<<<<
- Field f = new Field(F_WORD, text, Field.Store.YES, Field.Index.NOT_ANALYZED);
- f.setIndexOptions(IndexOptions.DOCS_ONLY);
- f.setOmitNorms(true);
-=======
Field f = new Field(F_WORD, StringField.TYPE_STORED, text);
->>>>>>>
doc.add(f); // orig term
addGram(text, doc, ng1, ng2);
return doc;
@@ -630,37 +622,22 @@ public class SpellChecker implements jav
String end = null;
for (int i = 0; i < len - ng + 1; i++) {
String gram = text.substring(i, i + ng);
-<<<<<<<
- Field ngramField = new Field(key, gram, Field.Store.NO, Field.Index.NOT_ANALYZED);
+ FieldType ft = new FieldType(StringField.TYPE_UNSTORED);
+ ft.setIndexOptions(IndexOptions.DOCS_AND_FREQS);
+ Field ngramField = new Field(key, ft, gram);
// spellchecker does not use positional queries, but we want freqs
// for scoring these multivalued n-gram fields.
- ngramField.setIndexOptions(IndexOptions.DOCS_AND_FREQS);
doc.add(ngramField);
-=======
- doc.add(new StringField(key, gram));
->>>>>>>
if (i == 0) {
// only one term possible in the startXXField, TF/pos and norms aren't needed.
-<<<<<<<
- Field startField = new Field("start" + ng, gram, Field.Store.NO, Field.Index.NOT_ANALYZED);
- startField.setIndexOptions(IndexOptions.DOCS_ONLY);
- startField.setOmitNorms(true);
-=======
Field startField = new StringField("start" + ng, gram);
->>>>>>>
doc.add(startField);
}
end = gram;
}
if (end != null) { // may not be present if len==ng1
// only one term possible in the endXXField, TF/pos and norms aren't needed.
-<<<<<<<
- Field endField = new Field("end" + ng, end, Field.Store.NO, Field.Index.NOT_ANALYZED);
- endField.setIndexOptions(IndexOptions.DOCS_ONLY);
- endField.setOmitNorms(true);
-=======
Field endField = new StringField("end" + ng, end);
->>>>>>>
doc.add(endField);
}
}
Modified: lucene/dev/branches/fieldtype_conflicted/modules/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/modules/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/modules/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/modules/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java Wed Aug 17 22:49:16 2011
@@ -151,7 +151,7 @@ public class TestDirectSpellChecker exte
for (int i = 0; i < 20; i++) {
Document doc = new Document();
- doc.add(newField("numbers", English.intToEnglish(i), Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("numbers", English.intToEnglish(i), TextField.TYPE_UNSTORED));
writer.addDocument(doc);
}
Modified: lucene/dev/branches/fieldtype_conflicted/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java Wed Aug 17 22:49:16 2011
@@ -349,11 +349,7 @@ public class DataImportHandler extends R
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
public static final String ENABLE_DEBUG = "enableDebug";
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/core/RequestHandlers.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/core/RequestHandlers.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/core/RequestHandlers.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/core/RequestHandlers.java Wed Aug 17 22:49:16 2011
@@ -299,11 +299,7 @@ final class RequestHandlers {
}
public String getSource() {
-<<<<<<<
String rev = "$URL$";
-=======
- String rev = "$URL$";
->>>>>>>
if( _handler != null ) {
rev += "\n" + _handler.getSource();
}
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/core/SolrCore.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/core/SolrCore.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/core/SolrCore.java Wed Aug 17 22:49:16 2011
@@ -1711,11 +1711,7 @@ public final class SolrCore implements S
}
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
public URL[] getDocs() {
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java Wed Aug 17 22:49:16 2011
@@ -125,11 +125,7 @@ public class BinaryUpdateRequestHandler
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
@Override
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/CSVRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/CSVRequestHandler.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/CSVRequestHandler.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/CSVRequestHandler.java Wed Aug 17 22:49:16 2011
@@ -70,11 +70,7 @@ public class CSVRequestHandler extends C
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
}
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java Wed Aug 17 22:49:16 2011
@@ -132,11 +132,7 @@ public class DocumentAnalysisRequestHand
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java Wed Aug 17 22:49:16 2011
@@ -79,10 +79,6 @@ public class DumpRequestHandler extends
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
}
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java Wed Aug 17 22:49:16 2011
@@ -118,11 +118,7 @@ public class FieldAnalysisRequestHandler
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
// ================================================= Helper methods ================================================
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/JsonUpdateRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/JsonUpdateRequestHandler.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/JsonUpdateRequestHandler.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/JsonUpdateRequestHandler.java Wed Aug 17 22:49:16 2011
@@ -59,11 +59,7 @@ public class JsonUpdateRequestHandler ex
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
}
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java Wed Aug 17 22:49:16 2011
@@ -424,11 +424,7 @@ public class MoreLikeThisHandler extends
@Override
public String getVersion() {
-<<<<<<<
return "$Revision$";
-=======
- return "$Revision$";
->>>>>>>
}
@Override
@@ -438,20 +434,12 @@ public class MoreLikeThisHandler extends
@Override
public String getSourceId() {
-<<<<<<<
- return "$Id$";
-=======
return "$Id$";
->>>>>>>
}
@Override
public String getSource() {
-<<<<<<<
- return "$URL$";
-=======
return "$URL$";
->>>>>>>
}
@Override
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java Wed Aug 17 22:49:16 2011
@@ -100,10 +100,6 @@ public class PingRequestHandler extends
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
}
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java Wed Aug 17 22:49:16 2011
@@ -466,11 +466,7 @@ public class ReplicationHandler extends
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
@Override
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java Wed Aug 17 22:49:16 2011
@@ -62,11 +62,7 @@ public class StandardRequestHandler exte
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
@Override
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java Wed Aug 17 22:49:16 2011
@@ -97,11 +97,7 @@ public class XmlUpdateRequestHandler ext
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
}
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java Wed Aug 17 22:49:16 2011
@@ -121,11 +121,7 @@ public class AdminHandlers implements So
}
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
public Category getCategory() {
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java Wed Aug 17 22:49:16 2011
@@ -587,10 +587,6 @@ public class CoreAdminHandler extends Re
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
}
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java Wed Aug 17 22:49:16 2011
@@ -34,12 +34,8 @@ import org.slf4j.LoggerFactory;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
-<<<<<<<
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.FieldInfo.IndexOptions;
-=======
import org.apache.lucene.document.Field;
->>>>>>>
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.Term;
@@ -514,29 +510,17 @@ public class LukeRequestHandler extends
@Override
public String getVersion() {
-<<<<<<<
return "$Revision$";
-=======
- return "$Revision$";
->>>>>>>
}
@Override
public String getSourceId() {
-<<<<<<<
- return "$Id$";
-=======
return "$Id$";
->>>>>>>
}
@Override
public String getSource() {
-<<<<<<<
- return "$URL$";
-=======
return "$URL$";
->>>>>>>
}
@Override
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java Wed Aug 17 22:49:16 2011
@@ -111,10 +111,6 @@ public class PluginInfoHandler extends R
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
}
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java Wed Aug 17 22:49:16 2011
@@ -66,10 +66,6 @@ public class PropertiesRequestHandler ex
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
}
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java Wed Aug 17 22:49:16 2011
@@ -233,10 +233,6 @@ public class ShowFileRequestHandler exte
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
}
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java Wed Aug 17 22:49:16 2011
@@ -107,11 +107,7 @@ public class SolrInfoMBeanHandler extend
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
@Override
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java Wed Aug 17 22:49:16 2011
@@ -292,11 +292,7 @@ public class SystemInfoHandler extends R
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
private static final long ONE_KB = 1024;
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java Wed Aug 17 22:49:16 2011
@@ -144,10 +144,6 @@ public class ThreadDumpHandler extends R
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
}
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java Wed Aug 17 22:49:16 2011
@@ -260,11 +260,7 @@ public class DebugComponent extends Sear
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
@Override
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java Wed Aug 17 22:49:16 2011
@@ -603,11 +603,7 @@ public class FacetComponent extends Sear
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
@Override
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java Wed Aug 17 22:49:16 2011
@@ -199,11 +199,7 @@ public class HighlightComponent extends
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
@Override
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java Wed Aug 17 22:49:16 2011
@@ -118,29 +118,17 @@ public class MoreLikeThisComponent exten
@Override
public String getVersion() {
-<<<<<<<
return "$Revision$";
-=======
- return "$Revision$";
->>>>>>>
}
@Override
public String getSourceId() {
-<<<<<<<
- return "$Id$";
-=======
return "$Id$";
->>>>>>>
}
@Override
public String getSource() {
-<<<<<<<
- return "$URL$";
-=======
return "$URL$";
->>>>>>>
}
@Override
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/PivotFacetHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/PivotFacetHelper.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/PivotFacetHelper.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/PivotFacetHelper.java Wed Aug 17 22:49:16 2011
@@ -249,11 +249,7 @@ public class PivotFacetHelper
// }
//
// public String getSource() {
-<<<<<<<
// return "$URL$";
-=======
-// return "$URL$";
->>>>>>>
// }
//
// public String getVersion() {
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java Wed Aug 17 22:49:16 2011
@@ -818,29 +818,17 @@ public class QueryComponent extends Sear
@Override
public String getVersion() {
-<<<<<<<
return "$Revision$";
-=======
- return "$Revision$";
->>>>>>>
}
@Override
public String getSourceId() {
-<<<<<<<
- return "$Id$";
-=======
return "$Id$";
->>>>>>>
}
@Override
public String getSource() {
-<<<<<<<
- return "$URL$";
-=======
return "$URL$";
->>>>>>>
}
@Override
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java Wed Aug 17 22:49:16 2011
@@ -451,11 +451,7 @@ public class QueryElevationComponent ext
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
@Override
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java Wed Aug 17 22:49:16 2011
@@ -330,11 +330,7 @@ public class SearchHandler extends Reque
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
}
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java Wed Aug 17 22:49:16 2011
@@ -736,11 +736,7 @@ public class SpellCheckComponent extends
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
}
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java Wed Aug 17 22:49:16 2011
@@ -163,11 +163,7 @@ public class StatsComponent extends Sear
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
}
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java Wed Aug 17 22:49:16 2011
@@ -11,11 +11,8 @@ import java.util.Map;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
-<<<<<<<
-=======
import org.apache.lucene.index.StoredFieldVisitor;
import org.apache.lucene.index.Term;
->>>>>>>
import org.apache.lucene.index.TermVectorMapper;
import org.apache.lucene.index.TermVectorOffsetInfo;
import org.apache.lucene.index.Terms;
@@ -423,29 +420,17 @@ public class TermVectorComponent extends
@Override
public String getVersion() {
-<<<<<<<
return "$Revision$";
-=======
- return "$Revision$";
->>>>>>>
}
@Override
public String getSourceId() {
-<<<<<<<
- return "$Id$";
-=======
return "$Id$";
->>>>>>>
}
@Override
public String getSource() {
-<<<<<<<
- return "$URL$";
-=======
return "$URL$";
->>>>>>>
}
@Override
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java Wed Aug 17 22:49:16 2011
@@ -483,11 +483,7 @@ public class TermsComponent extends Sear
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
@Override
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/DefaultEncoder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/DefaultEncoder.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/DefaultEncoder.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/DefaultEncoder.java Wed Aug 17 22:49:16 2011
@@ -42,11 +42,7 @@ public class DefaultEncoder extends High
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
@Override
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/GapFragmenter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/GapFragmenter.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/GapFragmenter.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/GapFragmenter.java Wed Aug 17 22:49:16 2011
@@ -61,11 +61,7 @@ public class GapFragmenter extends Highl
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
}
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/HtmlEncoder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/HtmlEncoder.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/HtmlEncoder.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/HtmlEncoder.java Wed Aug 17 22:49:16 2011
@@ -42,11 +42,7 @@ public class HtmlEncoder extends Highlig
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
@Override
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/HtmlFormatter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/HtmlFormatter.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/HtmlFormatter.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/HtmlFormatter.java Wed Aug 17 22:49:16 2011
@@ -60,10 +60,6 @@ public class HtmlFormatter extends Highl
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
}
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/RegexFragmenter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/RegexFragmenter.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/RegexFragmenter.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/RegexFragmenter.java Wed Aug 17 22:49:16 2011
@@ -107,11 +107,7 @@ public class RegexFragmenter extends Hig
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
}
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/ScoreOrderFragmentsBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/ScoreOrderFragmentsBuilder.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/ScoreOrderFragmentsBuilder.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/ScoreOrderFragmentsBuilder.java Wed Aug 17 22:49:16 2011
@@ -42,11 +42,7 @@ public class ScoreOrderFragmentsBuilder
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
@Override
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/SimpleFragListBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/SimpleFragListBuilder.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/SimpleFragListBuilder.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/SimpleFragListBuilder.java Wed Aug 17 22:49:16 2011
@@ -44,11 +44,7 @@ public class SimpleFragListBuilder exten
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
@Override
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/SimpleFragmentsBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/SimpleFragmentsBuilder.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/SimpleFragmentsBuilder.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/SimpleFragmentsBuilder.java Wed Aug 17 22:49:16 2011
@@ -42,11 +42,7 @@ public class SimpleFragmentsBuilder exte
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
@Override
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/SingleFragListBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/SingleFragListBuilder.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/SingleFragListBuilder.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/highlight/SingleFragListBuilder.java Wed Aug 17 22:49:16 2011
@@ -44,11 +44,7 @@ public class SingleFragListBuilder exten
@Override
public String getSource() {
-<<<<<<<
return "$URL$";
-=======
- return "$URL$";
->>>>>>>
}
@Override
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java Wed Aug 17 22:49:16 2011
@@ -26,12 +26,8 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-<<<<<<<
-import org.apache.lucene.document.Fieldable;
-=======
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.util.StringHelper;
->>>>>>>
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.util.NamedList;
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java Wed Aug 17 22:49:16 2011
@@ -202,14 +202,7 @@ public abstract class TextResponseWriter
public final SolrDocument toSolrDocument( Document doc )
{
SolrDocument out = new SolrDocument();
-<<<<<<<
- for( Fieldable f : doc.getFields() ) {
-=======
for( IndexableField f : doc) {
- if( "gack_i".equals( f.name() ) ) {
- System.out.println( f );
- }
->>>>>>>
// Make sure multivalued fields are represented as lists
Object existing = out.get(f.name());
if (existing == null) {
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/schema/BCDIntField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/schema/BCDIntField.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/schema/BCDIntField.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/schema/BCDIntField.java Wed Aug 17 22:49:16 2011
@@ -20,12 +20,7 @@ package org.apache.solr.schema;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.search.SortField;
import org.apache.solr.search.QParser;
-<<<<<<<
-import org.apache.lucene.document.Fieldable;
-=======
-import org.apache.solr.search.function.ValueSource;
import org.apache.lucene.index.IndexableField;
->>>>>>>
import org.apache.solr.util.BCDUtils;
import org.apache.solr.response.TextResponseWriter;
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/schema/BoolField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/schema/BoolField.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/schema/BoolField.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/schema/BoolField.java Wed Aug 17 22:49:16 2011
@@ -18,13 +18,10 @@
package org.apache.solr.schema;
import org.apache.lucene.index.IndexReader;
-<<<<<<<
-=======
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.SortField;
import org.apache.lucene.util.BytesRef;
->>>>>>>
import org.apache.lucene.queries.function.DocValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.BoolDocValues;
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/schema/ByteField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/schema/ByteField.java?rev=1158958&r1=1158957&r2=1158958&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/schema/ByteField.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/schema/ByteField.java Wed Aug 17 22:49:16 2011
@@ -16,13 +16,9 @@ package org.apache.solr.schema;
* limitations under the License.
*/
-<<<<<<<
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.valuesource.ByteFieldSource;
-=======
import org.apache.lucene.index.IndexableField;
->>>>>>>
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.cache.ByteValuesCreator;
import org.apache.lucene.search.cache.CachedArrayCreator;