You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/01/03 10:51:53 UTC
[05/18] lucene-solr:jira/solr-11702: Revert "LUCENE-8110: Fix
potential IndexOutOfBoundsException in *Classifier.getClasses(?, int)."
Revert "LUCENE-8110: Fix potential IndexOutOfBoundsException in *Classifier.getClasses(?,int)."
This reverts commit af41d02eae6a58fd450553f9a09c9325ddf6e0ab.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/152d223b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/152d223b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/152d223b
Branch: refs/heads/jira/solr-11702
Commit: 152d223b3235459a30f6a8b1cb5331bec46dfb3d
Parents: 287062d
Author: Christine Poerschke <cp...@apache.org>
Authored: Thu Dec 28 15:11:39 2017 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Thu Dec 28 15:11:39 2017 +0000
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 ---
.../java/org/apache/lucene/classification/BM25NBClassifier.java | 1 -
.../org/apache/lucene/classification/KNearestFuzzyClassifier.java | 1 -
.../apache/lucene/classification/KNearestNeighborClassifier.java | 1 -
.../apache/lucene/classification/SimpleNaiveBayesClassifier.java | 1 -
.../document/SimpleNaiveBayesDocumentClassifier.java | 1 -
6 files changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/152d223b/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 84ba235..0da2cfe 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -104,9 +104,6 @@ Bug Fixes
* LUCENE-8077: Fixed bug in how CheckIndex verifies doc-value iterators.
(Xiaoshan Sun via Adrien Grand)
-* LUCENE-8110: Fix potential IndexOutOfBoundsException in *Classifier.getClasses(?,int).
- (Christine Poerschke)
-
======================= Lucene 7.2.0 =======================
API Changes
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/152d223b/lucene/classification/src/java/org/apache/lucene/classification/BM25NBClassifier.java
----------------------------------------------------------------------
diff --git a/lucene/classification/src/java/org/apache/lucene/classification/BM25NBClassifier.java b/lucene/classification/src/java/org/apache/lucene/classification/BM25NBClassifier.java
index 39a5b2f..1a74416 100644
--- a/lucene/classification/src/java/org/apache/lucene/classification/BM25NBClassifier.java
+++ b/lucene/classification/src/java/org/apache/lucene/classification/BM25NBClassifier.java
@@ -124,7 +124,6 @@ public class BM25NBClassifier implements Classifier<BytesRef> {
public List<ClassificationResult<BytesRef>> getClasses(String text, int max) throws IOException {
List<ClassificationResult<BytesRef>> assignedClasses = assignClassNormalizedList(text);
Collections.sort(assignedClasses);
- max = Math.min(max, assignedClasses.size());
return assignedClasses.subList(0, max);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/152d223b/lucene/classification/src/java/org/apache/lucene/classification/KNearestFuzzyClassifier.java
----------------------------------------------------------------------
diff --git a/lucene/classification/src/java/org/apache/lucene/classification/KNearestFuzzyClassifier.java b/lucene/classification/src/java/org/apache/lucene/classification/KNearestFuzzyClassifier.java
index 65effe4..cbd241b 100644
--- a/lucene/classification/src/java/org/apache/lucene/classification/KNearestFuzzyClassifier.java
+++ b/lucene/classification/src/java/org/apache/lucene/classification/KNearestFuzzyClassifier.java
@@ -140,7 +140,6 @@ public class KNearestFuzzyClassifier implements Classifier<BytesRef> {
TopDocs knnResults = knnSearch(text);
List<ClassificationResult<BytesRef>> assignedClasses = buildListFromTopDocs(knnResults);
Collections.sort(assignedClasses);
- max = Math.min(max, assignedClasses.size());
return assignedClasses.subList(0, max);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/152d223b/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java
----------------------------------------------------------------------
diff --git a/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java b/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java
index f145912..f0391f4 100644
--- a/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java
+++ b/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java
@@ -162,7 +162,6 @@ public class KNearestNeighborClassifier implements Classifier<BytesRef> {
TopDocs knnResults = knnSearch(text);
List<ClassificationResult<BytesRef>> assignedClasses = buildListFromTopDocs(knnResults);
Collections.sort(assignedClasses);
- max = Math.min(max, assignedClasses.size());
return assignedClasses.subList(0, max);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/152d223b/lucene/classification/src/java/org/apache/lucene/classification/SimpleNaiveBayesClassifier.java
----------------------------------------------------------------------
diff --git a/lucene/classification/src/java/org/apache/lucene/classification/SimpleNaiveBayesClassifier.java b/lucene/classification/src/java/org/apache/lucene/classification/SimpleNaiveBayesClassifier.java
index 3bb701f..3509df5 100644
--- a/lucene/classification/src/java/org/apache/lucene/classification/SimpleNaiveBayesClassifier.java
+++ b/lucene/classification/src/java/org/apache/lucene/classification/SimpleNaiveBayesClassifier.java
@@ -132,7 +132,6 @@ public class SimpleNaiveBayesClassifier implements Classifier<BytesRef> {
public List<ClassificationResult<BytesRef>> getClasses(String text, int max) throws IOException {
List<ClassificationResult<BytesRef>> assignedClasses = assignClassNormalizedList(text);
Collections.sort(assignedClasses);
- max = Math.min(max, assignedClasses.size());
return assignedClasses.subList(0, max);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/152d223b/lucene/classification/src/java/org/apache/lucene/classification/document/SimpleNaiveBayesDocumentClassifier.java
----------------------------------------------------------------------
diff --git a/lucene/classification/src/java/org/apache/lucene/classification/document/SimpleNaiveBayesDocumentClassifier.java b/lucene/classification/src/java/org/apache/lucene/classification/document/SimpleNaiveBayesDocumentClassifier.java
index 097fe0c..6bc8573 100644
--- a/lucene/classification/src/java/org/apache/lucene/classification/document/SimpleNaiveBayesDocumentClassifier.java
+++ b/lucene/classification/src/java/org/apache/lucene/classification/document/SimpleNaiveBayesDocumentClassifier.java
@@ -105,7 +105,6 @@ public class SimpleNaiveBayesDocumentClassifier extends SimpleNaiveBayesClassifi
public List<ClassificationResult<BytesRef>> getClasses(Document document, int max) throws IOException {
List<ClassificationResult<BytesRef>> assignedClasses = assignNormClasses(document);
Collections.sort(assignedClasses);
- max = Math.min(max, assignedClasses.size());
return assignedClasses.subList(0, max);
}