You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by tf...@apache.org on 2017/03/13 23:01:17 UTC
lucene-solr:master: SOLR-10236: Remove FieldType.getNumericType()
from master
Repository: lucene-solr
Updated Branches:
refs/heads/master e3a0b428f -> abec54bd5
SOLR-10236: Remove FieldType.getNumericType() from master
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/abec54bd
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/abec54bd
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/abec54bd
Branch: refs/heads/master
Commit: abec54bd5722bc818fe46e111cf652cd7671db86
Parents: e3a0b42
Author: Tomas Fernandez Lobbe <tf...@apache.org>
Authored: Mon Mar 13 16:00:16 2017 -0700
Committer: Tomas Fernandez Lobbe <tf...@apache.org>
Committed: Mon Mar 13 16:00:16 2017 -0700
----------------------------------------------------------------------
solr/CHANGES.txt | 4 ++++
.../org/apache/solr/schema/DatePointField.java | 11 -----------
.../org/apache/solr/schema/DoublePointField.java | 12 ------------
.../src/java/org/apache/solr/schema/EnumField.java | 9 ---------
.../src/java/org/apache/solr/schema/FieldType.java | 11 -----------
.../org/apache/solr/schema/FloatPointField.java | 13 -------------
.../java/org/apache/solr/schema/IntPointField.java | 11 -----------
.../org/apache/solr/schema/LongPointField.java | 11 -----------
.../solr/schema/SpatialPointVectorFieldType.java | 7 -------
.../src/java/org/apache/solr/schema/TrieField.java | 17 -----------------
10 files changed, 4 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abec54bd/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 63424dd..80ecea8 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -50,6 +50,8 @@ Upgrading from Solr 6.x
factors should be indexed in a separate field and combined with the query
score using a function query.
+* Deprecated method getNumericType() has been removed from FieldType. Use getNumberType() instead
+
New Features
----------------------
* SOLR-9857, SOLR-9858: Collect aggregated metrics from nodes and shard leaders in overseer. (ab)
@@ -80,6 +82,8 @@ Optimizations
(yonik)
Other Changes
+* SOLR-10236: Removed FieldType.getNumericType(). Use getNumberType() instead. (Tom�s Fern�ndez L�bbe)
+
----------------------
================== 6.5.0 ==================
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abec54bd/solr/core/src/java/org/apache/solr/schema/DatePointField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/DatePointField.java b/solr/core/src/java/org/apache/solr/schema/DatePointField.java
index b3517db..377f571 100644
--- a/solr/core/src/java/org/apache/solr/schema/DatePointField.java
+++ b/solr/core/src/java/org/apache/solr/schema/DatePointField.java
@@ -17,7 +17,6 @@
package org.apache.solr.schema;
-import java.lang.invoke.MethodHandles;
import java.time.Instant;
import java.util.Collection;
import java.util.Date;
@@ -25,7 +24,6 @@ import java.util.Date;
import org.apache.lucene.document.LongPoint;
import org.apache.lucene.document.StoredField;
import org.apache.lucene.index.IndexableField;
-import org.apache.lucene.legacy.LegacyNumericType;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.valuesource.LongFieldSource;
import org.apache.lucene.queries.function.valuesource.MultiValuedLongFieldSource;
@@ -39,13 +37,9 @@ import org.apache.lucene.util.mutable.MutableValueLong;
import org.apache.solr.search.QParser;
import org.apache.solr.uninverting.UninvertingReader;
import org.apache.solr.util.DateMathParser;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class DatePointField extends PointField implements DateValueFieldType {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
public DatePointField() {
type = NumberType.DATE;
}
@@ -165,11 +159,6 @@ public class DatePointField extends PointField implements DateValueFieldType {
}
@Override
- public LegacyNumericType getNumericType() {
- return LegacyNumericType.LONG;
- }
-
- @Override
public IndexableField createField(SchemaField field, Object value) {
if (!isFieldUsed(field)) return null;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abec54bd/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 e34ebec..6ae8349 100644
--- a/solr/core/src/java/org/apache/solr/schema/DoublePointField.java
+++ b/solr/core/src/java/org/apache/solr/schema/DoublePointField.java
@@ -17,14 +17,12 @@
package org.apache.solr.schema;
-import java.lang.invoke.MethodHandles;
import java.util.Collection;
import org.apache.lucene.document.DoublePoint;
import org.apache.lucene.document.StoredField;
import org.apache.lucene.index.DocValuesType;
import org.apache.lucene.index.IndexableField;
-import org.apache.lucene.legacy.LegacyNumericType;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.valuesource.DoubleFieldSource;
import org.apache.lucene.queries.function.valuesource.MultiValuedDoubleFieldSource;
@@ -36,8 +34,6 @@ import org.apache.lucene.util.BytesRefBuilder;
import org.apache.lucene.util.NumericUtils;
import org.apache.solr.search.QParser;
import org.apache.solr.uninverting.UninvertingReader.Type;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* {@code PointField} implementation for {@code Double} values.
@@ -46,8 +42,6 @@ import org.slf4j.LoggerFactory;
*/
public class DoublePointField extends PointField implements DoubleValueFieldType {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
public DoublePointField() {
type = NumberType.DOUBLE;
}
@@ -172,12 +166,6 @@ public class DoublePointField extends PointField implements DoubleValueFieldType
}
@Override
- public LegacyNumericType getNumericType() {
- // TODO: refactor this to not use LegacyNumericType
- return LegacyNumericType.DOUBLE;
- }
-
- @Override
public IndexableField createField(SchemaField field, Object value) {
if (!isFieldUsed(field)) return null;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abec54bd/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 3e83db4..2e73f74 100644
--- a/solr/core/src/java/org/apache/solr/schema/EnumField.java
+++ b/solr/core/src/java/org/apache/solr/schema/EnumField.java
@@ -233,15 +233,6 @@ public class EnumField extends PrimitiveFieldType {
* {@inheritDoc}
*/
@Override
- @Deprecated
- public LegacyNumericType getNumericType() {
- return LegacyNumericType.INT;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
public NumberType getNumberType() {
return NumberType.INTEGER;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abec54bd/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 c542a95..67b7be7 100644
--- a/solr/core/src/java/org/apache/solr/schema/FieldType.java
+++ b/solr/core/src/java/org/apache/solr/schema/FieldType.java
@@ -39,7 +39,6 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.SortedSetDocValuesField;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.Term;
-import org.apache.lucene.legacy.LegacyNumericType;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
@@ -610,16 +609,6 @@ public abstract class FieldType extends FieldProperties {
return similarityFactory;
}
-
- /** Return the numeric type of this field, or null if this field is not a
- * numeric field.
- * @deprecated Please use {@link FieldType#getNumberType()} instead
- */
- @Deprecated
- public LegacyNumericType getNumericType() {
- return null;
- }
-
/**
* Return the numeric type of this field, or null if this field is not a
* numeric field.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abec54bd/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 39453e7..0f42cfd 100644
--- a/solr/core/src/java/org/apache/solr/schema/FloatPointField.java
+++ b/solr/core/src/java/org/apache/solr/schema/FloatPointField.java
@@ -17,14 +17,12 @@
package org.apache.solr.schema;
-import java.lang.invoke.MethodHandles;
import java.util.Collection;
import org.apache.lucene.document.FloatPoint;
import org.apache.lucene.document.StoredField;
import org.apache.lucene.index.DocValuesType;
import org.apache.lucene.index.IndexableField;
-import org.apache.lucene.legacy.LegacyNumericType;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.valuesource.FloatFieldSource;
import org.apache.lucene.queries.function.valuesource.MultiValuedFloatFieldSource;
@@ -36,8 +34,6 @@ import org.apache.lucene.util.BytesRefBuilder;
import org.apache.lucene.util.NumericUtils;
import org.apache.solr.search.QParser;
import org.apache.solr.uninverting.UninvertingReader.Type;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* {@code PointField} implementation for {@code Float} values.
@@ -46,8 +42,6 @@ import org.slf4j.LoggerFactory;
*/
public class FloatPointField extends PointField implements FloatValueFieldType {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
public FloatPointField() {
type = NumberType.FLOAT;
}
@@ -171,13 +165,6 @@ public class FloatPointField extends PointField implements FloatValueFieldType {
return new MultiValuedFloatFieldSource(f.getName(), choice);
}
-
- @Override
- public LegacyNumericType getNumericType() {
- // TODO: refactor this to not use LegacyNumericType
- return LegacyNumericType.FLOAT;
- }
-
@Override
public IndexableField createField(SchemaField field, Object value) {
if (!isFieldUsed(field)) return null;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abec54bd/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 db26988..5eaf7e0 100644
--- a/solr/core/src/java/org/apache/solr/schema/IntPointField.java
+++ b/solr/core/src/java/org/apache/solr/schema/IntPointField.java
@@ -17,13 +17,11 @@
package org.apache.solr.schema;
-import java.lang.invoke.MethodHandles;
import java.util.Collection;
import org.apache.lucene.document.IntPoint;
import org.apache.lucene.document.StoredField;
import org.apache.lucene.index.IndexableField;
-import org.apache.lucene.legacy.LegacyNumericType;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.valuesource.IntFieldSource;
import org.apache.lucene.queries.function.valuesource.MultiValuedIntFieldSource;
@@ -34,8 +32,6 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.BytesRefBuilder;
import org.apache.solr.search.QParser;
import org.apache.solr.uninverting.UninvertingReader.Type;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* {@code PointField} implementation for {@code Integer} values.
@@ -44,8 +40,6 @@ import org.slf4j.LoggerFactory;
*/
public class IntPointField extends PointField implements IntValueFieldType {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
public IntPointField() {
type = NumberType.INTEGER;
}
@@ -164,11 +158,6 @@ public class IntPointField extends PointField implements IntValueFieldType {
}
@Override
- public LegacyNumericType getNumericType() {
- return LegacyNumericType.INT;
- }
-
- @Override
public IndexableField createField(SchemaField field, Object value) {
if (!isFieldUsed(field)) return null;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abec54bd/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 f5d0948..e58fbcf 100644
--- a/solr/core/src/java/org/apache/solr/schema/LongPointField.java
+++ b/solr/core/src/java/org/apache/solr/schema/LongPointField.java
@@ -17,13 +17,11 @@
package org.apache.solr.schema;
-import java.lang.invoke.MethodHandles;
import java.util.Collection;
import org.apache.lucene.document.LongPoint;
import org.apache.lucene.document.StoredField;
import org.apache.lucene.index.IndexableField;
-import org.apache.lucene.legacy.LegacyNumericType;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.valuesource.LongFieldSource;
import org.apache.lucene.queries.function.valuesource.MultiValuedLongFieldSource;
@@ -33,8 +31,6 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.BytesRefBuilder;
import org.apache.solr.search.QParser;
import org.apache.solr.uninverting.UninvertingReader.Type;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* {@code PointField} implementation for {@code Long} values.
@@ -43,8 +39,6 @@ import org.slf4j.LoggerFactory;
*/
public class LongPointField extends PointField implements LongValueFieldType {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
public LongPointField() {
type = NumberType.LONG;
}
@@ -169,11 +163,6 @@ public class LongPointField extends PointField implements LongValueFieldType {
}
@Override
- public LegacyNumericType getNumericType() {
- return LegacyNumericType.LONG;
- }
-
- @Override
public IndexableField createField(SchemaField field, Object value) {
if (!isFieldUsed(field)) return null;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abec54bd/solr/core/src/java/org/apache/solr/schema/SpatialPointVectorFieldType.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/SpatialPointVectorFieldType.java b/solr/core/src/java/org/apache/solr/schema/SpatialPointVectorFieldType.java
index b4b3d2b..5c7734e 100644
--- a/solr/core/src/java/org/apache/solr/schema/SpatialPointVectorFieldType.java
+++ b/solr/core/src/java/org/apache/solr/schema/SpatialPointVectorFieldType.java
@@ -21,7 +21,6 @@ import java.util.List;
import java.util.Map;
import org.apache.lucene.legacy.LegacyFieldType;
-import org.apache.lucene.legacy.LegacyNumericType;
import org.apache.lucene.spatial.vector.PointVectorStrategy;
/**
@@ -80,12 +79,6 @@ public class SpatialPointVectorFieldType extends AbstractSpatialFieldType<PointV
}
@Override
- @Deprecated
- public LegacyNumericType getNumericType() {
- return LegacyNumericType.DOUBLE;
- }
-
- @Override
public NumberType getNumberType() {
return NumberType.DOUBLE;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abec54bd/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 b70b2b0..46240c9 100644
--- a/solr/core/src/java/org/apache/solr/schema/TrieField.java
+++ b/solr/core/src/java/org/apache/solr/schema/TrieField.java
@@ -337,23 +337,6 @@ public class TrieField extends NumericFieldType {
}
@Override
- public LegacyNumericType getNumericType() {
- switch (type) {
- case INTEGER:
- return LegacyNumericType.INT;
- case LONG:
- case DATE:
- return LegacyNumericType.LONG;
- case FLOAT:
- return LegacyNumericType.FLOAT;
- case DOUBLE:
- return LegacyNumericType.DOUBLE;
- default:
- throw new AssertionError();
- }
- }
-
- @Override
public Query getRangeQuery(QParser parser, SchemaField field, String min, String max, boolean minInclusive, boolean maxInclusive) {
if (field.multiValued() && field.hasDocValues() && !field.indexed()) {
// for the multi-valued dv-case, the default rangeimpl over toInternal is correct