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 2018/03/05 15:57:54 UTC

lucene-solr:branch_7x: LUCENE-8126: Add "s2" to SpatialPrefixTreeFactory lookup table

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_7x 3e63184ee -> c50a05bec


LUCENE-8126: Add "s2" to SpatialPrefixTreeFactory lookup table

(cherry picked from commit e0d6465)


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

Branch: refs/heads/branch_7x
Commit: c50a05becd62d620fcb2b39e8ac00eaee5e7f8f8
Parents: 3e63184
Author: David Smiley <ds...@apache.org>
Authored: Mon Mar 5 10:52:02 2018 -0500
Committer: David Smiley <ds...@apache.org>
Committed: Mon Mar 5 10:53:35 2018 -0500

----------------------------------------------------------------------
 .../lucene/spatial/prefix/tree/SpatialPrefixTreeFactory.java      | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c50a05be/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeFactory.java
----------------------------------------------------------------------
diff --git a/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeFactory.java b/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeFactory.java
index 67480d5..d88e41a 100644
--- a/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeFactory.java
+++ b/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeFactory.java
@@ -43,6 +43,7 @@ public abstract class SpatialPrefixTreeFactory {
    * If it's neither of these, then "geohash" is chosen for a geo context, otherwise "quad" is chosen.
    */
   public static SpatialPrefixTree makeSPT(Map<String,String> args, ClassLoader classLoader, SpatialContext ctx) {
+    //TODO refactor to use Java SPI like how Lucene already does for codecs/postingsFormats, etc
     SpatialPrefixTreeFactory instance;
     String cname = args.get(PREFIX_TREE);
     if (cname == null)
@@ -53,6 +54,8 @@ public abstract class SpatialPrefixTreeFactory {
       instance = new QuadPrefixTree.Factory();
     else if ("packedQuad".equalsIgnoreCase(cname))
       instance = new PackedQuadPrefixTree.Factory();
+    else if ("s2".equalsIgnoreCase(cname))
+      instance = new S2PrefixTree.Factory();
     else {
       try {
         Class<?> c = classLoader.loadClass(cname);