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 CF58BE4A7 for ; Mon, 4 Feb 2013 22:42:11 +0000 (UTC) Received: (qmail 18176 invoked by uid 500); 4 Feb 2013 22:42:11 -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 18167 invoked by uid 99); 4 Feb 2013 22:42:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Feb 2013 22:42:11 +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; Mon, 04 Feb 2013 22:42:10 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B1BFF2388978; Mon, 4 Feb 2013 22:41:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1442411 - in /lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index: FieldInfo.java NormsConsumerPerField.java Date: Mon, 04 Feb 2013 22:41:51 -0000 To: commits@lucene.apache.org From: rmuir@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130204224151.B1BFF2388978@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rmuir Date: Mon Feb 4 22:41:51 2013 New Revision: 1442411 URL: http://svn.apache.org/viewvc?rev=1442411&view=rev Log: clear nocommits Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/FieldInfo.java lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/NormsConsumerPerField.java Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/FieldInfo.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/FieldInfo.java?rev=1442411&r1=1442410&r2=1442411&view=diff ============================================================================== --- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/FieldInfo.java (original) +++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/FieldInfo.java Mon Feb 4 22:41:51 2013 @@ -234,7 +234,6 @@ public final class FieldInfo { assert checkConsistency(); } - // nocommit type is always number? should we remove this? void setNormValueType(DocValuesType type) { if (normType != null && normType != type) { throw new IllegalArgumentException("cannot change Norm type from " + normType + " to " + type + " for field \"" + name + "\""); Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/NormsConsumerPerField.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/NormsConsumerPerField.java?rev=1442411&r1=1442410&r2=1442411&view=diff ============================================================================== --- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/NormsConsumerPerField.java (original) +++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/NormsConsumerPerField.java Mon Feb 4 22:41:51 2013 @@ -43,8 +43,6 @@ final class NormsConsumerPerField extend void finish() throws IOException { if (fieldInfo.isIndexed() && !fieldInfo.omitsNorms()) { if (consumer == null) { - // nocommit wrongish? what about the - // only-doc-with-norms-enabled-hits-exc case? fieldInfo.setNormValueType(FieldInfo.DocValuesType.NUMERIC); consumer = new NumericDocValuesWriter(fieldInfo, docState.docWriter.bytesUsed); } @@ -56,8 +54,8 @@ final class NormsConsumerPerField extend int docCount = state.segmentInfo.getDocCount(); if (consumer == null) { return; // null type - not omitted but not written - - // nocommit meaning the only docs that had - // norms hit exceptions? + // meaning the only docs that had + // norms hit exceptions (but indexed=true is set...) } consumer.finish(docCount); consumer.flush(state, normsWriter);