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/25 14:23:35 UTC
svn commit: r1161533 [3/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/highlight/
lucene/contrib/highlighter/src/test/org/apache/lucen...
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java Thu Aug 25 12:23:31 2011
@@ -116,8 +116,7 @@ public class TestSnapshotDeletionPolicy
@Override
public void run() {
Document doc = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
- customType.setStored(true);
+ FieldType customType = new FieldType(TextField.TYPE_STORED);
customType.setStoreTermVectors(true);
customType.setStoreTermVectorPositions(true);
customType.setStoreTermVectorOffsets(true);
@@ -162,8 +161,7 @@ public class TestSnapshotDeletionPolicy
// final segment, so deletion policy has a chance to
// delete again:
Document doc = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
- customType.setStored(true);
+ FieldType customType = new FieldType(TextField.TYPE_STORED);
customType.setStoreTermVectors(true);
customType.setStoreTermVectorPositions(true);
customType.setStoreTermVectorOffsets(true);
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/TestStressAdvance.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/TestStressAdvance.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/TestStressAdvance.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/TestStressAdvance.java Thu Aug 25 12:23:31 2011
@@ -36,11 +36,9 @@ public class TestStressAdvance extends L
RandomIndexWriter w = new RandomIndexWriter(random, dir);
final Set<Integer> aDocs = new HashSet<Integer>();
final Document doc = new Document();
- FieldType customType = new FieldType(StringField.TYPE_UNSTORED);
- customType.setStored(true);
final Field f = newField("field", "", StringField.TYPE_UNSTORED);
doc.add(f);
- final Field idField = newField("id", "", customType);
+ final Field idField = newField("id", "", StringField.TYPE_STORED);
doc.add(idField);
int num = atLeast(4097);
for(int id=0;id<num;id++) {
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java Thu Aug 25 12:23:31 2011
@@ -75,12 +75,10 @@ public class TestStressIndexing extends
@Override
public void doWork() throws Exception {
// Add 10 docs:
- FieldType customType = new FieldType(StringField.TYPE_UNSTORED);
- customType.setStored(true);
for(int j=0; j<10; j++) {
Document d = new Document();
int n = random.nextInt();
- d.add(newField("id", Integer.toString(nextID++), customType));
+ d.add(newField("id", Integer.toString(nextID++), StringField.TYPE_STORED));
d.add(newField("contents", English.intToEnglish(n), TextField.TYPE_UNSTORED));
writer.addDocument(d);
}
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java Thu Aug 25 12:23:31 2011
@@ -136,11 +136,6 @@ public class TestStressIndexing2 extends
return o1.name().compareTo(o2.name());
}
};
- static Comparator<IndexableField> fieldNameComparator2 = new Comparator<IndexableField>() {
- public int compare(IndexableField o1, IndexableField o2) {
- return o1.name().compareTo(o2.name());
- }
- };
// This test avoids using any extra synchronization in the multiple
// indexing threads to test that IndexWriter does correctly synchronize
@@ -258,7 +253,7 @@ public class TestStressIndexing2 extends
ArrayList<IndexableField> fields = new ArrayList<IndexableField>();
fields.addAll(d.getFields());
// put fields in same order each time
- Collections.sort(fields, fieldNameComparator2);
+ Collections.sort(fields, fieldNameComparator);
Document d1 = new Document();
for (int i=0; i<fields.size(); i++) {
@@ -729,7 +724,7 @@ public class TestStressIndexing2 extends
}
if (sameFieldOrder) {
- Collections.sort(fields, fieldNameComparator2);
+ Collections.sort(fields, fieldNameComparator);
} else {
// random placement of id field also
Collections.swap(fields,nextInt(fields.size()), 0);
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java Thu Aug 25 12:23:31 2011
@@ -63,8 +63,7 @@ public class TestThreadedOptimize extend
((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(1000);
- final FieldType customType = new FieldType(StringField.TYPE_UNSTORED);
- customType.setStored(true);
+ final FieldType customType = new FieldType(StringField.TYPE_STORED);
customType.setOmitNorms(true);
for(int i=0;i<200;i++) {
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java Thu Aug 25 12:23:31 2011
@@ -130,11 +130,9 @@ public class TestTransactionRollback ext
IndexDeletionPolicy sdp=new KeepAllDeletionPolicy();
IndexWriter w=new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)).setIndexDeletionPolicy(sdp));
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
- customType.setStored(true);
for(int currentRecordId=1;currentRecordId<=100;currentRecordId++) {
Document doc=new Document();
- doc.add(newField(FIELD_RECORD_ID,""+currentRecordId,customType));
+ doc.add(newField(FIELD_RECORD_ID,""+currentRecordId,TextField.TYPE_STORED));
w.addDocument(doc);
if (currentRecordId%10 == 0) {
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java Thu Aug 25 12:23:31 2011
@@ -303,9 +303,7 @@ public class TestSurrogates extends Luce
uniqueTerms.add(term);
fieldTerms.add(new Term(field, term));
Document doc = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
- customType.setTokenized(false);
- doc.add(newField(field, term, customType));
+ doc.add(newField(field, term, StringField.TYPE_UNSTORED));
w.addDocument(doc);
}
uniqueTermCount += uniqueTerms.size();
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/values/TestDocValuesIndexing.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/values/TestDocValuesIndexing.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/values/TestDocValuesIndexing.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/index/values/TestDocValuesIndexing.java Thu Aug 25 12:23:31 2011
@@ -486,16 +486,6 @@ public class TestDocValuesIndexing exten
final boolean isNumeric = NUMERICS.contains(value);
FixedBitSet deleted = new FixedBitSet(numValues);
Document doc = new Document();
- FieldType ft = new FieldType();
- ft.setIndexed(random.nextBoolean());
- if (ft.indexed()) {
- ft.setTokenized(random.nextBoolean());
- ft.setOmitNorms(random.nextBoolean());
- }
- else {
- ft.setStored(true);
- }
-
IndexDocValuesField valField = new IndexDocValuesField(value.name());
doc.add(valField);
final BytesRef bytesRef = new BytesRef();
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java Thu Aug 25 12:23:31 2011
@@ -118,10 +118,8 @@ public class BaseTestRangeFilter extends
/* build an index */
Document doc = new Document();
- FieldType customType = new FieldType(StringField.TYPE_UNSTORED);
- customType.setStored(true);
- Field idField = newField(random, "id", "", customType);
- Field randField = newField(random, "rand", "", customType);
+ Field idField = newField(random, "id", "", StringField.TYPE_STORED);
+ Field randField = newField(random, "rand", "", StringField.TYPE_STORED);
Field bodyField = newField(random, "body", "", StringField.TYPE_UNSTORED);
doc.add(idField);
doc.add(randField);
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java Thu Aug 25 12:23:31 2011
@@ -57,17 +57,12 @@ public class TestBooleanMinShouldMatch e
index = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random, index);
- FieldType customType = new FieldType(StringField.TYPE_UNSTORED);
- customType.setStored(true);
- FieldType customType2 = new FieldType(TextField.TYPE_UNSTORED);
- customType2.setStored(true);
-
for (int i = 0; i < data.length; i++) {
Document doc = new Document();
- doc.add(newField("id", String.valueOf(i), customType));//Field.Keyword("id",String.valueOf(i)));
- doc.add(newField("all", "all", customType));//Field.Keyword("all","all"));
+ doc.add(newField("id", String.valueOf(i), StringField.TYPE_STORED));//Field.Keyword("id",String.valueOf(i)));
+ doc.add(newField("all", "all", StringField.TYPE_STORED));//Field.Keyword("all","all"));
if (null != data[i]) {
- doc.add(newField("data", data[i], customType2));//Field.Text("data",data[i]));
+ doc.add(newField("data", data[i], TextField.TYPE_STORED));//Field.Text("data",data[i]));
}
w.addDocument(doc);
}
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestBooleanOr.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestBooleanOr.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestBooleanOr.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestBooleanOr.java Thu Aug 25 12:23:31 2011
@@ -140,16 +140,14 @@ public class TestBooleanOr extends Lucen
//
Document d = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
- customType.setStored(true);
d.add(newField(
FIELD_T,
"Optimize not deleting all files",
- customType));
+ TextField.TYPE_STORED));
d.add(newField(
FIELD_C,
"Deleted When I run an optimize in our production environment.",
- customType));
+ TextField.TYPE_STORED));
//
writer.addDocument(d);
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java Thu Aug 25 12:23:31 2011
@@ -42,11 +42,9 @@ public class TestBooleanScorer extends L
String[] values = new String[] { "1", "2", "3", "4" };
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
- FieldType customType = new FieldType(StringField.TYPE_UNSTORED);
- customType.setStored(true);
for (int i = 0; i < values.length; i++) {
Document doc = new Document();
- doc.add(newField(FIELD, values[i], customType));
+ doc.add(newField(FIELD, values[i], StringField.TYPE_STORED));
writer.addDocument(doc);
}
IndexReader ir = writer.getReader();
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestCachingSpanFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestCachingSpanFilter.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestCachingSpanFilter.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestCachingSpanFilter.java Thu Aug 25 12:23:31 2011
@@ -57,8 +57,7 @@ public class TestCachingSpanFilter exten
// add a doc, refresh the reader, and check that its there
Document doc = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
- customType.setStored(true);
+ FieldType customType = new FieldType(TextField.TYPE_STORED);
customType.setTokenized(false);
doc.add(newField("id", "1", customType));
writer.addDocument(doc);
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java Thu Aug 25 12:23:31 2011
@@ -177,10 +177,7 @@ public class TestCachingWrapperFilter ex
// add a doc, refresh the reader, and check that its there
Document doc = new Document();
- FieldType customType = new FieldType(StringField.TYPE_UNSTORED);
- customType.setStored(true);
- customType.setTokenized(false);
- doc.add(newField("id", "1", customType));
+ doc.add(newField("id", "1", StringField.TYPE_STORED));
writer.addDocument(doc);
reader = refreshReader(reader);
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java Thu Aug 25 12:23:31 2011
@@ -26,6 +26,7 @@ import java.util.TreeMap;
import org.apache.lucene.document.DateTools;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -52,23 +53,18 @@ public class TestCustomSearcherSort exte
index = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, index);
RandomGen random = new RandomGen(this.random);
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
- customType.setStored(true);
- customType.setTokenized(false);
- FieldType customType2 = new FieldType(TextField.TYPE_UNSTORED);
- customType2.setStored(true);
for (int i = 0; i < INDEX_SIZE; ++i) { // don't decrease; if to low the
// problem doesn't show up
Document doc = new Document();
if ((i % 5) != 0) { // some documents must not have an entry in the first
// sort field
- doc.add(newField("publicationDate_", random.getLuceneDate(), customType));
+ doc.add(newField("publicationDate_", random.getLuceneDate(), StringField.TYPE_STORED));
}
if ((i % 7) == 0) { // some documents to match the query (see below)
- doc.add(newField("content", "test", customType2));
+ doc.add(newField("content", "test", TextField.TYPE_STORED));
}
// every document has a defined 'mandant' field
- doc.add(newField("mandant", Integer.toString(i % 3), customType));
+ doc.add(newField("mandant", Integer.toString(i % 3), StringField.TYPE_STORED));
writer.addDocument(doc);
}
reader = writer.getReader();
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestDateFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestDateFilter.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestDateFilter.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestDateFilter.java Thu Aug 25 12:23:31 2011
@@ -23,6 +23,7 @@ import org.apache.lucene.document.DateTo
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -49,13 +50,10 @@ public class TestDateFilter extends Luce
Document doc = new Document();
// add time that is in the past
- FieldType customType = new FieldType(TextField.TYPE_STORED);
- customType.setTokenized(false);
- FieldType customType2 = new FieldType(TextField.TYPE_STORED);
doc.add(newField("datefield", DateTools.timeToString(now - 1000,
- DateTools.Resolution.MILLISECOND), customType));
+ DateTools.Resolution.MILLISECOND), StringField.TYPE_STORED));
doc.add(newField("body", "Today is a very sunny day in New York City",
- customType2));
+ TextField.TYPE_STORED));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
@@ -118,13 +116,10 @@ public class TestDateFilter extends Luce
Document doc = new Document();
// add time that is in the future
- FieldType customType = new FieldType(TextField.TYPE_STORED);
- customType.setTokenized(false);
- FieldType customType2 = new FieldType(TextField.TYPE_STORED);
doc.add(newField("datefield", DateTools.timeToString(now + 888888,
- DateTools.Resolution.MILLISECOND), customType));
+ DateTools.Resolution.MILLISECOND), StringField.TYPE_STORED));
doc.add(newField("body", "Today is a very sunny day in New York City",
- customType2));
+ TextField.TYPE_STORED));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java Thu Aug 25 12:23:31 2011
@@ -42,7 +42,6 @@ public class TestMultiThreadTermVectors
//writer.setUseCompoundFile(false);
//writer.infoStream = System.out;
FieldType customType = new FieldType(TextField.TYPE_STORED);
- customType.setStored(true);
customType.setTokenized(false);
customType.setStoreTermVectors(true);
for (int i = 0; i < numDocs; i++) {
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestRegexpRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestRegexpRandom.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestRegexpRandom.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestRegexpRandom.java Thu Aug 25 12:23:31 2011
@@ -53,8 +53,7 @@ public class TestRegexpRandom extends Lu
.setMaxBufferedDocs(_TestUtil.nextInt(random, 50, 1000)));
Document doc = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
- customType.setStored(true);
+ FieldType customType = new FieldType(TextField.TYPE_STORED);
customType.setOmitNorms(true);
Field field = newField("field", "", customType);
doc.add(field);
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestTopDocsMerge.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestTopDocsMerge.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestTopDocsMerge.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestTopDocsMerge.java Thu Aug 25 12:23:31 2011
@@ -92,7 +92,7 @@ public class TestTopDocsMerge extends Lu
for(int docIDX=0;docIDX<numDocs;docIDX++) {
final Document doc = new Document();
- doc.add(newField("string", _TestUtil.randomRealisticUnicodeString(random), StringField.TYPE_STORED));
+ doc.add(newField("string", _TestUtil.randomRealisticUnicodeString(random), StringField.TYPE_UNSTORED));
doc.add(newField("text", content[random.nextInt(content.length)], TextField.TYPE_UNSTORED));
doc.add(new NumericField("float").setFloatValue(random.nextFloat()));
final int intValue;
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java Thu Aug 25 12:23:31 2011
@@ -113,11 +113,9 @@ public class TestPayloadNearQuery extend
//writer.infoStream = System.out;
for (int i = 0; i < 1000; i++) {
Document doc = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
- customType.setStored(true);
- doc.add(newField("field", English.intToEnglish(i), customType));
+ doc.add(newField("field", English.intToEnglish(i), TextField.TYPE_STORED));
String txt = English.intToEnglish(i) +' '+English.intToEnglish(i+1);
- doc.add(newField("field2", txt, customType));
+ doc.add(newField("field2", txt, TextField.TYPE_STORED));
writer.addDocument(doc);
}
reader = writer.getReader();
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java Thu Aug 25 12:23:31 2011
@@ -119,15 +119,13 @@ public class TestPayloadTermQuery extend
newIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer())
.setSimilarityProvider(similarityProvider).setMergePolicy(newLogMergePolicy()));
//writer.infoStream = System.out;
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
- customType.setStored(true);
for (int i = 0; i < 1000; i++) {
Document doc = new Document();
- Field noPayloadField = newField(PayloadHelper.NO_PAYLOAD_FIELD, English.intToEnglish(i), customType);
+ Field noPayloadField = newField(PayloadHelper.NO_PAYLOAD_FIELD, English.intToEnglish(i), TextField.TYPE_STORED);
//noPayloadField.setBoost(0);
doc.add(noPayloadField);
- doc.add(newField("field", English.intToEnglish(i), customType));
- doc.add(newField("multiField", English.intToEnglish(i) + " " + English.intToEnglish(i), customType));
+ doc.add(newField("field", English.intToEnglish(i), TextField.TYPE_STORED));
+ doc.add(newField("multiField", English.intToEnglish(i) + " " + English.intToEnglish(i), TextField.TYPE_STORED));
writer.addDocument(doc);
}
reader = writer.getReader();
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java Thu Aug 25 12:23:31 2011
@@ -121,9 +121,7 @@ public class TestBasics extends LuceneTe
//writer.infoStream = System.out;
for (int i = 0; i < 2000; i++) {
Document doc = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
- customType.setStored(true);
- doc.add(newField("field", English.intToEnglish(i), customType));
+ doc.add(newField("field", English.intToEnglish(i), TextField.TYPE_STORED));
writer.addDocument(doc);
}
reader = writer.getReader();
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java Thu Aug 25 12:23:31 2011
@@ -114,9 +114,7 @@ public class TestPayloadSpans extends Lu
newIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer()).setSimilarityProvider(similarity));
Document doc = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
- customType.setStored(true);
- doc.add(newField(PayloadHelper.FIELD, "one two three one four three", customType));
+ doc.add(newField(PayloadHelper.FIELD, "one two three one four three", TextField.TYPE_STORED));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
writer.close();
@@ -381,9 +379,7 @@ public class TestPayloadSpans extends Lu
newIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer()).setSimilarityProvider(similarity));
Document doc = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
- customType.setStored(true);
- doc.add(newField(PayloadHelper.FIELD,"xx rr yy mm pp", customType));
+ doc.add(newField(PayloadHelper.FIELD,"xx rr yy mm pp", TextField.TYPE_STORED));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
@@ -444,12 +440,10 @@ public class TestPayloadSpans extends Lu
newIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer()).setSimilarityProvider(similarity));
Document doc = null;
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
- customType.setStored(true);
for(int i = 0; i < docs.length; i++) {
doc = new Document();
String docText = docs[i];
- doc.add(newField(PayloadHelper.FIELD,docText, customType));
+ doc.add(newField(PayloadHelper.FIELD,docText, TextField.TYPE_STORED));
writer.addDocument(doc);
}
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java Thu Aug 25 12:23:31 2011
@@ -58,11 +58,9 @@ public class TestSpans extends LuceneTes
super.setUp();
directory = newDirectory();
RandomIndexWriter writer= new RandomIndexWriter(random, directory, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(newLogMergePolicy()));
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
- customType.setStored(true);
for (int i = 0; i < docFields.length; i++) {
Document doc = new Document();
- doc.add(newField(field, docFields[i], customType));
+ doc.add(newField(field, docFields[i], TextField.TYPE_STORED));
writer.addDocument(doc);
}
reader = writer.getReader();
@@ -456,12 +454,8 @@ public class TestSpans extends LuceneTes
// LUCENE-1404
private void addDoc(IndexWriter writer, String id, String text) throws IOException {
final Document doc = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
- customType.setStored(true);
- FieldType customType2 = new FieldType(StringField.TYPE_UNSTORED);
- customType2.setStored(true);
- doc.add( newField("id", id, customType2) );
- doc.add( newField("text", text, customType) );
+ doc.add( newField("id", id, StringField.TYPE_STORED) );
+ doc.add( newField("text", text, TextField.TYPE_STORED) );
writer.addDocument(doc);
}
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java Thu Aug 25 12:23:31 2011
@@ -92,12 +92,8 @@ public class TestSpansAdvanced extends L
final String text) throws IOException {
final Document document = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
- customType.setStored(true);
- FieldType customType2 = new FieldType(StringField.TYPE_UNSTORED);
- customType2.setStored(true);
- document.add(newField(FIELD_ID, id, customType2));
- document.add(newField(FIELD_TEXT, text, customType));
+ document.add(newField(FIELD_ID, id, StringField.TYPE_STORED));
+ document.add(newField(FIELD_TEXT, text, TextField.TYPE_STORED));
writer.addDocument(document);
}
Modified: lucene/dev/branches/fieldtype_conflicted/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java Thu Aug 25 12:23:31 2011
@@ -179,8 +179,8 @@ public class DocMaker {
protected Config config;
- protected FieldType valType;
- protected FieldType bodyValType;
+ protected final FieldType valType;
+ protected final FieldType bodyValType;
protected ContentSource source;
protected boolean reuseFields;
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=1161533&r1=1161532&r2=1161533&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 Thu Aug 25 12:23:31 2011
@@ -183,9 +183,7 @@ public class LuceneTaxonomyWriter implem
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, "");
+ fullPathField = new Field(Consts.FULL, StringField.TYPE_STORED, "");
this.nextID = indexWriter.maxDoc();
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=1161533&r1=1161532&r2=1161533&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 Thu Aug 25 12:23:31 2011
@@ -710,7 +710,10 @@ public final class MoreLikeThis {
IndexableField fields[] = d.getFields(fieldName);
if (fields != null) {
for (int j = 0; j < fields.length; j++) {
- addTermFrequencies(new StringReader(fields[j].stringValue()), termFreqMap, fieldName);
+ final String stringValue = fields[j].stringValue();
+ if (stringValue != null) {
+ addTermFrequencies(new StringReader(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=1161533&r1=1161532&r2=1161533&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 Thu Aug 25 12:23:31 2011
@@ -133,8 +133,7 @@ public abstract class FunctionTestSetup
Field f;
int scoreAndID = i + 1;
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
- customType.setStored(true);
+ FieldType customType = new FieldType(TextField.TYPE_STORED);
customType.setTokenized(false);
customType.setOmitNorms(true);
Modified: lucene/dev/branches/fieldtype_conflicted/modules/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/modules/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/modules/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/modules/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java Thu Aug 25 12:23:31 2011
@@ -68,9 +68,7 @@ public class TestMoreLikeThis extends Lu
private void addDoc(RandomIndexWriter writer, String text) throws IOException {
Document doc = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
- customType.setStored(true);
- doc.add(newField("text", text, customType));
+ doc.add(newField("text", text, TextField.TYPE_STORED));
writer.addDocument(doc);
}
Modified: lucene/dev/branches/fieldtype_conflicted/modules/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/modules/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/modules/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/modules/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java Thu Aug 25 12:23:31 2011
@@ -114,12 +114,10 @@ public class TestComplexPhraseQuery exte
super.setUp();
rd = newDirectory();
IndexWriter w = new IndexWriter(rd, newIndexWriterConfig(TEST_VERSION_CURRENT, analyzer));
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
- customType.setStored(true);
for (int i = 0; i < docsContent.length; i++) {
Document doc = new Document();
- doc.add(newField("name", docsContent[i].name, customType));
- doc.add(newField("id", docsContent[i].id, customType));
+ doc.add(newField("name", docsContent[i].name, TextField.TYPE_STORED));
+ doc.add(newField("id", docsContent[i].id, TextField.TYPE_STORED));
w.addDocument(doc);
}
w.close();
Modified: lucene/dev/branches/fieldtype_conflicted/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java Thu Aug 25 12:23:31 2011
@@ -45,7 +45,7 @@ public class SingleFieldTestDb {
new MockAnalyzer(random)));
for (int j = 0; j < docs.length; j++) {
Document d = new Document();
- d.add(new Field(fieldName, TextField.TYPE_UNSTORED, docs[j]));
+ d.add(new TextField(fieldName, docs[j]));
writer.addDocument(d);
}
writer.close();
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java Thu Aug 25 12:23:31 2011
@@ -556,7 +556,7 @@ public class BasicFunctionalityTest exte
assertU(commit());
SolrCore core = h.getCore();
- SolrQueryRequest req = req("q", "title:keyword" , "fl", "id,title,test_hlt");
+ SolrQueryRequest req = req("q", "title:keyword", "fl", "id,title,test_hlt");
SolrQueryResponse rsp = new SolrQueryResponse();
core.execute(core.getRequestHandler(req.getParams().get(CommonParams.QT)), req, rsp);
@@ -586,7 +586,6 @@ public class BasicFunctionalityTest exte
DocIterator di = dl.iterator();
Document d = req.getSearcher().doc(di.nextDoc());
// ensure field is lazy
- System.out.println(d.getField("test_hlt").getClass());
assertTrue( ((Field) d.getField("test_hlt")).getClass().getSimpleName().equals("LazyField"));
assertFalse( ((Field) d.getField("title")).getClass().getSimpleName().equals("LazyField"));
req.close();
Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/test/org/apache/solr/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/test/org/apache/solr/search/TestSort.java?rev=1161533&r1=1161532&r2=1161533&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/test/org/apache/solr/search/TestSort.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/test/org/apache/solr/search/TestSort.java Thu Aug 25 12:23:31 2011
@@ -150,8 +150,8 @@ public class TestSort extends SolrTestCa
public void testSort() throws Exception {
Directory dir = new RAMDirectory();
- Field f = new Field("f",StringField.TYPE_UNSTORED,"0");
- Field f2 = new Field("f2",StringField.TYPE_UNSTORED,"0");
+ Field f = new Field("f", StringField.TYPE_UNSTORED,"0");
+ Field f2 = new Field("f2", StringField.TYPE_UNSTORED,"0");
for (int iterCnt = 0; iterCnt<iter; iterCnt++) {
IndexWriter iw = new IndexWriter(