Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-8290: remove SchemaField.checkFieldCacheSource's unused QParser argument 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1714766 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Christine Poerschke 2015-11-17 12:00:16 +00:00
parent 64783d1757
commit ea917093f8
9 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -525,6 +525,8 @@ Other Changes
* SOLR-8246: Fix SolrCLI to clean the config directory in case creating a core failed. * SOLR-8246: Fix SolrCLI to clean the config directory in case creating a core failed.
(Jason Gerlowski via Shai Erera) (Jason Gerlowski via Shai Erera)
* SOLR-8290: remove SchemaField.checkFieldCacheSource's unused QParser argument (Christine Poerschke)
================== 5.3.1 ================== ================== 5.3.1 ==================
Bug Fixes Bug Fixes

2
solr/core/src/java/org/apache/solr/schema/BoolField.java
View File

@ -62,7 +62,7 @@ public class BoolField extends PrimitiveFieldType {
@Override @Override
public ValueSource getValueSource(SchemaField field, QParser qparser) { public ValueSource getValueSource(SchemaField field, QParser qparser) {
field.checkFieldCacheSource(qparser); field.checkFieldCacheSource();
return new BoolFieldSource(field.name); return new BoolFieldSource(field.name);
} }

2
solr/core/src/java/org/apache/solr/schema/CurrencyField.java
View File

@ -274,7 +274,7 @@ public class CurrencyField extends FieldType implements SchemaAware, ResourceLoa
*/ */
public RawCurrencyValueSource getValueSource(SchemaField field, public RawCurrencyValueSource getValueSource(SchemaField field,
QParser parser) { QParser parser) {
field.checkFieldCacheSource(parser); field.checkFieldCacheSource();
return new RawCurrencyValueSource(field, defaultCurrency, parser); return new RawCurrencyValueSource(field, defaultCurrency, parser);
} }

2
solr/core/src/java/org/apache/solr/schema/EnumField.java
View File

@ -203,7 +203,7 @@ public class EnumField extends PrimitiveFieldType {
*/ */
@Override @Override
public ValueSource getValueSource(SchemaField field, QParser qparser) { public ValueSource getValueSource(SchemaField field, QParser qparser) {
field.checkFieldCacheSource(qparser); field.checkFieldCacheSource();
return new EnumFieldSource(field.getName(), enumIntToStringMap, enumStringToIntMap); return new EnumFieldSource(field.getName(), enumIntToStringMap, enumStringToIntMap);
} }

2
solr/core/src/java/org/apache/solr/schema/FieldType.java
View File

@ -669,7 +669,7 @@ public abstract class FieldType extends FieldProperties {
* Lucene FieldCache.) * Lucene FieldCache.)
*/ */
public ValueSource getValueSource(SchemaField field, QParser parser) { public ValueSource getValueSource(SchemaField field, QParser parser) {
field.checkFieldCacheSource(parser); field.checkFieldCacheSource();
return new StrFieldSource(field.name); return new StrFieldSource(field.name);
} }

2
solr/core/src/java/org/apache/solr/schema/GeoHashField.java
View File

@ -89,7 +89,7 @@ public class GeoHashField extends FieldType implements SpatialQueryable {
@Override @Override
public ValueSource getValueSource(SchemaField field, QParser parser) { public ValueSource getValueSource(SchemaField field, QParser parser) {
field.checkFieldCacheSource(parser); field.checkFieldCacheSource();
return new StrFieldSource(field.name); return new StrFieldSource(field.name);
} }

3
solr/core/src/java/org/apache/solr/schema/SchemaField.java
View File

@ -28,7 +28,6 @@ import org.apache.lucene.search.SortField;
import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.SimpleOrderedMap; import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.response.TextResponseWriter; import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.search.QParser;
/** /**
* Encapsulates all information about a Field in a Solr Schema * Encapsulates all information about a Field in a Solr Schema
@ -177,7 +176,7 @@ public final class SchemaField extends FieldProperties {
* getValueSource implementation * getValueSource implementation
* @see FieldType#getValueSource * @see FieldType#getValueSource
*/ */
public void checkFieldCacheSource(QParser parser) throws SolrException { public void checkFieldCacheSource() throws SolrException {
if (! (indexed() || hasDocValues()) ) { if (! (indexed() || hasDocValues()) ) {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,
"can not use FieldCache on a field which is neither indexed nor has doc values: " "can not use FieldCache on a field which is neither indexed nor has doc values: "

2
solr/core/src/java/org/apache/solr/schema/StrField.java
View File

@ -79,7 +79,7 @@ public class StrField extends PrimitiveFieldType {
@Override @Override
public ValueSource getValueSource(SchemaField field, QParser parser) { public ValueSource getValueSource(SchemaField field, QParser parser) {
field.checkFieldCacheSource(parser); field.checkFieldCacheSource();
return new StrFieldSource(field.getName()); return new StrFieldSource(field.getName());
} }

2
solr/core/src/java/org/apache/solr/schema/TrieField.java
View File

@ -228,7 +228,7 @@ public class TrieField extends PrimitiveFieldType {
@Override @Override
public ValueSource getValueSource(SchemaField field, QParser qparser) { public ValueSource getValueSource(SchemaField field, QParser qparser) {
field.checkFieldCacheSource(qparser); field.checkFieldCacheSource();
switch (type) { switch (type) {
case INTEGER: case INTEGER:
return new IntFieldSource( field.getName()); return new IntFieldSource( field.getName());