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 9E125713B for ; Mon, 15 Aug 2011 22:05:05 +0000 (UTC) Received: (qmail 19393 invoked by uid 500); 15 Aug 2011 22:05:05 -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 19386 invoked by uid 99); 15 Aug 2011 22:05:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Aug 2011 22:05:05 +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, 15 Aug 2011 22:05:04 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5A3752388BA2; Mon, 15 Aug 2011 22:04:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1158029 [15/15] - in /lucene/dev/branches/fieldtype_conflicted: lucene/ lucene/contrib/ lucene/contrib/demo/src/java/org/apache/lucene/demo/ lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/ lucene/contrib/highlighter... Date: Mon, 15 Aug 2011 22:03:52 -0000 To: commits@lucene.apache.org From: rmuir@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110815220413.5A3752388BA2@eris.apache.org> Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java?rev=1158029&r1=1158028&r2=1158029&view=diff ============================================================================== --- lucene/dev/branches/fieldtype_conflicted/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java (original) +++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java Mon Aug 15 22:03:41 2011 @@ -18,7 +18,12 @@ package org.apache.solr.update; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +<<<<<<< import org.apache.solr.common.SolrInputDocument; +======= +import org.apache.lucene.document.StringField; +import org.apache.lucene.document.TextField; +>>>>>>> import org.apache.solr.core.SolrCore; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.util.AbstractSolrTestCase; @@ -56,9 +61,15 @@ public class DirectUpdateHandlerOptimize //the merge factor is 100 and the maxBufferedDocs is 2, so there should be 50 segments for (int i = 0; i < 99; i++) { // Add a valid document +<<<<<<< cmd.solrDoc = new SolrInputDocument(); cmd.solrDoc.addField("id", "id_" + i); cmd.solrDoc.addField("subject", "subject_" + i); +======= + cmd.doc = new Document(); + cmd.doc.add(new Field("id", StringField.TYPE_STORED, "id_" + i)); + cmd.doc.add(new TextField("subject", "subject_" + i)); +>>>>>>> updater.addDoc(cmd); } Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java?rev=1158029&r1=1158028&r2=1158029&view=diff ============================================================================== --- lucene/dev/branches/fieldtype_conflicted/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java (original) +++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java Mon Aug 15 22:03:41 2011 @@ -109,8 +109,8 @@ public class DocumentBuilderTest extends doc.addField( "home", "2.2,3.3", 1.0f ); Document out = DocumentBuilder.toDocument( doc, core.getSchema() ); assertNotNull( out.get( "home" ) );//contains the stored value and term vector, if there is one - assertNotNull( out.getFieldable( "home_0" + FieldType.POLY_FIELD_SEPARATOR + "double" ) ); - assertNotNull( out.getFieldable( "home_1" + FieldType.POLY_FIELD_SEPARATOR + "double" ) ); + assertNotNull( out.getField( "home_0" + FieldType.POLY_FIELD_SEPARATOR + "double" ) ); + assertNotNull( out.getField( "home_1" + FieldType.POLY_FIELD_SEPARATOR + "double" ) ); } } Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java?rev=1158029&r1=1158028&r2=1158029&view=diff ============================================================================== --- lucene/dev/branches/fieldtype_conflicted/solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java (original) +++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java Mon Aug 15 22:03:41 2011 @@ -19,8 +19,13 @@ package org.apache.solr.update; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +<<<<<<< import org.apache.lucene.document.Fieldable; import org.apache.solr.common.SolrInputDocument; +======= +import org.apache.lucene.document.StringField; +import org.apache.lucene.index.IndexableField; +>>>>>>> import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.schema.IndexSchema; import org.apache.solr.util.AbstractSolrTestCase; @@ -95,7 +100,21 @@ public class TestIndexingPerformance ext add.overwrite = overwrite; for (int i=0; i>>>>>> add.solrDoc = new SolrInputDocument(); add.solrDoc.addField("id", Integer.toString(i)); for (int j=0; j