You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2015/11/17 15:04:12 UTC
svn commit: r1714785 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/core/ solr/core/src/java/org/apache/solr/schema/
Author: cpoerschke
Date: Tue Nov 17 14:04:11 2015
New Revision: 1714785
URL: http://svn.apache.org/viewvc?rev=1714785&view=rev
Log:
SOLR-8290: remove SchemaField.checkFieldCacheSource's unused QParser argument (merge in revision 1714766 from trunk)
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/BoolField.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/CurrencyField.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/EnumField.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/FieldType.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/GeoHashField.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/SchemaField.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/StrField.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/TrieField.java
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1714785&r1=1714784&r2=1714785&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Tue Nov 17 14:04:11 2015
@@ -381,6 +381,8 @@ Other Changes
* SOLR-8246: Fix SolrCLI to clean the config directory in case creating a core failed.
(Jason Gerlowski via Shai Erera)
+* SOLR-8290: remove SchemaField.checkFieldCacheSource's unused QParser argument (Christine Poerschke)
+
================== 5.3.1 ==================
Bug Fixes
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/BoolField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/BoolField.java?rev=1714785&r1=1714784&r2=1714785&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/BoolField.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/BoolField.java Tue Nov 17 14:04:11 2015
@@ -62,7 +62,7 @@ public class BoolField extends Primitive
@Override
public ValueSource getValueSource(SchemaField field, QParser qparser) {
- field.checkFieldCacheSource(qparser);
+ field.checkFieldCacheSource();
return new BoolFieldSource(field.name);
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/CurrencyField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/CurrencyField.java?rev=1714785&r1=1714784&r2=1714785&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/CurrencyField.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/CurrencyField.java Tue Nov 17 14:04:11 2015
@@ -274,7 +274,7 @@ public class CurrencyField extends Field
*/
public RawCurrencyValueSource getValueSource(SchemaField field,
QParser parser) {
- field.checkFieldCacheSource(parser);
+ field.checkFieldCacheSource();
return new RawCurrencyValueSource(field, defaultCurrency, parser);
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/EnumField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/EnumField.java?rev=1714785&r1=1714784&r2=1714785&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/EnumField.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/EnumField.java Tue Nov 17 14:04:11 2015
@@ -203,7 +203,7 @@ public class EnumField extends Primitive
*/
@Override
public ValueSource getValueSource(SchemaField field, QParser qparser) {
- field.checkFieldCacheSource(qparser);
+ field.checkFieldCacheSource();
return new EnumFieldSource(field.getName(), enumIntToStringMap, enumStringToIntMap);
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/FieldType.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/FieldType.java?rev=1714785&r1=1714784&r2=1714785&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/FieldType.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/FieldType.java Tue Nov 17 14:04:11 2015
@@ -668,7 +668,7 @@ public abstract class FieldType extends
* Lucene FieldCache.)
*/
public ValueSource getValueSource(SchemaField field, QParser parser) {
- field.checkFieldCacheSource(parser);
+ field.checkFieldCacheSource();
return new StrFieldSource(field.name);
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/GeoHashField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/GeoHashField.java?rev=1714785&r1=1714784&r2=1714785&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/GeoHashField.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/GeoHashField.java Tue Nov 17 14:04:11 2015
@@ -89,7 +89,7 @@ public class GeoHashField extends FieldT
@Override
public ValueSource getValueSource(SchemaField field, QParser parser) {
- field.checkFieldCacheSource(parser);
+ field.checkFieldCacheSource();
return new StrFieldSource(field.name);
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/SchemaField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/SchemaField.java?rev=1714785&r1=1714784&r2=1714785&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/SchemaField.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/SchemaField.java Tue Nov 17 14:04:11 2015
@@ -28,7 +28,6 @@ import org.apache.lucene.search.SortFiel
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.response.TextResponseWriter;
-import org.apache.solr.search.QParser;
/**
* Encapsulates all information about a Field in a Solr Schema
@@ -177,7 +176,7 @@ public final class SchemaField extends F
* getValueSource implementation
* @see FieldType#getValueSource
*/
- public void checkFieldCacheSource(QParser parser) throws SolrException {
+ public void checkFieldCacheSource() throws SolrException {
if (! (indexed() || hasDocValues()) ) {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,
"can not use FieldCache on a field which is neither indexed nor has doc values: "
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/StrField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/StrField.java?rev=1714785&r1=1714784&r2=1714785&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/StrField.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/StrField.java Tue Nov 17 14:04:11 2015
@@ -79,7 +79,7 @@ public class StrField extends PrimitiveF
@Override
public ValueSource getValueSource(SchemaField field, QParser parser) {
- field.checkFieldCacheSource(parser);
+ field.checkFieldCacheSource();
return new StrFieldSource(field.getName());
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/TrieField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/TrieField.java?rev=1714785&r1=1714784&r2=1714785&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/TrieField.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/TrieField.java Tue Nov 17 14:04:11 2015
@@ -228,7 +228,7 @@ public class TrieField extends Primitive
@Override
public ValueSource getValueSource(SchemaField field, QParser qparser) {
- field.checkFieldCacheSource(qparser);
+ field.checkFieldCacheSource();
switch (type) {
case INTEGER:
return new IntFieldSource( field.getName());