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/29 13:24:47 UTC
svn commit: r1237261 - in
/lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene:
codecs/NormsFormat.java codecs/lucene3x/Lucene3xNormsFormat.java
codecs/lucene3x/Lucene3xNormsProducer.java index/SegmentCoreReaders.java
Author: rmuir
Date: Sun Jan 29 12:24:47 2012
New Revision: 1237261
URL: http://svn.apache.org/viewvc?rev=1237261&view=rev
Log:
LUCENE-3728: handle separate norms more privately inside 3.x codec
Modified:
lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/NormsFormat.java
lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsFormat.java
lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsProducer.java
lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java
Modified: lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/NormsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/NormsFormat.java?rev=1237261&r1=1237260&r2=1237261&view=diff
==============================================================================
--- lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/NormsFormat.java (original)
+++ lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/NormsFormat.java Sun Jan 29 12:24:47 2012
@@ -39,13 +39,4 @@ 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/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsFormat.java?rev=1237261&r1=1237260&r2=1237261&view=diff
==============================================================================
--- lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsFormat.java (original)
+++ lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsFormat.java Sun Jan 29 12:24:47 2012
@@ -56,12 +56,6 @@ public class Lucene3xNormsFormat extends
@Override
public PerDocProducer docsProducer(SegmentReadState state) throws IOException {
- return docsProducer(state, null);
- }
-
- @Override
- public PerDocProducer docsProducer(SegmentReadState state,
- Directory separateNormsDir) throws IOException {
- return new Lucene3xNormsProducer(state.dir, state.segmentInfo, state.fieldInfos, state.context, separateNormsDir);
+ return new Lucene3xNormsProducer(state.dir, state.segmentInfo, state.fieldInfos, state.context);
}
}
Modified: lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsProducer.java?rev=1237261&r1=1237260&r2=1237261&view=diff
==============================================================================
--- lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsProducer.java (original)
+++ lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsProducer.java Sun Jan 29 12:24:47 2012
@@ -67,7 +67,8 @@ class Lucene3xNormsProducer extends PerD
// note: just like segmentreader in 3.x, we open up all the files here (including separate norms) up front.
// but we just don't do any seeks or reading yet.
- public Lucene3xNormsProducer(Directory dir, SegmentInfo info, FieldInfos fields, IOContext context, Directory separateNormsDir) throws IOException {
+ public Lucene3xNormsProducer(Directory dir, SegmentInfo info, FieldInfos fields, IOContext context) throws IOException {
+ Directory separateNormsDir = info.dir; // separate norms are never inside CFS
maxdoc = info.docCount;
String segmentName = info.name;
Map<Integer,Long> normGen = info.getNormGen();
Modified: lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java?rev=1237261&r1=1237260&r2=1237261&view=diff
==============================================================================
--- lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java (original)
+++ lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java Sun Jan 29 12:24:47 2012
@@ -119,7 +119,7 @@ final class SegmentCoreReaders {
// ask codec for its Norms:
// TODO: since we don't write any norms file if there are no norms,
// kinda jaky to assume the codec handles the case of no norms file at all gracefully?!
- norms = codec.normsFormat().docsProducer(segmentReadState, dir);
+ norms = codec.normsFormat().docsProducer(segmentReadState);
perDocProducer = codec.docValuesFormat().docsProducer(segmentReadState);
final Directory storeDir;