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 2019/08/30 14:23:14 UTC
[lucene-solr] branch branch_8x updated: LUCENE-8758 Remove unused
fields in QuadPrefixTree
This is an automated email from the ASF dual-hosted git repository.
dsmiley pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8x by this push:
new f3b2358 LUCENE-8758 Remove unused fields in QuadPrefixTree
f3b2358 is described below
commit f3b2358bc73b688341920d1753aecc39e6a9494a
Author: Amish Shah <sh...@gmail.com>
AuthorDate: Fri Aug 30 16:14:27 2019 -0400
LUCENE-8758 Remove unused fields in QuadPrefixTree
(cherry picked from commit ea67d9c8c65c6c883ef2ebb3c061fcc6b251a360)
---
lucene/CHANGES.txt | 2 ++
.../org/apache/lucene/spatial/prefix/tree/QuadPrefixTree.java | 11 +----------
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 7dbde88..3273694 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -79,6 +79,8 @@ Other
* LUCENE-8778 LUCENE-8911 LUCENE-8957: Define analyzer SPI names as static final fields and document the names in Javadocs.
(Tomoko Uchida, Uwe Schindler)
+* LUCENE-8758: QuadPrefixTree: removed levelS and levelN fields which weren't used. (Amish Shah)
+
======================= Lucene 8.2.0 =======================
API Changes
diff --git a/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/QuadPrefixTree.java b/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/QuadPrefixTree.java
index 6133e26..e060302 100644
--- a/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/QuadPrefixTree.java
+++ b/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/QuadPrefixTree.java
@@ -73,8 +73,6 @@ public class QuadPrefixTree extends LegacyPrefixTree {
final double[] levelW;
final double[] levelH;
- final int[] levelS; // side
- final int[] levelN; // number
protected boolean robust = true; // for backward compatibility, use the old method if user specified old version.
@@ -88,8 +86,6 @@ public class QuadPrefixTree extends LegacyPrefixTree {
levelW = new double[maxLevels + 1];
levelH = new double[maxLevels + 1];
- levelS = new int[maxLevels + 1];
- levelN = new int[maxLevels + 1];
gridW = xmax - xmin;
gridH = ymax - ymin;
@@ -97,14 +93,10 @@ public class QuadPrefixTree extends LegacyPrefixTree {
this.ymid = ymin + gridH/2.0;
levelW[0] = gridW/2.0;
levelH[0] = gridH/2.0;
- levelS[0] = 2;
- levelN[0] = 4;
for (int i = 1; i < levelW.length; i++) {
levelW[i] = levelW[i - 1] / 2.0;
levelH[i] = levelH[i - 1] / 2.0;
- levelS[i] = levelS[i - 1] * 2;
- levelN[i] = levelN[i - 1] * 4;
}
}
@@ -129,8 +121,7 @@ public class QuadPrefixTree extends LegacyPrefixTree {
nf.setMinimumIntegerDigits(3);
for (int i = 0; i < maxLevels; i++) {
- out.println(i + "]\t" + nf.format(levelW[i]) + "\t" + nf.format(levelH[i]) + "\t" +
- levelS[i] + "\t" + (levelS[i] * levelS[i]));
+ out.println(i + "]\t" + nf.format(levelW[i]) + "\t" + nf.format(levelH[i]));
}
}