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

merge r1237083 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3661@1237129 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2012-01-28 18:24:05 +00:00
parent 8933cfe181 613cd64f31
commit 0e570cd5a2
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lucene/src/java/org/apache/lucene/codecs/NormsFormat.java
View File

@ -30,8 +30,6 @@ import org.apache.lucene.store.Directory;
*/
public abstract class NormsFormat {
public abstract PerDocConsumer docsConsumer(PerDocWriteState state) throws IOException;
@Deprecated
public abstract PerDocProducer docsProducer(SegmentReadState state, Directory separateNormsDir) throws IOException;
public abstract PerDocProducer docsProducer(SegmentReadState state) throws IOException;
public abstract void files(Directory dir, SegmentInfo info, Set<String> files) throws IOException;
@ -41,4 +39,13 @@ public abstract class NormsFormat {
*/
@Deprecated
public void separateFiles(Directory dir, SegmentInfo info, Set<String> files) throws IOException {};
/**
* Note: this should not be overridden!
* @deprecated
*/
@Deprecated
public PerDocProducer docsProducer(SegmentReadState state, Directory separateNormsDir) throws IOException {
return docsProducer(state);
}
}

7
lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40NormsFormat.java
View File

@ -55,13 +55,6 @@ public class Lucene40NormsFormat extends NormsFormat {
Lucene40NormsDocValuesConsumer.files(dir, info, files);
}
@Override
public PerDocProducer docsProducer(SegmentReadState state,
Directory separateNormsDir) throws IOException {
return docsProducer(state);
}
public static class Lucene40NormsDocValuesProducer extends Lucene40DocValuesProducer {

9
lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java
View File

@ -51,12 +51,5 @@ public class SimpleTextNormsFormat extends NormsFormat {
throws IOException {
SimpleTextNormsConsumer.files(dir, info, files);
}
@Override
public PerDocProducer docsProducer(SegmentReadState state,
Directory separateNormsDir) throws IOException {
return docsProducer(state);
}
}
}