Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-7383: Fix 'dimensionNumBytes' validation

This commit is contained in:
Martijn van Groningen 2016-07-22 16:26:05 +02:00
parent 85a585c516
commit 9b85f68278
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lucene/CHANGES.txt
View File

@ -76,6 +76,9 @@ Bug Fixes
wrong default AttributeFactory for new Tokenizers. wrong default AttributeFactory for new Tokenizers.
(Terry Smith, Uwe Schindler) (Terry Smith, Uwe Schindler)
* LUCENE-7389: Fix FieldType.setDimensions(...) validation for the dimensionNumBytes
parameter. (Martijn van Groningen)
Improvements Improvements
* LUCENE-7323: Compound file writing now verifies the incoming * LUCENE-7323: Compound file writing now verifies the incoming

2
lucene/core/src/java/org/apache/lucene/document/FieldType.java
View File

@ -374,7 +374,7 @@ public class FieldType implements IndexableFieldType {
if (dimensionNumBytes < 0) { if (dimensionNumBytes < 0) {
throw new IllegalArgumentException("dimensionNumBytes must be >= 0; got " + dimensionNumBytes); throw new IllegalArgumentException("dimensionNumBytes must be >= 0; got " + dimensionNumBytes);
} }
if (dimensionCount > PointValues.MAX_NUM_BYTES) { if (dimensionNumBytes > PointValues.MAX_NUM_BYTES) {
throw new IllegalArgumentException("dimensionNumBytes must be <= " + PointValues.MAX_NUM_BYTES + "; got " + dimensionNumBytes); throw new IllegalArgumentException("dimensionNumBytes must be <= " + PointValues.MAX_NUM_BYTES + "; got " + dimensionNumBytes);
} }
if (dimensionCount == 0) { if (dimensionCount == 0) {

3
lucene/core/src/test/org/apache/lucene/index/TestPointValues.java
View File

@ -362,9 +362,8 @@ public class TestPointValues extends LuceneTestCase {
IndexWriterConfig iwc = new IndexWriterConfig(new MockAnalyzer(random())); IndexWriterConfig iwc = new IndexWriterConfig(new MockAnalyzer(random()));
IndexWriter w = new IndexWriter(dir, iwc); IndexWriter w = new IndexWriter(dir, iwc);
Document doc = new Document(); Document doc = new Document();
doc.add(new BinaryPoint("dim", new byte[PointValues.MAX_NUM_BYTES+1]));
expectThrows(IllegalArgumentException.class, () -> { expectThrows(IllegalArgumentException.class, () -> {
w.addDocument(doc); doc.add(new BinaryPoint("dim", new byte[PointValues.MAX_NUM_BYTES+1]));
}); });
Document doc2 = new Document(); Document doc2 = new Document();