You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by is...@apache.org on 2017/03/12 00:18:12 UTC
[03/50] [abbrv] lucene-solr:jira/solr-6736: LUCENE-6819: Remove
index-time boosts.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/contrib/langid/src/java/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessor.java
----------------------------------------------------------------------
diff --git a/solr/contrib/langid/src/java/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessor.java b/solr/contrib/langid/src/java/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessor.java
index ce81ae1..a8d6523 100644
--- a/solr/contrib/langid/src/java/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessor.java
+++ b/solr/contrib/langid/src/java/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessor.java
@@ -252,7 +252,7 @@ public abstract class LanguageIdentifierUpdateProcessor extends UpdateRequestPro
if (mappedOutputField != null) {
log.debug("Mapping field {} to {}", doc.getFieldValue(docIdField), fieldLang);
SolrInputField inField = doc.getField(fieldName);
- doc.setField(mappedOutputField, inField.getValue(), inField.getBoost());
+ doc.setField(mappedOutputField, inField.getValue());
if(!mapKeepOrig) {
log.debug("Removing old field {}", fieldName);
doc.removeField(fieldName);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/LoadSolrBuilder.java
----------------------------------------------------------------------
diff --git a/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/LoadSolrBuilder.java b/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/LoadSolrBuilder.java
index 2c2660b..a3af6e1 100644
--- a/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/LoadSolrBuilder.java
+++ b/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/LoadSolrBuilder.java
@@ -17,10 +17,12 @@
package org.apache.solr.morphlines.solr;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.common.SolrInputDocument;
@@ -34,6 +36,9 @@ import org.kitesdk.morphline.base.AbstractCommand;
import org.kitesdk.morphline.base.Configs;
import org.kitesdk.morphline.base.Metrics;
import org.kitesdk.morphline.base.Notifications;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import com.codahale.metrics.Timer;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
@@ -43,6 +48,9 @@ import com.typesafe.config.ConfigFactory;
*/
public final class LoadSolrBuilder implements CommandBuilder {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final AtomicBoolean WARNED_ABOUT_INDEX_TIME_BOOSTS = new AtomicBoolean();
+
@Override
public Collection<String> getNames() {
return Collections.singletonList("loadSolr");
@@ -60,7 +68,6 @@ public final class LoadSolrBuilder implements CommandBuilder {
private static final class LoadSolr extends AbstractCommand {
private final DocumentLoader loader;
- private final Map<String, Float> boosts = new HashMap();
private final Timer elapsedTime;
public LoadSolr(CommandBuilder builder, Config config, Command parent, Command child, MorphlineContext context) {
@@ -70,10 +77,13 @@ public final class LoadSolrBuilder implements CommandBuilder {
LOG.debug("solrLocator: {}", locator);
this.loader = locator.getLoader();
Config boostsConfig = getConfigs().getConfig(config, "boosts", ConfigFactory.empty());
- for (Map.Entry<String, Object> entry : new Configs().getEntrySet(boostsConfig)) {
- String fieldName = entry.getKey();
- float boost = Float.parseFloat(entry.getValue().toString().trim());
- boosts.put(fieldName, boost);
+ if (new Configs().getEntrySet(boostsConfig).isEmpty() == false) {
+ String message = "Ignoring field boosts: as index-time boosts are not supported anymore";
+ if (WARNED_ABOUT_INDEX_TIME_BOOSTS.compareAndSet(false, true)) {
+ log.warn(message);
+ } else {
+ log.debug(message);
+ }
}
validateArguments();
this.elapsedTime = getTimer(Metrics.ELAPSED_TIME);
@@ -134,20 +144,10 @@ public final class LoadSolrBuilder implements CommandBuilder {
SolrInputDocument doc = new SolrInputDocument(new HashMap(2 * map.size()));
for (Map.Entry<String, Collection<Object>> entry : map.entrySet()) {
String key = entry.getKey();
- doc.setField(key, entry.getValue(), getBoost(key));
+ doc.setField(key, entry.getValue());
}
return doc;
}
-
- private float getBoost(String key) {
- if (boosts.size() > 0) {
- Float boost = boosts.get(key);
- if (boost != null) {
- return boost.floatValue();
- }
- }
- return 1.0f;
- }
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java
----------------------------------------------------------------------
diff --git a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java
index 024dc4e..ec08ee8 100644
--- a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java
+++ b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java
@@ -76,7 +76,7 @@ public class UIMAToSolrMapper {
if (log.isDebugEnabled()) {
log.debug("writing {} in {}", new Object[]{featureValue, fieldName});
}
- document.addField(fieldName, featureValue, 1.0f);
+ document.addField(fieldName, featureValue);
}
}
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java
index 4125aa9..fd568df 100644
--- a/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java
@@ -84,8 +84,6 @@ public class DocumentAnalysisRequestHandler extends AnalysisRequestHandlerBase {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final XMLErrorLogger xmllog = new XMLErrorLogger(log);
- private static final float DEFAULT_BOOST = 1.0f;
-
private XMLInputFactory inputFactory;
@Override
@@ -298,7 +296,7 @@ public class DocumentAnalysisRequestHandler extends AnalysisRequestHandlerBase {
}
return doc;
} else if ("field".equals(reader.getLocalName())) {
- doc.addField(fieldName, text.toString(), DEFAULT_BOOST);
+ doc.addField(fieldName, text.toString());
if (uniqueKeyField.equals(fieldName)) {
hasId = true;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/handler/ExportWriter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/ExportWriter.java b/solr/core/src/java/org/apache/solr/handler/ExportWriter.java
index 8bdd959..7602d9e 100644
--- a/solr/core/src/java/org/apache/solr/handler/ExportWriter.java
+++ b/solr/core/src/java/org/apache/solr/handler/ExportWriter.java
@@ -1377,7 +1377,7 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable {
while((o = vals.nextOrd()) != SortedSetDocValues.NO_MORE_ORDS) {
BytesRef ref = vals.lookupOrd(o);
fieldType.indexedToReadable(ref, cref);
- IndexableField f = fieldType.createField(schemaField, cref.toString(), 1.0f);
+ IndexableField f = fieldType.createField(schemaField, cref.toString());
if (f == null) w.add(cref.toString());
else w.add(fieldType.toObject(f));
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
index 7f08684..62a50e6 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
@@ -298,7 +298,6 @@ public class LukeRequestHandler extends RequestHandlerBase
if (bytes != null) {
f.add( "binary", Base64.byteArrayToBase64(bytes.bytes, bytes.offset, bytes.length));
}
- f.add( "boost", field.boost() );
if (!ftype.isPointField()) {
Term t = new Term(field.name(), ftype!=null ? ftype.storedToIndexed(field) : field.stringValue());
f.add( "docFreq", t.text()==null ? 0 : reader.docFreq( t ) ); // this can be 0 for non-indexed fields
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/handler/loader/CSVLoaderBase.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/loader/CSVLoaderBase.java b/solr/core/src/java/org/apache/solr/handler/loader/CSVLoaderBase.java
index 84c82d7..b503fa3 100644
--- a/solr/core/src/java/org/apache/solr/handler/loader/CSVLoaderBase.java
+++ b/solr/core/src/java/org/apache/solr/handler/loader/CSVLoaderBase.java
@@ -83,7 +83,7 @@ abstract class CSVLoaderBase extends ContentStreamLoader {
private class FieldAdder {
void add(SolrInputDocument doc, int line, int column, String val) {
if (val.length() > 0) {
- doc.addField(fieldnames[column],val,1.0f);
+ doc.addField(fieldnames[column],val);
}
}
}
@@ -92,7 +92,7 @@ abstract class CSVLoaderBase extends ContentStreamLoader {
private class FieldAdderEmpty extends CSVLoaderBase.FieldAdder {
@Override
void add(SolrInputDocument doc, int line, int column, String val) {
- doc.addField(fieldnames[column],val,1.0f);
+ doc.addField(fieldnames[column],val);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java b/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java
index 2041d2f..8650ab8 100644
--- a/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java
+++ b/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java
@@ -28,6 +28,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.commons.io.IOUtils;
import org.apache.solr.common.SolrException;
@@ -65,6 +66,7 @@ import static org.apache.solr.common.params.CommonParams.PATH;
*/
public class JsonLoader extends ContentStreamLoader {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final AtomicBoolean WARNED_ABOUT_INDEX_TIME_BOOSTS = new AtomicBoolean();
public static final String CHILD_DOC_KEY = "_childDocuments_";
@Override
@@ -435,8 +437,6 @@ public class JsonLoader extends ContentStreamLoader {
cmd.commitWithin = commitWithin;
cmd.overwrite = overwrite;
- float boost = 1.0f;
-
while (true) {
int ev = parser.nextEvent();
if (ev == JSONParser.STRING) {
@@ -454,7 +454,13 @@ public class JsonLoader extends ContentStreamLoader {
} else if (UpdateRequestHandler.COMMIT_WITHIN.equals(key)) {
cmd.commitWithin = (int) parser.getLong();
} else if ("boost".equals(key)) {
- boost = Float.parseFloat(parser.getNumberChars().toString());
+ String boost = parser.getNumberChars().toString();
+ String message = "Ignoring document boost: " + boost + " as index-time boosts are not supported anymore";
+ if (WARNED_ABOUT_INDEX_TIME_BOOSTS.compareAndSet(false, true)) {
+ log.warn(message);
+ } else {
+ log.debug(message);
+ }
} else {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "Unknown key '" + key + "' at [" + parser.getPosition() + "]");
}
@@ -467,7 +473,6 @@ public class JsonLoader extends ContentStreamLoader {
if (cmd.solrDoc == null) {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "Missing solr document at [" + parser.getPosition() + "]");
}
- cmd.solrDoc.setDocumentBoost(boost);
return cmd;
} else {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,
@@ -536,7 +541,7 @@ public class JsonLoader extends ContentStreamLoader {
// SolrInputDocument.addField will do the right thing
// if the doc already has another value for this field
// (ie: repeating fieldname keys)
- sdoc.addField(sif.getName(), sif.getValue(), sif.getBoost());
+ sdoc.addField(sif.getName(), sif.getValue());
}
}
@@ -548,14 +553,13 @@ public class JsonLoader extends ContentStreamLoader {
parseExtendedFieldValue(sif, ev);
} else {
Object val = parseNormalFieldValue(ev, sif.getName());
- sif.setValue(val, 1.0f);
+ sif.setValue(val);
}
}
private void parseExtendedFieldValue(SolrInputField sif, int ev) throws IOException {
assert ev == JSONParser.OBJECT_START;
- float boost = 1.0f;
Object normalFieldValue = null;
Map<String, Object> extendedInfo = null;
@@ -573,7 +577,12 @@ public class JsonLoader extends ContentStreamLoader {
+ "Unexpected " + JSONParser.getEventString(ev) + " at [" + parser.getPosition() + "], field=" + sif.getName());
}
- boost = (float) parser.getDouble();
+ String message = "Ignoring field boost: " + parser.getDouble() + " as index-time boosts are not supported anymore";
+ if (WARNED_ABOUT_INDEX_TIME_BOOSTS.compareAndSet(false, true)) {
+ log.warn(message);
+ } else {
+ log.debug(message);
+ }
} else if ("value".equals(label)) {
normalFieldValue = parseNormalFieldValue(parser.nextEvent(), sif.getName());
} else {
@@ -593,9 +602,9 @@ public class JsonLoader extends ContentStreamLoader {
if (normalFieldValue != null) {
extendedInfo.put("value", normalFieldValue);
}
- sif.setValue(extendedInfo, boost);
+ sif.setValue(extendedInfo);
} else {
- sif.setValue(normalFieldValue, boost);
+ sif.setValue(normalFieldValue);
}
return;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java b/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java
index d6a5170..038ed9f 100644
--- a/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java
+++ b/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java
@@ -35,6 +35,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
import com.google.common.collect.Lists;
import org.apache.commons.io.IOUtils;
@@ -71,6 +72,7 @@ import static org.apache.solr.common.params.CommonParams.NAME;
public class XMLLoader extends ContentStreamLoader {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final AtomicBoolean WARNED_ABOUT_INDEX_TIME_BOOSTS = new AtomicBoolean();
static final XMLErrorLogger xmllog = new XMLErrorLogger(log);
public static final String CONTEXT_TRANSFORMER_KEY = "xsltupdater.transformer";
@@ -379,7 +381,12 @@ public class XMLLoader extends ContentStreamLoader {
for (int i = 0; i < parser.getAttributeCount(); i++) {
attrName = parser.getAttributeLocalName(i);
if ("boost".equals(attrName)) {
- doc.setDocumentBoost(Float.parseFloat(parser.getAttributeValue(i)));
+ String message = "Ignoring document boost: " + parser.getAttributeValue(i) + " as index-time boosts are not supported anymore";
+ if (WARNED_ABOUT_INDEX_TIME_BOOSTS.compareAndSet(false, true)) {
+ log.warn(message);
+ } else {
+ log.debug(message);
+ }
} else {
log.warn("XML element <doc> has invalid XML attr:" + attrName);
}
@@ -387,7 +394,6 @@ public class XMLLoader extends ContentStreamLoader {
StringBuilder text = new StringBuilder();
String name = null;
- float boost = 1.0f;
boolean isNull = false;
String update = null;
Collection<SolrInputDocument> subDocs = null;
@@ -438,8 +444,7 @@ public class XMLLoader extends ContentStreamLoader {
}
break;
}
- doc.addField(name, v, boost);
- boost = 1.0f;
+ doc.addField(name, v);
// field is over
name = null;
}
@@ -460,7 +465,6 @@ public class XMLLoader extends ContentStreamLoader {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,
msg);
}
- boost = 1.0f;
update = null;
isNull = false;
String attrVal = "";
@@ -470,7 +474,12 @@ public class XMLLoader extends ContentStreamLoader {
if (NAME.equals(attrName)) {
name = attrVal;
} else if ("boost".equals(attrName)) {
- boost = Float.parseFloat(attrVal);
+ String message = "Ignoring field boost: " + attrVal + " as index-time boosts are not supported anymore";
+ if (WARNED_ABOUT_INDEX_TIME_BOOSTS.compareAndSet(false, true)) {
+ log.warn(message);
+ } else {
+ log.debug(message);
+ }
} else if ("null".equals(attrName)) {
isNull = StrUtils.parseBoolean(attrVal);
} else if ("update".equals(attrName)) {
@@ -488,7 +497,7 @@ public class XMLLoader extends ContentStreamLoader {
for (Map.Entry<String, Map<String, Object>> entry : updateMap.entrySet()) {
name = entry.getKey();
Map<String, Object> value = entry.getValue();
- doc.addField(name, value, 1.0f);
+ doc.addField(name, value);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java b/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java
index 10756da..4e2829e 100644
--- a/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java
+++ b/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java
@@ -200,7 +200,7 @@ public abstract class AbstractSpatialFieldType<T extends SpatialStrategy> extend
//--------------------------------------------------------------
@Override
- public final Field createField(SchemaField field, Object val, float boost) {
+ public final Field createField(SchemaField field, Object val) {
throw new IllegalStateException("instead call createFields() because isPolyField() is true");
}
@@ -210,7 +210,7 @@ public abstract class AbstractSpatialFieldType<T extends SpatialStrategy> extend
}
@Override
- public List<IndexableField> createFields(SchemaField field, Object val, float boost) {
+ public List<IndexableField> createFields(SchemaField field, Object val) {
String shapeStr = null;
Shape shape;
if (val instanceof Shape) {
@@ -237,7 +237,7 @@ public abstract class AbstractSpatialFieldType<T extends SpatialStrategy> extend
return result;
}
- /** Called by {@link #createFields(SchemaField, Object, float)} to get the stored value. */
+ /** Called by {@link #createFields(SchemaField, Object)} to get the stored value. */
protected String getStoredValue(Shape shape, String shapeStr) {
return (shapeStr == null) ? shapeToString(shape) : shapeStr;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/schema/BBoxField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/BBoxField.java b/solr/core/src/java/org/apache/solr/schema/BBoxField.java
index d7fda7c..d69255b 100644
--- a/solr/core/src/java/org/apache/solr/schema/BBoxField.java
+++ b/solr/core/src/java/org/apache/solr/schema/BBoxField.java
@@ -137,7 +137,7 @@ public class BBoxField extends AbstractSpatialFieldType<BBoxStrategy> implements
//Solr's FieldType ought to expose Lucene FieldType. Instead as a hack we create a Field with a dummy value.
final SchemaField solrNumField = new SchemaField("_", numberType);//dummy temp
org.apache.lucene.document.FieldType luceneType =
- (org.apache.lucene.document.FieldType) solrNumField.createField(0.0, 1.0f).fieldType();
+ (org.apache.lucene.document.FieldType) solrNumField.createField(0.0).fieldType();
luceneType.setStored(storeSubFields);
//and annoyingly this Field isn't going to have a docValues format because Solr uses a separate Field for that
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/schema/BinaryField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/BinaryField.java b/solr/core/src/java/org/apache/solr/schema/BinaryField.java
index 889bd3c..d1882b1 100644
--- a/solr/core/src/java/org/apache/solr/schema/BinaryField.java
+++ b/solr/core/src/java/org/apache/solr/schema/BinaryField.java
@@ -20,7 +20,6 @@ import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.nio.ByteBuffer;
-import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.SortField;
import org.apache.lucene.util.BytesRef;
@@ -71,7 +70,7 @@ public class BinaryField extends FieldType {
}
@Override
- public IndexableField createField(SchemaField field, Object val, float boost) {
+ public IndexableField createField(SchemaField field, Object val) {
if (val == null) return null;
if (!field.stored()) {
log.trace("Ignoring unstored binary field: " + field);
@@ -95,8 +94,6 @@ public class BinaryField extends FieldType {
len = buf.length;
}
- Field f = new org.apache.lucene.document.StoredField(field.getName(), buf, offset, len);
- f.setBoost(boost);
- return f;
+ return new org.apache.lucene.document.StoredField(field.getName(), buf, offset, len);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/schema/BoolField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/BoolField.java b/solr/core/src/java/org/apache/solr/schema/BoolField.java
index 1645ee6..7d5c0d7 100644
--- a/solr/core/src/java/org/apache/solr/schema/BoolField.java
+++ b/solr/core/src/java/org/apache/solr/schema/BoolField.java
@@ -182,8 +182,8 @@ public class BoolField extends PrimitiveFieldType {
}
@Override
- public List<IndexableField> createFields(SchemaField field, Object value, float boost) {
- IndexableField fval = createField(field, value, boost);
+ public List<IndexableField> createFields(SchemaField field, Object value) {
+ IndexableField fval = createField(field, value);
if (field.hasDocValues()) {
IndexableField docval;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/schema/CollationField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/CollationField.java b/solr/core/src/java/org/apache/solr/schema/CollationField.java
index 805e204..a498c01 100644
--- a/solr/core/src/java/org/apache/solr/schema/CollationField.java
+++ b/solr/core/src/java/org/apache/solr/schema/CollationField.java
@@ -254,10 +254,10 @@ public class CollationField extends FieldType {
}
@Override
- public List<IndexableField> createFields(SchemaField field, Object value, float boost) {
+ public List<IndexableField> createFields(SchemaField field, Object value) {
if (field.hasDocValues()) {
List<IndexableField> fields = new ArrayList<>();
- fields.add(createField(field, value, boost));
+ fields.add(createField(field, value));
final BytesRef bytes = getCollationKey(field.getName(), value.toString());
if (field.multiValued()) {
fields.add(new SortedSetDocValuesField(field.getName(), bytes));
@@ -266,7 +266,7 @@ public class CollationField extends FieldType {
}
return fields;
} else {
- return Collections.singletonList(createField(field, value, boost));
+ return Collections.singletonList(createField(field, value));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/schema/CurrencyField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/CurrencyField.java b/solr/core/src/java/org/apache/solr/schema/CurrencyField.java
index 7ad285b..9e994cf 100644
--- a/solr/core/src/java/org/apache/solr/schema/CurrencyField.java
+++ b/solr/core/src/java/org/apache/solr/schema/CurrencyField.java
@@ -171,21 +171,21 @@ public class CurrencyField extends FieldType implements SchemaAware, ResourceLoa
}
@Override
- public List<IndexableField> createFields(SchemaField field, Object externalVal, float boost) {
+ public List<IndexableField> createFields(SchemaField field, Object externalVal) {
CurrencyValue value = CurrencyValue.parse(externalVal.toString(), defaultCurrency);
List<IndexableField> f = new ArrayList<>();
SchemaField amountField = getAmountField(field);
- f.add(amountField.createField(String.valueOf(value.getAmount()), amountField.indexed() && !amountField.omitNorms() ? boost : 1F));
+ f.add(amountField.createField(String.valueOf(value.getAmount())));
SchemaField currencyField = getCurrencyField(field);
- f.add(currencyField.createField(value.getCurrencyCode(), currencyField.indexed() && !currencyField.omitNorms() ? boost : 1F));
+ f.add(currencyField.createField(value.getCurrencyCode()));
if (field.stored()) {
String storedValue = externalVal.toString().trim();
if (storedValue.indexOf(",") < 0) {
storedValue += "," + defaultCurrency;
}
- f.add(createField(field.getName(), storedValue, StoredField.TYPE, 1F));
+ f.add(createField(field.getName(), storedValue, StoredField.TYPE));
}
return f;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/schema/DateRangeField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/DateRangeField.java b/solr/core/src/java/org/apache/solr/schema/DateRangeField.java
index d51c1f1..8dde953 100644
--- a/solr/core/src/java/org/apache/solr/schema/DateRangeField.java
+++ b/solr/core/src/java/org/apache/solr/schema/DateRangeField.java
@@ -63,10 +63,10 @@ public class DateRangeField extends AbstractSpatialPrefixTreeFieldType<NumberRan
}
@Override
- public List<IndexableField> createFields(SchemaField field, Object val, float boost) {
+ public List<IndexableField> createFields(SchemaField field, Object val) {
if (val instanceof Date || val instanceof Calendar)//From URP?
val = tree.toUnitShape(val);
- return super.createFields(field, val, boost);
+ return super.createFields(field, val);
}
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/schema/DoublePointField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/DoublePointField.java b/solr/core/src/java/org/apache/solr/schema/DoublePointField.java
index 3a90eec..e34ebec 100644
--- a/solr/core/src/java/org/apache/solr/schema/DoublePointField.java
+++ b/solr/core/src/java/org/apache/solr/schema/DoublePointField.java
@@ -178,12 +178,9 @@ public class DoublePointField extends PointField implements DoubleValueFieldType
}
@Override
- public IndexableField createField(SchemaField field, Object value, float boost) {
+ public IndexableField createField(SchemaField field, Object value) {
if (!isFieldUsed(field)) return null;
- if (boost != 1.0 && log.isTraceEnabled()) {
- log.trace("Can't use document/field boost for PointField. Field: " + field.getName() + ", boost: " + boost);
- }
double doubleValue = (value instanceof Number) ? ((Number) value).doubleValue() : Double.parseDouble(value.toString());
return new DoublePoint(field.getName(), doubleValue);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/schema/EnumField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/EnumField.java b/solr/core/src/java/org/apache/solr/schema/EnumField.java
index 37cd24b..3e83db4 100644
--- a/solr/core/src/java/org/apache/solr/schema/EnumField.java
+++ b/solr/core/src/java/org/apache/solr/schema/EnumField.java
@@ -391,7 +391,7 @@ public class EnumField extends PrimitiveFieldType {
* {@inheritDoc}
*/
@Override
- public IndexableField createField(SchemaField field, Object value, float boost) {
+ public IndexableField createField(SchemaField field, Object value) {
final boolean indexed = field.indexed();
final boolean stored = field.stored();
final boolean docValues = field.hasDocValues();
@@ -418,21 +418,17 @@ public class EnumField extends PrimitiveFieldType {
newType.setNumericType(LegacyNumericType.INT);
newType.setNumericPrecisionStep(DEFAULT_PRECISION_STEP);
- final org.apache.lucene.document.Field f;
- f = new LegacyIntField(field.getName(), intValue.intValue(), newType);
-
- f.setBoost(boost);
- return f;
+ return new LegacyIntField(field.getName(), intValue.intValue(), newType);
}
/**
* {@inheritDoc}
*/
@Override
- public List<IndexableField> createFields(SchemaField sf, Object value, float boost) {
+ public List<IndexableField> createFields(SchemaField sf, Object value) {
if (sf.hasDocValues()) {
List<IndexableField> fields = new ArrayList<>();
- final IndexableField field = createField(sf, value, boost);
+ final IndexableField field = createField(sf, value);
fields.add(field);
if (sf.multiValued()) {
@@ -445,7 +441,7 @@ public class EnumField extends PrimitiveFieldType {
}
return fields;
} else {
- return Collections.singletonList(createField(sf, value, boost));
+ return Collections.singletonList(createField(sf, value));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/schema/FieldType.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/FieldType.java b/solr/core/src/java/org/apache/solr/schema/FieldType.java
index c21b23f..c542a95 100644
--- a/solr/core/src/java/org/apache/solr/schema/FieldType.java
+++ b/solr/core/src/java/org/apache/solr/schema/FieldType.java
@@ -86,7 +86,7 @@ public abstract class FieldType extends FieldProperties {
/**
* The default poly field separator.
*
- * @see #createFields(SchemaField, Object, float)
+ * @see #createFields(SchemaField, Object)
* @see #isPolyField()
*/
public static final String POLY_FIELD_SEPARATOR = "___";
@@ -119,9 +119,9 @@ public abstract class FieldType extends FieldProperties {
}
/**
- * A "polyField" is a FieldType that can produce more than one IndexableField instance for a single value, via the {@link #createFields(org.apache.solr.schema.SchemaField, Object, float)} method. This is useful
+ * A "polyField" is a FieldType that can produce more than one IndexableField instance for a single value, via the {@link #createFields(org.apache.solr.schema.SchemaField, Object)} method. This is useful
* when hiding the implementation details of a field from the Solr end user. For instance, a spatial point may be represented by multiple different fields.
- * @return true if the {@link #createFields(org.apache.solr.schema.SchemaField, Object, float)} method may return more than one field
+ * @return true if the {@link #createFields(org.apache.solr.schema.SchemaField, Object)} method may return more than one field
*/
public boolean isPolyField(){
return false;
@@ -263,7 +263,7 @@ public abstract class FieldType extends FieldProperties {
*
*
*/
- public IndexableField createField(SchemaField field, Object value, float boost) {
+ public IndexableField createField(SchemaField field, Object value) {
if (!field.indexed() && !field.stored()) {
if (log.isTraceEnabled())
log.trace("Ignoring unindexed/unstored field: " + field);
@@ -287,7 +287,7 @@ public abstract class FieldType extends FieldProperties {
newType.setStoreTermVectorOffsets(field.storeTermOffsets());
newType.setStoreTermVectorPositions(field.storeTermPositions());
newType.setStoreTermVectorPayloads(field.storeTermPayloads());*/
- return createField(field.getName(), val, field, boost);
+ return createField(field.getName(), val, field);
}
/**
@@ -296,27 +296,23 @@ public abstract class FieldType extends FieldProperties {
* @param name The name of the field
* @param val The _internal_ value to index
* @param type {@link org.apache.lucene.document.FieldType}
- * @param boost The boost value
* @return the {@link org.apache.lucene.index.IndexableField}.
*/
- protected IndexableField createField(String name, String val, org.apache.lucene.index.IndexableFieldType type, float boost){
- Field f = new Field(name, val, type);
- f.setBoost(boost);
- return f;
+ protected IndexableField createField(String name, String val, org.apache.lucene.index.IndexableFieldType type){
+ return new Field(name, val, type);
}
/**
* Given a {@link org.apache.solr.schema.SchemaField}, create one or more {@link org.apache.lucene.index.IndexableField} instances
* @param field the {@link org.apache.solr.schema.SchemaField}
* @param value The value to add to the field
- * @param boost The boost to apply
* @return An array of {@link org.apache.lucene.index.IndexableField}
*
- * @see #createField(SchemaField, Object, float)
+ * @see #createField(SchemaField, Object)
* @see #isPolyField()
*/
- public List<IndexableField> createFields(SchemaField field, Object value, float boost) {
- IndexableField f = createField( field, value, boost);
+ public List<IndexableField> createFields(SchemaField field, Object value) {
+ IndexableField f = createField( field, value);
if (field.hasDocValues() && f.fieldType().docValuesType() == null) {
// field types that support doc values should either override createField
// to return a field with doc values or extend createFields if this can't
@@ -366,7 +362,7 @@ public abstract class FieldType extends FieldProperties {
public Object toObject(SchemaField sf, BytesRef term) {
final CharsRefBuilder ref = new CharsRefBuilder();
indexedToReadable(term, ref);
- final IndexableField f = createField(sf, ref.toString(), 1.0f);
+ final IndexableField f = createField(sf, ref.toString());
return toObject(f);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/schema/FloatPointField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/FloatPointField.java b/solr/core/src/java/org/apache/solr/schema/FloatPointField.java
index 6647286..39453e7 100644
--- a/solr/core/src/java/org/apache/solr/schema/FloatPointField.java
+++ b/solr/core/src/java/org/apache/solr/schema/FloatPointField.java
@@ -179,12 +179,9 @@ public class FloatPointField extends PointField implements FloatValueFieldType {
}
@Override
- public IndexableField createField(SchemaField field, Object value, float boost) {
+ public IndexableField createField(SchemaField field, Object value) {
if (!isFieldUsed(field)) return null;
- if (boost != 1.0 && log.isTraceEnabled()) {
- log.trace("Can't use document/field boost for PointField. Field: " + field.getName() + ", boost: " + boost);
- }
float floatValue = (value instanceof Number) ? ((Number) value).floatValue() : Float.parseFloat(value.toString());
return new FloatPoint(field.getName(), floatValue);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/schema/IntPointField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/IntPointField.java b/solr/core/src/java/org/apache/solr/schema/IntPointField.java
index b25bc9f..db26988 100644
--- a/solr/core/src/java/org/apache/solr/schema/IntPointField.java
+++ b/solr/core/src/java/org/apache/solr/schema/IntPointField.java
@@ -169,12 +169,9 @@ public class IntPointField extends PointField implements IntValueFieldType {
}
@Override
- public IndexableField createField(SchemaField field, Object value, float boost) {
+ public IndexableField createField(SchemaField field, Object value) {
if (!isFieldUsed(field)) return null;
- if (boost != 1.0 && log.isTraceEnabled()) {
- log.trace("Can't use document/field boost for PointField. Field: " + field.getName() + ", boost: " + boost);
- }
int intValue = (value instanceof Number) ? ((Number) value).intValue() : Integer.parseInt(value.toString());
return new IntPoint(field.getName(), intValue);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/schema/LatLonType.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/LatLonType.java b/solr/core/src/java/org/apache/solr/schema/LatLonType.java
index 856c8bb..c484f3a 100644
--- a/solr/core/src/java/org/apache/solr/schema/LatLonType.java
+++ b/solr/core/src/java/org/apache/solr/schema/LatLonType.java
@@ -67,7 +67,7 @@ public class LatLonType extends AbstractSubTypeFieldType implements SpatialQuery
}
@Override
- public List<IndexableField> createFields(SchemaField field, Object value, float boost) {
+ public List<IndexableField> createFields(SchemaField field, Object value) {
String externalVal = value.toString();
//we could have 3 fields (two for the lat & lon, one for storage)
List<IndexableField> f = new ArrayList<>(3);
@@ -75,14 +75,14 @@ public class LatLonType extends AbstractSubTypeFieldType implements SpatialQuery
Point point = SpatialUtils.parsePointSolrException(externalVal, SpatialContext.GEO);
//latitude
SchemaField subLatSF = subField(field, LAT, schema);
- f.add(subLatSF.createField(String.valueOf(point.getY()), subLatSF.indexed() && !subLatSF.omitNorms() ? boost : 1f));
+ f.add(subLatSF.createField(String.valueOf(point.getY())));
//longitude
SchemaField subLonSF = subField(field, LON, schema);
- f.add(subLonSF.createField(String.valueOf(point.getX()), subLonSF.indexed() && !subLonSF.omitNorms() ? boost : 1f));
+ f.add(subLonSF.createField(String.valueOf(point.getX())));
}
if (field.stored()) {
- f.add(createField(field.getName(), externalVal, StoredField.TYPE, 1f));
+ f.add(createField(field.getName(), externalVal, StoredField.TYPE));
}
return f;
}
@@ -245,7 +245,7 @@ public class LatLonType extends AbstractSubTypeFieldType implements SpatialQuery
//It never makes sense to create a single field, so make it impossible to happen
@Override
- public IndexableField createField(SchemaField field, Object value, float boost) {
+ public IndexableField createField(SchemaField field, Object value) {
throw new UnsupportedOperationException("LatLonType uses multiple fields. field=" + field.getName());
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/schema/LongPointField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/LongPointField.java b/solr/core/src/java/org/apache/solr/schema/LongPointField.java
index 5631938..f5d0948 100644
--- a/solr/core/src/java/org/apache/solr/schema/LongPointField.java
+++ b/solr/core/src/java/org/apache/solr/schema/LongPointField.java
@@ -174,12 +174,9 @@ public class LongPointField extends PointField implements LongValueFieldType {
}
@Override
- public IndexableField createField(SchemaField field, Object value, float boost) {
+ public IndexableField createField(SchemaField field, Object value) {
if (!isFieldUsed(field)) return null;
- if (boost != 1.0 && log.isTraceEnabled()) {
- log.trace("Can't use document/field boost for PointField. Field: " + field.getName() + ", boost: " + boost);
- }
long longValue = (value instanceof Number) ? ((Number) value).longValue() : Long.parseLong(value.toString());
return new LongPoint(field.getName(), longValue);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/schema/PointField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/PointField.java b/solr/core/src/java/org/apache/solr/schema/PointField.java
index 8746dac..6c75105 100644
--- a/solr/core/src/java/org/apache/solr/schema/PointField.java
+++ b/solr/core/src/java/org/apache/solr/schema/PointField.java
@@ -203,12 +203,12 @@ public abstract class PointField extends NumericFieldType {
}
@Override
- public List<IndexableField> createFields(SchemaField sf, Object value, float boost) {
+ public List<IndexableField> createFields(SchemaField sf, Object value) {
if (!(sf.hasDocValues() || sf.stored())) {
- return Collections.singletonList(createField(sf, value, boost));
+ return Collections.singletonList(createField(sf, value));
}
List<IndexableField> fields = new ArrayList<>();
- final IndexableField field = createField(sf, value, boost);
+ final IndexableField field = createField(sf, value);
fields.add(field);
if (sf.hasDocValues()) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/schema/PointType.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/PointType.java b/solr/core/src/java/org/apache/solr/schema/PointType.java
index 1c13097..4c022b8 100644
--- a/solr/core/src/java/org/apache/solr/schema/PointType.java
+++ b/solr/core/src/java/org/apache/solr/schema/PointType.java
@@ -66,7 +66,7 @@ public class PointType extends CoordinateFieldType implements SpatialQueryable {
}
@Override
- public List<IndexableField> createFields(SchemaField field, Object value, float boost) {
+ public List<IndexableField> createFields(SchemaField field, Object value) {
String externalVal = value.toString();
String[] point = parseCommaSeparatedList(externalVal, dimension);
@@ -76,13 +76,13 @@ public class PointType extends CoordinateFieldType implements SpatialQueryable {
if (field.indexed()) {
for (int i=0; i<dimension; i++) {
SchemaField sf = subField(field, i, schema);
- f.add(sf.createField(point[i], sf.indexed() && !sf.omitNorms() ? boost : 1f));
+ f.add(sf.createField(point[i]));
}
}
if (field.stored()) {
String storedVal = externalVal; // normalize or not?
- f.add(createField(field.getName(), storedVal, StoredField.TYPE, 1f));
+ f.add(createField(field.getName(), storedVal, StoredField.TYPE));
}
return f;
@@ -105,7 +105,7 @@ public class PointType extends CoordinateFieldType implements SpatialQueryable {
*
*/
@Override
- public IndexableField createField(SchemaField field, Object value, float boost) {
+ public IndexableField createField(SchemaField field, Object value) {
throw new UnsupportedOperationException("PointType uses multiple fields. field=" + field.getName());
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java b/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java
index 5f125d9..d2dc811 100644
--- a/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java
+++ b/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java
@@ -119,11 +119,10 @@ public class PreAnalyzedField extends TextField implements HasImplicitIndexAnaly
}
@Override
- public IndexableField createField(SchemaField field, Object value,
- float boost) {
+ public IndexableField createField(SchemaField field, Object value) {
IndexableField f = null;
try {
- f = fromString(field, String.valueOf(value), boost);
+ f = fromString(field, String.valueOf(value));
} catch (Exception e) {
LOG.warn("Error parsing pre-analyzed field '" + field.getName() + "'", e);
return null;
@@ -225,7 +224,7 @@ public class PreAnalyzedField extends TextField implements HasImplicitIndexAnaly
}
- public IndexableField fromString(SchemaField field, String val, float boost) throws Exception {
+ public IndexableField fromString(SchemaField field, String val) throws Exception {
if (val == null || val.trim().length() == 0) {
return null;
}
@@ -269,9 +268,6 @@ public class PreAnalyzedField extends TextField implements HasImplicitIndexAnaly
}
}
}
- if (f != null) {
- f.setBoost(boost);
- }
return f;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/schema/SchemaField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/SchemaField.java b/solr/core/src/java/org/apache/solr/schema/SchemaField.java
index 009e5fc..e690a13 100644
--- a/solr/core/src/java/org/apache/solr/schema/SchemaField.java
+++ b/solr/core/src/java/org/apache/solr/schema/SchemaField.java
@@ -113,16 +113,16 @@ public final class SchemaField extends FieldProperties implements IndexableField
boolean isTokenized() { return (properties & TOKENIZED)!=0; }
boolean isBinary() { return (properties & BINARY)!=0; }
- public IndexableField createField(Object val, float boost) {
- return type.createField(this,val,boost);
+ public IndexableField createField(Object val) {
+ return type.createField(this,val);
}
- public List<IndexableField> createFields(Object val, float boost) {
- return type.createFields(this,val,boost);
+ public List<IndexableField> createFields(Object val) {
+ return type.createFields(this,val);
}
/**
- * If true, then use {@link #createFields(Object, float)}, else use {@link #createField} to save an extra allocation
+ * If true, then use {@link #createFields(Object)}, else use {@link #createField} to save an extra allocation
* @return true if this field is a poly field
*/
public boolean isPolyField(){
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/schema/StrField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/StrField.java b/solr/core/src/java/org/apache/solr/schema/StrField.java
index a00cfb7..0b1576b 100644
--- a/solr/core/src/java/org/apache/solr/schema/StrField.java
+++ b/solr/core/src/java/org/apache/solr/schema/StrField.java
@@ -40,8 +40,8 @@ public class StrField extends PrimitiveFieldType {
}
@Override
- public List<IndexableField> createFields(SchemaField field, Object value, float boost) {
- IndexableField fval = createField(field, value, boost);
+ public List<IndexableField> createFields(SchemaField field, Object value) {
+ IndexableField fval = createField(field, value);
if (field.hasDocValues()) {
IndexableField docval;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/schema/TrieField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/TrieField.java b/solr/core/src/java/org/apache/solr/schema/TrieField.java
index e470155..b70b2b0 100644
--- a/solr/core/src/java/org/apache/solr/schema/TrieField.java
+++ b/solr/core/src/java/org/apache/solr/schema/TrieField.java
@@ -572,7 +572,7 @@ public class TrieField extends NumericFieldType {
}
@Override
- public IndexableField createField(SchemaField field, Object value, float boost) {
+ public IndexableField createField(SchemaField field, Object value) {
boolean indexed = field.indexed();
boolean stored = field.stored();
boolean docValues = field.hasDocValues();
@@ -647,15 +647,14 @@ public class TrieField extends NumericFieldType {
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Unknown type for trie field: " + type);
}
- f.setBoost(boost);
return f;
}
@Override
- public List<IndexableField> createFields(SchemaField sf, Object value, float boost) {
+ public List<IndexableField> createFields(SchemaField sf, Object value) {
if (sf.hasDocValues()) {
List<IndexableField> fields = new ArrayList<>();
- final IndexableField field = createField(sf, value, boost);
+ final IndexableField field = createField(sf, value);
fields.add(field);
if (sf.multiValued()) {
@@ -677,7 +676,7 @@ public class TrieField extends NumericFieldType {
return fields;
} else {
- return Collections.singletonList(createField(sf, value, boost));
+ return Collections.singletonList(createField(sf, value));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/search/Grouping.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/Grouping.java b/solr/core/src/java/org/apache/solr/search/Grouping.java
index 75011e7..327e5bb 100644
--- a/solr/core/src/java/org/apache/solr/search/Grouping.java
+++ b/solr/core/src/java/org/apache/solr/search/Grouping.java
@@ -819,7 +819,7 @@ public class Grouping {
SchemaField schemaField = searcher.getSchema().getField(groupBy);
FieldType fieldType = schemaField.getType();
String readableValue = fieldType.indexedToReadable(group.groupValue.utf8ToString());
- IndexableField field = schemaField.createField(readableValue, 1.0f);
+ IndexableField field = schemaField.createField(readableValue);
nl.add("groupValue", fieldType.toObject(field));
} else {
nl.add("groupValue", null);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java b/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java
index 47b5276..de2dee4 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java
@@ -69,7 +69,7 @@ public class GroupedEndResultTransformer implements EndResultTransformer {
SimpleOrderedMap<Object> groupResult = new SimpleOrderedMap<>();
if (group.groupValue != null) {
groupResult.add(
- "groupValue", groupFieldType.toObject(groupField.createField(group.groupValue.utf8ToString(), 1.0f))
+ "groupValue", groupFieldType.toObject(groupField.createField(group.groupValue.utf8ToString()))
);
} else {
groupResult.add("groupValue", null);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/update/DocumentBuilder.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/DocumentBuilder.java b/solr/core/src/java/org/apache/solr/update/DocumentBuilder.java
index eb6612e..abf4a1f 100644
--- a/solr/core/src/java/org/apache/solr/update/DocumentBuilder.java
+++ b/solr/core/src/java/org/apache/solr/update/DocumentBuilder.java
@@ -43,25 +43,22 @@ public class DocumentBuilder {
* @param doc Document that the field needs to be added to
* @param field The schema field object for the field
* @param val The value for the field to be added
- * @param boost Boost value for the field
* @param forInPlaceUpdate Whether the field is to be added for in-place update. If true,
* only numeric docValues based fields are added to the document. This can be true
* when constructing a Lucene document for writing an in-place update, and we don't need
* presence of non-updatable fields (non NDV) in such a document.
*/
- private static void addField(Document doc, SchemaField field, Object val, float boost,
+ private static void addField(Document doc, SchemaField field, Object val,
boolean forInPlaceUpdate) {
if (val instanceof IndexableField) {
if (forInPlaceUpdate) {
assert val instanceof NumericDocValuesField: "Expected in-place update to be done on"
+ " NDV fields only.";
}
- // set boost to the calculated compound boost
- ((Field)val).setBoost(boost);
doc.add((Field)val);
return;
}
- for (IndexableField f : field.getType().createFields(field, val, boost)) {
+ for (IndexableField f : field.getType().createFields(field, val)) {
if (f != null) { // null fields are not added
// HACK: workaround for SOLR-9809
// even though at this point in the code we know the field is single valued and DV only
@@ -126,7 +123,6 @@ public class DocumentBuilder {
final String uniqueKeyFieldName = null == uniqueKeyField ? null : uniqueKeyField.getName();
Document out = new Document();
- final float docBoost = doc.getDocumentBoost();
Set<String> usedFields = Sets.newHashSet();
// Load fields from SolrDocument to Document
@@ -141,19 +137,6 @@ public class DocumentBuilder {
"ERROR: "+getID(doc, schema)+"multiple values encountered for non multiValued field " +
sfield.getName() + ": " +field.getValue() );
}
-
- float fieldBoost = field.getBoost();
- boolean applyBoost = sfield != null && sfield.indexed() && !sfield.omitNorms();
-
- if (applyBoost == false && fieldBoost != 1.0F) {
- throw new SolrException( SolrException.ErrorCode.BAD_REQUEST,
- "ERROR: "+getID(doc, schema)+"cannot set an index-time boost, unindexed or norms are omitted for field " +
- sfield.getName() + ": " +field.getValue() );
- }
-
- // Lucene no longer has a native docBoost, so we have to multiply
- // it ourselves
- float compoundBoost = fieldBoost * docBoost;
List<CopyField> copyFields = schema.getCopyFieldsList(name);
if( copyFields.size() == 0 ) copyFields = null;
@@ -168,7 +151,7 @@ public class DocumentBuilder {
hasField = true;
if (sfield != null) {
used = true;
- addField(out, sfield, v, applyBoost ? compoundBoost : 1f,
+ addField(out, sfield, v,
name.equals(uniqueKeyFieldName) ? false : forInPlaceUpdate);
// record the field as having a value
usedFields.add(sfield.getName());
@@ -200,27 +183,13 @@ public class DocumentBuilder {
val = cf.getLimitedValue((String)val);
}
- // we can't copy any boost unless the dest field is
- // indexed & !omitNorms, but which boost we copy depends
- // on whether the dest field already contains values (we
- // don't want to apply the compounded docBoost more then once)
- final float destBoost =
- (destinationField.indexed() && !destinationField.omitNorms()) ?
- (destHasValues ? fieldBoost : compoundBoost) : 1.0F;
-
- addField(out, destinationField, val, destBoost,
+ addField(out, destinationField, val,
destinationField.getName().equals(uniqueKeyFieldName) ? false : forInPlaceUpdate);
// record the field as having a value
usedFields.add(destinationField.getName());
}
}
}
-
- // The final boost for a given field named is the product of the
- // *all* boosts on values of that field.
- // For multi-valued fields, we only want to set the boost on the
- // first field.
- fieldBoost = compoundBoost = 1.0f;
}
}
catch( SolrException ex ) {
@@ -250,7 +219,7 @@ public class DocumentBuilder {
for (SchemaField field : schema.getRequiredFields()) {
if (out.getField(field.getName() ) == null) {
if (field.getDefaultValue() != null) {
- addField(out, field, field.getDefaultValue(), 1.0f, false);
+ addField(out, field, field.getDefaultValue(), false);
}
else {
String msg = getID(doc, schema) + "missing required field: " + field.getName();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/update/processor/AllValuesOrNoneFieldMutatingUpdateProcessor.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/processor/AllValuesOrNoneFieldMutatingUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/AllValuesOrNoneFieldMutatingUpdateProcessor.java
index 52726ea..1d56a62 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/AllValuesOrNoneFieldMutatingUpdateProcessor.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/AllValuesOrNoneFieldMutatingUpdateProcessor.java
@@ -104,10 +104,9 @@ public abstract class AllValuesOrNoneFieldMutatingUpdateProcessor extends FieldM
srcField.getName(), srcVal.getClass().getSimpleName(), srcVal,
destVal.getClass().getSimpleName(), destVal));
}
- result.addValue(destVal, 1.0F);
+ result.addValue(destVal);
}
}
- result.setBoost(srcField.getBoost());
if (null != messages && log.isDebugEnabled()) {
for (String message : messages) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java b/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java
index 0c17758..093149a 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java
@@ -306,18 +306,18 @@ public class AtomicUpdateDocumentMerger {
protected void doSet(SolrInputDocument toDoc, SolrInputField sif, Object fieldVal) {
SchemaField sf = schema.getField(sif.getName());
- toDoc.setField(sif.getName(), sf.getType().toNativeType(fieldVal), sif.getBoost());
+ toDoc.setField(sif.getName(), sf.getType().toNativeType(fieldVal));
}
protected void doAdd(SolrInputDocument toDoc, SolrInputField sif, Object fieldVal) {
SchemaField sf = schema.getField(sif.getName());
- toDoc.addField(sif.getName(), sf.getType().toNativeType(fieldVal), sif.getBoost());
+ toDoc.addField(sif.getName(), sf.getType().toNativeType(fieldVal));
}
protected void doInc(SolrInputDocument toDoc, SolrInputField sif, Object fieldVal) {
SolrInputField numericField = toDoc.get(sif.getName());
if (numericField == null) {
- toDoc.setField(sif.getName(), fieldVal, sif.getBoost());
+ toDoc.setField(sif.getName(), fieldVal);
} else {
// TODO: fieldtype needs externalToObject?
String oldValS = numericField.getFirstValue().toString();
@@ -339,7 +339,7 @@ public class AtomicUpdateDocumentMerger {
result = ((Integer) oldVal).intValue() + Integer.parseInt(fieldValS);
}
- toDoc.setField(sif.getName(), result, sif.getBoost());
+ toDoc.setField(sif.getName(), result);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/update/processor/CloneFieldUpdateProcessorFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/processor/CloneFieldUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/CloneFieldUpdateProcessorFactory.java
index ad5c772..2ffc5b9 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/CloneFieldUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/CloneFieldUpdateProcessorFactory.java
@@ -450,8 +450,7 @@ public class CloneFieldUpdateProcessorFactory
}
for (Object val : srcFieldValues) {
- // preserve existing dest boost (multiplicitive), ignore src boost
- destField.addValue(val, 1.0f);
+ destField.addValue(val);
}
// put it in map to avoid concurrent modification...
destMap.put(resolvedDest, destField);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/update/processor/ConcatFieldUpdateProcessorFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/processor/ConcatFieldUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/ConcatFieldUpdateProcessorFactory.java
index 65ca976..ae260e9 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/ConcatFieldUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/ConcatFieldUpdateProcessorFactory.java
@@ -81,8 +81,7 @@ public final class ConcatFieldUpdateProcessorFactory extends FieldMutatingUpdate
if (src.getValueCount() <= 1) return src;
SolrInputField result = new SolrInputField(src.getName());
- result.setValue(StringUtils.join(src.getValues(), delimiter),
- src.getBoost());
+ result.setValue(StringUtils.join(src.getValues(), delimiter));
return result;
});
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/update/processor/CountFieldValuesUpdateProcessorFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/processor/CountFieldValuesUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/CountFieldValuesUpdateProcessorFactory.java
index 5ffd0f6..1ed52c0 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/CountFieldValuesUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/CountFieldValuesUpdateProcessorFactory.java
@@ -72,8 +72,7 @@ public final class CountFieldValuesUpdateProcessorFactory extends FieldMutatingU
UpdateRequestProcessor next) {
return mutator(getSelector(), next, src -> {
SolrInputField result = new SolrInputField(src.getName());
- result.setValue(src.getValueCount(),
- src.getBoost());
+ result.setValue(src.getValueCount());
return result;
});
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/update/processor/FieldValueMutatingUpdateProcessor.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/processor/FieldValueMutatingUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/FieldValueMutatingUpdateProcessor.java
index 51d99f1..b08ed9b 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/FieldValueMutatingUpdateProcessor.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/FieldValueMutatingUpdateProcessor.java
@@ -78,10 +78,9 @@ public abstract class FieldValueMutatingUpdateProcessor
log.debug("replace value from field '{}': {} with {}",
new Object[] { src.getName(), srcVal, destVal });
}
- result.addValue(destVal, 1.0F);
+ result.addValue(destVal);
}
}
- result.setBoost(src.getBoost());
return 0 == result.getValueCount() ? null : result;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/update/processor/FieldValueSubsetUpdateProcessorFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/processor/FieldValueSubsetUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/FieldValueSubsetUpdateProcessorFactory.java
index 1fda07d..89c94bb 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/FieldValueSubsetUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/FieldValueSubsetUpdateProcessorFactory.java
@@ -39,8 +39,7 @@ public abstract class FieldValueSubsetUpdateProcessorFactory extends FieldMutati
if (src.getValueCount() <= 1) return src;
SolrInputField result = new SolrInputField(src.getName());
- result.setValue(pickSubset(src.getValues()),
- src.getBoost());
+ result.setValue(pickSubset(src.getValues()));
return result;
});
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/java/org/apache/solr/update/processor/PreAnalyzedUpdateProcessorFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/processor/PreAnalyzedUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/PreAnalyzedUpdateProcessorFactory.java
index 2b76fbf..690c0f0 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/PreAnalyzedUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/PreAnalyzedUpdateProcessorFactory.java
@@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
* <p>This update processor uses {@link PreAnalyzedParser}
* to parse the original field content (interpreted as a string value), and thus
* obtain the stored part and the token stream part. Then it creates the "template"
- * {@link Field}-s using the original {@link SchemaField#createFields(Object, float)}
+ * {@link Field}-s using the original {@link SchemaField#createFields(Object)}
* as declared in the current schema. Finally it sets the pre-analyzed parts if
* available (string value and the token
* stream value) on the first field of these "template" fields. If the declared
@@ -155,17 +155,16 @@ class PreAnalyzedUpdateProcessor extends FieldMutatingUpdateProcessor {
return null;
}
SolrInputField res = new SolrInputField(src.getName());
- res.setBoost(src.getBoost());
for (Object o : src) {
if (o == null) {
continue;
}
- Field pre = (Field)parser.createField(sf, o, 1.0f);
+ Field pre = (Field)parser.createField(sf, o);
if (pre != null) {
- res.addValue(pre, 1.0f);
+ res.addValue(pre);
} else { // restore the original value
log.warn("Could not parse field {} - using original value as is: {}", src.getName(), o);
- res.addValue(o, 1.0f);
+ res.addValue(o);
}
}
return res;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
index 579ccf0..f4a14db 100644
--- a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
+++ b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
@@ -506,32 +506,32 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {
IndexableField luf; // Lucene field
f = ischema.getField("test_basictv");
- luf = f.createField("test", 0f);
+ luf = f.createField("test");
assertTrue(f.storeTermVector());
assertTrue(luf.fieldType().storeTermVectors());
f = ischema.getField("test_notv");
- luf = f.createField("test", 0f);
+ luf = f.createField("test");
assertTrue(!f.storeTermVector());
assertTrue(!luf.fieldType().storeTermVectors());
f = ischema.getField("test_postv");
- luf = f.createField("test", 0f);
+ luf = f.createField("test");
assertTrue(f.storeTermVector() && f.storeTermPositions());
assertTrue(luf.fieldType().storeTermVectorPositions());
f = ischema.getField("test_offtv");
- luf = f.createField("test", 0f);
+ luf = f.createField("test");
assertTrue(f.storeTermVector() && f.storeTermOffsets());
assertTrue(luf.fieldType().storeTermVectorOffsets());
f = ischema.getField("test_posofftv");
- luf = f.createField("test", 0f);
+ luf = f.createField("test");
assertTrue(f.storeTermVector() && f.storeTermPositions() && f.storeTermOffsets());
assertTrue(luf.fieldType().storeTermVectorOffsets() && luf.fieldType().storeTermVectorPositions());
f = ischema.getField("test_posoffpaytv");
- luf = f.createField("test", 0f);
+ luf = f.createField("test");
assertTrue(f.storeTermVector() && f.storeTermPositions() && f.storeTermOffsets() && f.storeTermPayloads());
assertTrue(luf.fieldType().storeTermVectorOffsets() && luf.fieldType().storeTermVectorPositions() && luf.fieldType().storeTermVectorPayloads());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/test/org/apache/solr/TestDocumentBuilder.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/TestDocumentBuilder.java b/solr/core/src/test/org/apache/solr/TestDocumentBuilder.java
index df8ef00..a3ca089 100644
--- a/solr/core/src/test/org/apache/solr/TestDocumentBuilder.java
+++ b/solr/core/src/test/org/apache/solr/TestDocumentBuilder.java
@@ -41,7 +41,6 @@ public class TestDocumentBuilder extends LuceneTestCase {
list.add(33);
list.add(20);
doc.addField("field5", list);
- doc.setDocumentBoost(5f);
SolrInputDocument clone = doc.deepCopy();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java
index 2f6c5e9..ec2dac6 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java
@@ -244,7 +244,7 @@ public class TestCloudDeleteByQuery extends SolrCloudTestCase {
public static SolrInputField f(String fieldName, Object... values) {
SolrInputField f = new SolrInputField(fieldName);
- f.setValue(values, 1.0F);
+ f.setValue(values);
return f;
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java b/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java
index 9f29d3d..9c04f75 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java
@@ -437,13 +437,13 @@ public class TestStressCloudBlindAtomicUpdates extends SolrCloudTestCase {
public static SolrInputField f(String fieldName, Object... values) {
SolrInputField f = new SolrInputField(fieldName);
- f.setValue(values, 1.0F);
+ f.setValue(values);
// TODO: soooooooooo stupid (but currently neccessary because atomic updates freak out
// if the Map with the "inc" operation is inside of a collection - even if it's the only "value") ...
if (1 == values.length) {
- f.setValue(values[0], 1.0F);
+ f.setValue(values[0]);
} else {
- f.setValue(values, 1.0F);
+ f.setValue(values);
}
return f;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java
index f5dead9..f66f892 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java
@@ -1036,7 +1036,7 @@ public class TestTolerantUpdateProcessorCloud extends SolrCloudTestCase {
public static SolrInputField f(String fieldName, Object... values) {
SolrInputField f = new SolrInputField(fieldName);
- f.setValue(values, 1.0F);
+ f.setValue(values);
return f;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java b/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java
index 5ca51c8..4f8b7da 100644
--- a/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java
@@ -52,7 +52,7 @@ public class JsonLoaderTest extends SolrTestCaseJ4 {
" },\n" +
" 'array': [ 'aaa', 'bbb' ],\n" +
" 'boosted': {\n" +
- " 'boost': 6.7,\n" +
+ " 'boost': 6.7,\n" + // make sure we still accept boosts
" 'value': [ 'aaa', 'bbb' ]\n" +
" }\n" +
" }\n" +
@@ -94,7 +94,6 @@ public class JsonLoaderTest extends SolrTestCaseJ4 {
AddUpdateCommand add = p.addCommands.get(0);
SolrInputDocument d = add.solrDoc;
SolrInputField f = d.getField( "boosted" );
- assertEquals(6.7f, f.getBoost(), 0.1);
assertEquals(2, f.getValues().size());
//
@@ -102,7 +101,6 @@ public class JsonLoaderTest extends SolrTestCaseJ4 {
d = add.solrDoc;
f = d.getField( "f1" );
assertEquals(2, f.getValues().size());
- assertEquals(3.45f, d.getDocumentBoost(), 0.001);
assertEquals(false, add.overwrite);
assertEquals(0, d.getField("f2").getValueCount());
@@ -262,7 +260,6 @@ public class JsonLoaderTest extends SolrTestCaseJ4 {
assertEquals(2, d.getFieldNames().size());
assertEquals("1", d.getFieldValue("id"));
assertEquals(new Object[] {45L, 67L, 89L} , d.getFieldValues("f").toArray());
- assertEquals(0.0F, fBoost, d.getField("f").getBoost());
d = p.addCommands.get(1).solrDoc;
assertEquals(1, d.getFieldNames().size());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java
index 7282e19..6d46722 100644
--- a/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java
@@ -76,13 +76,6 @@ public class XmlUpdateRequestHandlerTest extends SolrTestCaseJ4 {
XMLLoader loader = new XMLLoader();
SolrInputDocument doc = loader.readDoc( parser );
- // Read boosts
- assertEquals( 5.5f, doc.getDocumentBoost(), 0.1);
- assertEquals( 1.0f, doc.getField( "name" ).getBoost(), 0.1);
- assertEquals( 2.2f, doc.getField( "id" ).getBoost(), 0.1);
- // Boost is the product of each value
- assertEquals( (3*4*5.0f), doc.getField( "cat" ).getBoost(), 0.1);
-
// Read values
assertEquals( "12345", doc.getField( "id" ).getValue() );
assertEquals( "kitten", doc.getField( "name").getValue() );
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/test/org/apache/solr/schema/AbstractCurrencyFieldTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/AbstractCurrencyFieldTest.java b/solr/core/src/test/org/apache/solr/schema/AbstractCurrencyFieldTest.java
index e633a13..a195794 100644
--- a/solr/core/src/test/org/apache/solr/schema/AbstractCurrencyFieldTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/AbstractCurrencyFieldTest.java
@@ -98,7 +98,7 @@ public abstract class AbstractCurrencyFieldTest extends SolrTestCaseJ4 {
FieldType tmp = amount.getType();
assertTrue(tmp instanceof CurrencyField);
String currencyValue = "1.50,EUR";
- List<IndexableField> fields = amount.createFields(currencyValue, 2);
+ List<IndexableField> fields = amount.createFields(currencyValue);
assertEquals(fields.size(), 3);
// First field is currency code, second is value, third is stored.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java b/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java
index 9e88b6e..ac451bf 100644
--- a/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java
@@ -50,13 +50,13 @@ public class DateFieldTest extends SolrTestCaseJ4 {
int props = FieldProperties.INDEXED ^ FieldProperties.STORED;
SchemaField sf = new SchemaField( "test", f, props, null );
// String
- IndexableField out = f.createField(sf, "1995-12-31T23:59:59Z", 1.0f );
+ IndexableField out = f.createField(sf, "1995-12-31T23:59:59Z" );
assertEquals(820454399000L, f.toObject( out ).getTime() );
// Date obj
- out = f.createField(sf, new Date(820454399000L), 1.0f );
+ out = f.createField(sf, new Date(820454399000L) );
assertEquals(820454399000L, f.toObject( out ).getTime() );
// Date math
- out = f.createField(sf, "1995-12-31T23:59:59.99Z+5MINUTES", 1.0f);
+ out = f.createField(sf, "1995-12-31T23:59:59.99Z+5MINUTES");
assertEquals(820454699990L, f.toObject( out ).getTime() );
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java b/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
index cc3486e..cf43a68 100644
--- a/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
@@ -152,7 +152,7 @@ public class DocValuesTest extends SolrTestCaseJ4 {
}
private void tstToObj(SchemaField sf, Object o) {
- List<IndexableField> fields = sf.createFields(o, 1.0f);
+ List<IndexableField> fields = sf.createFields(o);
for (IndexableField field : fields) {
assertEquals( sf.getType().toObject(field), o);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/test/org/apache/solr/schema/PolyFieldTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/PolyFieldTest.java b/solr/core/src/test/org/apache/solr/schema/PolyFieldTest.java
index f788ba0..6839c70 100644
--- a/solr/core/src/test/org/apache/solr/schema/PolyFieldTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/PolyFieldTest.java
@@ -83,7 +83,7 @@ public class PolyFieldTest extends SolrTestCaseJ4 {
assertEquals(pt.getDimension(), 2);
double[] xy = new double[]{35.0, -79.34};
String point = xy[0] + "," + xy[1];
- List<IndexableField> fields = home.createFields(point, 2);
+ List<IndexableField> fields = home.createFields(point);
assertEquals(fields.size(), 3);//should be 3, we have a stored field
//first two fields contain the values, third is just stored and contains the original
for (int i = 0; i < 3; i++) {
@@ -99,13 +99,13 @@ public class PolyFieldTest extends SolrTestCaseJ4 {
home = schema.getField("home_ns");
assertNotNull(home);
- fields = home.createFields(point, 2);
+ fields = home.createFields(point);
assertEquals(fields.size(), 2);//should be 2, since we aren't storing
home = schema.getField("home_ns");
assertNotNull(home);
try {
- fields = home.createFields("35.0,foo", 2);
+ fields = home.createFields("35.0,foo");
assertTrue(false);
} catch (Exception e) {
//
@@ -115,7 +115,7 @@ public class PolyFieldTest extends SolrTestCaseJ4 {
SchemaField s1 = schema.getField("test_p");
SchemaField s2 = schema.getField("test_p");
// If we use [Int/Double/Long/Float]PointField, we can't get the valueSource, since docValues is false
- if (s1.createFields("1,2", 0).get(0).fieldType().pointDimensionCount() == 0) {
+ if (s1.createFields("1,2").get(0).fieldType().pointDimensionCount() == 0) {
assertFalse(s2.getType().isPointField());
ValueSource v1 = s1.getType().getValueSource(s1, null);
ValueSource v2 = s2.getType().getValueSource(s2, null);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldTest.java b/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldTest.java
index 622a634..a494654 100644
--- a/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldTest.java
@@ -105,7 +105,7 @@ public class PreAnalyzedFieldTest extends SolrTestCaseJ4 {
for (int i = 0; i < valid.length; i++) {
String s = valid[i];
try {
- Field f = (Field)paf.fromString(field, s, 1.0f);
+ Field f = (Field)paf.fromString(field, s);
//System.out.println(" - toString: '" + sb.toString() + "'");
assertEquals(validParsed[i], parser.toFormattedString(f));
} catch (Exception e) {
@@ -179,7 +179,7 @@ public class PreAnalyzedFieldTest extends SolrTestCaseJ4 {
paf.init(h.getCore().getLatestSchema(), Collections.<String,String>emptyMap());
for (String s : invalidSimple) {
try {
- paf.fromString(field, s, 1.0f);
+ paf.fromString(field, s);
fail("should fail: '" + s + "'");
} catch (Exception e) {
//
@@ -232,7 +232,7 @@ public class PreAnalyzedFieldTest extends SolrTestCaseJ4 {
args.put(PreAnalyzedField.PARSER_IMPL, SimplePreAnalyzedParser.class.getName());
paf.init(h.getCore().getLatestSchema(), args);
try {
- Field f = (Field)paf.fromString(field, valid[0], 1.0f);
+ Field f = (Field)paf.fromString(field, valid[0]);
} catch (Exception e) {
fail("Should pass: '" + valid[0] + "', exception: " + e);
}
@@ -240,14 +240,14 @@ public class PreAnalyzedFieldTest extends SolrTestCaseJ4 {
args.put(PreAnalyzedField.PARSER_IMPL, JsonPreAnalyzedParser.class.getName());
paf.init(h.getCore().getLatestSchema(), args);
try {
- Field f = (Field)paf.fromString(field, valid[0], 1.0f);
+ Field f = (Field)paf.fromString(field, valid[0]);
fail("Should fail JSON parsing: '" + valid[0] + "'");
} catch (Exception e) {
}
byte[] deadbeef = new byte[]{(byte)0xd, (byte)0xe, (byte)0xa, (byte)0xd, (byte)0xb, (byte)0xe, (byte)0xe, (byte)0xf};
PreAnalyzedParser parser = new JsonPreAnalyzedParser();
try {
- Field f = (Field)paf.fromString(field, jsonValid, 1.0f);
+ Field f = (Field)paf.fromString(field, jsonValid);
assertEquals(jsonValid, parser.toFormattedString(f));
} catch (Exception e) {
fail("Should pass: '" + jsonValid + "', exception: " + e);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ed2b764/solr/core/src/test/org/apache/solr/schema/SortableBinaryField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/SortableBinaryField.java b/solr/core/src/test/org/apache/solr/schema/SortableBinaryField.java
index 1ebf4cc..b8ed296 100644
--- a/solr/core/src/test/org/apache/solr/schema/SortableBinaryField.java
+++ b/solr/core/src/test/org/apache/solr/schema/SortableBinaryField.java
@@ -40,10 +40,10 @@ public class SortableBinaryField extends BinaryField {
}
@Override
- public List<IndexableField> createFields(SchemaField field, Object value, float boost) {
+ public List<IndexableField> createFields(SchemaField field, Object value) {
if (field.hasDocValues()) {
List<IndexableField> fields = new ArrayList<>();
- IndexableField storedField = createField(field, value, boost);
+ IndexableField storedField = createField(field, value);
fields.add(storedField);
ByteBuffer byteBuffer = toObject(storedField);
BytesRef bytes = new BytesRef
@@ -55,7 +55,7 @@ public class SortableBinaryField extends BinaryField {
}
return fields;
} else {
- return Collections.singletonList(createField(field, value, boost));
+ return Collections.singletonList(createField(field, value));
}
}