You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2010/12/26 15:25:43 UTC
svn commit: r1052889 - in /lucene/dev/trunk/solr/src/java/org/apache/solr:
schema/ update/
Author: yonik
Date: Sun Dec 26 14:25:42 2010
New Revision: 1052889
URL: http://svn.apache.org/viewvc?rev=1052889&view=rev
Log:
SOLR-1930: remove solr deprecations - fieldType.getValueSource migration
Removed:
lucene/dev/trunk/solr/src/java/org/apache/solr/update/DirectUpdateHandler.java
Modified:
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/BCDIntField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/BoolField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ByteField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/DoubleField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/FieldType.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/FloatField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/IntField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/LongField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/RandomSortField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ShortField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableDoubleField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableFloatField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableIntField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableLongField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/TrieField.java
lucene/dev/trunk/solr/src/java/org/apache/solr/schema/UUIDField.java
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/BCDIntField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/BCDIntField.java?rev=1052889&r1=1052888&r2=1052889&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/BCDIntField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/BCDIntField.java Sun Dec 26 14:25:42 2010
@@ -18,6 +18,7 @@
package org.apache.solr.schema;
import org.apache.lucene.search.SortField;
+import org.apache.solr.search.QParser;
import org.apache.solr.search.function.ValueSource;
import org.apache.lucene.document.Fieldable;
import org.apache.solr.util.BCDUtils;
@@ -36,7 +37,8 @@ public class BCDIntField extends FieldTy
return getStringSort(field,reverse);
}
- public ValueSource getValueSource(SchemaField field) {
+ @Override
+ public ValueSource getValueSource(SchemaField field, QParser qparser) {
throw new UnsupportedOperationException("ValueSource not implemented");
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/BoolField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/BoolField.java?rev=1052889&r1=1052888&r2=1052889&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/BoolField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/BoolField.java Sun Dec 26 14:25:42 2010
@@ -20,6 +20,7 @@ package org.apache.solr.schema;
import org.apache.lucene.search.SortField;
import org.apache.lucene.util.BytesRef;
import org.apache.noggit.CharArr;
+import org.apache.solr.search.QParser;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.OrdFieldSource;
import org.apache.lucene.analysis.Analyzer;
@@ -43,7 +44,8 @@ public class BoolField extends FieldType
return getStringSort(field,reverse);
}
- public ValueSource getValueSource(SchemaField field) {
+ @Override
+ public ValueSource getValueSource(SchemaField field, QParser qparser) {
return new OrdFieldSource(field.name);
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ByteField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ByteField.java?rev=1052889&r1=1052888&r2=1052889&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ByteField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ByteField.java Sun Dec 26 14:25:42 2010
@@ -22,6 +22,7 @@ import org.apache.lucene.search.cache.By
import org.apache.lucene.search.cache.CachedArrayCreator;
import org.apache.solr.response.TextResponseWriter;
+import org.apache.solr.search.QParser;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.ByteFieldSource;
@@ -41,7 +42,8 @@ public class ByteField extends FieldType
return new SortField(field.name, SortField.BYTE, reverse);
}
- public ValueSource getValueSource(SchemaField field) {
+ @Override
+ public ValueSource getValueSource(SchemaField field, QParser qparser) {
return new ByteFieldSource( new ByteValuesCreator( field.name, null, CachedArrayCreator.CACHE_VALUES_AND_BITS ) );
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/DoubleField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/DoubleField.java?rev=1052889&r1=1052888&r2=1052889&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/DoubleField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/DoubleField.java Sun Dec 26 14:25:42 2010
@@ -22,6 +22,7 @@ import org.apache.lucene.search.SortFiel
import org.apache.lucene.search.cache.CachedArrayCreator;
import org.apache.lucene.search.cache.DoubleValuesCreator;
import org.apache.solr.response.TextResponseWriter;
+import org.apache.solr.search.QParser;
import org.apache.solr.search.function.DoubleFieldSource;
import org.apache.solr.search.function.ValueSource;
@@ -41,7 +42,8 @@ public class DoubleField extends FieldTy
return new SortField(field.name, SortField.DOUBLE, reverse);
}
- public ValueSource getValueSource(SchemaField field) {
+ @Override
+ public ValueSource getValueSource(SchemaField field, QParser qparser) {
// fieldCache doesn't support double
return new DoubleFieldSource( new DoubleValuesCreator( field.name, null, CachedArrayCreator.CACHE_VALUES_AND_BITS ) );
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/FieldType.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/FieldType.java?rev=1052889&r1=1052888&r2=1052889&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/FieldType.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/FieldType.java Sun Dec 26 14:25:42 2010
@@ -490,19 +490,10 @@ public abstract class FieldType extends
* Lucene FieldCache.)
*/
public ValueSource getValueSource(SchemaField field, QParser parser) {
- return getValueSource(field);
- }
-
-
- /**
- * @deprecated use {@link #getValueSource(SchemaField, QParser)}
- */
- @Deprecated
- public ValueSource getValueSource(SchemaField field) {
- // return new OrdFieldSource(field.name);
return new StrFieldSource(field.name);
}
+
/**
* Returns a Query instance for doing range searches on this field type. {@link org.apache.solr.search.SolrQueryParser}
* currently passes part1 and part2 as null if they are '*' respectively. minInclusive and maxInclusive are both true
@@ -540,6 +531,8 @@ public abstract class FieldType extends
*
*/
public Query getFieldQuery(QParser parser, SchemaField field, String externalVal) {
- return new TermQuery(new Term(field.getName(), toInternal(externalVal)));
+ BytesRef br = new BytesRef();
+ readableToIndexed(externalVal, br);
+ return new TermQuery(new Term(field.getName(), br));
}
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/FloatField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/FloatField.java?rev=1052889&r1=1052888&r2=1052889&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/FloatField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/FloatField.java Sun Dec 26 14:25:42 2010
@@ -20,6 +20,7 @@ package org.apache.solr.schema;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.cache.CachedArrayCreator;
import org.apache.lucene.search.cache.FloatValuesCreator;
+import org.apache.solr.search.QParser;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.FloatFieldSource;
import org.apache.lucene.document.Fieldable;
@@ -39,7 +40,8 @@ public class FloatField extends FieldTyp
return new SortField(field.name,SortField.FLOAT, reverse);
}
- public ValueSource getValueSource(SchemaField field) {
+ @Override
+ public ValueSource getValueSource(SchemaField field, QParser qparser) {
return new FloatFieldSource( new FloatValuesCreator( field.name, null, CachedArrayCreator.CACHE_VALUES_AND_BITS ) );
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/IntField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/IntField.java?rev=1052889&r1=1052888&r2=1052889&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/IntField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/IntField.java Sun Dec 26 14:25:42 2010
@@ -20,6 +20,7 @@ package org.apache.solr.schema;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.cache.CachedArrayCreator;
import org.apache.lucene.search.cache.IntValuesCreator;
+import org.apache.solr.search.QParser;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.IntFieldSource;
import org.apache.lucene.document.Fieldable;
@@ -39,7 +40,8 @@ public class IntField extends FieldType
return new SortField(field.name,SortField.INT, reverse);
}
- public ValueSource getValueSource(SchemaField field) {
+ @Override
+ public ValueSource getValueSource(SchemaField field, QParser qparser) {
return new IntFieldSource(new IntValuesCreator( field.name, null, CachedArrayCreator.CACHE_VALUES_AND_BITS ) );
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/LongField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/LongField.java?rev=1052889&r1=1052888&r2=1052889&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/LongField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/LongField.java Sun Dec 26 14:25:42 2010
@@ -22,6 +22,7 @@ import org.apache.lucene.search.SortFiel
import org.apache.lucene.search.cache.CachedArrayCreator;
import org.apache.lucene.search.cache.LongValuesCreator;
import org.apache.solr.response.TextResponseWriter;
+import org.apache.solr.search.QParser;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.LongFieldSource;
@@ -42,7 +43,8 @@ public class LongField extends FieldType
return new SortField(field.name,SortField.LONG, reverse);
}
- public ValueSource getValueSource(SchemaField field) {
+ @Override
+ public ValueSource getValueSource(SchemaField field, QParser qparser) {
return new LongFieldSource( new LongValuesCreator( field.name, null, CachedArrayCreator.CACHE_VALUES_AND_BITS ) );
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/RandomSortField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/RandomSortField.java?rev=1052889&r1=1052888&r2=1052889&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/RandomSortField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/RandomSortField.java Sun Dec 26 14:25:42 2010
@@ -24,6 +24,7 @@ import org.apache.lucene.document.Fielda
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.*;
import org.apache.solr.response.TextResponseWriter;
+import org.apache.solr.search.QParser;
import org.apache.solr.search.function.DocValues;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.SolrIndexReader;
@@ -95,7 +96,7 @@ public class RandomSortField extends Fie
}
@Override
- public ValueSource getValueSource(SchemaField field) {
+ public ValueSource getValueSource(SchemaField field, QParser qparser) {
return new RandomValueSource(field.getName());
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ShortField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ShortField.java?rev=1052889&r1=1052888&r2=1052889&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ShortField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ShortField.java Sun Dec 26 14:25:42 2010
@@ -22,6 +22,7 @@ import org.apache.lucene.search.cache.Ca
import org.apache.lucene.search.cache.ShortValuesCreator;
import org.apache.solr.response.TextResponseWriter;
+import org.apache.solr.search.QParser;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.ShortFieldSource;
@@ -45,7 +46,8 @@ public class ShortField extends FieldTyp
return new SortField(field.name, SortField.SHORT, reverse);
}
- public ValueSource getValueSource(SchemaField field) {
+ @Override
+ public ValueSource getValueSource(SchemaField field, QParser qparser) {
return new ShortFieldSource(new ShortValuesCreator( field.name, null, CachedArrayCreator.CACHE_VALUES_AND_BITS ) );
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableDoubleField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableDoubleField.java?rev=1052889&r1=1052888&r2=1052889&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableDoubleField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableDoubleField.java Sun Dec 26 14:25:42 2010
@@ -22,6 +22,7 @@ import org.apache.lucene.util.BytesRef;
import org.apache.noggit.CharArr;
import org.apache.solr.search.MutableValueDouble;
import org.apache.solr.search.MutableValue;
+import org.apache.solr.search.QParser;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.FieldCacheSource;
import org.apache.solr.search.function.DocValues;
@@ -45,7 +46,8 @@ public class SortableDoubleField extends
return getStringSort(field,reverse);
}
- public ValueSource getValueSource(SchemaField field) {
+ @Override
+ public ValueSource getValueSource(SchemaField field, QParser qparser) {
return new SortableDoubleFieldSource(field.name);
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableFloatField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableFloatField.java?rev=1052889&r1=1052888&r2=1052889&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableFloatField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableFloatField.java Sun Dec 26 14:25:42 2010
@@ -22,6 +22,7 @@ import org.apache.lucene.util.BytesRef;
import org.apache.noggit.CharArr;
import org.apache.solr.search.MutableValueFloat;
import org.apache.solr.search.MutableValue;
+import org.apache.solr.search.QParser;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.FieldCacheSource;
import org.apache.solr.search.function.DocValues;
@@ -45,7 +46,8 @@ public class SortableFloatField extends
return getStringSort(field,reverse);
}
- public ValueSource getValueSource(SchemaField field) {
+ @Override
+ public ValueSource getValueSource(SchemaField field, QParser qparser) {
return new SortableFloatFieldSource(field.name);
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableIntField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableIntField.java?rev=1052889&r1=1052888&r2=1052889&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableIntField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableIntField.java Sun Dec 26 14:25:42 2010
@@ -22,6 +22,7 @@ import org.apache.lucene.util.BytesRef;
import org.apache.noggit.CharArr;
import org.apache.solr.search.MutableValueInt;
import org.apache.solr.search.MutableValue;
+import org.apache.solr.search.QParser;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.FieldCacheSource;
import org.apache.solr.search.function.DocValues;
@@ -45,7 +46,8 @@ public class SortableIntField extends Fi
return getStringSort(field,reverse);
}
- public ValueSource getValueSource(SchemaField field) {
+ @Override
+ public ValueSource getValueSource(SchemaField field, QParser qparser) {
return new SortableIntFieldSource(field.name);
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableLongField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableLongField.java?rev=1052889&r1=1052888&r2=1052889&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableLongField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SortableLongField.java Sun Dec 26 14:25:42 2010
@@ -22,6 +22,7 @@ import org.apache.lucene.util.BytesRef;
import org.apache.noggit.CharArr;
import org.apache.solr.search.MutableValueLong;
import org.apache.solr.search.MutableValue;
+import org.apache.solr.search.QParser;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.FieldCacheSource;
import org.apache.solr.search.function.DocValues;
@@ -45,7 +46,8 @@ public class SortableLongField extends F
return getStringSort(field,reverse);
}
- public ValueSource getValueSource(SchemaField field) {
+ @Override
+ public ValueSource getValueSource(SchemaField field, QParser qparser) {
return new SortableLongFieldSource(field.name);
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/TrieField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/TrieField.java?rev=1052889&r1=1052888&r2=1052889&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/TrieField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/TrieField.java Sun Dec 26 14:25:42 2010
@@ -174,7 +174,8 @@ public class TrieField extends FieldType
}
}
- public ValueSource getValueSource(SchemaField field) {
+ @Override
+ public ValueSource getValueSource(SchemaField field, QParser qparser) {
int flags = CachedArrayCreator.CACHE_VALUES_AND_BITS;
switch (type) {
case INTEGER:
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/UUIDField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/UUIDField.java?rev=1052889&r1=1052888&r2=1052889&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/UUIDField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/UUIDField.java Sun Dec 26 14:25:42 2010
@@ -35,7 +35,7 @@ import org.apache.solr.response.TextResp
* @see UUID#randomUUID
* @version $Id$
*/
-public class UUIDField extends FieldType {
+public class UUIDField extends StrField {
private static final String NEW = "NEW";
private static final char DASH='-';