You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2017/05/23 15:13:14 UTC
lucene-solr:branch_6x: SOLR-10729: Deprecated LatLonType, GeoHashField,
SpatialPointVectorFieldType, and SpatialTermQueryPrefixTreeFieldType
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 84da41c7d -> f79b3cb71
SOLR-10729: Deprecated LatLonType, GeoHashField, SpatialPointVectorFieldType, and SpatialTermQueryPrefixTreeFieldType
(cherry picked from commit 92ed8b4)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/f79b3cb7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/f79b3cb7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/f79b3cb7
Branch: refs/heads/branch_6x
Commit: f79b3cb71e7aab73bc12332c4dd8e9d2e882214f
Parents: 84da41c
Author: David Smiley <ds...@apache.org>
Authored: Tue May 23 11:09:32 2017 -0400
Committer: David Smiley <ds...@apache.org>
Committed: Tue May 23 11:13:10 2017 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 4 ++++
solr/core/src/java/org/apache/solr/schema/GeoHashField.java | 3 +++
solr/core/src/java/org/apache/solr/schema/LatLonType.java | 3 +++
.../java/org/apache/solr/schema/SpatialPointVectorFieldType.java | 3 ++-
.../apache/solr/schema/SpatialTermQueryPrefixTreeFieldType.java | 3 ++-
5 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f79b3cb7/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 8f3aa61..a1b8f1e 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -351,6 +351,10 @@ Other Changes
* SOLR-10000: Expose cache statistics using metrics API. (ab)
+* SOLR-10729: Deprecated LatLonType, GeoHashField, SpatialPointVectorFieldType, and SpatialTermQueryPrefixTreeFieldType.
+ Instead, switch to LatLonPointSpatialField or SpatialRecursivePrefixTreeFieldType or RptWithGeometrySpatialField.
+ (David Smiley)
+
================== 6.5.1 ==================
Bug Fixes
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f79b3cb7/solr/core/src/java/org/apache/solr/schema/GeoHashField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/GeoHashField.java b/solr/core/src/java/org/apache/solr/schema/GeoHashField.java
index 3f0d765..842333f 100644
--- a/solr/core/src/java/org/apache/solr/schema/GeoHashField.java
+++ b/solr/core/src/java/org/apache/solr/schema/GeoHashField.java
@@ -40,7 +40,10 @@ import org.locationtech.spatial4j.shape.Point;
* This is a class that represents a <a
* href="http://en.wikipedia.org/wiki/Geohash">Geohash</a> field. The field is
* provided as a lat/lon pair and is internally represented as a string.
+ *
+ * @deprecated use {@link LatLonPointSpatialField} instead
*/
+@Deprecated
public class GeoHashField extends FieldType implements SpatialQueryable {
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f79b3cb7/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 33a6d11..c7f2abf 100644
--- a/solr/core/src/java/org/apache/solr/schema/LatLonType.java
+++ b/solr/core/src/java/org/apache/solr/schema/LatLonType.java
@@ -54,7 +54,10 @@ import org.locationtech.spatial4j.shape.Rectangle;
/**
* Represents a Latitude/Longitude as a 2 dimensional point. Latitude is <b>always</b> specified first.
+ *
+ * @deprecated use {@link LatLonPointSpatialField} instead
*/
+@Deprecated
public class LatLonType extends AbstractSubTypeFieldType implements SpatialQueryable {
protected static final int LAT = 0;
protected static final int LON = 1;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f79b3cb7/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 e184a64..3e1d81f 100644
--- a/solr/core/src/java/org/apache/solr/schema/SpatialPointVectorFieldType.java
+++ b/solr/core/src/java/org/apache/solr/schema/SpatialPointVectorFieldType.java
@@ -25,8 +25,9 @@ import org.apache.lucene.spatial.vector.PointVectorStrategy;
/**
* @see PointVectorStrategy
- * @lucene.experimental
+ * @deprecated use {@link LatLonPointSpatialField} instead
*/
+@Deprecated
public class SpatialPointVectorFieldType extends AbstractSpatialFieldType<PointVectorStrategy> implements SchemaAware {
protected String numberFieldName = "tdouble";//in example schema defaults to non-zero precision step -- a good choice
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f79b3cb7/solr/core/src/java/org/apache/solr/schema/SpatialTermQueryPrefixTreeFieldType.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/SpatialTermQueryPrefixTreeFieldType.java b/solr/core/src/java/org/apache/solr/schema/SpatialTermQueryPrefixTreeFieldType.java
index 1779f01..203a7b8 100644
--- a/solr/core/src/java/org/apache/solr/schema/SpatialTermQueryPrefixTreeFieldType.java
+++ b/solr/core/src/java/org/apache/solr/schema/SpatialTermQueryPrefixTreeFieldType.java
@@ -20,8 +20,9 @@ import org.apache.lucene.spatial.prefix.TermQueryPrefixTreeStrategy;
/**
* @see TermQueryPrefixTreeStrategy
- * @lucene.experimental
+ * @deprecated use {@link org.apache.lucene.spatial.prefix.RecursivePrefixTreeStrategy} or {@link RptWithGeometrySpatialField}
*/
+@Deprecated
public class SpatialTermQueryPrefixTreeFieldType extends AbstractSpatialPrefixTreeFieldType<TermQueryPrefixTreeStrategy> {
@Override