Return-Path: Delivered-To: apmail-jakarta-lucene-dev-archive@www.apache.org Received: (qmail 67603 invoked from network); 14 May 2004 12:49:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 14 May 2004 12:49:53 -0000 Received: (qmail 83376 invoked by uid 500); 14 May 2004 12:49:53 -0000 Delivered-To: apmail-jakarta-lucene-dev-archive@jakarta.apache.org Received: (qmail 83329 invoked by uid 500); 14 May 2004 12:49:53 -0000 Mailing-List: contact lucene-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Lucene Developers List" Reply-To: "Lucene Developers List" Delivered-To: mailing list lucene-dev@jakarta.apache.org Received: (qmail 83300 invoked by uid 500); 14 May 2004 12:49:52 -0000 Received: (qmail 83290 invoked by uid 98); 14 May 2004 12:49:52 -0000 Received: from otis@apache.org by hermes.apache.org by uid 82 with qmail-scanner-1.20 (clamuko: 0.70. Clear:RC:0(209.237.227.194):. Processed in 0.286424 secs); 14 May 2004 12:49:52 -0000 X-Qmail-Scanner-Mail-From: otis@apache.org via hermes.apache.org X-Qmail-Scanner: 1.20 (Clear:RC:0(209.237.227.194):. Processed in 0.286424 secs) Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by hermes.apache.org with SMTP; 14 May 2004 12:49:52 -0000 Received: (qmail 67532 invoked by uid 1371); 14 May 2004 12:49:46 -0000 Date: 14 May 2004 12:49:46 -0000 Message-ID: <20040514124946.67531.qmail@minotaur.apache.org> From: otis@apache.org To: jakarta-lucene-cvs@apache.org Subject: cvs commit: jakarta-lucene/src/java/org/apache/lucene/index MultiReader.java X-Spam-Rating: hermes.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N otis 2004/05/14 05:49:46 Modified: src/java/org/apache/lucene/index MultiReader.java Log: - Replaced /t with two spaces and fixed indentation Revision Changes Path 1.6 +57 -60 jakarta-lucene/src/java/org/apache/lucene/index/MultiReader.java Index: MultiReader.java =================================================================== RCS file: /home/cvs/jakarta-lucene/src/java/org/apache/lucene/index/MultiReader.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- MultiReader.java 11 May 2004 17:12:29 -0000 1.5 +++ MultiReader.java 14 May 2004 12:49:46 -0000 1.6 @@ -57,13 +57,13 @@ super(directory, sis, closeDirectory); initialize(subReaders); } - + private void initialize(IndexReader[] subReaders) throws IOException{ this.subReaders = subReaders; - starts = new int[subReaders.length + 1]; // build starts array - for (int i = 0; i < subReaders.length; i++) { + starts = new int[subReaders.length + 1]; // build starts array + for (int i = 0; i < subReaders.length; i++) { starts[i] = maxDoc; - maxDoc += subReaders[i].maxDoc(); // compute maxDocs + maxDoc += subReaders[i].maxDoc(); // compute maxDocs if (subReaders[i].hasDeletions()) hasDeletions = true; @@ -78,23 +78,22 @@ * in a given vectorized field. * If no such fields existed, the method returns null. */ - public TermFreqVector[] getTermFreqVectors(int n) - throws IOException { - int i = readerIndex(n); // find segment num + public TermFreqVector[] getTermFreqVectors(int n) throws IOException { + int i = readerIndex(n); // find segment num return subReaders[i].getTermFreqVectors(n - starts[i]); // dispatch to segment } public TermFreqVector getTermFreqVector(int n, String field) - throws IOException { - int i = readerIndex(n); // find segment num + throws IOException { + int i = readerIndex(n); // find segment num return subReaders[i].getTermFreqVector(n - starts[i], field); } public synchronized int numDocs() { - if (numDocs == -1) { // check cache - int n = 0; // cache miss--recompute + if (numDocs == -1) { // check cache + int n = 0; // cache miss--recompute for (int i = 0; i < subReaders.length; i++) - n += subReaders[i].numDocs(); // sum from readers + n += subReaders[i].numDocs(); // sum from readers numDocs = n; } return numDocs; @@ -105,21 +104,21 @@ } public Document document(int n) throws IOException { - int i = readerIndex(n); // find segment num - return subReaders[i].document(n - starts[i]); // dispatch to segment reader + int i = readerIndex(n); // find segment num + return subReaders[i].document(n - starts[i]); // dispatch to segment reader } public boolean isDeleted(int n) { - int i = readerIndex(n); // find segment num - return subReaders[i].isDeleted(n - starts[i]); // dispatch to segment reader + int i = readerIndex(n); // find segment num + return subReaders[i].isDeleted(n - starts[i]); // dispatch to segment reader } public boolean hasDeletions() { return hasDeletions; } protected void doDelete(int n) throws IOException { - numDocs = -1; // invalidate cache - int i = readerIndex(n); // find segment num - subReaders[i].delete(n - starts[i]); // dispatch to segment reader + numDocs = -1; // invalidate cache + int i = readerIndex(n); // find segment num + subReaders[i].delete(n - starts[i]); // dispatch to segment reader hasDeletions = true; } @@ -129,22 +128,22 @@ hasDeletions = false; } - private int readerIndex(int n) { // find reader for doc n: - int lo = 0; // search starts array + private int readerIndex(int n) { // find reader for doc n: + int lo = 0; // search starts array int hi = subReaders.length - 1; // for first element less while (hi >= lo) { int mid = (lo + hi) >> 1; int midValue = starts[mid]; if (n < midValue) - hi = mid - 1; + hi = mid - 1; else if (n > midValue) - lo = mid + 1; + lo = mid + 1; else { // found a match while (mid+1 < subReaders.length && starts[mid+1] == midValue) { mid++; // scan to last match } - return mid; + return mid; } } return hi; @@ -153,12 +152,12 @@ public synchronized byte[] norms(String field) throws IOException { byte[] bytes = (byte[])normsCache.get(field); if (bytes != null) - return bytes; // cache hit + return bytes; // cache hit bytes = new byte[maxDoc()]; for (int i = 0; i < subReaders.length; i++) subReaders[i].norms(field, bytes, starts[i]); - normsCache.put(field, bytes); // update cache + normsCache.put(field, bytes); // update cache return bytes; } @@ -174,8 +173,8 @@ protected void doSetNorm(int n, String field, byte value) throws IOException { - normsCache.remove(field); // clear cache - int i = readerIndex(n); // find segment num + normsCache.remove(field); // clear cache + int i = readerIndex(n); // find segment num subReaders[i].setNorm(n-starts[i], field, value); // dispatch } @@ -188,7 +187,7 @@ } public int docFreq(Term t) throws IOException { - int total = 0; // sum freqs in segments + int total = 0; // sum freqs in segments for (int i = 0; i < subReaders.length; i++) total += subReaders[i].docFreq(t); return total; @@ -201,7 +200,7 @@ public TermPositions termPositions() throws IOException { return new MultiTermPositions(subReaders, starts); } - + protected void doCommit() throws IOException { for (int i = 0; i < subReaders.length; i++) subReaders[i].commit(); @@ -248,9 +247,9 @@ // maintain a unique set of field names Set fieldSet = new HashSet(); for (int i = 0; i < subReaders.length; i++) { - IndexReader reader = subReaders[i]; - Collection names = reader.getIndexedFieldNames(storedTermVector); - fieldSet.addAll(names); + IndexReader reader = subReaders[i]; + Collection names = reader.getIndexedFieldNames(storedTermVector); + fieldSet.addAll(names); } return fieldSet; } @@ -271,15 +270,15 @@ SegmentTermEnum termEnum; if (t != null) { - termEnum = (SegmentTermEnum)reader.terms(t); + termEnum = (SegmentTermEnum)reader.terms(t); } else - termEnum = (SegmentTermEnum)reader.terms(); + termEnum = (SegmentTermEnum)reader.terms(); SegmentMergeInfo smi = new SegmentMergeInfo(starts[i], termEnum, reader); if (t == null ? smi.next() : termEnum.term() != null) - queue.put(smi); // initialize queue + queue.put(smi); // initialize queue else - smi.close(); + smi.close(); } if (t != null && queue.size() > 0) { @@ -299,11 +298,11 @@ while (top != null && term.compareTo(top.term) == 0) { queue.pop(); - docFreq += top.termEnum.docFreq(); // increment freq + docFreq += top.termEnum.docFreq(); // increment freq if (top.next()) - queue.put(top); // restore queue + queue.put(top); // restore queue else - top.close(); // done with a segment + top.close(); // done with a segment top = (SegmentMergeInfo)queue.top(); } return true; @@ -370,25 +369,24 @@ } /** Optimized implementation. */ - public int read(final int[] docs, final int[] freqs) - throws IOException { + public int read(final int[] docs, final int[] freqs) throws IOException { while (true) { while (current == null) { - if (pointer < readers.length) { // try next segment - base = starts[pointer]; - current = termDocs(pointer++); - } else { - return 0; - } + if (pointer < readers.length) { // try next segment + base = starts[pointer]; + current = termDocs(pointer++); + } else { + return 0; + } } int end = current.read(docs, freqs); - if (end == 0) { // none left in segment - current = null; - } else { // got some - final int b = base; // adjust doc numbers - for (int i = 0; i < end; i++) - docs[i] += b; - return end; + if (end == 0) { // none left in segment + current = null; + } else { // got some + final int b = base; // adjust doc numbers + for (int i = 0; i < end; i++) + docs[i] += b; + return end; } } } @@ -397,9 +395,9 @@ public boolean skipTo(int target) throws IOException { do { if (!next()) - return false; + return false; } while (target > doc()); - return true; + return true; } private SegmentTermDocs termDocs(int i) throws IOException { @@ -430,8 +428,7 @@ super(r,s); } - protected SegmentTermDocs termDocs(IndexReader reader) - throws IOException { + protected SegmentTermDocs termDocs(IndexReader reader) throws IOException { return (SegmentTermDocs)reader.termPositions(); } --------------------------------------------------------------------- To unsubscribe, e-mail: lucene-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: lucene-dev-help@jakarta.apache.org