You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by rm...@apache.org on 2010/01/15 23:15:10 UTC
svn commit: r899831 - in /lucene/java/branches/flex_1458:
contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/
contrib/misc/src/java/org/apache/lucene/misc/
contrib/regex/src/java/org/apache/lucene/search/regex/
contrib/snowball/src/tes...
Author: rmuir
Date: Fri Jan 15 22:15:08 2010
New Revision: 899831
URL: http://svn.apache.org/viewvc?rev=899831&view=rev
Log:
LUCENE-2185: @Deprecated for flex, and undeprecate RegexTermsEnum
Modified:
lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiDocMaker.java
lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocMaker.java
lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/misc/LengthNormModifier.java
lucene/java/branches/flex_1458/contrib/regex/src/java/org/apache/lucene/search/regex/RegexTermEnum.java
lucene/java/branches/flex_1458/contrib/regex/src/java/org/apache/lucene/search/regex/RegexTermsEnum.java
lucene/java/branches/flex_1458/contrib/snowball/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/AllTermDocs.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexReader.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/MultipleTermPositions.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentReader.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermEnum.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermDocs.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermEnum.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/TermInfo.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/TermInfosReader.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FilteredTermEnum.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FuzzyTermEnum.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/TermRangeQuery.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/function/MultiValueSource.java
lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/UnicodeUtil.java
lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestTermEnumSurrogate.java
Modified: lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiDocMaker.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiDocMaker.java?rev=899831&r1=899830&r2=899831&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiDocMaker.java (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiDocMaker.java Fri Jan 15 22:15:08 2010
@@ -25,6 +25,7 @@
* content source was defined in the configuration.
* @deprecated Please use {@link DocMaker} instead, with content.source=EnwikiContentSource
*/
+@Deprecated
public class EnwikiDocMaker extends DocMaker {
@Override
public void setConfig(Config config) {
Modified: lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocMaker.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocMaker.java?rev=899831&r1=899830&r2=899831&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocMaker.java (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocMaker.java Fri Jan 15 22:15:08 2010
@@ -38,6 +38,7 @@
* </ul>
* @deprecated Please use {@link DocMaker} instead, with content.source=LineDocSource
*/
+@Deprecated
public class LineDocMaker extends DocMaker {
@Override
public void setConfig(Config config) {
Modified: lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/misc/LengthNormModifier.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/misc/LengthNormModifier.java?rev=899831&r1=899830&r2=899831&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/misc/LengthNormModifier.java (original)
+++ lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/misc/LengthNormModifier.java Fri Jan 15 22:15:08 2010
@@ -41,6 +41,7 @@
* @version $Id$
* @deprecated Use {@link org.apache.lucene.index.FieldNormModifier}
*/
+@Deprecated
public class LengthNormModifier {
/**
Modified: lucene/java/branches/flex_1458/contrib/regex/src/java/org/apache/lucene/search/regex/RegexTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/regex/src/java/org/apache/lucene/search/regex/RegexTermEnum.java?rev=899831&r1=899830&r2=899831&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/regex/src/java/org/apache/lucene/search/regex/RegexTermEnum.java (original)
+++ lucene/java/branches/flex_1458/contrib/regex/src/java/org/apache/lucene/search/regex/RegexTermEnum.java Fri Jan 15 22:15:08 2010
@@ -34,6 +34,7 @@
* @deprecated Use {@link RegexTermsEnum} instead.
*/
+@Deprecated
public class RegexTermEnum extends FilteredTermEnum {
private String field = "";
private String pre = "";
Modified: lucene/java/branches/flex_1458/contrib/regex/src/java/org/apache/lucene/search/regex/RegexTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/regex/src/java/org/apache/lucene/search/regex/RegexTermsEnum.java?rev=899831&r1=899830&r2=899831&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/regex/src/java/org/apache/lucene/search/regex/RegexTermsEnum.java (original)
+++ lucene/java/branches/flex_1458/contrib/regex/src/java/org/apache/lucene/search/regex/RegexTermsEnum.java Fri Jan 15 22:15:08 2010
@@ -33,7 +33,6 @@
* Term enumerations are always ordered by Term.compareTo(). Each term in
* the enumeration is greater than all that precede it.
*
- * @deprecated Use {@link RegexTermsEnum} instead.
*/
public class RegexTermsEnum extends FilteredTermsEnum {
Modified: lucene/java/branches/flex_1458/contrib/snowball/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/snowball/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java?rev=899831&r1=899830&r2=899831&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/snowball/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java (original)
+++ lucene/java/branches/flex_1458/contrib/snowball/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java Fri Jan 15 22:15:08 2010
@@ -73,6 +73,7 @@
* Test turkish lowercasing (old buggy behavior)
* @deprecated Remove this when support for 3.0 indexes is no longer required
*/
+ @Deprecated
public void testTurkishBWComp() throws Exception {
Analyzer a = new SnowballAnalyzer(Version.LUCENE_30, "Turkish");
// AÄACI in turkish lowercases to aÄacı, but with lowercase filter aÄaci.
Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/AllTermDocs.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/AllTermDocs.java?rev=899831&r1=899830&r2=899831&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/AllTermDocs.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/AllTermDocs.java Fri Jan 15 22:15:08 2010
@@ -20,6 +20,7 @@
import org.apache.lucene.util.BitVector;
/** @deprecated Switch to AllDocsEnum */
+@Deprecated
class AllTermDocs extends AbstractAllTermDocs {
protected BitVector deletedDocs;
Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexReader.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexReader.java?rev=899831&r1=899830&r2=899831&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexReader.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexReader.java Fri Jan 15 22:15:08 2010
@@ -878,6 +878,7 @@
* @deprecated Use the new flex API ({@link #fields()}) instead.
* @throws IOException if there is a low-level IO error
*/
+ @Deprecated
public abstract TermEnum terms() throws IOException;
// Default impl emulates new API using old one
@@ -893,12 +894,14 @@
* @deprecated Use the new flex API ({@link #fields()}) instead.
* @throws IOException if there is a low-level IO error
*/
+ @Deprecated
public abstract TermEnum terms(Term t) throws IOException;
/** Returns the number of documents containing the term <code>t</code>.
* @throws IOException if there is a low-level IO error
* @deprecated Use {@link #docFreq(String,TermRef)} instead.
*/
+ @Deprecated
public abstract int docFreq(Term t) throws IOException;
/** Returns the number of documents containing the term
@@ -928,6 +931,7 @@
* @deprecated Use the new flex API ({@link #termDocsEnum()}) instead.
* @throws IOException if there is a low-level IO error
*/
+ @Deprecated
public TermDocs termDocs(Term term) throws IOException {
ensureOpen();
TermDocs termDocs = termDocs();
@@ -994,6 +998,7 @@
* @deprecated Use the new flex API ({@link #fields()}) instead.
* @throws IOException if there is a low-level IO error
*/
+ @Deprecated
public abstract TermDocs termDocs() throws IOException;
/** Returns an enumeration of all the documents which contain
@@ -1015,6 +1020,7 @@
* #termDocsEnum()}) instead
* @throws IOException if there is a low-level IO error
*/
+ @Deprecated
public TermPositions termPositions(Term term) throws IOException {
ensureOpen();
TermPositions termPositions = termPositions();
@@ -1027,6 +1033,7 @@
* #termDocsEnum()}) instead
* @throws IOException if there is a low-level IO error
*/
+ @Deprecated
public abstract TermPositions termPositions() throws IOException;
@@ -1231,6 +1238,7 @@
* This method will be removed in the 3.0 release.
*
*/
+ @Deprecated
public static void unlock(Directory directory) throws IOException {
directory.makeLock(IndexWriter.WRITE_LOCK_NAME).release();
}
Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/MultipleTermPositions.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/MultipleTermPositions.java?rev=899831&r1=899830&r2=899831&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/MultipleTermPositions.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/MultipleTermPositions.java Fri Jan 15 22:15:08 2010
@@ -31,6 +31,7 @@
* @deprecated This class is being replaced by the package
* private MultiDocsEnum on org.apache.lucene.search.
*/
+@Deprecated
public class MultipleTermPositions implements TermPositions {
private static final class TermPositionsQueue extends PriorityQueue<TermPositions> {
Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentReader.java?rev=899831&r1=899830&r2=899831&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentReader.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentReader.java Fri Jan 15 22:15:08 2010
@@ -845,6 +845,7 @@
/** @deprecated Please switch to the flex API ({@link
* #fields}) instead. */
+ @Deprecated
@Override
public TermEnum terms(Term t) throws IOException {
ensureOpen();
@@ -876,6 +877,7 @@
/** @deprecated Switch to the flex API ({@link
* IndexReader#termDocsEnum}) instead. */
+ @Deprecated
@Override
public TermDocs termDocs(Term term) throws IOException {
if (term == null) {
@@ -892,6 +894,7 @@
/** @deprecated Switch to the flex API {@link
* IndexReader#termDocsEnum} instead. */
+ @Deprecated
@Override
public TermDocs termDocs() throws IOException {
ensureOpen();
@@ -911,6 +914,7 @@
/** @deprecated Switch to the flex API {@link
* IndexReader#termDocsEnum} instead */
+ @Deprecated
@Override
public TermPositions termPositions() throws IOException {
ensureOpen();
Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermEnum.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermEnum.java?rev=899831&r1=899830&r2=899831&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermEnum.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermEnum.java Fri Jan 15 22:15:08 2010
@@ -26,6 +26,7 @@
the enumeration is greater than all that precede it.
* @deprecated Use TermsEnum instead */
+@Deprecated
public abstract class TermEnum implements Closeable {
/** Increments the enumeration to the next element. True if one exists.*/
public abstract boolean next() throws IOException;
Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermDocs.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermDocs.java?rev=899831&r1=899830&r2=899831&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermDocs.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermDocs.java Fri Jan 15 22:15:08 2010
@@ -29,6 +29,7 @@
import org.apache.lucene.util.Bits;
/** @deprecated */
+@Deprecated
public class SegmentTermDocs implements TermDocs {
//protected SegmentReader parent;
private final FieldInfos fieldInfos;
Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermEnum.java?rev=899831&r1=899830&r2=899831&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermEnum.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermEnum.java Fri Jan 15 22:15:08 2010
@@ -28,6 +28,7 @@
* @deprecated No longer used with flex indexing, except for
* reading old segments */
+@Deprecated
public final class SegmentTermEnum extends TermEnum implements Cloneable {
private IndexInput input;
FieldInfos fieldInfos;
Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/TermInfo.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/TermInfo.java?rev=899831&r1=899830&r2=899831&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/TermInfo.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/TermInfo.java Fri Jan 15 22:15:08 2010
@@ -22,6 +22,7 @@
* @deprecated This class is no longer used in flexible
* indexing. */
+@Deprecated
final class TermInfo {
/** The number of documents which contain the term. */
int docFreq = 0;
Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/TermInfosReader.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/TermInfosReader.java?rev=899831&r1=899830&r2=899831&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/TermInfosReader.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/TermInfosReader.java Fri Jan 15 22:15:08 2010
@@ -33,6 +33,7 @@
* @deprecated This class has been replaced by
* FormatPostingsTermsDictReader, except for reading old segments. */
// nocommit -- public
+@Deprecated
public final class TermInfosReader {
private final Directory directory;
private final String segment;
Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FilteredTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FilteredTermEnum.java?rev=899831&r1=899830&r2=899831&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FilteredTermEnum.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FilteredTermEnum.java Fri Jan 15 22:15:08 2010
@@ -48,6 +48,7 @@
* together with {@link FilteredTermsEnum}. For example
* see {@link FuzzyTermsEnum}
*/
+ @Deprecated
public abstract float difference();
/** Indicates the end of the enumeration has been reached */
Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FuzzyTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FuzzyTermEnum.java?rev=899831&r1=899830&r2=899831&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FuzzyTermEnum.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FuzzyTermEnum.java Fri Jan 15 22:15:08 2010
@@ -140,6 +140,7 @@
}
/** @deprecated Use {@link MultiTermQuery.BoostAttribute} together with {@link FuzzyTermsEnum} */
+ @Deprecated
@Override
public final float difference() {
return (similarity - minimumSimilarity) * scale_factor;
Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/TermRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/TermRangeQuery.java?rev=899831&r1=899830&r2=899831&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/TermRangeQuery.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/TermRangeQuery.java Fri Jan 15 22:15:08 2010
@@ -148,6 +148,7 @@
}
/** @deprecated */
+ @Deprecated
public String field() {
return getField();
}
Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/function/MultiValueSource.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/function/MultiValueSource.java?rev=899831&r1=899830&r2=899831&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/function/MultiValueSource.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/function/MultiValueSource.java Fri Jan 15 22:15:08 2010
@@ -35,6 +35,7 @@
* migration to segment-based searching. Please change your
* code to not pass composite readers to these APIs. */
+@Deprecated
public final class MultiValueSource extends ValueSource {
final ValueSource other;
Modified: lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/UnicodeUtil.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/UnicodeUtil.java?rev=899831&r1=899830&r2=899831&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/UnicodeUtil.java (original)
+++ lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/UnicodeUtil.java Fri Jan 15 22:15:08 2010
@@ -124,6 +124,7 @@
*
* @deprecated Use {@link #UTF16toUTF8(char[], int, int,
* UTF8Result)} instead. */
+ @Deprecated
public static void UTF16toUTF8(final char[] source, final int offset, UTF8Result result) {
int upto = 0;
Modified: lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestTermEnumSurrogate.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestTermEnumSurrogate.java?rev=899831&r1=899830&r2=899831&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestTermEnumSurrogate.java (original)
+++ lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestTermEnumSurrogate.java Fri Jan 15 22:15:08 2010
@@ -32,6 +32,7 @@
*
* @deprecated Remove this when the old API is no longer supported.
*/
+@Deprecated
public class TestTermEnumSurrogate extends LuceneTestCase {
public void testSeekSurrogate() throws Exception {
RAMDirectory dir = new RAMDirectory();