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 AA04C10FB7 for ; Thu, 8 Aug 2013 19:08:05 +0000 (UTC) Received: (qmail 58757 invoked by uid 500); 8 Aug 2013 19:08:04 -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 58742 invoked by uid 99); 8 Aug 2013 19:08:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Aug 2013 19:08:04 +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; Thu, 08 Aug 2013 19:07:57 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 467D023888CD; Thu, 8 Aug 2013 19:07:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1511958 - in /lucene/dev/branches/branch_4x: ./ dev-tools/ lucene/ lucene/analysis/ lucene/analysis/icu/src/java/org/apache/lucene/collation/ lucene/backwards/ lucene/benchmark/ lucene/classification/ lucene/classification/src/ lucene/code... Date: Thu, 08 Aug 2013 19:07:36 -0000 To: commits@lucene.apache.org From: hossman@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130808190736.467D023888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hossman Date: Thu Aug 8 19:07:34 2013 New Revision: 1511958 URL: http://svn.apache.org/r1511958 Log: SOLR-4952: TestIndexSearcher.testReopen needs fixed segment merging (merge r1511954) Modified: lucene/dev/branches/branch_4x/ (props changed) lucene/dev/branches/branch_4x/dev-tools/ (props changed) lucene/dev/branches/branch_4x/lucene/ (props changed) lucene/dev/branches/branch_4x/lucene/BUILD.txt (props changed) lucene/dev/branches/branch_4x/lucene/CHANGES.txt (props changed) lucene/dev/branches/branch_4x/lucene/JRE_VERSION_MIGRATION.txt (props changed) lucene/dev/branches/branch_4x/lucene/LICENSE.txt (props changed) lucene/dev/branches/branch_4x/lucene/MIGRATE.txt (props changed) lucene/dev/branches/branch_4x/lucene/NOTICE.txt (props changed) lucene/dev/branches/branch_4x/lucene/README.txt (props changed) lucene/dev/branches/branch_4x/lucene/SYSTEM_REQUIREMENTS.txt (props changed) lucene/dev/branches/branch_4x/lucene/analysis/ (props changed) lucene/dev/branches/branch_4x/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyFilterFactory.java (props changed) lucene/dev/branches/branch_4x/lucene/backwards/ (props changed) lucene/dev/branches/branch_4x/lucene/benchmark/ (props changed) lucene/dev/branches/branch_4x/lucene/build.xml (props changed) lucene/dev/branches/branch_4x/lucene/classification/ (props changed) lucene/dev/branches/branch_4x/lucene/classification/build.xml (props changed) lucene/dev/branches/branch_4x/lucene/classification/ivy.xml (props changed) lucene/dev/branches/branch_4x/lucene/classification/src/ (props changed) lucene/dev/branches/branch_4x/lucene/codecs/ (props changed) lucene/dev/branches/branch_4x/lucene/common-build.xml (props changed) lucene/dev/branches/branch_4x/lucene/core/ (props changed) lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed) lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.40.cfs.zip (props changed) lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.40.nocfs.zip (props changed) lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.cfs.zip (props changed) lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.nocfs.zip (props changed) lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSort.java (props changed) lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSortDocValues.java (props changed) lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java (props changed) lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java (props changed) lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java (props changed) lucene/dev/branches/branch_4x/lucene/demo/ (props changed) lucene/dev/branches/branch_4x/lucene/facet/ (props changed) lucene/dev/branches/branch_4x/lucene/grouping/ (props changed) lucene/dev/branches/branch_4x/lucene/highlighter/ (props changed) lucene/dev/branches/branch_4x/lucene/ivy-settings.xml (props changed) lucene/dev/branches/branch_4x/lucene/join/ (props changed) lucene/dev/branches/branch_4x/lucene/licenses/ (props changed) lucene/dev/branches/branch_4x/lucene/memory/ (props changed) lucene/dev/branches/branch_4x/lucene/misc/ (props changed) lucene/dev/branches/branch_4x/lucene/module-build.xml (props changed) lucene/dev/branches/branch_4x/lucene/queries/ (props changed) lucene/dev/branches/branch_4x/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java (props changed) lucene/dev/branches/branch_4x/lucene/queryparser/ (props changed) lucene/dev/branches/branch_4x/lucene/replicator/ (props changed) lucene/dev/branches/branch_4x/lucene/sandbox/ (props changed) lucene/dev/branches/branch_4x/lucene/site/ (props changed) lucene/dev/branches/branch_4x/lucene/spatial/ (props changed) lucene/dev/branches/branch_4x/lucene/suggest/ (props changed) lucene/dev/branches/branch_4x/lucene/test-framework/ (props changed) lucene/dev/branches/branch_4x/lucene/tools/ (props changed) lucene/dev/branches/branch_4x/solr/ (props changed) lucene/dev/branches/branch_4x/solr/CHANGES.txt (props changed) lucene/dev/branches/branch_4x/solr/LICENSE.txt (props changed) lucene/dev/branches/branch_4x/solr/NOTICE.txt (props changed) lucene/dev/branches/branch_4x/solr/README.txt (props changed) lucene/dev/branches/branch_4x/solr/SYSTEM_REQUIREMENTS.txt (props changed) lucene/dev/branches/branch_4x/solr/build.xml (props changed) lucene/dev/branches/branch_4x/solr/cloud-dev/ (props changed) lucene/dev/branches/branch_4x/solr/common-build.xml (props changed) lucene/dev/branches/branch_4x/solr/contrib/ (props changed) lucene/dev/branches/branch_4x/solr/core/ (props changed) lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestConfig.java (props changed) lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java lucene/dev/branches/branch_4x/solr/example/ (props changed) lucene/dev/branches/branch_4x/solr/licenses/ (props changed) lucene/dev/branches/branch_4x/solr/licenses/httpclient-LICENSE-ASL.txt (props changed) lucene/dev/branches/branch_4x/solr/licenses/httpclient-NOTICE.txt (props changed) lucene/dev/branches/branch_4x/solr/licenses/httpcore-LICENSE-ASL.txt (props changed) lucene/dev/branches/branch_4x/solr/licenses/httpcore-NOTICE.txt (props changed) lucene/dev/branches/branch_4x/solr/licenses/httpmime-LICENSE-ASL.txt (props changed) lucene/dev/branches/branch_4x/solr/licenses/httpmime-NOTICE.txt (props changed) lucene/dev/branches/branch_4x/solr/scripts/ (props changed) lucene/dev/branches/branch_4x/solr/site/ (props changed) lucene/dev/branches/branch_4x/solr/solrj/ (props changed) lucene/dev/branches/branch_4x/solr/test-framework/ (props changed) lucene/dev/branches/branch_4x/solr/webapp/ (props changed) Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java?rev=1511958&r1=1511957&r2=1511958&view=diff ============================================================================== --- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java (original) +++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java Thu Aug 8 19:07:34 2013 @@ -16,6 +16,7 @@ */ package org.apache.solr.search; +import org.apache.lucene.index.LogDocMergePolicy; import org.apache.lucene.index.AtomicReaderContext; import org.apache.lucene.index.IndexReaderContext; import org.apache.lucene.index.ReaderUtil; @@ -34,6 +35,11 @@ public class TestIndexSearcher extends S @BeforeClass public static void beforeClass() throws Exception { + + // we need a consistent segmentation because reopen test validation + // dependso n merges not happening when it doesn't expect + System.setProperty("solr.tests.mergePolicy", LogDocMergePolicy.class.getName()); + initCore("solrconfig.xml","schema.xml"); }