You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2015/09/02 15:06:22 UTC
svn commit: r1700800 [3/24] - in /lucene/dev/branches/lucene6699: ./
dev-tools/ dev-tools/eclipse/ dev-tools/idea/.idea/ dev-tools/scripts/
lucene/ lucene/analysis/ lucene/analysis/common/
lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ ...
Modified: lucene/dev/branches/lucene6699/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SpanishStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SpanishStemmer.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SpanishStemmer.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SpanishStemmer.java Wed Sep 2 13:06:13 2015
@@ -10,11 +10,11 @@ import org.tartarus.snowball.SnowballPro
* It implements the stemming algorithm defined by a snowball script.
*/
-public class SpanishStemmer extends SnowballProgram {
+@SuppressWarnings("unused") public class SpanishStemmer extends SnowballProgram {
private static final long serialVersionUID = 1L;
- private final static SpanishStemmer methodObject = new SpanishStemmer ();
+ /* patched */ private static final java.lang.invoke.MethodHandles.Lookup methodObject = java.lang.invoke.MethodHandles.lookup();
private final static Among a_0[] = {
new Among ( "", -1, 6, "", methodObject ),
Modified: lucene/dev/branches/lucene6699/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SwedishStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SwedishStemmer.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SwedishStemmer.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SwedishStemmer.java Wed Sep 2 13:06:13 2015
@@ -10,11 +10,11 @@ import org.tartarus.snowball.SnowballPro
* It implements the stemming algorithm defined by a snowball script.
*/
-public class SwedishStemmer extends SnowballProgram {
+@SuppressWarnings("unused") public class SwedishStemmer extends SnowballProgram {
private static final long serialVersionUID = 1L;
- private final static SwedishStemmer methodObject = new SwedishStemmer ();
+ /* patched */ private static final java.lang.invoke.MethodHandles.Lookup methodObject = java.lang.invoke.MethodHandles.lookup();
private final static Among a_0[] = {
new Among ( "a", -1, 1, "", methodObject ),
Modified: lucene/dev/branches/lucene6699/lucene/analysis/common/src/java/org/tartarus/snowball/ext/TurkishStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/common/src/java/org/tartarus/snowball/ext/TurkishStemmer.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/common/src/java/org/tartarus/snowball/ext/TurkishStemmer.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/common/src/java/org/tartarus/snowball/ext/TurkishStemmer.java Wed Sep 2 13:06:13 2015
@@ -10,11 +10,11 @@ import org.tartarus.snowball.SnowballPro
* It implements the stemming algorithm defined by a snowball script.
*/
-public class TurkishStemmer extends SnowballProgram {
+@SuppressWarnings("unused") public class TurkishStemmer extends SnowballProgram {
private static final long serialVersionUID = 1L;
- private final static TurkishStemmer methodObject = new TurkishStemmer ();
+ /* patched */ private static final java.lang.invoke.MethodHandles.Lookup methodObject = java.lang.invoke.MethodHandles.lookup();
private final static Among a_0[] = {
new Among ( "m", -1, -1, "", methodObject ),
Modified: lucene/dev/branches/lucene6699/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory Wed Sep 2 13:06:13 2015
@@ -26,6 +26,7 @@ org.apache.lucene.analysis.commongrams.C
org.apache.lucene.analysis.commongrams.CommonGramsQueryFilterFactory
org.apache.lucene.analysis.compound.DictionaryCompoundWordTokenFilterFactory
org.apache.lucene.analysis.compound.HyphenationCompoundWordTokenFilterFactory
+org.apache.lucene.analysis.core.DecimalDigitFilterFactory
org.apache.lucene.analysis.core.LowerCaseFilterFactory
org.apache.lucene.analysis.core.StopFilterFactory
org.apache.lucene.analysis.core.TypeTokenFilterFactory
@@ -60,6 +61,7 @@ org.apache.lucene.analysis.lv.LatvianSte
org.apache.lucene.analysis.miscellaneous.ASCIIFoldingFilterFactory
org.apache.lucene.analysis.miscellaneous.CapitalizationFilterFactory
org.apache.lucene.analysis.miscellaneous.CodepointCountFilterFactory
+org.apache.lucene.analysis.miscellaneous.FingerprintFilterFactory
org.apache.lucene.analysis.miscellaneous.HyphenatedWordsFilterFactory
org.apache.lucene.analysis.miscellaneous.KeepWordFilterFactory
org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilterFactory
Modified: lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java Wed Sep 2 13:06:13 2015
@@ -21,6 +21,7 @@ import java.io.IOException;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.util.CharArraySet;
+import org.apache.lucene.util.Version;
/**
* Test the Arabic Analyzer
@@ -100,6 +101,27 @@ public class TestArabicAnalyzer extends
a.close();
}
+ /**
+ * test we fold digits to latin-1
+ */
+ public void testDigits() throws Exception {
+ ArabicAnalyzer a = new ArabicAnalyzer();
+ checkOneTerm(a, "١٢٣٤", "1234");
+ a.close();
+ }
+
+ /**
+ * test that we don't fold digits for back compat behavior
+ * @deprecated remove this test in lucene 7
+ */
+ @Deprecated
+ public void testDigitsBackCompat() throws Exception {
+ ArabicAnalyzer a = new ArabicAnalyzer();
+ a.setVersion(Version.LUCENE_5_3_0);
+ checkOneTerm(a, "١٢٣٤", "١٢٣٤");
+ a.close();
+ }
+
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
ArabicAnalyzer a = new ArabicAnalyzer();
Modified: lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniAnalyzer.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniAnalyzer.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniAnalyzer.java Wed Sep 2 13:06:13 2015
@@ -22,6 +22,7 @@ import java.io.IOException;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.util.CharArraySet;
+import org.apache.lucene.util.Version;
/**
* Test the Sorani analyzer
@@ -63,6 +64,28 @@ public class TestSoraniAnalyzer extends
a.close();
}
+ /**
+ * test we fold digits to latin-1
+ * (these are somewhat rare, but generally a few % of digits still)
+ */
+ public void testDigits() throws Exception {
+ SoraniAnalyzer a = new SoraniAnalyzer();
+ checkOneTerm(a, "١٢٣٤", "1234");
+ a.close();
+ }
+
+ /**
+ * test that we don't fold digits for back compat behavior
+ * @deprecated remove this test in lucene 7
+ */
+ @Deprecated
+ public void testDigitsBackCompat() throws Exception {
+ SoraniAnalyzer a = new SoraniAnalyzer();
+ a.setVersion(Version.LUCENE_5_3_0);
+ checkOneTerm(a, "١٢٣٤", "١٢٣٤");
+ a.close();
+ }
+
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
Analyzer a = new SoraniAnalyzer();
Modified: lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilter.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilter.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilter.java Wed Sep 2 13:06:13 2015
@@ -23,6 +23,8 @@ import java.io.IOException;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
+import org.apache.lucene.analysis.MockTokenizer;
+import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.core.KeywordTokenizer;
@@ -107,6 +109,18 @@ public class TestSoraniStemFilter extend
/** test against a basic vocabulary file */
public void testVocabulary() throws Exception {
// top 8k words or so: freq > 1000
+
+ // just normalization+stem, we are testing that the stemming doesn't break.
+ Analyzer a = new Analyzer() {
+ @Override
+ protected TokenStreamComponents createComponents(String fieldName) {
+ Tokenizer tokenizer = new MockTokenizer(MockTokenizer.WHITESPACE, true);
+ TokenStream stream = new SoraniNormalizationFilter(tokenizer);
+ stream = new SoraniStemFilter(stream);
+ return new TokenStreamComponents(tokenizer, stream);
+ }
+ };
assertVocabulary(a, getDataPath("ckbtestdata.zip"), "testdata.txt");
+ a.close();
}
}
Modified: lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilter.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilter.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilter.java Wed Sep 2 13:06:13 2015
@@ -1,6 +1,6 @@
package org.apache.lucene.analysis.core;
-/**
+/*
* Copyright 2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
Modified: lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java Wed Sep 2 13:06:13 2015
@@ -1,6 +1,6 @@
package org.apache.lucene.analysis.el;
-/**
+/*
* Copyright 2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
Modified: lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java Wed Sep 2 13:06:13 2015
@@ -20,6 +20,7 @@ package org.apache.lucene.analysis.fa;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.util.CharArraySet;
+import org.apache.lucene.util.Version;
/**
* Test the Persian Analyzer
@@ -228,6 +229,27 @@ public class TestPersianAnalyzer extends
a.close();
}
+ /**
+ * test we fold digits to latin-1
+ */
+ public void testDigits() throws Exception {
+ PersianAnalyzer a = new PersianAnalyzer();
+ checkOneTerm(a, "Û±Û²Û³Û´", "1234");
+ a.close();
+ }
+
+ /**
+ * test that we don't fold digits for back compat behavior
+ * @deprecated remove this test in lucene 7
+ */
+ @Deprecated
+ public void testDigitsBackCompat() throws Exception {
+ PersianAnalyzer a = new PersianAnalyzer();
+ a.setVersion(Version.LUCENE_5_3_0);
+ checkOneTerm(a, "Û±Û²Û³Û´", "Û±Û²Û³Û´");
+ a.close();
+ }
+
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
PersianAnalyzer a = new PersianAnalyzer();
Modified: lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java Wed Sep 2 13:06:13 2015
@@ -3,6 +3,7 @@ package org.apache.lucene.analysis.hi;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.util.CharArraySet;
+import org.apache.lucene.util.Version;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -47,6 +48,27 @@ public class TestHindiAnalyzer extends B
a.close();
}
+ /**
+ * test we fold digits to latin-1
+ */
+ public void testDigits() throws Exception {
+ HindiAnalyzer a = new HindiAnalyzer();
+ checkOneTerm(a, "१२३४", "1234");
+ a.close();
+ }
+
+ /**
+ * test that we don't fold digits for back compat behavior
+ * @deprecated remove this test in lucene 7
+ */
+ @Deprecated
+ public void testDigitsBackCompat() throws Exception {
+ HindiAnalyzer a = new HindiAnalyzer();
+ a.setVersion(Version.LUCENE_5_3_0);
+ checkOneTerm(a, "१२३४", "१२३४");
+ a.close();
+ }
+
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
Analyzer analyzer = new HindiAnalyzer();
Modified: lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianFoldingFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianFoldingFilterFactory.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianFoldingFilterFactory.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianFoldingFilterFactory.java Wed Sep 2 13:06:13 2015
@@ -1,6 +1,6 @@
package org.apache.lucene.analysis.miscellaneous;
-/**
+/*
* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
Modified: lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizationFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizationFilterFactory.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizationFilterFactory.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizationFilterFactory.java Wed Sep 2 13:06:13 2015
@@ -1,6 +1,6 @@
package org.apache.lucene.analysis.miscellaneous;
-/**
+/*
* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
Modified: lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java Wed Sep 2 13:06:13 2015
@@ -1,6 +1,6 @@
package org.apache.lucene.analysis.payloads;
-/**
+/*
* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
Modified: lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterTest.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterTest.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterTest.java Wed Sep 2 13:06:13 2015
@@ -1,6 +1,6 @@
package org.apache.lucene.analysis.payloads;
-/**
+/*
* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
Modified: lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java Wed Sep 2 13:06:13 2015
@@ -1,6 +1,6 @@
package org.apache.lucene.analysis.payloads;
-/**
+/*
* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
Modified: lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/DateRecognizerSinkTokenizerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/DateRecognizerSinkTokenizerTest.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/DateRecognizerSinkTokenizerTest.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/DateRecognizerSinkTokenizerTest.java Wed Sep 2 13:06:13 2015
@@ -1,6 +1,6 @@
package org.apache.lucene.analysis.sinks;
-/**
+/*
* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
Modified: lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java Wed Sep 2 13:06:13 2015
@@ -1,6 +1,6 @@
package org.apache.lucene.analysis.sinks;
-/**
+/*
* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
Modified: lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TokenTypeSinkTokenizerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TokenTypeSinkTokenizerTest.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TokenTypeSinkTokenizerTest.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TokenTypeSinkTokenizerTest.java Wed Sep 2 13:06:13 2015
@@ -1,6 +1,6 @@
package org.apache.lucene.analysis.sinks;
-/**
+/*
* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
Modified: lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballPorterFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballPorterFilterFactory.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballPorterFilterFactory.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballPorterFilterFactory.java Wed Sep 2 13:06:13 2015
@@ -1,6 +1,6 @@
package org.apache.lucene.analysis.snowball;
-/**
+/*
* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
Modified: lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java Wed Sep 2 13:06:13 2015
@@ -39,18 +39,14 @@ public class TestSnowballVocab extends L
assertCorrectOutput("Danish", "danish");
assertCorrectOutput("Dutch", "dutch");
assertCorrectOutput("English", "english");
- // disabled due to snowball java code generation bug:
- // see http://article.gmane.org/gmane.comp.search.snowball/1139
- // assertCorrectOutput("Finnish", "finnish");
+ assertCorrectOutput("Finnish", "finnish");
assertCorrectOutput("French", "french");
assertCorrectOutput("German", "german");
assertCorrectOutput("German2", "german2");
assertCorrectOutput("Hungarian", "hungarian");
assertCorrectOutput("Italian", "italian");
assertCorrectOutput("Kp", "kraaij_pohlmann");
- // disabled due to snowball java code generation bug:
- // see http://article.gmane.org/gmane.comp.search.snowball/1139
- // assertCorrectOutput("Lovins", "lovins");
+ assertCorrectOutput("Lovins", "lovins");
assertCorrectOutput("Norwegian", "norwegian");
assertCorrectOutput("Porter", "porter");
assertCorrectOutput("Portuguese", "portuguese");
Modified: lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/WordBreakTestUnicode_6_3_0.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/WordBreakTestUnicode_6_3_0.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/WordBreakTestUnicode_6_3_0.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/WordBreakTestUnicode_6_3_0.java Wed Sep 2 13:06:13 2015
@@ -1,6 +1,6 @@
package org.apache.lucene.analysis.standard;
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
Modified: lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/generateJavaUnicodeWordBreakTest.pl
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/generateJavaUnicodeWordBreakTest.pl?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/generateJavaUnicodeWordBreakTest.pl (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/generateJavaUnicodeWordBreakTest.pl Wed Sep 2 13:06:13 2015
@@ -42,7 +42,7 @@ my $output_filename = "${class_name}.jav
my $header =<<"__HEADER__";
package org.apache.lucene.analysis.core;
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
Modified: lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java Wed Sep 2 13:06:13 2015
@@ -23,6 +23,7 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.core.StopAnalyzer;
import org.apache.lucene.analysis.tokenattributes.FlagsAttribute;
import org.apache.lucene.analysis.util.CharArraySet;
+import org.apache.lucene.util.Version;
/**
* Test case for ThaiAnalyzer, modified from TestFrenchAnalyzer
@@ -122,6 +123,27 @@ public class TestThaiAnalyzer extends Ba
analyzer.close();
}
+ /**
+ * test we fold digits to latin-1
+ */
+ public void testDigits() throws Exception {
+ ThaiAnalyzer a = new ThaiAnalyzer();
+ checkOneTerm(a, "à¹à¹à¹à¹", "1234");
+ a.close();
+ }
+
+ /**
+ * test that we don't fold digits for back compat behavior
+ * @deprecated remove this test in lucene 7
+ */
+ @Deprecated
+ public void testDigitsBackCompat() throws Exception {
+ ThaiAnalyzer a = new ThaiAnalyzer();
+ a.setVersion(Version.LUCENE_5_3_0);
+ checkOneTerm(a, "à¹à¹à¹à¹", "à¹à¹à¹à¹");
+ a.close();
+ }
+
public void testTwoSentences() throws Exception {
Analyzer analyzer = new ThaiAnalyzer(CharArraySet.EMPTY_SET);
assertAnalyzesTo(analyzer, "This is a test. à¸à¸²à¸£à¸à¸µà¹à¹à¸à¹à¸à¹à¸à¸à¹à¸ªà¸à¸à¸§à¹à¸²à¸à¸²à¸à¸à¸µ",
Modified: lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationDocValuesField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationDocValuesField.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationDocValuesField.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationDocValuesField.java Wed Sep 2 13:06:13 2015
@@ -1,6 +1,6 @@
package org.apache.lucene.collation;
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -120,10 +120,10 @@ public class TestCollationDocValuesField
for(int docID=0;docID<is.getIndexReader().maxDoc();docID++) {
StoredDocument doc = is.doc(docID);
String s = doc.getField("field").stringValue();
- boolean collatorAccepts = collator.compare(s, startPoint) >= 0 && collator.compare(s, endPoint) <= 0;
+ boolean collatorAccepts = collate(collator, s, startPoint) >= 0 && collate(collator, s, endPoint) <= 0;
BytesRef br = dvs.get(docID);
boolean luceneAccepts = br.compareTo(startBR) >= 0 && br.compareTo(endBR) <= 0;
- assertEquals(collatorAccepts, luceneAccepts);
+ assertEquals(startPoint + " <= " + s + " <= " + endPoint, collatorAccepts, luceneAccepts);
}
}
}
Modified: lucene/dev/branches/lucene6699/lucene/analysis/icu/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/icu/build.xml?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/icu/build.xml (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/icu/build.xml Wed Sep 2 13:06:13 2015
@@ -59,7 +59,7 @@
</target>
<property name="gennorm2.src.files"
- value="nfc.txt nfkc.txt nfkc_cf.txt BasicFoldings.txt DiacriticFolding.txt DingbatFolding.txt HanRadicalFolding.txt NativeDigitFolding.txt"/>
+ value="nfc.txt nfkc.txt nfkc_cf.txt BasicFoldings.txt DiacriticFolding.txt DingbatFolding.txt HanRadicalFolding.txt NativeDigitFolding.txt"/>
<property name="gennorm2.tmp" value="${build.dir}/gennorm2/utr30.tmp"/>
<property name="gennorm2.dst" value="${resources.dir}/org/apache/lucene/analysis/icu/utr30.nrm"/>
<target name="gennorm2" depends="gen-utr30-data-files">
@@ -85,7 +85,7 @@ are part of the ICU4C package. See http:
<property name="rbbi.src.dir" location="src/data/uax29"/>
<property name="rbbi.dst.dir" location="${resources.dir}/org/apache/lucene/analysis/icu/segmentation"/>
-
+
<target name="genrbbi" depends="compile-tools">
<mkdir dir="${rbbi.dst.dir}"/>
<java
@@ -94,8 +94,8 @@ are part of the ICU4C package. See http:
fork="true"
failonerror="true">
<classpath>
- <path refid="icujar"/>
- <pathelement location="${build.dir}/classes/tools"/>
+ <path refid="icujar"/>
+ <pathelement location="${build.dir}/classes/tools"/>
</classpath>
<assertions>
<enable package="org.apache.lucene"/>
Modified: lucene/dev/branches/lucene6699/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationDocValuesField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationDocValuesField.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationDocValuesField.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationDocValuesField.java Wed Sep 2 13:06:13 2015
@@ -1,6 +1,6 @@
package org.apache.lucene.collation;
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
Modified: lucene/dev/branches/lucene6699/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationDocValuesField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationDocValuesField.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationDocValuesField.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationDocValuesField.java Wed Sep 2 13:06:13 2015
@@ -1,6 +1,6 @@
package org.apache.lucene.collation;
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
Modified: lucene/dev/branches/lucene6699/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilter.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilter.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilter.java Wed Sep 2 13:06:13 2015
@@ -1,6 +1,6 @@
package org.apache.lucene.analysis.ja;
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
Modified: lucene/dev/branches/lucene6699/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilterFactory.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilterFactory.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilterFactory.java Wed Sep 2 13:06:13 2015
@@ -1,6 +1,6 @@
package org.apache.lucene.analysis.ja;
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
Modified: lucene/dev/branches/lucene6699/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseNumberFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseNumberFilter.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseNumberFilter.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseNumberFilter.java Wed Sep 2 13:06:13 2015
@@ -1,6 +1,6 @@
package org.apache.lucene.analysis.ja;
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
Modified: lucene/dev/branches/lucene6699/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilter.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilter.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilter.java Wed Sep 2 13:06:13 2015
@@ -1,6 +1,6 @@
package org.apache.lucene.analysis.ja;
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
Modified: lucene/dev/branches/lucene6699/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseNumberFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseNumberFilter.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseNumberFilter.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseNumberFilter.java Wed Sep 2 13:06:13 2015
@@ -1,6 +1,6 @@
package org.apache.lucene.analysis.ja;
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
Modified: lucene/dev/branches/lucene6699/lucene/analysis/stempel/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/stempel/build.xml?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/stempel/build.xml (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/stempel/build.xml Wed Sep 2 13:06:13 2015
@@ -29,6 +29,6 @@
<pathelement path="${analyzers-common.jar}"/>
<path refid="base.classpath"/>
</path>
-
+
<target name="compile-core" depends="jar-analyzers-common, common.compile-core"/>
</project>
Modified: lucene/dev/branches/lucene6699/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelFilter.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelFilter.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelFilter.java Wed Sep 2 13:06:13 2015
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may
Modified: lucene/dev/branches/lucene6699/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelStemmer.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelStemmer.java (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelStemmer.java Wed Sep 2 13:06:13 2015
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
Modified: lucene/dev/branches/lucene6699/lucene/analysis/uima/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/analysis/uima/build.xml?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/analysis/uima/build.xml (original)
+++ lucene/dev/branches/lucene6699/lucene/analysis/uima/build.xml Wed Sep 2 13:06:13 2015
@@ -22,7 +22,7 @@
<description>
Analysis integration with Apache UIMA
</description>
-
+
<property name="tests.userdir" value="src/test-files"/>
<!-- TODO: why is this limited to one JVM? -->
<property name="tests.jvms.override" value="1" />
Modified: lucene/dev/branches/lucene6699/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (original)
+++ lucene/dev/branches/lucene6699/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java Wed Sep 2 13:06:13 2015
@@ -224,7 +224,9 @@ public class TestBackwardsCompatibility
"5.2.0-cfs",
"5.2.0-nocfs",
"5.2.1-cfs",
- "5.2.1-nocfs"
+ "5.2.1-nocfs",
+ "5.3.0-cfs",
+ "5.3.0-nocfs"
};
final String[] unsupportedNames = {
Modified: lucene/dev/branches/lucene6699/lucene/benchmark/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/benchmark/build.xml?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/benchmark/build.xml (original)
+++ lucene/dev/branches/lucene6699/lucene/benchmark/build.xml Wed Sep 2 13:06:13 2015
@@ -46,9 +46,9 @@
<available file="temp/enwiki-20070527-pages-articles.xml.bz2" property="enwiki.exists"/>
<available file="temp/enwiki-20070527-pages-articles.xml" property="enwiki.expanded"/>
<available file="${working.dir}/enwiki.txt" property="enwiki.extracted"/>
- <available file="temp/${top.100k.words.archive.filename}"
+ <available file="temp/${top.100k.words.archive.filename}"
property="top.100k.words.archive.present"/>
- <available file="${working.dir}/top100k-out"
+ <available file="${working.dir}/top100k-out"
property="top.100k.word.files.expanded"/>
</target>
@@ -137,27 +137,27 @@
<untar src="temp/mini_newsgroups.tar" dest="${working.dir}"/>
</target>
- <property name="top.100k.words.archive.filename"
- value="top.100k.words.de.en.fr.uk.wikipedia.2009-11.tar.bz2"/>
- <property name="top.100k.words.archive.base.url"
- value="http://people.apache.org/~rmuir/wikipedia"/>
- <target name="get-top-100k-words-archive" unless="top.100k.words.archive.present">
- <mkdir dir="temp"/>
- <get src="${top.100k.words.archive.base.url}/${top.100k.words.archive.filename}"
- dest="temp/${top.100k.words.archive.filename}"/>
- </target>
- <target name="expand-top-100k-word-files" unless="top.100k.word.files.expanded">
- <mkdir dir="${working.dir}/top100k-out"/>
- <untar src="temp/${top.100k.words.archive.filename}"
- overwrite="true" compression="bzip2" dest="${working.dir}/top100k-out"/>
- </target>
-
- <target name="top-100k-wiki-word-files" depends="check-files">
- <mkdir dir="${working.dir}"/>
- <antcall target="get-top-100k-words-archive"/>
- <antcall target="expand-top-100k-word-files"/>
- </target>
-
+ <property name="top.100k.words.archive.filename"
+ value="top.100k.words.de.en.fr.uk.wikipedia.2009-11.tar.bz2"/>
+ <property name="top.100k.words.archive.base.url"
+ value="http://people.apache.org/~rmuir/wikipedia"/>
+ <target name="get-top-100k-words-archive" unless="top.100k.words.archive.present">
+ <mkdir dir="temp"/>
+ <get src="${top.100k.words.archive.base.url}/${top.100k.words.archive.filename}"
+ dest="temp/${top.100k.words.archive.filename}"/>
+ </target>
+ <target name="expand-top-100k-word-files" unless="top.100k.word.files.expanded">
+ <mkdir dir="${working.dir}/top100k-out"/>
+ <untar src="temp/${top.100k.words.archive.filename}"
+ overwrite="true" compression="bzip2" dest="${working.dir}/top100k-out"/>
+ </target>
+
+ <target name="top-100k-wiki-word-files" depends="check-files">
+ <mkdir dir="${working.dir}"/>
+ <antcall target="get-top-100k-words-archive"/>
+ <antcall target="expand-top-100k-word-files"/>
+ </target>
+
<target name="get-files" depends="check-files">
<mkdir dir="temp"/>
<antcall target="get-reuters"/>
@@ -222,44 +222,44 @@
</java>
</target>
- <property name="collation.alg.file" location="conf/collation.alg"/>
- <property name="collation.output.file"
- value="${working.dir}/collation.benchmark.output.txt"/>
- <property name="collation.jira.output.file"
- value="${working.dir}/collation.bm2jira.output.txt"/>
-
- <path id="collation.runtime.classpath">
- <path refid="run.classpath"/>
+ <property name="collation.alg.file" location="conf/collation.alg"/>
+ <property name="collation.output.file"
+ value="${working.dir}/collation.benchmark.output.txt"/>
+ <property name="collation.jira.output.file"
+ value="${working.dir}/collation.bm2jira.output.txt"/>
+
+ <path id="collation.runtime.classpath">
+ <path refid="run.classpath"/>
<pathelement path="${analyzers-icu.jar}"/>
- </path>
-
- <target name="collation" depends="compile,jar-analyzers-icu,top-100k-wiki-word-files">
- <echo>Running benchmark with alg file: ${collation.alg.file}</echo>
- <java fork="true" classname="org.apache.lucene.benchmark.byTask.Benchmark"
- maxmemory="${task.mem}" output="${collation.output.file}">
- <classpath refid="collation.runtime.classpath"/>
- <arg file="${collation.alg.file}"/>
- </java>
- <echo>Benchmark output is in file: ${collation.output.file}</echo>
- <echo>Converting to JIRA table format...</echo>
- <exec executable="${perl.exe}" output="${collation.jira.output.file}" failonerror="true">
+ </path>
+
+ <target name="collation" depends="compile,jar-analyzers-icu,top-100k-wiki-word-files">
+ <echo>Running benchmark with alg file: ${collation.alg.file}</echo>
+ <java fork="true" classname="org.apache.lucene.benchmark.byTask.Benchmark"
+ maxmemory="${task.mem}" output="${collation.output.file}">
+ <classpath refid="collation.runtime.classpath"/>
+ <arg file="${collation.alg.file}"/>
+ </java>
+ <echo>Benchmark output is in file: ${collation.output.file}</echo>
+ <echo>Converting to JIRA table format...</echo>
+ <exec executable="${perl.exe}" output="${collation.jira.output.file}" failonerror="true">
<arg value="-CSD"/>
- <arg value="scripts/collation.bm2jira.pl"/>
- <arg value="${collation.output.file}"/>
- </exec>
- <echo>Benchmark output in JIRA table format is in file: ${collation.jira.output.file}</echo>
- </target>
-
+ <arg value="scripts/collation.bm2jira.pl"/>
+ <arg value="${collation.output.file}"/>
+ </exec>
+ <echo>Benchmark output in JIRA table format is in file: ${collation.jira.output.file}</echo>
+ </target>
+
<property name="shingle.alg.file" location="conf/shingle.alg"/>
<property name="shingle.output.file"
value="${working.dir}/shingle.benchmark.output.txt"/>
<property name="shingle.jira.output.file"
value="${working.dir}/shingle.bm2jira.output.txt"/>
-
+
<path id="shingle.runtime.classpath">
<path refid="run.classpath"/>
</path>
-
+
<target name="shingle" depends="compile,get-files">
<echo>Running benchmark with alg file: ${shingle.alg.file}</echo>
<java fork="true" classname="org.apache.lucene.benchmark.byTask.Benchmark"
Modified: lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/Constants.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/Constants.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/Constants.java (original)
+++ lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/Constants.java Wed Sep 2 13:06:13 2015
@@ -1,5 +1,5 @@
package org.apache.lucene.benchmark;
-/**
+/*
* Copyright 2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
Modified: lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/AbstractQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/AbstractQueryMaker.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/AbstractQueryMaker.java (original)
+++ lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/AbstractQueryMaker.java Wed Sep 2 13:06:13 2015
@@ -1,5 +1,5 @@
package org.apache.lucene.benchmark.byTask.feeds;
-/**
+/*
* Copyright 2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
Modified: lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java (original)
+++ lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java Wed Sep 2 13:06:13 2015
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2004 The Apache Software Foundation
+ * <p/>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.lucene.benchmark.byTask.feeds;
import org.apache.lucene.analysis.Analyzer;
@@ -16,22 +32,6 @@ import java.util.ArrayList;
import java.util.List;
/**
- * Copyright 2004 The Apache Software Foundation
- * <p/>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
* Create queries from a FileReader. One per line, pass them through the
* QueryParser. Lines beginning with # are treated as comments
*
Modified: lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocSource.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocSource.java (original)
+++ lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocSource.java Wed Sep 2 13:06:13 2015
@@ -250,7 +250,7 @@ public class LineDocSource extends Conte
try {
final Class<? extends LineParser> clazz =
Class.forName(docDataLineReaderClassName).asSubclass(LineParser.class);
- Constructor<? extends LineParser> cnstr = clazz.getConstructor(new Class[]{String[].class});
+ Constructor<? extends LineParser> cnstr = clazz.getConstructor(String[].class);
return cnstr.newInstance((Object)header);
} catch (Exception e) {
throw new RuntimeException("Failed to instantiate "+docDataLineReaderClassName, e);
Modified: lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/programmatic/Sample.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/programmatic/Sample.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/programmatic/Sample.java (original)
+++ lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/programmatic/Sample.java Wed Sep 2 13:06:13 2015
@@ -1,6 +1,6 @@
package org.apache.lucene.benchmark.byTask.programmatic;
-/**
+/*
* Copyright 2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
Modified: lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java (original)
+++ lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java Wed Sep 2 13:06:13 2015
@@ -112,6 +112,7 @@ public class AnalyzerFactoryTask extends
* and 0+ TokenFilterFactory's
*/
@Override
+ @SuppressWarnings("fallthrough")
public void setParams(String params) {
super.setParams(params);
ArgType expectedArgType = ArgType.ANALYZER_ARG;
@@ -287,6 +288,7 @@ public class AnalyzerFactoryTask extends
* @param stok stream tokenizer from which to draw analysis factory params
* @param clazz analysis factory class to instantiate
*/
+ @SuppressWarnings("fallthrough")
private void createAnalysisPipelineComponent
(StreamTokenizer stok, Class<? extends AbstractAnalysisFactory> clazz) {
Map<String,String> argMap = new HashMap<>();
Modified: lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java (original)
+++ lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java Wed Sep 2 13:06:13 2015
@@ -1,5 +1,5 @@
package org.apache.lucene.benchmark.byTask.tasks;
-/**
+/*
* Copyright 2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
Modified: lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewCollationAnalyzerTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewCollationAnalyzerTask.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewCollationAnalyzerTask.java (original)
+++ lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewCollationAnalyzerTask.java Wed Sep 2 13:06:13 2015
@@ -65,8 +65,7 @@ public class NewCollationAnalyzerTask ex
static Analyzer createAnalyzer(Locale locale, Implementation impl)
throws Exception {
final Class<?> collatorClazz = Class.forName(impl.collatorClassName);
- Method collatorMethod = collatorClazz.getMethod("getInstance",
- new Class[] {Locale.class});
+ Method collatorMethod = collatorClazz.getMethod("getInstance", Locale.class);
Object collator = collatorMethod.invoke(null, locale);
final Class<? extends Analyzer> clazz = Class.forName(impl.className)
Modified: lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java (original)
+++ lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java Wed Sep 2 13:06:13 2015
@@ -1,5 +1,5 @@
package org.apache.lucene.benchmark.byTask.tasks;
-/**
+/*
* Copyright 2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
Modified: lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractReuters.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractReuters.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractReuters.java (original)
+++ lucene/dev/branches/lucene6699/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractReuters.java Wed Sep 2 13:06:13 2015
@@ -1,5 +1,5 @@
package org.apache.lucene.benchmark.utils;
-/**
+/*
* Copyright 2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
Modified: lucene/dev/branches/lucene6699/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/build.xml?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/build.xml (original)
+++ lucene/dev/branches/lucene6699/lucene/build.xml Wed Sep 2 13:06:13 2015
@@ -78,7 +78,7 @@
<!-- Validation here depends on compile-tools: but we want to compile modules' tools too -->
<target name="compile-tools" depends="common.compile-tools">
- <modules-crawl target="compile-tools" failonerror="true"/>
+ <modules-crawl target="compile-tools" failonerror="true"/>
</target>
<target name="check-licenses" depends="compile-tools,resolve,load-custom-tasks" description="Validate license stuff.">
@@ -97,7 +97,8 @@
<lib-versions-check-macro dir="${common.dir}/.."
centralized.versions.file="${common.dir}/ivy-versions.properties"
ivy.settings.file="${common.dir}/ivy-settings.xml"
- ivy.resolution-cache.dir="${ivy.resolution-cache.dir}"
+ ivy.resolution-cache.dir="${ivy.resolution-cache.dir}"
+ ivy.lock-strategy="${ivy.lock-strategy}"
common.build.dir="${common.build.dir}"
ignore.conflicts.file="${common.dir}/ivy-ignore-conflicts.properties"/>
</target>
@@ -237,7 +238,7 @@
<fileset dir="site/html"/>
</copy>
</target>
-
+
<target name="javadocs-modules" description="Generate javadoc for modules classes">
<modules-crawl target="javadocs"
failonerror="true"/>
@@ -281,7 +282,7 @@
<patternset refid="binary.build.dist.patterns"/>
</zipfileset>
</zip>
- <make-checksums file="${dist.dir}/lucene-${version}.zip"/>
+ <make-checksums file="${dist.dir}/lucene-${version}.zip"/>
</target>
<!-- ================================================================== -->
@@ -435,7 +436,7 @@
<modules-crawl target="-validate-maven-dependencies"/>
</sequential>
</target>
-
+
<!-- ================================================================== -->
<!-- support for signing the artifacts using gpg -->
<!-- ================================================================== -->
Modified: lucene/dev/branches/lucene6699/lucene/classification/src/test/org/apache/lucene/classification/utils/ConfusionMatrixGeneratorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/classification/src/test/org/apache/lucene/classification/utils/ConfusionMatrixGeneratorTest.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/classification/src/test/org/apache/lucene/classification/utils/ConfusionMatrixGeneratorTest.java (original)
+++ lucene/dev/branches/lucene6699/lucene/classification/src/test/org/apache/lucene/classification/utils/ConfusionMatrixGeneratorTest.java Wed Sep 2 13:06:13 2015
@@ -31,7 +31,7 @@ import org.junit.Test;
/**
* Tests for {@link ConfusionMatrixGenerator}
*/
-public class ConfusionMatrixGeneratorTest extends ClassificationTestBase {
+public class ConfusionMatrixGeneratorTest extends ClassificationTestBase<Object> {
@Test
public void testGetConfusionMatrixWithSNB() throws Exception {
Modified: lucene/dev/branches/lucene6699/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilterFactory.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilterFactory.java (original)
+++ lucene/dev/branches/lucene6699/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilterFactory.java Wed Sep 2 13:06:13 2015
@@ -1,5 +1,5 @@
package org.apache.lucene.codecs.bloom;
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
Modified: lucene/dev/branches/lucene6699/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java (original)
+++ lucene/dev/branches/lucene6699/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java Wed Sep 2 13:06:13 2015
@@ -1,6 +1,6 @@
package org.apache.lucene.codecs.bloom;
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
Modified: lucene/dev/branches/lucene6699/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/DefaultBloomFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/DefaultBloomFilterFactory.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/DefaultBloomFilterFactory.java (original)
+++ lucene/dev/branches/lucene6699/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/DefaultBloomFilterFactory.java Wed Sep 2 13:06:13 2015
@@ -1,5 +1,5 @@
package org.apache.lucene.codecs.bloom;
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
Modified: lucene/dev/branches/lucene6699/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java (original)
+++ lucene/dev/branches/lucene6699/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java Wed Sep 2 13:06:13 2015
@@ -1,6 +1,6 @@
package org.apache.lucene.codecs.bloom;
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
Modified: lucene/dev/branches/lucene6699/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/HashFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/HashFunction.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/HashFunction.java (original)
+++ lucene/dev/branches/lucene6699/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/HashFunction.java Wed Sep 2 13:06:13 2015
@@ -1,5 +1,5 @@
package org.apache.lucene.codecs.bloom;
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
Modified: lucene/dev/branches/lucene6699/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/MurmurHash2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/MurmurHash2.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/MurmurHash2.java (original)
+++ lucene/dev/branches/lucene6699/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/MurmurHash2.java Wed Sep 2 13:06:13 2015
@@ -1,5 +1,5 @@
package org.apache.lucene.codecs.bloom;
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
Modified: lucene/dev/branches/lucene6699/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java (original)
+++ lucene/dev/branches/lucene6699/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java Wed Sep 2 13:06:13 2015
@@ -1,6 +1,6 @@
package org.apache.lucene.codecs.memory;
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
Modified: lucene/dev/branches/lucene6699/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/common-build.xml?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/common-build.xml (original)
+++ lucene/dev/branches/lucene6699/lucene/common-build.xml Wed Sep 2 13:06:13 2015
@@ -81,8 +81,11 @@
<property name="ivy.bootstrap.version" value="2.3.0" />
<property name="ivy.default.configuration" value="*"/>
+
+ <!-- Running ant targets in parralel may require this set to false because ivy:retrieve tasks may race with resolve -->
<property name="ivy.sync" value="true"/>
<property name="ivy.resolution-cache.dir" location="${common.build.dir}/ivy-resolution-cache"/>
+ <property name="ivy.lock-strategy" value="artifact-lock"/>
<property name="junit.jar" value="junit-4.10.jar"/>
<property name="junit-location.jar" location="${common.dir}/test-framework/lib/${junit.jar}"/>
@@ -221,7 +224,7 @@
<include name="**/lib/*.jar"/>
</fileset>
</path>
-
+
<property name="changes.src.dir" location="${common.dir}/site/changes"/>
<property name="changes.target.dir" location="${common.dir}/build/docs/changes"/>
@@ -555,7 +558,7 @@
</pathconvert>
<macrodef name="m2-deploy" description="Builds a Maven artifact">
- <element name="artifact-attachments" optional="yes"/>
+ <element name="artifact-attachments" optional="yes"/>
<element name="parent-poms" optional="yes"/>
<element name="credentials" optional="yes"/>
<attribute name="pom.xml"/>
@@ -613,7 +616,7 @@
</macrodef>
<macrodef name="build-manifest" description="Builds a manifest file">
- <attribute name="title"/>
+ <attribute name="title"/>
<attribute name="implementation.title"/>
<attribute name="manifest.file" default="${manifest.file}"/>
<element name="additional-manifest-attributes" optional="true"/>
@@ -666,11 +669,11 @@
</manifest>
</sequential>
</macrodef>
-
+
<macrodef name="jarify" description="Builds a JAR file">
- <attribute name="basedir" default="${build.dir}/classes/java"/>
- <attribute name="destfile" default="${build.dir}/${final.name}.jar"/>
- <attribute name="title" default="Lucene Search Engine: ${ant.project.name}"/>
+ <attribute name="basedir" default="${build.dir}/classes/java"/>
+ <attribute name="destfile" default="${build.dir}/${final.name}.jar"/>
+ <attribute name="title" default="Lucene Search Engine: ${ant.project.name}"/>
<attribute name="excludes" default="**/pom.xml,**/*.iml"/>
<attribute name="metainf.source.dir" default="${common.dir}"/>
<attribute name="implementation.title" default="org.apache.lucene"/>
@@ -685,7 +688,7 @@
<jarify-additional-manifest-attributes />
</additional-manifest-attributes>
</build-manifest>
-
+
<jar destfile="@{destfile}"
basedir="@{basedir}"
manifest="@{manifest.file}"
@@ -703,7 +706,7 @@
<attribute name="module-src-name" default="@{name}"/>
<sequential>
<uptodate property="@{property}" targetfile="@{jarfile}">
- <srcfiles dir="${common.dir}/@{module-src-name}/src/java" includes="**/*.java"/>
+ <srcfiles dir="${common.dir}/@{module-src-name}/src/java" includes="**/*.java"/>
</uptodate>
</sequential>
</macrodef>
@@ -711,7 +714,7 @@
<property name="lucene-core.jar" value="${common.dir}/build/core/lucene-core-${version}.jar"/>
<target name="check-lucene-core-uptodate" unless="lucene-core.uptodate">
<uptodate property="lucene-core.uptodate" targetfile="${lucene-core.jar}">
- <srcfiles dir="${common.dir}/core/src/java" includes="**/*.java"/>
+ <srcfiles dir="${common.dir}/core/src/java" includes="**/*.java"/>
</uptodate>
</target>
<target name="jar-lucene-core" unless="lucene-core.uptodate" depends="check-lucene-core-uptodate">
@@ -794,12 +797,12 @@
</target>
<macrodef name="compile-test-macro" description="Compiles junit tests.">
- <attribute name="srcdir"/>
- <attribute name="destdir"/>
- <attribute name="test.classpath"/>
+ <attribute name="srcdir"/>
+ <attribute name="destdir"/>
+ <attribute name="test.classpath"/>
<attribute name="javac.source" default="${javac.source}"/>
<attribute name="javac.target" default="${javac.target}"/>
- <sequential>
+ <sequential>
<compile
srcdir="@{srcdir}"
destdir="@{destdir}"
@@ -812,7 +815,7 @@
<copy todir="@{destdir}">
<fileset dir="@{srcdir}" excludes="**/*.java"/>
</copy>
- </sequential>
+ </sequential>
</macrodef>
<target name="test-updatecache" description="Overwrite tests' timings cache for balancing." depends="install-junit4-taskdef">
@@ -1626,7 +1629,7 @@ ${tests-output}/junit4-*.suites - pe
<!-- TODO, this is really unintuitive how we depend on a target that does not exist -->
<target name="javadocs">
- <fail message="You must redefine the javadocs task to do something!!!!!"/>
+ <fail message="You must redefine the javadocs task to do something!!!!!"/>
</target>
<target name="install-maven-tasks" unless="maven-tasks.uptodate" depends="ivy-availability-check,ivy-configure">
@@ -1821,7 +1824,7 @@ ${ant.project.name}.test.dependencies=${
</target>
<target name="rat-sources" depends="rat-sources-typedef"
- description="runs the tasks over source and test files">
+ description="runs the tasks over source and test files">
<!-- create a temp file for the log to go to -->
<tempfile property="rat.sources.logfile"
prefix="rat"
@@ -2052,7 +2055,7 @@ ${ant.project.name}.test.dependencies=${
<macrodef name="invoke-javadoc">
<element name="sources" optional="yes"/>
<attribute name="destdir"/>
- <attribute name="title" default="${Name} ${version} API"/>
+ <attribute name="title" default="${Name} ${version} API"/>
<attribute name="overview" default="${src.dir}/overview.html"/>
<attribute name="linksource" default="no"/>
<sequential>
@@ -2085,7 +2088,7 @@ ${ant.project.name}.test.dependencies=${
description="WARNING: This API is experimental and might change in incompatible ways in the next release."/>
<tag name="lucene.internal"
description="NOTE: This API is for internal purposes only and might change in incompatible ways in the next release."/>
- <link offline="true" packagelistLoc="${javadoc.dir}"/>
+ <link offline="true" packagelistLoc="${javadoc.dir}"/>
<link offline="true" href="${javadoc.link}" packagelistLoc="${javadoc.packagelist.dir}/java8"/>
<bottom><![CDATA[
<i>Copyright © ${year} Apache Software Foundation. All Rights Reserved.</i>
@@ -2104,9 +2107,9 @@ ${ant.project.name}.test.dependencies=${
})();
</script>
]]></bottom>
-
- <sources />
-
+
+ <sources />
+
<classpath refid="javadoc.classpath"/>
<arg line="${javadoc.doclint.args}"/>
</javadoc>
@@ -2429,7 +2432,7 @@ ${ant.project.name}.test.dependencies=${
public final class PegDownFilter extends ChainableReaderFilter {
@Override
- public String filter(String markdownSource) {
+ public String filter(String markdownSource) {
PegDownProcessor processor = new PegDownProcessor(
Extensions.ABBREVIATIONS | Extensions.AUTOLINKS |
Extensions.FENCED_CODE_BLOCKS | Extensions.SMARTS
@@ -2479,13 +2482,13 @@ ${ant.project.name}.test.dependencies=${
</macrodef>
<target name="regenerate"/>
-
+
<macrodef name="check-broken-links">
<attribute name="dir"/>
<sequential>
<exec dir="." executable="${python32.exe}" failonerror="true">
- <!-- Tell Python not to write any bytecode cache into the filesystem: -->
- <arg value="-B"/>
+ <!-- Tell Python not to write any bytecode cache into the filesystem: -->
+ <arg value="-B"/>
<arg value="${dev-tools.dir}/scripts/checkJavadocLinks.py"/>
<arg value="@{dir}"/>
</exec>
@@ -2497,8 +2500,8 @@ ${ant.project.name}.test.dependencies=${
<attribute name="level" default="class"/>
<sequential>
<exec dir="." executable="${python32.exe}" failonerror="true">
- <!-- Tell Python not to write any bytecode cache into the filesystem: -->
- <arg value="-B"/>
+ <!-- Tell Python not to write any bytecode cache into the filesystem: -->
+ <arg value="-B"/>
<arg value="${dev-tools.dir}/scripts/checkJavaDocs.py"/>
<arg value="@{dir}"/>
<arg value="@{level}"/>
Modified: lucene/dev/branches/lucene6699/lucene/core/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/core/build.xml?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/core/build.xml (original)
+++ lucene/dev/branches/lucene6699/lucene/core/build.xml Wed Sep 2 13:06:13 2015
@@ -65,20 +65,20 @@
<target name="-dist-maven" depends="-dist-maven-src-java"/>
<macrodef name="createLevAutomaton">
- <attribute name="n"/>
- <sequential>
+ <attribute name="n"/>
+ <sequential>
<exec dir="src/java/org/apache/lucene/util/automaton"
executable="${python.exe}" failonerror="true">
- <!-- Tell Python not to write any bytecode cache into the filesystem: -->
- <arg value="-B"/>
+ <!-- Tell Python not to write any bytecode cache into the filesystem: -->
+ <arg value="-B"/>
<arg value="createLevAutomata.py"/>
<arg value="@{n}"/>
<arg value="True"/>
</exec>
<exec dir="src/java/org/apache/lucene/util/automaton"
executable="${python.exe}" failonerror="true">
- <!-- Tell Python not to write any bytecode cache into the filesystem: -->
- <arg value="-B"/>
+ <!-- Tell Python not to write any bytecode cache into the filesystem: -->
+ <arg value="-B"/>
<arg value="createLevAutomata.py"/>
<arg value="@{n}"/>
<arg value="False"/>
Modified: lucene/dev/branches/lucene6699/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsReader.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsReader.java (original)
+++ lucene/dev/branches/lucene6699/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsReader.java Wed Sep 2 13:06:13 2015
@@ -1,6 +1,6 @@
package org.apache.lucene.codecs;
-/**
+/*
* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
Modified: lucene/dev/branches/lucene6699/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java (original)
+++ lucene/dev/branches/lucene6699/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java Wed Sep 2 13:06:13 2015
@@ -1,6 +1,6 @@
package org.apache.lucene.codecs;
-/**
+/*
* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
Modified: lucene/dev/branches/lucene6699/lucene/core/src/java/org/apache/lucene/codecs/blocktree/AutoPrefixTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/core/src/java/org/apache/lucene/codecs/blocktree/AutoPrefixTermsWriter.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/core/src/java/org/apache/lucene/codecs/blocktree/AutoPrefixTermsWriter.java (original)
+++ lucene/dev/branches/lucene6699/lucene/core/src/java/org/apache/lucene/codecs/blocktree/AutoPrefixTermsWriter.java Wed Sep 2 13:06:13 2015
@@ -40,7 +40,7 @@ import org.apache.lucene.util.StringHelp
/** Used in the first pass when writing a segment to locate
* "appropriate" auto-prefix terms to pre-compile into the index.
* This visits every term in the index to find prefixes that
- * match >= min and <= max number of terms. */
+ * match {@code >= min} and {@code <= max} number of terms. */
class AutoPrefixTermsWriter {
Modified: lucene/dev/branches/lucene6699/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java (original)
+++ lucene/dev/branches/lucene6699/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java Wed Sep 2 13:06:13 2015
@@ -341,7 +341,6 @@ public final class CompressingStoredFiel
* <li>Bytes --> Potential additional bytes to read depending on the
* header.
* </ul>
- * <p>
*/
static void writeZFloat(DataOutput out, float f) throws IOException {
int intVal = (int) f;
@@ -380,7 +379,6 @@ public final class CompressingStoredFiel
* <li>Bytes --> Potential additional bytes to read depending on the
* header.
* </ul>
- * <p>
*/
static void writeZDouble(DataOutput out, double d) throws IOException {
int intVal = (int) d;
@@ -431,7 +429,6 @@ public final class CompressingStoredFiel
* <li>Bytes --> Potential additional bytes to read depending on the
* header.
* </ul>
- * <p>
*/
// T for "timestamp"
static void writeTLong(DataOutput out, long l) throws IOException {
Modified: lucene/dev/branches/lucene6699/lucene/core/src/java/org/apache/lucene/index/ExitableDirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/core/src/java/org/apache/lucene/index/ExitableDirectoryReader.java?rev=1700800&r1=1700799&r2=1700800&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/core/src/java/org/apache/lucene/index/ExitableDirectoryReader.java (original)
+++ lucene/dev/branches/lucene6699/lucene/core/src/java/org/apache/lucene/index/ExitableDirectoryReader.java Wed Sep 2 13:06:13 2015
@@ -80,7 +80,13 @@ public class ExitableDirectoryReader ext
@Override
public Fields fields() throws IOException {
- return new ExitableFields(super.fields(), queryTimeout);
+ Fields fields = super.fields();
+ if (queryTimeout.isTimeoutEnabled()) {
+ return new ExitableFields(fields, queryTimeout);
+ }
+ else {
+ return fields; // break out of wrapper as soon as possible
+ }
}
@Override