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 2011/05/23 18:48:20 UTC
svn commit: r1126576 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/backwards/ lucene/src/java/org/apache/lucene/index/ solr/
Author: rmuir
Date: Mon May 23 16:48:20 2011
New Revision: 1126576
URL: http://svn.apache.org/viewvc?rev=1126576&view=rev
Log:
LUCENE-3117: move norms version constant out of SegmentMerger
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/ (props changed)
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/NormsWriter.java
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/SegmentNorms.java
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/SegmentReader.java
lucene/dev/branches/branch_3x/solr/ (props changed)
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/NormsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/NormsWriter.java?rev=1126576&r1=1126575&r2=1126576&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/NormsWriter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/NormsWriter.java Mon May 23 16:48:20 2011
@@ -92,7 +92,7 @@ final class NormsWriter extends Inverted
IndexOutput normsOut = state.directory.createOutput(normsFileName);
try {
- normsOut.writeBytes(SegmentMerger.NORMS_HEADER, 0, SegmentMerger.NORMS_HEADER.length);
+ normsOut.writeBytes(SegmentNorms.NORMS_HEADER, 0, SegmentNorms.NORMS_HEADER.length);
final int numField = fieldInfos.size();
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/SegmentMerger.java?rev=1126576&r1=1126575&r2=1126576&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/SegmentMerger.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/SegmentMerger.java Mon May 23 16:48:20 2011
@@ -40,10 +40,6 @@ import org.apache.lucene.util.ReaderUtil
* @see #add
*/
final class SegmentMerger {
-
- /** norms header placeholder */
- static final byte[] NORMS_HEADER = new byte[]{'N','R','M',-1};
-
private Directory directory;
private String segment;
private int termIndexInterval = IndexWriterConfig.DEFAULT_TERM_INDEX_INTERVAL;
@@ -630,7 +626,7 @@ final class SegmentMerger {
if (fi.isIndexed && !fi.omitNorms) {
if (output == null) {
output = directory.createOutput(IndexFileNames.segmentFileName(segment, IndexFileNames.NORMS_EXTENSION));
- output.writeBytes(NORMS_HEADER,NORMS_HEADER.length);
+ output.writeBytes(SegmentNorms.NORMS_HEADER, SegmentNorms.NORMS_HEADER.length);
}
if (normBuffer == null) {
normBuffer = new byte[bufferSize];
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/SegmentNorms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/SegmentNorms.java?rev=1126576&r1=1126575&r2=1126576&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/SegmentNorms.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/SegmentNorms.java Mon May 23 16:48:20 2011
@@ -33,6 +33,10 @@ import org.apache.lucene.store.IndexOutp
*/
final class SegmentNorms implements Cloneable {
+
+ /** norms header placeholder */
+ static final byte[] NORMS_HEADER = new byte[]{'N','R','M',-1};
+
int refCount = 1;
// If this instance is a clone, the originalNorm
@@ -242,7 +246,7 @@ final class SegmentNorms implements Clon
boolean success = false;
try {
try {
- out.writeBytes(SegmentMerger.NORMS_HEADER, 0, SegmentMerger.NORMS_HEADER.length);
+ out.writeBytes(SegmentNorms.NORMS_HEADER, 0, SegmentNorms.NORMS_HEADER.length);
out.writeBytes(bytes, owner.maxDoc());
} finally {
out.close();
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/SegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/SegmentReader.java?rev=1126576&r1=1126575&r2=1126576&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/SegmentReader.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/SegmentReader.java Mon May 23 16:48:20 2011
@@ -623,7 +623,7 @@ public class SegmentReader extends Index
}
private void openNorms(Directory cfsDir, int readBufferSize) throws IOException {
- long nextNormSeek = SegmentMerger.NORMS_HEADER.length; //skip header (header unused for now)
+ long nextNormSeek = SegmentNorms.NORMS_HEADER.length; //skip header (header unused for now)
int maxDoc = maxDoc();
for (int i = 0; i < core.fieldInfos.size(); i++) {
FieldInfo fi = core.fieldInfos.fieldInfo(i);
@@ -669,7 +669,7 @@ public class SegmentReader extends Index
if (isUnversioned) {
normSeek = 0;
} else {
- normSeek = SegmentMerger.NORMS_HEADER.length;
+ normSeek = SegmentNorms.NORMS_HEADER.length;
}
}