Repository: mahout Updated Branches: refs/heads/master 3930aafb3 -> 0b3b4911b
MAHOUT-1744: Deprecate lucene2seq Project: http://git-wip-us.apache.org/repos/asf/mahout/repo Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/0b3b4911 Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/0b3b4911 Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/0b3b4911 Branch: refs/heads/master Commit: 0b3b4911b52c779ca1749673ab65c97c6014e0ab Parents: 3930aaf Author: smarthi <[email protected]> Authored: Sun Aug 2 17:56:15 2015 -0400 Committer: smarthi <[email protected]> Committed: Sun Aug 2 17:56:15 2015 -0400 ---------------------------------------------------------------------- .../java/org/apache/mahout/text/LuceneIndexFileNameFilter.java | 1 + .../main/java/org/apache/mahout/text/LuceneSegmentInputFormat.java | 1 + .../main/java/org/apache/mahout/text/LuceneSegmentInputSplit.java | 1 + .../java/org/apache/mahout/text/LuceneSegmentRecordReader.java | 1 + .../src/main/java/org/apache/mahout/text/LuceneSeqFileHelper.java | 1 + .../java/org/apache/mahout/text/LuceneStorageConfiguration.java | 1 + .../java/org/apache/mahout/text/ReadOnlyFileSystemDirectory.java | 1 + .../org/apache/mahout/text/SequenceFilesFromLuceneStorage.java | 1 + .../apache/mahout/text/SequenceFilesFromLuceneStorageMRJob.java | 1 + .../apache/mahout/text/SequenceFilesFromLuceneStorageMapper.java | 1 + .../java/org/apache/mahout/text/AbstractLuceneStorageTest.java | 1 + .../java/org/apache/mahout/text/LuceneSegmentInputFormatTest.java | 2 +- .../java/org/apache/mahout/text/LuceneSegmentInputSplitTest.java | 2 +- .../java/org/apache/mahout/text/LuceneSegmentRecordReaderTest.java | 2 +- .../org/apache/mahout/text/LuceneStorageConfigurationTest.java | 2 +- .../mahout/text/SequenceFilesFromLuceneStorageMRJobTest.java | 2 +- .../org/apache/mahout/text/SequenceFilesFromLuceneStorageTest.java | 2 +- .../java/org/apache/mahout/text/doc/MultipleFieldsDocument.java | 1 + .../test/java/org/apache/mahout/text/doc/NumericFieldDocument.java | 1 + .../test/java/org/apache/mahout/text/doc/SingleFieldDocument.java | 1 + .../src/test/java/org/apache/mahout/text/doc/TestDocument.java | 2 +- .../java/org/apache/mahout/text/doc/UnstoredFieldsDocument.java | 1 + 22 files changed, 22 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/0b3b4911/integration/src/main/java/org/apache/mahout/text/LuceneIndexFileNameFilter.java ---------------------------------------------------------------------- diff --git a/integration/src/main/java/org/apache/mahout/text/LuceneIndexFileNameFilter.java b/integration/src/main/java/org/apache/mahout/text/LuceneIndexFileNameFilter.java index a3ad3d0..c505fcb 100644 --- a/integration/src/main/java/org/apache/mahout/text/LuceneIndexFileNameFilter.java +++ b/integration/src/main/java/org/apache/mahout/text/LuceneIndexFileNameFilter.java @@ -26,6 +26,7 @@ import java.util.regex.Pattern; * A wrapper class to convert an IndexFileNameFilter which implements * java.io.FilenameFilter to an org.apache.hadoop.fs.PathFilter. */ +@Deprecated final class LuceneIndexFileNameFilter implements PathFilter { private static final LuceneIndexFileNameFilter LUCENE_INDEX_FILE_NAME_FILTER = new LuceneIndexFileNameFilter(); http://git-wip-us.apache.org/repos/asf/mahout/blob/0b3b4911/integration/src/main/java/org/apache/mahout/text/LuceneSegmentInputFormat.java ---------------------------------------------------------------------- diff --git a/integration/src/main/java/org/apache/mahout/text/LuceneSegmentInputFormat.java b/integration/src/main/java/org/apache/mahout/text/LuceneSegmentInputFormat.java index 1c4f8de..1b5d717 100644 --- a/integration/src/main/java/org/apache/mahout/text/LuceneSegmentInputFormat.java +++ b/integration/src/main/java/org/apache/mahout/text/LuceneSegmentInputFormat.java @@ -38,6 +38,7 @@ import org.slf4j.LoggerFactory; /** * {@link InputFormat} implementation which splits a Lucene index at the segment level. */ +@Deprecated public class LuceneSegmentInputFormat extends InputFormat { private static final Logger LOG = LoggerFactory.getLogger(LuceneSegmentInputFormat.class); http://git-wip-us.apache.org/repos/asf/mahout/blob/0b3b4911/integration/src/main/java/org/apache/mahout/text/LuceneSegmentInputSplit.java ---------------------------------------------------------------------- diff --git a/integration/src/main/java/org/apache/mahout/text/LuceneSegmentInputSplit.java b/integration/src/main/java/org/apache/mahout/text/LuceneSegmentInputSplit.java index 1441e32..12949f5 100644 --- a/integration/src/main/java/org/apache/mahout/text/LuceneSegmentInputSplit.java +++ b/integration/src/main/java/org/apache/mahout/text/LuceneSegmentInputSplit.java @@ -32,6 +32,7 @@ import java.io.IOException; /** * {@link InputSplit} implementation that represents a Lucene segment. */ +@Deprecated public class LuceneSegmentInputSplit extends InputSplit implements Writable { private Path indexPath; http://git-wip-us.apache.org/repos/asf/mahout/blob/0b3b4911/integration/src/main/java/org/apache/mahout/text/LuceneSegmentRecordReader.java ---------------------------------------------------------------------- diff --git a/integration/src/main/java/org/apache/mahout/text/LuceneSegmentRecordReader.java b/integration/src/main/java/org/apache/mahout/text/LuceneSegmentRecordReader.java index 485e856..66d37f7 100644 --- a/integration/src/main/java/org/apache/mahout/text/LuceneSegmentRecordReader.java +++ b/integration/src/main/java/org/apache/mahout/text/LuceneSegmentRecordReader.java @@ -35,6 +35,7 @@ import java.io.IOException; * {@link RecordReader} implementation for Lucene segments. Each {@link InputSplit} contains a separate Lucene segment. * Emits records consisting of a {@link Text} document ID and a null key. */ +@Deprecated public class LuceneSegmentRecordReader extends RecordReader<Text, NullWritable> { public static final int USE_TERM_INFO = 1; http://git-wip-us.apache.org/repos/asf/mahout/blob/0b3b4911/integration/src/main/java/org/apache/mahout/text/LuceneSeqFileHelper.java ---------------------------------------------------------------------- diff --git a/integration/src/main/java/org/apache/mahout/text/LuceneSeqFileHelper.java b/integration/src/main/java/org/apache/mahout/text/LuceneSeqFileHelper.java index fe5af54..e6dc84a 100644 --- a/integration/src/main/java/org/apache/mahout/text/LuceneSeqFileHelper.java +++ b/integration/src/main/java/org/apache/mahout/text/LuceneSeqFileHelper.java @@ -28,6 +28,7 @@ import static org.apache.commons.lang.StringUtils.isNotBlank; * * **/ +@Deprecated class LuceneSeqFileHelper { public static final String SEPARATOR_FIELDS = " "; http://git-wip-us.apache.org/repos/asf/mahout/blob/0b3b4911/integration/src/main/java/org/apache/mahout/text/LuceneStorageConfiguration.java ---------------------------------------------------------------------- diff --git a/integration/src/main/java/org/apache/mahout/text/LuceneStorageConfiguration.java b/integration/src/main/java/org/apache/mahout/text/LuceneStorageConfiguration.java index b36f3e9..735fb5d 100644 --- a/integration/src/main/java/org/apache/mahout/text/LuceneStorageConfiguration.java +++ b/integration/src/main/java/org/apache/mahout/text/LuceneStorageConfiguration.java @@ -51,6 +51,7 @@ import static org.apache.lucene.util.Version.LUCENE_46; * Holds all the configuration for {@link SequenceFilesFromLuceneStorage}, which generates a sequence file * with id as the key and a content field as value. */ +@Deprecated public class LuceneStorageConfiguration implements Writable { private static final Query DEFAULT_QUERY = new MatchAllDocsQuery(); http://git-wip-us.apache.org/repos/asf/mahout/blob/0b3b4911/integration/src/main/java/org/apache/mahout/text/ReadOnlyFileSystemDirectory.java ---------------------------------------------------------------------- diff --git a/integration/src/main/java/org/apache/mahout/text/ReadOnlyFileSystemDirectory.java b/integration/src/main/java/org/apache/mahout/text/ReadOnlyFileSystemDirectory.java index e97e35b..cd8137f 100644 --- a/integration/src/main/java/org/apache/mahout/text/ReadOnlyFileSystemDirectory.java +++ b/integration/src/main/java/org/apache/mahout/text/ReadOnlyFileSystemDirectory.java @@ -46,6 +46,7 @@ import java.util.Collection; * <p/> * // TODO: Rename to FileSystemReadOnlyDirectory */ +@Deprecated public class ReadOnlyFileSystemDirectory extends BaseDirectory { private final FileSystem fs; http://git-wip-us.apache.org/repos/asf/mahout/blob/0b3b4911/integration/src/main/java/org/apache/mahout/text/SequenceFilesFromLuceneStorage.java ---------------------------------------------------------------------- diff --git a/integration/src/main/java/org/apache/mahout/text/SequenceFilesFromLuceneStorage.java b/integration/src/main/java/org/apache/mahout/text/SequenceFilesFromLuceneStorage.java index b7fd495..84953c2 100644 --- a/integration/src/main/java/org/apache/mahout/text/SequenceFilesFromLuceneStorage.java +++ b/integration/src/main/java/org/apache/mahout/text/SequenceFilesFromLuceneStorage.java @@ -46,6 +46,7 @@ import static org.apache.commons.lang.StringUtils.isBlank; * Generates a sequence file from a Lucene index with a specified id field as the key and a content field as the value. * Configure this class with a {@link LuceneStorageConfiguration} bean. */ +@Deprecated public class SequenceFilesFromLuceneStorage { private static final Logger log = LoggerFactory.getLogger(SequenceFilesFromLuceneStorage.class); http://git-wip-us.apache.org/repos/asf/mahout/blob/0b3b4911/integration/src/main/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageMRJob.java ---------------------------------------------------------------------- diff --git a/integration/src/main/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageMRJob.java b/integration/src/main/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageMRJob.java index 5b45c48..787bf15 100644 --- a/integration/src/main/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageMRJob.java +++ b/integration/src/main/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageMRJob.java @@ -30,6 +30,7 @@ import java.io.IOException; * Generates a sequence file from a Lucene index via MapReduce. Uses a specified id field as the key and a content field * as the value. Configure this class with a {@link LuceneStorageConfiguration} bean. */ +@Deprecated public class SequenceFilesFromLuceneStorageMRJob { public void run(LuceneStorageConfiguration lucene2seqConf) { http://git-wip-us.apache.org/repos/asf/mahout/blob/0b3b4911/integration/src/main/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageMapper.java ---------------------------------------------------------------------- diff --git a/integration/src/main/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageMapper.java b/integration/src/main/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageMapper.java index f31d055..5feceef 100644 --- a/integration/src/main/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageMapper.java +++ b/integration/src/main/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageMapper.java @@ -36,6 +36,7 @@ import java.util.List; * Maps document IDs to key value pairs with ID field as the key and the concatenated stored field(s) * as value. */ +@Deprecated public class SequenceFilesFromLuceneStorageMapper extends Mapper<Text, NullWritable, Text, Text> { public enum DataStatus { EMPTY_KEY, EMPTY_VALUE, EMPTY_BOTH } http://git-wip-us.apache.org/repos/asf/mahout/blob/0b3b4911/integration/src/test/java/org/apache/mahout/text/AbstractLuceneStorageTest.java ---------------------------------------------------------------------- diff --git a/integration/src/test/java/org/apache/mahout/text/AbstractLuceneStorageTest.java b/integration/src/test/java/org/apache/mahout/text/AbstractLuceneStorageTest.java index c7486c5..3164092 100644 --- a/integration/src/test/java/org/apache/mahout/text/AbstractLuceneStorageTest.java +++ b/integration/src/test/java/org/apache/mahout/text/AbstractLuceneStorageTest.java @@ -40,6 +40,7 @@ import org.apache.mahout.text.doc.TestDocument; /** * Abstract test for working with Lucene storage. */ +@Deprecated public abstract class AbstractLuceneStorageTest extends MahoutTestCase { protected Path indexPath1; http://git-wip-us.apache.org/repos/asf/mahout/blob/0b3b4911/integration/src/test/java/org/apache/mahout/text/LuceneSegmentInputFormatTest.java ---------------------------------------------------------------------- diff --git a/integration/src/test/java/org/apache/mahout/text/LuceneSegmentInputFormatTest.java b/integration/src/test/java/org/apache/mahout/text/LuceneSegmentInputFormatTest.java index 2d31f7c..ee81a32 100644 --- a/integration/src/test/java/org/apache/mahout/text/LuceneSegmentInputFormatTest.java +++ b/integration/src/test/java/org/apache/mahout/text/LuceneSegmentInputFormatTest.java @@ -31,7 +31,7 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.util.Collections; import java.util.List; - +@Deprecated public class LuceneSegmentInputFormatTest extends AbstractLuceneStorageTest { private LuceneSegmentInputFormat inputFormat; http://git-wip-us.apache.org/repos/asf/mahout/blob/0b3b4911/integration/src/test/java/org/apache/mahout/text/LuceneSegmentInputSplitTest.java ---------------------------------------------------------------------- diff --git a/integration/src/test/java/org/apache/mahout/text/LuceneSegmentInputSplitTest.java b/integration/src/test/java/org/apache/mahout/text/LuceneSegmentInputSplitTest.java index 3135891..5375610 100644 --- a/integration/src/test/java/org/apache/mahout/text/LuceneSegmentInputSplitTest.java +++ b/integration/src/test/java/org/apache/mahout/text/LuceneSegmentInputSplitTest.java @@ -30,7 +30,7 @@ import java.io.IOException; import java.util.List; import static java.util.Arrays.asList; - +@Deprecated public class LuceneSegmentInputSplitTest extends AbstractLuceneStorageTest { private Configuration configuration; http://git-wip-us.apache.org/repos/asf/mahout/blob/0b3b4911/integration/src/test/java/org/apache/mahout/text/LuceneSegmentRecordReaderTest.java ---------------------------------------------------------------------- diff --git a/integration/src/test/java/org/apache/mahout/text/LuceneSegmentRecordReaderTest.java b/integration/src/test/java/org/apache/mahout/text/LuceneSegmentRecordReaderTest.java index c64dbda..8a23ecb 100644 --- a/integration/src/test/java/org/apache/mahout/text/LuceneSegmentRecordReaderTest.java +++ b/integration/src/test/java/org/apache/mahout/text/LuceneSegmentRecordReaderTest.java @@ -34,7 +34,7 @@ import org.junit.Test; import static org.apache.mahout.text.doc.SingleFieldDocument.FIELD; import static org.apache.mahout.text.doc.SingleFieldDocument.ID_FIELD; - +@Deprecated public class LuceneSegmentRecordReaderTest extends AbstractLuceneStorageTest { private Configuration configuration; http://git-wip-us.apache.org/repos/asf/mahout/blob/0b3b4911/integration/src/test/java/org/apache/mahout/text/LuceneStorageConfigurationTest.java ---------------------------------------------------------------------- diff --git a/integration/src/test/java/org/apache/mahout/text/LuceneStorageConfigurationTest.java b/integration/src/test/java/org/apache/mahout/text/LuceneStorageConfigurationTest.java index f58224c..e24066c 100644 --- a/integration/src/test/java/org/apache/mahout/text/LuceneStorageConfigurationTest.java +++ b/integration/src/test/java/org/apache/mahout/text/LuceneStorageConfigurationTest.java @@ -23,7 +23,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.mahout.common.MahoutTestCase; import org.junit.Test; - +@Deprecated public class LuceneStorageConfigurationTest extends MahoutTestCase { @Test http://git-wip-us.apache.org/repos/asf/mahout/blob/0b3b4911/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageMRJobTest.java ---------------------------------------------------------------------- diff --git a/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageMRJobTest.java b/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageMRJobTest.java index fc03e49..94bec2b 100644 --- a/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageMRJobTest.java +++ b/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageMRJobTest.java @@ -34,7 +34,7 @@ import org.junit.Before; import org.junit.Test; import static java.util.Arrays.asList; - +@Deprecated public class SequenceFilesFromLuceneStorageMRJobTest extends AbstractLuceneStorageTest { private SequenceFilesFromLuceneStorageMRJob lucene2seq; http://git-wip-us.apache.org/repos/asf/mahout/blob/0b3b4911/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageTest.java ---------------------------------------------------------------------- diff --git a/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageTest.java b/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageTest.java index 3cd87f2..09c2dd7 100644 --- a/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageTest.java +++ b/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageTest.java @@ -42,7 +42,7 @@ import org.apache.mahout.text.doc.UnstoredFieldsDocument; import org.junit.After; import org.junit.Before; import org.junit.Test; - +@Deprecated public class SequenceFilesFromLuceneStorageTest extends AbstractLuceneStorageTest { private SequenceFilesFromLuceneStorage lucene2Seq; http://git-wip-us.apache.org/repos/asf/mahout/blob/0b3b4911/integration/src/test/java/org/apache/mahout/text/doc/MultipleFieldsDocument.java ---------------------------------------------------------------------- diff --git a/integration/src/test/java/org/apache/mahout/text/doc/MultipleFieldsDocument.java b/integration/src/test/java/org/apache/mahout/text/doc/MultipleFieldsDocument.java index a045bdf..7483b2d 100644 --- a/integration/src/test/java/org/apache/mahout/text/doc/MultipleFieldsDocument.java +++ b/integration/src/test/java/org/apache/mahout/text/doc/MultipleFieldsDocument.java @@ -23,6 +23,7 @@ import org.apache.lucene.document.TextField; /** * Used for testing lucene2seq */ +@Deprecated public class MultipleFieldsDocument extends SingleFieldDocument { public static final String FIELD1 = "field1"; http://git-wip-us.apache.org/repos/asf/mahout/blob/0b3b4911/integration/src/test/java/org/apache/mahout/text/doc/NumericFieldDocument.java ---------------------------------------------------------------------- diff --git a/integration/src/test/java/org/apache/mahout/text/doc/NumericFieldDocument.java b/integration/src/test/java/org/apache/mahout/text/doc/NumericFieldDocument.java index 55d6e0f..e06e8d6 100644 --- a/integration/src/test/java/org/apache/mahout/text/doc/NumericFieldDocument.java +++ b/integration/src/test/java/org/apache/mahout/text/doc/NumericFieldDocument.java @@ -25,6 +25,7 @@ import org.apache.lucene.document.TextField; /** * Document with numeric field. */ +@Deprecated public class NumericFieldDocument extends SingleFieldDocument { public static final String NUMERIC_FIELD = "numeric"; http://git-wip-us.apache.org/repos/asf/mahout/blob/0b3b4911/integration/src/test/java/org/apache/mahout/text/doc/SingleFieldDocument.java ---------------------------------------------------------------------- diff --git a/integration/src/test/java/org/apache/mahout/text/doc/SingleFieldDocument.java b/integration/src/test/java/org/apache/mahout/text/doc/SingleFieldDocument.java index 908ae24..4636a51 100644 --- a/integration/src/test/java/org/apache/mahout/text/doc/SingleFieldDocument.java +++ b/integration/src/test/java/org/apache/mahout/text/doc/SingleFieldDocument.java @@ -24,6 +24,7 @@ import org.apache.lucene.document.TextField; /** * Used for testing lucene2seq */ +@Deprecated public class SingleFieldDocument implements TestDocument { public static final String ID_FIELD = "idField"; http://git-wip-us.apache.org/repos/asf/mahout/blob/0b3b4911/integration/src/test/java/org/apache/mahout/text/doc/TestDocument.java ---------------------------------------------------------------------- diff --git a/integration/src/test/java/org/apache/mahout/text/doc/TestDocument.java b/integration/src/test/java/org/apache/mahout/text/doc/TestDocument.java index 7c751c0..7243c71 100644 --- a/integration/src/test/java/org/apache/mahout/text/doc/TestDocument.java +++ b/integration/src/test/java/org/apache/mahout/text/doc/TestDocument.java @@ -17,7 +17,7 @@ package org.apache.mahout.text.doc; import org.apache.lucene.document.Document; - +@Deprecated public interface TestDocument { String getId(); http://git-wip-us.apache.org/repos/asf/mahout/blob/0b3b4911/integration/src/test/java/org/apache/mahout/text/doc/UnstoredFieldsDocument.java ---------------------------------------------------------------------- diff --git a/integration/src/test/java/org/apache/mahout/text/doc/UnstoredFieldsDocument.java b/integration/src/test/java/org/apache/mahout/text/doc/UnstoredFieldsDocument.java index 08cdeb9..6eb43f6 100644 --- a/integration/src/test/java/org/apache/mahout/text/doc/UnstoredFieldsDocument.java +++ b/integration/src/test/java/org/apache/mahout/text/doc/UnstoredFieldsDocument.java @@ -23,6 +23,7 @@ import org.apache.lucene.document.StringField; /** * Used for testing lucene2seq */ +@Deprecated public class UnstoredFieldsDocument extends SingleFieldDocument { public static final String UNSTORED_FIELD = "unstored";
