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 2012/06/10 20:27:17 UTC
svn commit: r1348639 [8/8] - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/analysis/ lucene/analysis/common/
lucene/analysis/common/src/test/org/apache/lucene/analysis/core/
lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneou...
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java Sun Jun 10 18:27:08 2012
@@ -34,14 +34,12 @@ import org.apache.lucene.document.LongFi
import org.apache.lucene.document.StoredField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.*;
-import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.search.*;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.OpenBitSet;
-import org.apache.lucene.util.ReaderUtil;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
@@ -461,7 +459,7 @@ public class SolrIndexSearcher extends I
@Override
public void intField(FieldInfo fieldInfo, int value) {
- FieldType ft = new FieldType(IntField.TYPE);
+ FieldType ft = new FieldType(IntField.TYPE_NOT_STORED);
ft.setStored(true);
ft.setIndexed(fieldInfo.isIndexed());
doc.add(new IntField(fieldInfo.name, value, ft));
@@ -469,7 +467,7 @@ public class SolrIndexSearcher extends I
@Override
public void longField(FieldInfo fieldInfo, long value) {
- FieldType ft = new FieldType(LongField.TYPE);
+ FieldType ft = new FieldType(LongField.TYPE_NOT_STORED);
ft.setStored(true);
ft.setIndexed(fieldInfo.isIndexed());
doc.add(new LongField(fieldInfo.name, value, ft));
@@ -477,7 +475,7 @@ public class SolrIndexSearcher extends I
@Override
public void floatField(FieldInfo fieldInfo, float value) {
- FieldType ft = new FieldType(FloatField.TYPE);
+ FieldType ft = new FieldType(FloatField.TYPE_NOT_STORED);
ft.setStored(true);
ft.setIndexed(fieldInfo.isIndexed());
doc.add(new FloatField(fieldInfo.name, value, ft));
@@ -485,7 +483,7 @@ public class SolrIndexSearcher extends I
@Override
public void doubleField(FieldInfo fieldInfo, double value) {
- FieldType ft = new FieldType(DoubleField.TYPE);
+ FieldType ft = new FieldType(DoubleField.TYPE_NOT_STORED);
ft.setStored(true);
ft.setIndexed(fieldInfo.isIndexed());
doc.add(new DoubleField(fieldInfo.name, value, ft));
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java Sun Jun 10 18:27:08 2012
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.util.List;
+import org.apache.lucene.document.Field;
import org.apache.lucene.index.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -105,7 +106,7 @@ public class FileBasedSpellChecker exten
for (String s : lines) {
Document d = new Document();
- d.add(new TextField(WORD_FIELD_NAME, s));
+ d.add(new TextField(WORD_FIELD_NAME, s, Field.Store.NO));
writer.addDocument(d);
}
writer.forceMerge(1);
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java Sun Jun 10 18:27:08 2012
@@ -124,8 +124,8 @@ public class TestArbitraryIndexDir exten
new IndexWriterConfig(Version.LUCENE_40, new StandardAnalyzer(Version.LUCENE_40))
);
Document doc = new Document();
- doc.add(new Field("id", "2", TextField.TYPE_STORED));
- doc.add(new Field("name", "name2", TextField.TYPE_STORED));
+ doc.add(new TextField("id", "2", Field.Store.YES));
+ doc.add(new TextField("name", "name2", Field.Store.YES));
iw.addDocument(doc);
iw.commit();
iw.close();
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestSort.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestSort.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestSort.java Sun Jun 10 18:27:08 2012
@@ -158,8 +158,8 @@ public class TestSort extends SolrTestCa
public void testSort() throws Exception {
Directory dir = new RAMDirectory();
- Field f = new Field("f", "0", StringField.TYPE_UNSTORED);
- Field f2 = new Field("f2", "0", StringField.TYPE_UNSTORED);
+ Field f = new StringField("f", "0", Field.Store.NO);
+ Field f2 = new StringField("f2", "0", Field.Store.NO);
for (int iterCnt = 0; iterCnt<iter; iterCnt++) {
IndexWriter iw = new IndexWriter(
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java Sun Jun 10 18:27:08 2012
@@ -291,7 +291,7 @@ public class IndexBasedSpellCheckerTest
);
for (int i = 0; i < ALT_DOCS.length; i++) {
Document doc = new Document();
- doc.add(new Field("title", ALT_DOCS[i], TextField.TYPE_STORED));
+ doc.add(new TextField("title", ALT_DOCS[i], Field.Store.YES));
iw.addDocument(doc);
}
iw.forceMerge(1);