You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/12/08 14:10:14 UTC
svn commit: r1643805 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/analysis/ lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/
lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/
Author: rmuir
Date: Mon Dec 8 13:10:14 2014
New Revision: 1643805
URL: http://svn.apache.org/r1643805
Log:
LUCENE-5595: try to improve test efficiency
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/analysis/ (props changed)
lucene/dev/branches/branch_5x/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2CharFilter.java
lucene/dev/branches/branch_5x/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2CharFilter.java
Modified: lucene/dev/branches/branch_5x/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2CharFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2CharFilter.java?rev=1643805&r1=1643804&r2=1643805&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2CharFilter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2CharFilter.java Mon Dec 8 13:10:14 2014
@@ -19,6 +19,7 @@ package org.apache.lucene.analysis.icu;
import java.io.IOException;
import java.io.Reader;
+import java.util.Objects;
import org.apache.lucene.analysis.charfilter.BaseCharFilter;
@@ -29,8 +30,6 @@ import com.ibm.icu.text.Normalizer2;
*/
public final class ICUNormalizer2CharFilter extends BaseCharFilter {
- private static final int IO_BUFFER_SIZE = 128;
-
private final Normalizer2 normalizer;
private final StringBuilder inputBuffer = new StringBuilder();
private final StringBuilder resultBuffer = new StringBuilder();
@@ -55,11 +54,14 @@ public final class ICUNormalizer2CharFil
* @param normalizer normalizer to use
*/
public ICUNormalizer2CharFilter(Reader in, Normalizer2 normalizer) {
+ this(in, normalizer, 128);
+ }
+
+ // for testing ONLY
+ ICUNormalizer2CharFilter(Reader in, Normalizer2 normalizer, int bufferSize) {
super(in);
- if (normalizer == null) {
- throw new NullPointerException("normalizer == null");
- }
- this.normalizer = normalizer;
+ this.normalizer = Objects.requireNonNull(normalizer);
+ this.tmpBuffer = new char[bufferSize];
}
@Override
@@ -92,7 +94,7 @@ public final class ICUNormalizer2CharFil
return -1;
}
- private final char[] tmpBuffer = new char[IO_BUFFER_SIZE];
+ private final char[] tmpBuffer;
private int readInputToBuffer() throws IOException {
final int len = input.read(tmpBuffer);
Modified: lucene/dev/branches/branch_5x/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2CharFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2CharFilter.java?rev=1643805&r1=1643804&r2=1643805&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2CharFilter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2CharFilter.java Mon Dec 8 13:10:14 2014
@@ -105,7 +105,7 @@ public class TestICUNormalizer2CharFilte
);
}
- public void doTestMode(final Normalizer2 normalizer, int maxLength, int iterations) throws IOException {
+ public void doTestMode(final Normalizer2 normalizer, int maxLength, int iterations, final int bufferSize) throws IOException {
Analyzer a = new Analyzer() {
@Override
protected TokenStreamComponents createComponents(String fieldName) {
@@ -114,7 +114,7 @@ public class TestICUNormalizer2CharFilte
@Override
protected Reader initReader(String fieldName, Reader reader) {
- return new ICUNormalizer2CharFilter(reader, normalizer);
+ return new ICUNormalizer2CharFilter(reader, normalizer, bufferSize);
}
};
@@ -132,43 +132,43 @@ public class TestICUNormalizer2CharFilte
}
public void testNFC() throws Exception {
- doTestMode(Normalizer2.getInstance(null, "nfc", Normalizer2.Mode.COMPOSE), 20, RANDOM_MULTIPLIER*1000);
+ doTestMode(Normalizer2.getInstance(null, "nfc", Normalizer2.Mode.COMPOSE), 20, RANDOM_MULTIPLIER*1000, 128);
}
public void testNFCHuge() throws Exception {
- doTestMode(Normalizer2.getInstance(null, "nfc", Normalizer2.Mode.COMPOSE), 8192, RANDOM_MULTIPLIER*100);
+ doTestMode(Normalizer2.getInstance(null, "nfc", Normalizer2.Mode.COMPOSE), 256, RANDOM_MULTIPLIER*500, 16);
}
public void testNFD() throws Exception {
- doTestMode(Normalizer2.getInstance(null, "nfc", Normalizer2.Mode.DECOMPOSE), 20, RANDOM_MULTIPLIER*1000);
+ doTestMode(Normalizer2.getInstance(null, "nfc", Normalizer2.Mode.DECOMPOSE), 20, RANDOM_MULTIPLIER*1000, 128);
}
public void testNFDHuge() throws Exception {
- doTestMode(Normalizer2.getInstance(null, "nfc", Normalizer2.Mode.DECOMPOSE), 8192, RANDOM_MULTIPLIER*100);
+ doTestMode(Normalizer2.getInstance(null, "nfc", Normalizer2.Mode.DECOMPOSE), 256, RANDOM_MULTIPLIER*500, 16);
}
public void testNFKC() throws Exception {
- doTestMode(Normalizer2.getInstance(null, "nfkc", Normalizer2.Mode.COMPOSE), 20, RANDOM_MULTIPLIER*1000);
+ doTestMode(Normalizer2.getInstance(null, "nfkc", Normalizer2.Mode.COMPOSE), 20, RANDOM_MULTIPLIER*1000, 128);
}
public void testNFKCHuge() throws Exception {
- doTestMode(Normalizer2.getInstance(null, "nfkc", Normalizer2.Mode.COMPOSE), 8192, RANDOM_MULTIPLIER*100);
+ doTestMode(Normalizer2.getInstance(null, "nfkc", Normalizer2.Mode.COMPOSE), 256, RANDOM_MULTIPLIER*500, 16);
}
public void testNFKD() throws Exception {
- doTestMode(Normalizer2.getInstance(null, "nfkc", Normalizer2.Mode.DECOMPOSE), 20, RANDOM_MULTIPLIER*1000);
+ doTestMode(Normalizer2.getInstance(null, "nfkc", Normalizer2.Mode.DECOMPOSE), 20, RANDOM_MULTIPLIER*1000, 128);
}
public void testNFKDHuge() throws Exception {
- doTestMode(Normalizer2.getInstance(null, "nfkc", Normalizer2.Mode.DECOMPOSE), 8192, RANDOM_MULTIPLIER*100);
+ doTestMode(Normalizer2.getInstance(null, "nfkc", Normalizer2.Mode.DECOMPOSE), 256, RANDOM_MULTIPLIER*500, 16);
}
public void testNFKC_CF() throws Exception {
- doTestMode(Normalizer2.getInstance(null, "nfkc_cf", Normalizer2.Mode.COMPOSE), 20, RANDOM_MULTIPLIER*1000);
+ doTestMode(Normalizer2.getInstance(null, "nfkc_cf", Normalizer2.Mode.COMPOSE), 20, RANDOM_MULTIPLIER*1000, 128);
}
public void testNFKC_CFHuge() throws Exception {
- doTestMode(Normalizer2.getInstance(null, "nfkc_cf", Normalizer2.Mode.COMPOSE), 8192, RANDOM_MULTIPLIER*100);
+ doTestMode(Normalizer2.getInstance(null, "nfkc_cf", Normalizer2.Mode.COMPOSE), 256, RANDOM_MULTIPLIER*500, 16);
}
public void testRandomStrings() throws IOException {
@@ -186,7 +186,7 @@ public class TestICUNormalizer2CharFilte
};
checkRandomData(random(), a, 1000*RANDOM_MULTIPLIER);
// huge strings
- checkRandomData(random(), a, 100*RANDOM_MULTIPLIER, 8192);
+ checkRandomData(random(), a, 25*RANDOM_MULTIPLIER, 8192);
// nfkd
a = new Analyzer() {
@@ -202,7 +202,7 @@ public class TestICUNormalizer2CharFilte
};
checkRandomData(random(), a, 1000*RANDOM_MULTIPLIER);
// huge strings
- checkRandomData(random(), a, 100*RANDOM_MULTIPLIER, 8192);
+ checkRandomData(random(), a, 25*RANDOM_MULTIPLIER, 8192);
}
public void testCuriousString() throws Exception {
@@ -408,7 +408,7 @@ public class TestICUNormalizer2CharFilte
return new ICUNormalizer2CharFilter(reader, Normalizer2.getInstance(null, "nfkc_cf", Normalizer2.Mode.COMPOSE));
}
};
- for (int i = 0; i < 1000; i++) {
+ for (int i = 0; i < 25; i++) {
checkAnalysisConsistency(random(), a, false, text);
}
}