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:09:38 UTC

lucene-solr:master: SOLR-10729: Deprecated LatLonType, GeoHashField, SpatialPointVectorFieldType, and SpatialTermQueryPrefixTreeFieldType

Repository: lucene-solr
Updated Branches:
  refs/heads/master 2218ded2a -> 92ed8b422


SOLR-10729: Deprecated LatLonType, GeoHashField, SpatialPointVectorFieldType, and SpatialTermQueryPrefixTreeFieldType


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/92ed8b42
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/92ed8b42
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/92ed8b42

Branch: refs/heads/master
Commit: 92ed8b4220d1427a0c07eecaab422c2d22a2ce8c
Parents: 2218ded
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:09:32 2017 -0400

----------------------------------------------------------------------
 solr/CHANGES.txt                                              | 7 +++++++
 solr/core/src/java/org/apache/solr/schema/GeoHashField.java   | 3 +++
 solr/core/src/java/org/apache/solr/schema/LatLonType.java     | 3 +++
 .../org/apache/solr/schema/SpatialPointVectorFieldType.java   | 3 ++-
 .../solr/schema/SpatialTermQueryPrefixTreeFieldType.java      | 3 ++-
 5 files changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/92ed8b42/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index e29952b..951b9d5 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -79,6 +79,9 @@ Upgrading from Solr 6.x
 * The PostingsSolrHighlighter is deprecated. Furthermore, it now internally works via a re-configuration
   of the UnifiedSolrHighlighter.
 
+* Deprecated LatLonType, GeoHashField, SpatialPointVectorFieldType, and SpatialTermQueryPrefixTreeFieldType.
+  Instead, switch to LatLonPointSpatialField or SpatialRecursivePrefixTreeFieldType or RptWithGeometrySpatialField.
+
 New Features
 ----------------------
 * SOLR-9857, SOLR-9858: Collect aggregated metrics from nodes and shard leaders in overseer. (ab)
@@ -504,6 +507,10 @@ Other Changes
 
 * SOLR-10644: solr.in.sh installed by install script should be writable by solr user (janhoy)
 
+* 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/92ed8b42/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/92ed8b42/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 8c4e19a..6898369 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/92ed8b42/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 5c7734e..ef05f18 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/92ed8b42/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