Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5907F987A for ; Wed, 7 Dec 2011 01:20:01 +0000 (UTC) Received: (qmail 70414 invoked by uid 500); 7 Dec 2011 01:20:01 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 70406 invoked by uid 99); 7 Dec 2011 01:20:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Dec 2011 01:20:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Dec 2011 01:19:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 256FB23888FD; Wed, 7 Dec 2011 01:19:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1211256 - in /lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index: MultiPerDocValues.java ParallelReader.java codecs/DocValuesConsumer.java codecs/DocValuesReaderBase.java codecs/PerDocValues.java Date: Wed, 07 Dec 2011 01:19:35 -0000 To: commits@lucene.apache.org From: rmuir@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111207011936.256FB23888FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rmuir Date: Wed Dec 7 01:19:35 2011 New Revision: 1211256 URL: http://svn.apache.org/viewvc?rev=1211256&view=rev Log: LUCENE-3622: remove unused PerDocValues.fields(), its not per-doc and duplicated with IR.fieldNames/fieldOptions... which looks neglected here Modified: lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/MultiPerDocValues.java lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/ParallelReader.java lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/codecs/DocValuesConsumer.java lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/codecs/DocValuesReaderBase.java lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/codecs/PerDocValues.java Modified: lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/MultiPerDocValues.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/MultiPerDocValues.java?rev=1211256&r1=1211255&r2=1211256&view=diff ============================================================================== --- lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/MultiPerDocValues.java (original) +++ lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/MultiPerDocValues.java Wed Dec 7 01:19:35 2011 @@ -49,15 +49,10 @@ public class MultiPerDocValues extends P private final PerDocValues[] subs; private final ReaderUtil.Slice[] subSlices; private final Map docValues = new ConcurrentHashMap(); - private final TreeSet fields; public MultiPerDocValues(PerDocValues[] subs, ReaderUtil.Slice[] subSlices) { this.subs = subs; this.subSlices = subSlices; - fields = new TreeSet(); - for (PerDocValues sub : subs) { - fields.addAll(sub.fields()); - } } /** @@ -154,9 +149,4 @@ public class MultiPerDocValues extends P public void close() throws IOException { IOUtils.close(this.subs); } - - @Override - public Collection fields() { - return fields; - } } Modified: lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/ParallelReader.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/ParallelReader.java?rev=1211256&r1=1211255&r2=1211256&view=diff ============================================================================== --- lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/ParallelReader.java (original) +++ lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/ParallelReader.java Wed Dec 7 01:19:35 2011 @@ -533,11 +533,6 @@ public class ParallelReader extends Inde public IndexDocValues docValues(String field) throws IOException { return fields.get(field); } - - @Override - public Collection fields() { - return fields.keySet(); - } } } Modified: lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/codecs/DocValuesConsumer.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/codecs/DocValuesConsumer.java?rev=1211256&r1=1211255&r2=1211256&view=diff ============================================================================== --- lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/codecs/DocValuesConsumer.java (original) +++ lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/codecs/DocValuesConsumer.java Wed Dec 7 01:19:35 2011 @@ -114,6 +114,9 @@ public abstract class DocValuesConsumer * @throws IOException * if an {@link IOException} occurs */ + // nocommit: can't we have a default implementation here that merges naively with our apis? + // this is how stored fields and term vectors work. its a pain to have to impl merging + // (should be an optimization to override it) protected abstract void merge(SingleSubMergeState mergeState) throws IOException; /** Modified: lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/codecs/DocValuesReaderBase.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/codecs/DocValuesReaderBase.java?rev=1211256&r1=1211255&r2=1211256&view=diff ============================================================================== --- lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/codecs/DocValuesReaderBase.java (original) +++ lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/codecs/DocValuesReaderBase.java Wed Dec 7 01:19:35 2011 @@ -53,11 +53,6 @@ public abstract class DocValuesReaderBas public IndexDocValues docValues(String field) throws IOException { return docValues().get(field); } - - @Override - public Collection fields() { - return docValues().keySet(); - } public Comparator getComparator() throws IOException { return BytesRef.getUTF8SortedAsUnicodeComparator(); Modified: lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/codecs/PerDocValues.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/codecs/PerDocValues.java?rev=1211256&r1=1211255&r2=1211256&view=diff ============================================================================== --- lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/codecs/PerDocValues.java (original) +++ lucene/dev/branches/lucene3622/lucene/src/java/org/apache/lucene/index/codecs/PerDocValues.java Wed Dec 7 01:19:35 2011 @@ -17,7 +17,6 @@ package org.apache.lucene.index.codecs; */ import java.io.Closeable; import java.io.IOException; -import java.util.Collection; import org.apache.lucene.index.values.IndexDocValues; @@ -46,9 +45,4 @@ public abstract class PerDocValues imple public abstract IndexDocValues docValues(String field) throws IOException; public static final PerDocValues[] EMPTY_ARRAY = new PerDocValues[0]; - - /** - * Returns all fields this {@link PerDocValues} contains values for. - */ - public abstract Collection fields(); }