You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/01/28 17:13:25 UTC
svn commit: r1237083 - in
/lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs:
NormsFormat.java lucene40/Lucene40NormsFormat.java
simpletext/SimpleTextNormsFormat.java
Author: rmuir
Date: Sat Jan 28 16:13:24 2012
New Revision: 1237083
URL: http://svn.apache.org/viewvc?rev=1237083&view=rev
Log:
deprecated hook for separate norms should not be abstract: 4.x codecs use a clean api
Modified:
lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/NormsFormat.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40NormsFormat.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/NormsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/NormsFormat.java?rev=1237083&r1=1237082&r2=1237083&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/NormsFormat.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/NormsFormat.java Sat Jan 28 16:13:24 2012
@@ -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);
+ }
}
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40NormsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40NormsFormat.java?rev=1237083&r1=1237082&r2=1237083&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40NormsFormat.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40NormsFormat.java Sat Jan 28 16:13:24 2012
@@ -55,13 +55,6 @@ public class Lucene40NormsFormat extends
Lucene40NormsDocValuesConsumer.files(dir, info, files);
}
-
- @Override
- public PerDocProducer docsProducer(SegmentReadState state,
- Directory separateNormsDir) throws IOException {
- return docsProducer(state);
- }
-
public static class Lucene40NormsDocValuesProducer extends Lucene40DocValuesProducer {
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java?rev=1237083&r1=1237082&r2=1237083&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java Sat Jan 28 16:13:24 2012
@@ -51,12 +51,5 @@ public class SimpleTextNormsFormat exten
throws IOException {
SimpleTextNormsConsumer.files(dir, info, files);
- }
-
- @Override
- public PerDocProducer docsProducer(SegmentReadState state,
- Directory separateNormsDir) throws IOException {
- return docsProducer(state);
- }
-
+ }
}