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 41E9FDC4C for ; Sun, 18 Nov 2012 18:39:54 +0000 (UTC) Received: (qmail 29380 invoked by uid 500); 18 Nov 2012 18:39:54 -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 29373 invoked by uid 99); 18 Nov 2012 18:39:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 18 Nov 2012 18:39:54 +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; Sun, 18 Nov 2012 18:39:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D0FB92388900; Sun, 18 Nov 2012 18:39:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1410953 - in /lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index: BytesDVWriter.java NumberDVWriter.java SortedBytesDVWriter.java Date: Sun, 18 Nov 2012 18:39:29 -0000 To: commits@lucene.apache.org From: mikemccand@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121118183929.D0FB92388900@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mikemccand Date: Sun Nov 18 18:39:28 2012 New Revision: 1410953 URL: http://svn.apache.org/viewvc?rev=1410953&view=rev Log: detect illegal multi-valued DV field Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/BytesDVWriter.java lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/NumberDVWriter.java lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SortedBytesDVWriter.java Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/BytesDVWriter.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/BytesDVWriter.java?rev=1410953&r1=1410952&r2=1410953&view=diff ============================================================================== --- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/BytesDVWriter.java (original) +++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/BytesDVWriter.java Sun Nov 18 18:39:28 2012 @@ -49,6 +49,9 @@ class BytesDVWriter { } public void addValue(int docID, BytesRef value) { + if (docID < addedValues) { + throw new IllegalArgumentException("DocValuesField \"" + fieldInfo.name + "\" appears more than once in this document (only one value is allowed per field)"); + } if (value == null) { // nocommit improve message throw new IllegalArgumentException("null binaryValue not allowed (field=" + fieldInfo.name + ")"); Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/NumberDVWriter.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/NumberDVWriter.java?rev=1410953&r1=1410952&r2=1410953&view=diff ============================================================================== --- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/NumberDVWriter.java (original) +++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/NumberDVWriter.java Sun Nov 18 18:39:28 2012 @@ -51,6 +51,9 @@ class NumberDVWriter { } public void addValue(int docID, long value) { + if (docID < pending.size()) { + throw new IllegalArgumentException("DocValuesField \"" + fieldInfo.name + "\" appears more than once in this document (only one value is allowed per field)"); + } mergeValue(value); // Fill in any holes: Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SortedBytesDVWriter.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SortedBytesDVWriter.java?rev=1410953&r1=1410952&r2=1410953&view=diff ============================================================================== --- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SortedBytesDVWriter.java (original) +++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SortedBytesDVWriter.java Sun Nov 18 18:39:28 2012 @@ -60,6 +60,9 @@ class SortedBytesDVWriter { } public void addValue(int docID, BytesRef value) { + if (docID < pendingIndex) { + throw new IllegalArgumentException("DocValuesField \"" + fieldInfo.name + "\" appears more than once in this document (only one value is allowed per field)"); + } if (value == null) { // nocommit improve message throw new IllegalArgumentException("null sortedValue not allowed (field=" + fieldInfo.name + ")");