From chelsea50@example.com Tue Feb 01 02:08:59 2011 Return-Path: <chelsea50@example.com> Delivered-To: chelsea50@example.com Received: (qmail 89619 invoked from network); 1 Feb 2011 02:08:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Feb 2011 02:08:59 -0000 Received: (qmail 81409 invoked by uid 500); 1 Feb 2011 02:08:58 -0000 Mailing-List: contact chelsea50@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:chelsea50@example.com> List-Unsubscribe: <mailto:chelsea50@example.com> List-Post: <mailto:chelsea50@example.com> List-Id: <commits.lucene.apache.org> Reply-To: chelsea50@example.com Delivered-To: mailing list chelsea50@example.com Received: (qmail 81402 invoked by uid 99); 1 Feb 2011 02:08:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Feb 2011 02:08:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Feb 2011 02:08:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DA735238890A; Tue, 1 Feb 2011 02:08:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1065891 - /lucene/dev/trunk/solr/contrib/dataimporthandler/README.txt Date: Tue, 01 Feb 2011 02:08:35 -0000 To: chelsea50@example.com From: chelsea50@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <chelsea50@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: rmuir Date: Tue Feb 1 02:08:35 2011 New Revision: 1065891 URL: http://svn.apache.org/viewvc?rev=1065891&view=rev Log: SOLR-1916: add locale/timezone warning Added: lucene/dev/trunk/solr/contrib/dataimporthandler/README.txt (with props) Added: lucene/dev/trunk/solr/contrib/dataimporthandler/README.txt URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/README.txt?rev=1065891&view=auto ============================================================================== --- lucene/dev/trunk/solr/contrib/dataimporthandler/README.txt (added) +++ lucene/dev/trunk/solr/contrib/dataimporthandler/README.txt Tue Feb 1 02:08:35 2011 @@ -0,0 +1,7 @@ +Although Solr strives to be agnostic of the Locale where the server is +running, some code paths in DataImportHandler are known to depend on the +System default Locale, Timezone, or Charset. It is recommended that when +running Solr you set the following system properties: + -Duser.language=xx -Duser.country=YY -Duser.timezone=ZZZ + +where xx, YY, and ZZZ are consistent with any database server's configuration. From chelsea50@example.com Tue Feb 01 02:11:51 2011 Return-Path: <chelsea50@example.com> Delivered-To: chelsea50@example.com Received: (qmail 90474 invoked from network); 1 Feb 2011 02:11:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Feb 2011 02:11:50 -0000 Received: (qmail 82928 invoked by uid 500); 1 Feb 2011 02:11:50 -0000 Mailing-List: contact chelsea50@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:chelsea50@example.com> List-Unsubscribe: <mailto:chelsea50@example.com> List-Post: <mailto:chelsea50@example.com> List-Id: <commits.lucene.apache.org> Reply-To: chelsea50@example.com Delivered-To: mailing list chelsea50@example.com Received: (qmail 82921 invoked by uid 99); 1 Feb 2011 02:11:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Feb 2011 02:11:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Feb 2011 02:11:48 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 668CE23889ED; Tue, 1 Feb 2011 02:11:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1065892 - in /lucene/dev/branches/branch_3x: ./ lucene/ solr/ solr/contrib/dataimporthandler/README.txt Date: Tue, 01 Feb 2011 02:11:27 -0000 To: chelsea50@example.com From: chelsea50@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <chelsea50@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: rmuir Date: Tue Feb 1 02:11:27 2011 New Revision: 1065892 URL: http://svn.apache.org/viewvc?rev=1065892&view=rev Log: SOLR-1916: add locale/timezone warning Added: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/README.txt - copied unchanged from r1065891, lucene/dev/trunk/solr/contrib/dataimporthandler/README.txt Modified: lucene/dev/branches/branch_3x/ (props changed) lucene/dev/branches/branch_3x/lucene/ (props changed) lucene/dev/branches/branch_3x/solr/ (props changed) From chelsea50@example.com Tue Feb 01 11:42:12 2011 Return-Path: <chelsea50@example.com> Delivered-To: chelsea50@example.com Received: (qmail 43833 invoked from network); 1 Feb 2011 11:42:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Feb 2011 11:42:12 -0000 Received: (qmail 56755 invoked by uid 500); 1 Feb 2011 11:42:10 -0000 Mailing-List: contact chelsea50@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:chelsea50@example.com> List-Unsubscribe: <mailto:chelsea50@example.com> List-Post: <mailto:chelsea50@example.com> List-Id: <commits.lucene.apache.org> Reply-To: chelsea50@example.com Delivered-To: mailing list chelsea50@example.com Received: (qmail 56743 invoked by uid 99); 1 Feb 2011 11:42:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Feb 2011 11:42:09 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Feb 2011 11:42:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5A90023889D5; Tue, 1 Feb 2011 11:41:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1066008 - /lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/MockRandomMergePolicy.java Date: Tue, 01 Feb 2011 11:41:49 -0000 To: chelsea50@example.com From: chelsea50@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <chelsea50@example.com> Author: mikemccand Date: Tue Feb 1 11:41:49 2011 New Revision: 1066008 URL: http://svn.apache.org/viewvc?rev=1066008&view=rev Log: make MockRandomMergePolicy slightly less evil; fixes 2 recent test failures Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/MockRandomMergePolicy.java Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/MockRandomMergePolicy.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/MockRandomMergePolicy.java?rev=1066008&r1=1066007&r2=1066008&view=diff ============================================================================== --- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/MockRandomMergePolicy.java (original) +++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/MockRandomMergePolicy.java Tue Feb 1 11:41:49 2011 @@ -67,7 +67,8 @@ public class MockRandomMergePolicy exten Collections.shuffle(segmentInfos2, random); int upto = 0; while(upto < segmentInfos.size()) { - int inc = _TestUtil.nextInt(random, 1, segmentInfos.size()-upto); + int max = Math.min(10, segmentInfos.size()-upto); + int inc = max <= 2 ? max : _TestUtil.nextInt(random, 2, max); mergeSpec.add(new OneMerge(segmentInfos2.range(upto, upto+inc))); upto += inc; } @@ -88,6 +89,7 @@ public class MockRandomMergePolicy exten @Override public boolean useCompoundFile(SegmentInfos infos, SegmentInfo mergedInfo) throws IOException { - return random.nextBoolean(); + // 80% of the time we create CFS: + return random.nextInt(5) != 1; } } From chelsea50@example.com Tue Feb 01 16:30:17 2011 Return-Path: <chelsea50@example.com> Delivered-To: chelsea50@example.com Received: (qmail 48483 invoked from network); 1 Feb 2011 16:30:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Feb 2011 16:30:17 -0000 Received: (qmail 90403 invoked by uid 500); 1 Feb 2011 16:30:15 -0000 Mailing-List: contact chelsea50@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:chelsea50@example.com> List-Unsubscribe: <mailto:chelsea50@example.com> List-Post: <mailto:chelsea50@example.com> List-Id: <commits.lucene.apache.org> Reply-To: chelsea50@example.com Delivered-To: mailing list chelsea50@example.com Received: (qmail 90396 invoked by uid 99); 1 Feb 2011 16:30:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Feb 2011 16:30:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Feb 2011 16:30:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5713023888D2; Tue, 1 Feb 2011 16:29:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1066084 - in /lucene/dev/nightly: common-maven.sh hudson-lucene-3.x.sh hudson-lucene-solr-maven-trunk.sh hudson-lucene-trunk.sh hudson-settings.sh hudson-solr-3.x.sh hudson-solr-trunk.sh Date: Tue, 01 Feb 2011 16:29:53 -0000 To: chelsea50@example.com From: chelsea50@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <chelsea50@example.com> Author: sarowe Date: Tue Feb 1 16:29:52 2011 New Revision: 1066084 URL: http://svn.apache.org/viewvc?rev=1066084&view=rev Log: stop generating maven artifacts in the non-maven nightly builds; stop deleting the entire maven local repository before every build; consolidate maven-specific common settings into common-maven.sh; ignore BasicDistributedZkTest only in the trunk maven build, since it doesn't exist in 3.x Modified: lucene/dev/nightly/common-maven.sh lucene/dev/nightly/hudson-lucene-3.x.sh lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh lucene/dev/nightly/hudson-lucene-trunk.sh lucene/dev/nightly/hudson-settings.sh lucene/dev/nightly/hudson-solr-3.x.sh lucene/dev/nightly/hudson-solr-trunk.sh Modified: lucene/dev/nightly/common-maven.sh URL: http://svn.apache.org/viewvc/lucene/dev/nightly/common-maven.sh?rev=1066084&r1=1066083&r2=1066084&view=diff ============================================================================== --- lucene/dev/nightly/common-maven.sh (original) +++ lucene/dev/nightly/common-maven.sh Tue Feb 1 16:29:52 2011 @@ -1,6 +1,7 @@ ## This script is sourced from the *-maven-*.sh scripts. ## The commands in this file should work in any branch/trunk. +MAVEN_ARTIFACTS=$WORKSPACE/maven_artifacts export M2_HOME=$HOME/tools/maven/latest2.2 mkdir -p $MAVEN_ARTIFACTS/org/apache @@ -24,10 +25,6 @@ echo ">>> Installing non-mavenized deps $M2_HOME/bin/mvn --batch-mode --non-recursive -Pbootstrap install echo ">>> Done installing non-mavenized deps into the maven local repo" -echo ">>> Ignoring BasicDistributedZkTest, which always fails on Hudson trunk under Maven" -perl -pi.bak -e 's/(?=public class BasicDistributedZkTest)/import org.junit.Ignore;\n\@Ignore\n/;'\ - solr/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java - echo ">>> Running the Maven build" $M2_HOME/bin/mvn --batch-mode --fail-at-end clean install echo ">>> Done running the Maven build" Modified: lucene/dev/nightly/hudson-lucene-3.x.sh URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-lucene-3.x.sh?rev=1066084&r1=1066083&r2=1066084&view=diff ============================================================================== --- lucene/dev/nightly/hudson-lucene-3.x.sh (original) +++ lucene/dev/nightly/hudson-lucene-3.x.sh Tue Feb 1 16:29:52 2011 @@ -3,10 +3,8 @@ #Update the Version # when doing a release VERSION=3.1-$BUILD_ID -MAVEN_ARTIFACT_VERSION=3.1-SNAPSHOT mkdir -p $ARTIFACTS -mkdir -p $MAVEN_ARTIFACTS mkdir -p $JAVADOCS_ARTIFACTS cd $WORKSPACE/$CORE_DIR @@ -34,18 +32,6 @@ JAVA_HOME=$JAVA_HOME_16 $ANT_HOME/bin/an # release it mv -f dist/*.tar.gz $ARTIFACTS -#Generate the Maven snapshot -set +e -JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/ant \ - -Dsvnversion.exe=$SVNVERSION_EXE \ - -Dsvn.exe=$SVN_EXE \ - -Dversion=$MAVEN_ARTIFACT_VERSION \ - clean generate-maven-artifacts -#copy the artifacts to the side so the cron job can publish them -echo "Moving Maven artifacts to $MAVEN_ARTIFACTS" -mv -f dist/maven/* $MAVEN_ARTIFACTS -echo "Done moving Maven Artifacts" - #Rerun testsuite with clover on set +e JAVA_HOME=$JAVA_HOME_16 $ANT_HOME/bin/ant \ Modified: lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh?rev=1066084&r1=1066083&r2=1066084&view=diff ============================================================================== --- lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh (original) +++ lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh Tue Feb 1 16:29:52 2011 @@ -6,6 +6,10 @@ MAVEN_ARTIFACT_VERSION=4.0-SNAPSHOT export JAVA_HOME=$JAVA_HOME_16 +echo ">>> Ignoring BasicDistributedZkTest, which always fails on Hudson trunk under Maven" +perl -pi.bak -e 's/(?=public class BasicDistributedZkTest)/import org.junit.Ignore;\n\@Ignore\n/;'\ + solr/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java + . $WORKSPACE/nightly/common-maven.sh echo ">>> Moving Maven artifacts to $MAVEN_ARTIFACTS" Modified: lucene/dev/nightly/hudson-lucene-trunk.sh URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-lucene-trunk.sh?rev=1066084&r1=1066083&r2=1066084&view=diff ============================================================================== --- lucene/dev/nightly/hudson-lucene-trunk.sh (original) +++ lucene/dev/nightly/hudson-lucene-trunk.sh Tue Feb 1 16:29:52 2011 @@ -3,10 +3,8 @@ #Update the Version # when doing a release VERSION=4.0-$BUILD_ID -MAVEN_ARTIFACT_VERSION=4.0-SNAPSHOT mkdir -p $ARTIFACTS -mkdir -p $MAVEN_ARTIFACTS mkdir -p $JAVADOCS_ARTIFACTS #Package the Source and compile Binaries @@ -54,28 +52,6 @@ JAVA_HOME=$JAVA_HOME_16 $ANT_HOME/bin/an -Dtests.linedocsfile=$TEST_LINE_DOCS_FILE \ test -set +e -#Generate the Maven snapshot -cd $WORKSPACE/$CORE_DIR -JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/ant \ - -Dsvnversion.exe=$SVNVERSION_EXE \ - -Dsvn.exe=$SVN_EXE \ - -Dversion=$MAVEN_ARTIFACT_VERSION \ - clean generate-maven-artifacts -cd $WORKSPACE/$MODULES_DIR -JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/ant \ - -Dsvnversion.exe=$SVNVERSION_EXE \ - -Dsvn.exe=$SVN_EXE \ - -Dversion=$MAVEN_ARTIFACT_VERSION \ - clean generate-maven-artifacts -#copy the artifacts to the side so the cron job can publish them -echo "Moving Maven artifacts to $MAVEN_ARTIFACTS" -mv -f $WORKSPACE/$CORE_DIR/dist/maven/* $MAVEN_ARTIFACTS -cp -r $WORKSPACE/$MODULES_DIR/dist/maven/* $MAVEN_ARTIFACTS -echo "Done moving Maven Artifacts" - -#TODO: add maven stuff here *LOL* - #Rerun testsuite with clover on set +e cd $WORKSPACE/$CORE_DIR Modified: lucene/dev/nightly/hudson-settings.sh URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-settings.sh?rev=1066084&r1=1066083&r2=1066084&view=diff ============================================================================== --- lucene/dev/nightly/hudson-settings.sh (original) +++ lucene/dev/nightly/hudson-settings.sh Tue Feb 1 16:29:52 2011 @@ -22,12 +22,8 @@ MODULES_DIR=$ROOT_DIR/modules SOLR_DIR=$ROOT_DIR/solr ARTIFACTS=$WORKSPACE/artifacts -MAVEN_ARTIFACTS=$WORKSPACE/maven_artifacts JAVADOCS_ARTIFACTS=$WORKSPACE/javadocs -# cleanup maven -rm -rf $HOME/.m2/repository - #do some checks that are common to all build scripts: set +x Modified: lucene/dev/nightly/hudson-solr-3.x.sh URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-solr-3.x.sh?rev=1066084&r1=1066083&r2=1066084&view=diff ============================================================================== --- lucene/dev/nightly/hudson-solr-3.x.sh (original) +++ lucene/dev/nightly/hudson-solr-3.x.sh Tue Feb 1 16:29:52 2011 @@ -2,10 +2,8 @@ . $WORKSPACE/nightly/hudson-settings.sh VERSION=3.1-$BUILD_ID -MAVEN_ARTIFACT_VERSION=3.1-SNAPSHOT mkdir -p $ARTIFACTS -mkdir -p $MAVEN_ARTIFACTS mkdir -p $JAVADOCS_ARTIFACTS cd $WORKSPACE/$SOLR_DIR @@ -30,17 +28,6 @@ JAVA_HOME=$JAVA_HOME_16 $ANT_HOME/bin/an mv -f dist/*.tgz dist/*.zip dist/*.war $ARTIFACTS mv -f build/docs/api/* $JAVADOCS_ARTIFACTS -set +e -JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/ant \ - -Dversion=$MAVEN_ARTIFACT_VERSION \ - -Dlucene_version=$MAVEN_ARTIFACT_VERSION \ - -Dsvnversion.exe=$SVNVERSION_EXE \ - clean generate-maven-artifacts - -# release it -mv -f dist/maven/* $MAVEN_ARTIFACTS -set -e - # just clean up lucene build to also instrument with clover: cd $WORKSPACE/$CORE_DIR $ANT_HOME/bin/ant clean Modified: lucene/dev/nightly/hudson-solr-trunk.sh URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-solr-trunk.sh?rev=1066084&r1=1066083&r2=1066084&view=diff ============================================================================== --- lucene/dev/nightly/hudson-solr-trunk.sh (original) +++ lucene/dev/nightly/hudson-solr-trunk.sh Tue Feb 1 16:29:52 2011 @@ -2,10 +2,8 @@ . $WORKSPACE/nightly/hudson-settings.sh VERSION=4.0-$BUILD_ID -MAVEN_ARTIFACT_VERSION=4.0-SNAPSHOT mkdir -p $ARTIFACTS -mkdir -p $MAVEN_ARTIFACTS mkdir -p $JAVADOCS_ARTIFACTS cd $WORKSPACE/$SOLR_DIR @@ -26,17 +24,6 @@ $ANT_HOME/bin/ant \ mv -f dist/*.tgz dist/*.zip dist/*.war $ARTIFACTS mv -f build/docs/api/* $JAVADOCS_ARTIFACTS -set +e -$ANT_HOME/bin/ant \ - -Dversion=$MAVEN_ARTIFACT_VERSION \ - -Dlucene_version=$MAVEN_ARTIFACT_VERSION \ - -Dsvnversion.exe=$SVNVERSION_EXE \ - clean generate-maven-artifacts - -# release it -mv -f dist/maven/* $MAVEN_ARTIFACTS -set -e - # just clean up lucene build to also instrument with clover: cd $WORKSPACE/$CORE_DIR $ANT_HOME/bin/ant clean From chelsea50@example.com Tue Feb 01 16:38:20 2011 Return-Path: <chelsea50@example.com> Delivered-To: chelsea50@example.com Received: (qmail 52610 invoked from network); 1 Feb 2011 16:38:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Feb 2011 16:38:20 -0000 Received: (qmail 14631 invoked by uid 500); 1 Feb 2011 16:38:18 -0000 Mailing-List: contact chelsea50@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:chelsea50@example.com> List-Unsubscribe: <mailto:chelsea50@example.com> List-Post: <mailto:chelsea50@example.com> List-Id: <commits.lucene.apache.org> Reply-To: chelsea50@example.com Delivered-To: mailing list chelsea50@example.com Received: (qmail 14624 invoked by uid 99); 1 Feb 2011 16:38:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Feb 2011 16:38:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Feb 2011 16:38:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3ACDE23888D2; Tue, 1 Feb 2011 16:37:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1066086 - /lucene/dev/nightly/common-maven.sh Date: Tue, 01 Feb 2011 16:37:57 -0000 To: chelsea50@example.com From: chelsea50@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <chelsea50@example.com> Author: sarowe Date: Tue Feb 1 16:37:56 2011 New Revision: 1066086 URL: http://svn.apache.org/viewvc?rev=1066086&view=rev Log: remove previous Lucene/Solr artifacts from the maven local repository before generating maven artifacts (previously the entire maven local repository was being removed in hudson-settings.sh Modified: lucene/dev/nightly/common-maven.sh Modified: lucene/dev/nightly/common-maven.sh URL: http://svn.apache.org/viewvc/lucene/dev/nightly/common-maven.sh?rev=1066086&r1=1066085&r2=1066086&view=diff ============================================================================== --- lucene/dev/nightly/common-maven.sh (original) +++ lucene/dev/nightly/common-maven.sh Tue Feb 1 16:37:56 2011 @@ -4,7 +4,10 @@ MAVEN_ARTIFACTS=$WORKSPACE/maven_artifacts export M2_HOME=$HOME/tools/maven/latest2.2 -mkdir -p $MAVEN_ARTIFACTS/org/apache +echo ">>> Removing Lucene/Solr artifacts from ~/.m2/repository/" +rm -rf $HOME/.m2/repository/org/apache/lucene +rm -rf $HOME/.m2/repository/org/apache/solr +echo ">>> Done removing Lucene/Solr artifacts from ~/.m2/repository/" cd $WORKSPACE/$ROOT_DIR @@ -16,11 +19,6 @@ $ANT_HOME/bin/ant \ generate-maven-artifacts echo ">>> Done generating the Maven snapshot artifacts" -echo ">>> Removing Lucene/Solr artifacts from ~/.m2/repository/" -rm -rf $HOME/.m2/repository/org/apache/lucene -rm -rf $HOME/.m2/repository/org/apache/solr -echo ">>> Done removing Lucene/Solr artifacts from ~/.m2/repository/" - echo ">>> Installing non-mavenized deps into the maven local repo" $M2_HOME/bin/mvn --batch-mode --non-recursive -Pbootstrap install echo ">>> Done installing non-mavenized deps into the maven local repo" @@ -28,3 +26,5 @@ echo ">>> Done installing non-mavenized echo ">>> Running the Maven build" $M2_HOME/bin/mvn --batch-mode --fail-at-end clean install echo ">>> Done running the Maven build" + +mkdir -p $MAVEN_ARTIFACTS/org/apache From chelsea50@example.com Tue Feb 01 18:16:29 2011 Return-Path: <chelsea50@example.com> Delivered-To: chelsea50@example.com Received: (qmail 6373 invoked from network); 1 Feb 2011 18:16:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Feb 2011 18:16:29 -0000 Received: (qmail 15106 invoked by uid 500); 1 Feb 2011 18:16:27 -0000 Mailing-List: contact chelsea50@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:chelsea50@example.com> List-Unsubscribe: <mailto:chelsea50@example.com> List-Post: <mailto:chelsea50@example.com> List-Id: <commits.lucene.apache.org> Reply-To: chelsea50@example.com Delivered-To: mailing list chelsea50@example.com Received: (qmail 15099 invoked by uid 99); 1 Feb 2011 18:16:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Feb 2011 18:16:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Feb 2011 18:16:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 89A5323888CD; Tue, 1 Feb 2011 18:16:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1066113 - /lucene/dev/branches/branch_3x/build.xml Date: Tue, 01 Feb 2011 18:16:03 -0000 To: chelsea50@example.com From: chelsea50@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <chelsea50@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: sarowe Date: Tue Feb 1 18:16:03 2011 New Revision: 1066113 URL: http://svn.apache.org/viewvc?rev=1066113&view=rev Log: make generate-maven-artifacts at the top level populate top-level dist/maven/ instead of two separate dist/maven/ dirs under lucene/ and solr/ Modified: lucene/dev/branches/branch_3x/build.xml Modified: lucene/dev/branches/branch_3x/build.xml URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/build.xml?rev=1066113&r1=1066112&r2=1066113&view=diff ============================================================================== --- lucene/dev/branches/branch_3x/build.xml (original) +++ lucene/dev/branches/branch_3x/build.xml Tue Feb 1 18:16:03 2011 @@ -52,12 +52,13 @@ </target> <target name="generate-maven-artifacts" description="Generate Maven Artifacts for Lucene and Solr"> + <property name="maven.dist.dir" location="dist/maven" /> + <mkdir dir="${maven.dist.dir}" /> + <sequential> <subant target="generate-maven-artifacts" inheritall="false" failonerror="true"> + <property name="maven.dist.dir" location="${maven.dist.dir}" /> <fileset dir="lucene" includes="build.xml" /> - </subant> - - <subant target="generate-maven-artifacts" inheritall="false" failonerror="true"> <fileset dir="solr" includes="build.xml" /> </subant> </sequential> From chelsea50@example.com Tue Feb 01 18:23:01 2011 Return-Path: <chelsea50@example.com> Delivered-To: chelsea50@example.com Received: (qmail 8571 invoked from network); 1 Feb 2011 18:23:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Feb 2011 18:23:01 -0000 Received: (qmail 29263 invoked by uid 500); 1 Feb 2011 18:23:00 -0000 Mailing-List: contact chelsea50@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:chelsea50@example.com> List-Unsubscribe: <mailto:chelsea50@example.com> List-Post: <mailto:chelsea50@example.com> List-Id: <commits.lucene.apache.org> Reply-To: chelsea50@example.com Delivered-To: mailing list chelsea50@example.com Received: (qmail 29251 invoked by uid 99); 1 Feb 2011 18:22:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Feb 2011 18:22:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Feb 2011 18:22:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3A62F23888D2; Tue, 1 Feb 2011 18:22:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1066116 - in /lucene/dev/nightly: common-maven.sh hudson-lucene-solr-maven-3.x.sh hudson-lucene-solr-maven-trunk.sh Date: Tue, 01 Feb 2011 18:22:36 -0000 To: chelsea50@example.com From: chelsea50@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <chelsea50@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: sarowe Date: Tue Feb 1 18:22:35 2011 New Revision: 1066116 URL: http://svn.apache.org/viewvc?rev=1066116&view=rev Log: since top-level 3.x generate-maven-artifacts now populates the same top-level dist/maven/ dir as trunk does, the maven artifact move can now be done in common-maven.sh rather than separately in the trunk and 3.x maven builds Modified: lucene/dev/nightly/common-maven.sh lucene/dev/nightly/hudson-lucene-solr-maven-3.x.sh lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh Modified: lucene/dev/nightly/common-maven.sh URL: http://svn.apache.org/viewvc/lucene/dev/nightly/common-maven.sh?rev=1066116&r1=1066115&r2=1066116&view=diff ============================================================================== --- lucene/dev/nightly/common-maven.sh (original) +++ lucene/dev/nightly/common-maven.sh Tue Feb 1 18:22:35 2011 @@ -27,4 +27,7 @@ echo ">>> Running the Maven build" $M2_HOME/bin/mvn --batch-mode --fail-at-end clean install echo ">>> Done running the Maven build" -mkdir -p $MAVEN_ARTIFACTS/org/apache +echo ">>> Moving Maven artifacts to $MAVEN_ARTIFACTS" +mkdir -p $MAVEN_ARTIFACTS +mv -f $WORKSPACE/$ROOT_DIR/dist/maven/* $MAVEN_ARTIFACTS/ +echo ">>> Done moving Maven Artifacts" Modified: lucene/dev/nightly/hudson-lucene-solr-maven-3.x.sh URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-lucene-solr-maven-3.x.sh?rev=1066116&r1=1066115&r2=1066116&view=diff ============================================================================== --- lucene/dev/nightly/hudson-lucene-solr-maven-3.x.sh (original) +++ lucene/dev/nightly/hudson-lucene-solr-maven-3.x.sh Tue Feb 1 18:22:35 2011 @@ -7,10 +7,3 @@ MAVEN_ARTIFACT_VERSION=3.1-SNAPSHOT export JAVA_HOME=$JAVA_HOME_15 . $WORKSPACE/nightly/common-maven.sh - -echo ">>> Moving Maven artifacts to $MAVEN_ARTIFACTS" -mv -f $WORKSPACE/$CORE_DIR/dist/maven/org/apache/lucene \ - $MAVEN_ARTIFACTS/org/apache -mv -f $WORKSPACE/$SOLR_DIR/dist/maven/org/apache/solr \ - $MAVEN_ARTIFACTS/org/apache -echo ">>> Done moving Maven Artifacts" Modified: lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh?rev=1066116&r1=1066115&r2=1066116&view=diff ============================================================================== --- lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh (original) +++ lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh Tue Feb 1 18:22:35 2011 @@ -10,9 +10,4 @@ echo ">>> Ignoring BasicDistributedZkTes perl -pi.bak -e 's/(?=public class BasicDistributedZkTest)/import org.junit.Ignore;\n\@Ignore\n/;'\ solr/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java -. $WORKSPACE/nightly/common-maven.sh - -echo ">>> Moving Maven artifacts to $MAVEN_ARTIFACTS" -mv -f $WORKSPACE/$ROOT_DIR/dist/maven/org/apache/* \ - $MAVEN_ARTIFACTS/org/apache -echo ">>> Done moving Maven Artifacts" +. $WORKSPACE/nightly/common-maven.sh \ No newline at end of file From chelsea50@example.com Tue Feb 01 23:02:29 2011 Return-Path: <chelsea50@example.com> Delivered-To: chelsea50@example.com Received: (qmail 80424 invoked from network); 1 Feb 2011 23:02:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Feb 2011 23:02:29 -0000 Received: (qmail 83194 invoked by uid 500); 1 Feb 2011 23:02:28 -0000 Mailing-List: contact chelsea50@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:chelsea50@example.com> List-Unsubscribe: <mailto:chelsea50@example.com> List-Post: <mailto:chelsea50@example.com> List-Id: <commits.lucene.apache.org> Reply-To: chelsea50@example.com Delivered-To: mailing list chelsea50@example.com Received: (qmail 83173 invoked by uid 99); 1 Feb 2011 23:02:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Feb 2011 23:02:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Feb 2011 23:02:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8E4E723888CF; Tue, 1 Feb 2011 23:02:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1066258 - /lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh Date: Tue, 01 Feb 2011 23:02:06 -0000 To: chelsea50@example.com From: chelsea50@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <chelsea50@example.com> Author: sarowe Date: Tue Feb 1 23:02:06 2011 New Revision: 1066258 URL: http://svn.apache.org/viewvc?rev=1066258&view=rev Log: fix path to BasicDistributedZkTest.java Modified: lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh Modified: lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh?rev=1066258&r1=1066257&r2=1066258&view=diff ============================================================================== --- lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh (original) +++ lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh Tue Feb 1 23:02:06 2011 @@ -8,6 +8,6 @@ export JAVA_HOME=$JAVA_HOME_16 echo ">>> Ignoring BasicDistributedZkTest, which always fails on Hudson trunk under Maven" perl -pi.bak -e 's/(?=public class BasicDistributedZkTest)/import org.junit.Ignore;\n\@Ignore\n/;'\ - solr/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java + $SOLR_DIR/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java . $WORKSPACE/nightly/common-maven.sh \ No newline at end of file From chelsea50@example.com Wed Feb 02 16:23:17 2011 Return-Path: <chelsea50@example.com> Delivered-To: chelsea50@example.com Received: (qmail 60673 invoked from network); 2 Feb 2011 16:23:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Feb 2011 16:23:17 -0000 Received: (qmail 42892 invoked by uid 500); 2 Feb 2011 16:23:14 -0000 Mailing-List: contact chelsea50@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:chelsea50@example.com> List-Unsubscribe: <mailto:chelsea50@example.com> List-Post: <mailto:chelsea50@example.com> List-Id: <commits.lucene.apache.org> Reply-To: chelsea50@example.com Delivered-To: mailing list chelsea50@example.com Received: (qmail 42884 invoked by uid 99); 2 Feb 2011 16:23:13 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Feb 2011 16:23:13 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Feb 2011 16:23:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C75832388906; Wed, 2 Feb 2011 16:22:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1066515 - in /lucene/dev/trunk/solr/src/java/org/apache/solr/search: DocSet.java SortedIntDocSet.java Date: Wed, 02 Feb 2011 16:22:51 -0000 To: chelsea50@example.com From: chelsea50@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <chelsea50@example.com> Author: yonik Date: Wed Feb 2 16:22:51 2011 New Revision: 1066515 URL: http://svn.apache.org/viewvc?rev=1066515&view=rev Log: LUCENE-2831: remove unnecessary casts Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/search/DocSet.java lucene/dev/trunk/solr/src/java/org/apache/solr/search/SortedIntDocSet.java Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/search/DocSet.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/search/DocSet.java?rev=1066515&r1=1066514&r2=1066515&view=diff ============================================================================== --- lucene/dev/trunk/solr/src/java/org/apache/solr/search/DocSet.java (original) +++ lucene/dev/trunk/solr/src/java/org/apache/solr/search/DocSet.java Wed Feb 2 16:22:51 2011 @@ -248,9 +248,8 @@ abstract class DocSetBase implements Doc return new Filter() { @Override - public DocIdSet getDocIdSet(AtomicReaderContext ctx) throws IOException { - IndexReader.AtomicReaderContext context = (IndexReader.AtomicReaderContext)ctx; // TODO: remove after lucene migration - IndexReader reader = ctx.reader; + public DocIdSet getDocIdSet(AtomicReaderContext context) throws IOException { + IndexReader reader = context.reader; if (context.isTopLevel) { return bs; Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/search/SortedIntDocSet.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/search/SortedIntDocSet.java?rev=1066515&r1=1066514&r2=1066515&view=diff ============================================================================== --- lucene/dev/trunk/solr/src/java/org/apache/solr/search/SortedIntDocSet.java (original) +++ lucene/dev/trunk/solr/src/java/org/apache/solr/search/SortedIntDocSet.java Wed Feb 2 16:22:51 2011 @@ -552,8 +552,7 @@ public class SortedIntDocSet extends Doc int lastEndIdx = 0; @Override - public DocIdSet getDocIdSet(AtomicReaderContext contextX) throws IOException { - AtomicReaderContext context = (AtomicReaderContext)contextX; // TODO: remove after lucene migration + public DocIdSet getDocIdSet(AtomicReaderContext context) throws IOException { IndexReader reader = context.reader; final int base = context.docBase; From chelsea50@example.com Wed Feb 02 20:32:23 2011 Return-Path: <chelsea50@example.com> Delivered-To: chelsea50@example.com Received: (qmail 61267 invoked from network); 2 Feb 2011 20:32:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Feb 2011 20:32:16 -0000 Received: (qmail 7237 invoked by uid 500); 2 Feb 2011 20:32:15 -0000 Mailing-List: contact chelsea50@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:chelsea50@example.com> List-Unsubscribe: <mailto:chelsea50@example.com> List-Post: <mailto:chelsea50@example.com> List-Id: <commits.lucene.apache.org> Reply-To: chelsea50@example.com Delivered-To: mailing list chelsea50@example.com Received: (qmail 7230 invoked by uid 99); 2 Feb 2011 20:32:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Feb 2011 20:32:15 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Feb 2011 20:32:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9BE6D23889E3; Wed, 2 Feb 2011 20:31:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1066615 - in /lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/pfordelta: FrameOfRefCodec.java PatchedFrameOfRefCodec.java Date: Wed, 02 Feb 2011 20:31:54 -0000 To: chelsea50@example.com From: chelsea50@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <chelsea50@example.com> Author: rmuir Date: Wed Feb 2 20:31:54 2011 New Revision: 1066615 URL: http://svn.apache.org/viewvc?rev=1066615&view=rev Log: cut over for/pfor to variable gap terms index Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/pfordelta/FrameOfRefCodec.java lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/pfordelta/PatchedFrameOfRefCodec.java Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/pfordelta/FrameOfRefCodec.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/pfordelta/FrameOfRefCodec.java?rev=1066615&r1=1066614&r2=1066615&view=diff ============================================================================== --- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/pfordelta/FrameOfRefCodec.java (original) +++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/pfordelta/FrameOfRefCodec.java Wed Feb 2 20:31:54 2011 @@ -37,8 +37,8 @@ import org.apache.lucene.index.codecs.Te import org.apache.lucene.index.codecs.TermsIndexReaderBase; import org.apache.lucene.index.codecs.PostingsReaderBase; import org.apache.lucene.index.codecs.PostingsWriterBase; -import org.apache.lucene.index.codecs.FixedGapTermsIndexWriter; -import org.apache.lucene.index.codecs.FixedGapTermsIndexReader; +import org.apache.lucene.index.codecs.VariableGapTermsIndexReader; +import org.apache.lucene.index.codecs.VariableGapTermsIndexWriter; public class FrameOfRefCodec extends Codec { @@ -53,7 +53,7 @@ public class FrameOfRefCodec extends Cod boolean success = false; TermsIndexWriterBase indexWriter; try { - indexWriter = new FixedGapTermsIndexWriter(state); + indexWriter = new VariableGapTermsIndexWriter(state, new VariableGapTermsIndexWriter.EveryNTermSelector(state.termIndexInterval)); success = true; } finally { if (!success) { @@ -88,12 +88,11 @@ public class FrameOfRefCodec extends Cod TermsIndexReaderBase indexReader; boolean success = false; try { - indexReader = new FixedGapTermsIndexReader(state.dir, - state.fieldInfos, - state.segmentInfo.name, - state.termsIndexDivisor, - BytesRef.getUTF8SortedAsUnicodeComparator(), - state.codecId); + indexReader = new VariableGapTermsIndexReader(state.dir, + state.fieldInfos, + state.segmentInfo.name, + state.termsIndexDivisor, + state.codecId); success = true; } finally { if (!success) { @@ -129,13 +128,13 @@ public class FrameOfRefCodec extends Cod public void files(Directory dir, SegmentInfo segmentInfo, String id, Set<String> files) { SepPostingsReaderImpl.files(segmentInfo, id, files); BlockTermsReader.files(dir, segmentInfo, id, files); - FixedGapTermsIndexReader.files(dir, segmentInfo, id, files); + VariableGapTermsIndexReader.files(dir, segmentInfo, id, files); } @Override public void getExtensions(Set<String> extensions) { SepPostingsWriterImpl.getExtensions(extensions); BlockTermsReader.getExtensions(extensions); - FixedGapTermsIndexReader.getIndexExtensions(extensions); + VariableGapTermsIndexReader.getIndexExtensions(extensions); } } Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/pfordelta/PatchedFrameOfRefCodec.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/pfordelta/PatchedFrameOfRefCodec.java?rev=1066615&r1=1066614&r2=1066615&view=diff ============================================================================== --- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/pfordelta/PatchedFrameOfRefCodec.java (original) +++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/pfordelta/PatchedFrameOfRefCodec.java Wed Feb 2 20:31:54 2011 @@ -37,8 +37,8 @@ import org.apache.lucene.index.codecs.Te import org.apache.lucene.index.codecs.TermsIndexReaderBase; import org.apache.lucene.index.codecs.PostingsReaderBase; import org.apache.lucene.index.codecs.PostingsWriterBase; -import org.apache.lucene.index.codecs.FixedGapTermsIndexWriter; -import org.apache.lucene.index.codecs.FixedGapTermsIndexReader; +import org.apache.lucene.index.codecs.VariableGapTermsIndexReader; +import org.apache.lucene.index.codecs.VariableGapTermsIndexWriter; public class PatchedFrameOfRefCodec extends Codec { @@ -53,7 +53,7 @@ public class PatchedFrameOfRefCodec exte boolean success = false; TermsIndexWriterBase indexWriter; try { - indexWriter = new FixedGapTermsIndexWriter(state); + indexWriter = new VariableGapTermsIndexWriter(state, new VariableGapTermsIndexWriter.EveryNTermSelector(state.termIndexInterval)); success = true; } finally { if (!success) { @@ -88,12 +88,11 @@ public class PatchedFrameOfRefCodec exte TermsIndexReaderBase indexReader; boolean success = false; try { - indexReader = new FixedGapTermsIndexReader(state.dir, - state.fieldInfos, - state.segmentInfo.name, - state.termsIndexDivisor, - BytesRef.getUTF8SortedAsUnicodeComparator(), - state.codecId); + indexReader = new VariableGapTermsIndexReader(state.dir, + state.fieldInfos, + state.segmentInfo.name, + state.termsIndexDivisor, + state.codecId); success = true; } finally { if (!success) { @@ -129,13 +128,13 @@ public class PatchedFrameOfRefCodec exte public void files(Directory dir, SegmentInfo segmentInfo, String id, Set<String> files) { SepPostingsReaderImpl.files(segmentInfo, id, files); BlockTermsReader.files(dir, segmentInfo, id, files); - FixedGapTermsIndexReader.files(dir, segmentInfo, id, files); + VariableGapTermsIndexReader.files(dir, segmentInfo, id, files); } @Override public void getExtensions(Set<String> extensions) { SepPostingsWriterImpl.getExtensions(extensions); BlockTermsReader.getExtensions(extensions); - FixedGapTermsIndexReader.getIndexExtensions(extensions); + VariableGapTermsIndexReader.getIndexExtensions(extensions); } } From chelsea50@example.com Wed Feb 02 20:32:31 2011 Return-Path: <chelsea50@example.com> Delivered-To: chelsea50@example.com Received: (qmail 61969 invoked from network); 2 Feb 2011 20:32:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Feb 2011 20:32:31 -0000 Received: (qmail 7353 invoked by uid 500); 2 Feb 2011 20:32:30 -0000 Mailing-List: contact chelsea50@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:chelsea50@example.com> List-Unsubscribe: <mailto:chelsea50@example.com> List-Post: <mailto:chelsea50@example.com> List-Id: <commits.lucene.apache.org> Reply-To: chelsea50@example.com Delivered-To: mailing list chelsea50@example.com Received: (qmail 7346 invoked by uid 99); 2 Feb 2011 20:32:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Feb 2011 20:32:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Feb 2011 20:32:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2BABF23889E9; Wed, 2 Feb 2011 20:32:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1066616 - /lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/pfordelta2/PForDeltaFixedIntBlockCodec.java Date: Wed, 02 Feb 2011 20:32:07 -0000 To: chelsea50@example.com From: chelsea50@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <chelsea50@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: rmuir Date: Wed Feb 2 20:32:06 2011 New Revision: 1066616 URL: http://svn.apache.org/viewvc?rev=1066616&view=rev Log: cut over pfor2 to variable gap terms index Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/pfordelta2/PForDeltaFixedIntBlockCodec.java Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/pfordelta2/PForDeltaFixedIntBlockCodec.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/pfordelta2/PForDeltaFixedIntBlockCodec.java?rev=1066616&r1=1066615&r2=1066616&view=diff ============================================================================== --- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/pfordelta2/PForDeltaFixedIntBlockCodec.java (original) +++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/pfordelta2/PForDeltaFixedIntBlockCodec.java Wed Feb 2 20:32:06 2011 @@ -34,14 +34,14 @@ import org.apache.lucene.index.codecs.se import org.apache.lucene.index.codecs.sep.SepPostingsWriterImpl; import org.apache.lucene.index.codecs.intblock.FixedIntBlockIndexInput; import org.apache.lucene.index.codecs.intblock.FixedIntBlockIndexOutput; -import org.apache.lucene.index.codecs.FixedGapTermsIndexReader; -import org.apache.lucene.index.codecs.FixedGapTermsIndexWriter; import org.apache.lucene.index.codecs.PostingsWriterBase; import org.apache.lucene.index.codecs.PostingsReaderBase; import org.apache.lucene.index.codecs.BlockTermsReader; import org.apache.lucene.index.codecs.BlockTermsWriter; import org.apache.lucene.index.codecs.TermsIndexReaderBase; import org.apache.lucene.index.codecs.TermsIndexWriterBase; +import org.apache.lucene.index.codecs.VariableGapTermsIndexReader; +import org.apache.lucene.index.codecs.VariableGapTermsIndexWriter; import org.apache.lucene.index.codecs.standard.StandardCodec; import org.apache.lucene.store.*; import org.apache.lucene.util.BytesRef; @@ -169,7 +169,7 @@ public class PForDeltaFixedIntBlockCodec boolean success = false; TermsIndexWriterBase indexWriter; try { - indexWriter = new FixedGapTermsIndexWriter(state); + indexWriter = new VariableGapTermsIndexWriter(state, new VariableGapTermsIndexWriter.EveryNTermSelector(state.termIndexInterval)); success = true; } finally { if (!success) { @@ -203,11 +203,11 @@ public class PForDeltaFixedIntBlockCodec TermsIndexReaderBase indexReader; boolean success = false; try { - indexReader = new FixedGapTermsIndexReader(state.dir, - state.fieldInfos, - state.segmentInfo.name, - state.termsIndexDivisor, - BytesRef.getUTF8SortedAsUnicodeComparator(), state.codecId); + indexReader = new VariableGapTermsIndexReader(state.dir, + state.fieldInfos, + state.segmentInfo.name, + state.termsIndexDivisor, + state.codecId); success = true; } finally { if (!success) { @@ -243,13 +243,13 @@ public class PForDeltaFixedIntBlockCodec public void files(Directory dir, SegmentInfo segmentInfo, String codecId, Set<String> files) { SepPostingsReaderImpl.files(segmentInfo, codecId, files); BlockTermsReader.files(dir, segmentInfo, codecId, files); - FixedGapTermsIndexReader.files(dir, segmentInfo, codecId, files); + VariableGapTermsIndexReader.files(dir, segmentInfo, codecId, files); } @Override public void getExtensions(Set<String> extensions) { SepPostingsWriterImpl.getExtensions(extensions); BlockTermsReader.getExtensions(extensions); - FixedGapTermsIndexReader.getIndexExtensions(extensions); + VariableGapTermsIndexReader.getIndexExtensions(extensions); } } From chelsea50@example.com Wed Feb 02 20:33:05 2011 Return-Path: <chelsea50@example.com> Delivered-To: chelsea50@example.com Received: (qmail 62303 invoked from network); 2 Feb 2011 20:33:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Feb 2011 20:33:05 -0000 Received: (qmail 9273 invoked by uid 500); 2 Feb 2011 20:33:05 -0000 Mailing-List: contact chelsea50@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:chelsea50@example.com> List-Unsubscribe: <mailto:chelsea50@example.com> List-Post: <mailto:chelsea50@example.com> List-Id: <commits.lucene.apache.org> Reply-To: chelsea50@example.com Delivered-To: mailing list chelsea50@example.com Received: (qmail 9266 invoked by uid 99); 2 Feb 2011 20:33:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Feb 2011 20:33:05 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Feb 2011 20:33:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AFBE223889E3; Wed, 2 Feb 2011 20:32:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1066617 - /lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/codecs/pfordelta/TestPForDelta.java Date: Wed, 02 Feb 2011 20:32:44 -0000 To: chelsea50@example.com From: chelsea50@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <chelsea50@example.com> Author: rmuir Date: Wed Feb 2 20:32:44 2011 New Revision: 1066617 URL: http://svn.apache.org/viewvc?rev=1066617&view=rev Log: fix sneaky off-by-one: the test data could lie on a block boundary Modified: lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/codecs/pfordelta/TestPForDelta.java Modified: lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/codecs/pfordelta/TestPForDelta.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/codecs/pfordelta/TestPForDelta.java?rev=1066617&r1=1066616&r2=1066617&view=diff ============================================================================== --- lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/codecs/pfordelta/TestPForDelta.java (original) +++ lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/codecs/pfordelta/TestPForDelta.java Wed Feb 2 20:32:44 2011 @@ -61,12 +61,12 @@ public class TestPForDelta extends Lucen assertTrue(pointerMax > 0); for(int i=0;i<testDataSize;i++) { - assertEquals(testData[i], buffer[pointer++]); if (pointer == pointerMax) { pointerMax = r.fill(); assertTrue(pointerMax > 0); pointer = 0; } + assertEquals(testData[i], buffer[pointer++]); } in.close(); dir.close(); From chelsea50@example.com Wed Feb 02 20:33:27 2011 Return-Path: <chelsea50@example.com> Delivered-To: chelsea50@example.com Received: (qmail 62394 invoked from network); 2 Feb 2011 20:33:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Feb 2011 20:33:26 -0000 Received: (qmail 9428 invoked by uid 500); 2 Feb 2011 20:33:26 -0000 Mailing-List: contact chelsea50@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:chelsea50@example.com> List-Unsubscribe: <mailto:chelsea50@example.com> List-Post: <mailto:chelsea50@example.com> List-Id: <commits.lucene.apache.org> Reply-To: chelsea50@example.com Delivered-To: mailing list chelsea50@example.com Received: (qmail 9421 invoked by uid 99); 2 Feb 2011 20:33:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Feb 2011 20:33:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Feb 2011 20:33:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A9C0F2388A66; Wed, 2 Feb 2011 20:33:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1066618 - /lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/codecs/pfordelta2/TestPForDelta2.java Date: Wed, 02 Feb 2011 20:33:03 -0000 To: chelsea50@example.com From: chelsea50@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <chelsea50@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: rmuir Date: Wed Feb 2 20:33:03 2011 New Revision: 1066618 URL: http://svn.apache.org/viewvc?rev=1066618&view=rev Log: fix sneaky off-by-one: the test data could lie on a block boundary Modified: lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/codecs/pfordelta2/TestPForDelta2.java Modified: lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/codecs/pfordelta2/TestPForDelta2.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/codecs/pfordelta2/TestPForDelta2.java?rev=1066618&r1=1066617&r2=1066618&view=diff ============================================================================== --- lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/codecs/pfordelta2/TestPForDelta2.java (original) +++ lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/codecs/pfordelta2/TestPForDelta2.java Wed Feb 2 20:33:03 2011 @@ -63,14 +63,14 @@ public class TestPForDelta2 extends Luce assertTrue(pointerMax > 0); for(int i=0;i<testDataSize;i++) { - final int expected = testData[i]; - final int actual = buffer[pointer++]; - assertEquals(actual + " != " + expected, expected, actual); if (pointer == pointerMax) { pointerMax = r.fill(); assertTrue(pointerMax > 0); pointer = 0; } + final int expected = testData[i]; + final int actual = buffer[pointer++]; + assertEquals(actual + " != " + expected, expected, actual); } in.close(); dir.close(); From chelsea50@example.com Wed Feb 02 22:34:38 2011 Return-Path: <chelsea50@example.com> Delivered-To: chelsea50@example.com Received: (qmail 51014 invoked from network); 2 Feb 2011 22:34:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Feb 2011 22:34:38 -0000 Received: (qmail 50520 invoked by uid 500); 2 Feb 2011 22:34:37 -0000 Mailing-List: contact chelsea50@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:chelsea50@example.com> List-Unsubscribe: <mailto:chelsea50@example.com> List-Post: <mailto:chelsea50@example.com> List-Id: <commits.lucene.apache.org> Reply-To: chelsea50@example.com Delivered-To: mailing list chelsea50@example.com Received: (qmail 50508 invoked by uid 99); 2 Feb 2011 22:34:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Feb 2011 22:34:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Feb 2011 22:34:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C45EE23889CB; Wed, 2 Feb 2011 22:34:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1066669 - in /lucene/dev/trunk: lucene/src/java/org/apache/lucene/search/IndexSearcher.java solr/src/java/org/apache/solr/search/function/QueryValueSource.java Date: Wed, 02 Feb 2011 22:34:15 -0000 To: chelsea50@example.com From: chelsea50@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <chelsea50@example.com> Author: simonw Date: Wed Feb 2 22:34:15 2011 New Revision: 1066669 URL: http://svn.apache.org/viewvc?rev=1066669&view=rev Log: LUCENE-2831: Use leaf reader slices for parallel execution instead of SubSearcher instances. Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/IndexSearcher.java lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/QueryValueSource.java Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/IndexSearcher.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/IndexSearcher.java?rev=1066669&r1=1066668&r2=1066669&view=diff ============================================================================== --- lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/IndexSearcher.java (original) +++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/IndexSearcher.java Wed Feb 2 22:34:15 2011 @@ -65,10 +65,11 @@ public class IndexSearcher { // in the next release protected final ReaderContext readerContext; protected final AtomicReaderContext[] leafContexts; + // used with executor - each slice holds a set of leafs executed within one thread + protected final LeafSlice[] leafSlices; // These are only used for multi-threaded search private final ExecutorService executor; - protected final IndexSearcher[] subSearchers; // the default SimilarityProvider private static final SimilarityProvider defaultProvider = new DefaultSimilarity(); @@ -175,47 +176,22 @@ public class IndexSearcher { this.closeReader = closeReader; this.readerContext = context; leafContexts = ReaderUtil.leaves(context); - - if (executor == null) { - subSearchers = null; - } else { - subSearchers = new IndexSearcher[this.leafContexts.length]; - for (int i = 0; i < subSearchers.length; i++) { - if (leafContexts[i].reader == context.reader) { - subSearchers[i] = this; - } else { - subSearchers[i] = new IndexSearcher(context, leafContexts[i]); - } - } - } - } - - /** - * Expert: Creates a searcher from a top-level {@link ReaderContext} with and - * executes searches on the given leave slice exclusively instead of searching - * over all leaves. This constructor should be used to run one or more leaves - * within a single thread. Hence, for scorer and filter this looks like an - * ordinary search in the hierarchy such that there is no difference between - * single and multi-threaded. - * - * @lucene.experimental - * */ - public IndexSearcher(ReaderContext topLevel, AtomicReaderContext... leaves) { - assert assertLeaves(topLevel, leaves); - readerContext = topLevel; - reader = topLevel.reader; - leafContexts = leaves; - executor = null; - subSearchers = null; - closeReader = false; + this.leafSlices = executor == null ? null : slices(leafContexts); } - private boolean assertLeaves(ReaderContext topLevel, AtomicReaderContext... leaves) { - for (AtomicReaderContext leaf : leaves) { - assert ReaderUtil.getTopLevelContext(leaf) == topLevel : "leaf context is not a leaf of the given top-level context"; + /** + * Expert: Creates an array of leaf slices each holding a subset of the given leaves. + * Each {@link LeafSlice} is executed in a single thread. By default there + * will be one {@link LeafSlice} per leaf ({@link AtomicReaderContext}). + */ + protected LeafSlice[] slices(AtomicReaderContext...leaves) { + LeafSlice[] slices = new LeafSlice[leaves.length]; + for (int i = 0; i < slices.length; i++) { + slices[i] = new LeafSlice(leaves[i]); } - return true; + return slices; } + /** Return the {@link IndexReader} this searches. */ public IndexReader getIndexReader() { @@ -236,11 +212,11 @@ public class IndexSearcher { return reader.docFreq(term); } else { final ExecutionHelper<Integer> runner = new ExecutionHelper<Integer>(executor); - for(int i = 0; i < subSearchers.length; i++) { - final IndexSearcher searchable = subSearchers[i]; + for(int i = 0; i < leafContexts.length; i++) { + final IndexReader leaf = leafContexts[i].reader; runner.submit(new Callable<Integer>() { public Integer call() throws IOException { - return Integer.valueOf(searchable.docFreq(term)); + return Integer.valueOf(leaf.docFreq(term)); } }); } @@ -324,7 +300,7 @@ public class IndexSearcher { */ public void search(Query query, Filter filter, Collector results) throws IOException { - search(createWeight(query), filter, results); + search(leafContexts, createWeight(query), filter, results); } /** Lower-level search API. @@ -342,7 +318,7 @@ public class IndexSearcher { */ public void search(Query query, Collector results) throws IOException { - search(createWeight(query), null, results); + search(leafContexts, createWeight(query), null, results); } /** Search implementation with arbitrary sorting. Finds @@ -382,25 +358,16 @@ public class IndexSearcher { * @throws BooleanQuery.TooManyClauses */ protected TopDocs search(Weight weight, Filter filter, int nDocs) throws IOException { - if (executor == null) { - // single thread - int limit = reader.maxDoc(); - if (limit == 0) { - limit = 1; - } - nDocs = Math.min(nDocs, limit); - TopScoreDocCollector collector = TopScoreDocCollector.create(nDocs, !weight.scoresDocsOutOfOrder()); - search(weight, filter, collector); - return collector.topDocs(); + return search(leafContexts, weight, filter, nDocs); } else { final HitQueue hq = new HitQueue(nDocs, false); final Lock lock = new ReentrantLock(); final ExecutionHelper<TopDocs> runner = new ExecutionHelper<TopDocs>(executor); - for (int i = 0; i < subSearchers.length; i++) { // search each sub + for (int i = 0; i < leafSlices.length; i++) { // search each sub runner.submit( - new SearcherCallableNoSort(lock, subSearchers[i], weight, filter, nDocs, hq)); + new SearcherCallableNoSort(lock, this, leafSlices[i], weight, filter, nDocs, hq)); } int totalHits = 0; @@ -418,6 +385,25 @@ public class IndexSearcher { } } + /** Expert: Low-level search implementation. Finds the top <code>n</code> + * hits for <code>query</code>, using the given leaf readers applying <code>filter</code> if non-null. + * + * <p>Applications should usually call {@link IndexSearcher#search(Query,int)} or + * {@link IndexSearcher#search(Query,Filter,int)} instead. + * @throws BooleanQuery.TooManyClauses + */ + protected TopDocs search(AtomicReaderContext[] leaves, Weight weight, Filter filter, int nDocs) throws IOException { + // single thread + int limit = reader.maxDoc(); + if (limit == 0) { + limit = 1; + } + nDocs = Math.min(nDocs, limit); + TopScoreDocCollector collector = TopScoreDocCollector.create(nDocs, !weight.scoresDocsOutOfOrder()); + search(leaves, weight, filter, collector); + return collector.topDocs(); + } + /** Expert: Low-level search implementation with arbitrary sorting. Finds * the top <code>n</code> hits for <code>query</code>, applying * <code>filter</code> if non-null, and sorting the hits by the criteria in @@ -449,27 +435,18 @@ public class IndexSearcher { throws IOException { if (sort == null) throw new NullPointerException(); - + if (executor == null) { - // single thread - int limit = reader.maxDoc(); - if (limit == 0) { - limit = 1; - } - nDocs = Math.min(nDocs, limit); - - TopFieldCollector collector = TopFieldCollector.create(sort, nDocs, - fillFields, fieldSortDoTrackScores, fieldSortDoMaxScore, !weight.scoresDocsOutOfOrder()); - search(weight, filter, collector); - return (TopFieldDocs) collector.topDocs(); + // use all leaves here! + return search (leafContexts, weight, filter, nDocs, sort, fillFields); } else { // TODO: make this respect fillFields final FieldDocSortedHitQueue hq = new FieldDocSortedHitQueue(nDocs); final Lock lock = new ReentrantLock(); final ExecutionHelper<TopFieldDocs> runner = new ExecutionHelper<TopFieldDocs>(executor); - for (int i = 0; i < subSearchers.length; i++) { // search each sub + for (int i = 0; i < leafSlices.length; i++) { // search each leaf slice runner.submit( - new SearcherCallableWithSort(lock, subSearchers[i], weight, filter, nDocs, hq, sort)); + new SearcherCallableWithSort(lock, this, leafSlices[i], weight, filter, nDocs, hq, sort)); } int totalHits = 0; float maxScore = Float.NEGATIVE_INFINITY; @@ -484,6 +461,33 @@ public class IndexSearcher { return new TopFieldDocs(totalHits, scoreDocs, hq.getFields(), maxScore); } } + + + /** + * Just like {@link #search(Weight, Filter, int, Sort)}, but you choose + * whether or not the fields in the returned {@link FieldDoc} instances should + * be set by specifying fillFields. + * + * <p>NOTE: this does not compute scores by default. If you + * need scores, create a {@link TopFieldCollector} + * instance by calling {@link TopFieldCollector#create} and + * then pass that to {@link #search(Weight, Filter, + * Collector)}.</p> + */ + protected TopFieldDocs search(AtomicReaderContext[] leaves, Weight weight, Filter filter, int nDocs, + Sort sort, boolean fillFields) throws IOException { + // single thread + int limit = reader.maxDoc(); + if (limit == 0) { + limit = 1; + } + nDocs = Math.min(nDocs, limit); + + TopFieldCollector collector = TopFieldCollector.create(sort, nDocs, + fillFields, fieldSortDoTrackScores, fieldSortDoMaxScore, !weight.scoresDocsOutOfOrder()); + search(leaves, weight, filter, collector); + return (TopFieldDocs) collector.topDocs(); + } /** * Lower-level search API. @@ -497,6 +501,12 @@ public class IndexSearcher { * documents. The high-level search API ({@link IndexSearcher#search(Query,int)}) is * usually more efficient, as it skips non-high-scoring hits. * + * <p> + * NOTE: this method executes the searches on all given leaves exclusively. + * To search across all the searchers leaves use {@link #leafContexts}. + * + * @param leaves + * the searchers leaves to execute the searches on * @param weight * to match documents * @param filter @@ -505,7 +515,7 @@ public class IndexSearcher { * to receive hits * @throws BooleanQuery.TooManyClauses */ - protected void search(Weight weight, Filter filter, Collector collector) + protected void search(AtomicReaderContext[] leaves, Weight weight, Filter filter, Collector collector) throws IOException { // TODO: should we make this @@ -513,18 +523,18 @@ public class IndexSearcher { ScorerContext scorerContext = ScorerContext.def().scoreDocsInOrder(true).topScorer(true); // always use single thread: if (filter == null) { - for (int i = 0; i < leafContexts.length; i++) { // search each subreader - collector.setNextReader(leafContexts[i]); + for (int i = 0; i < leaves.length; i++) { // search each subreader + collector.setNextReader(leaves[i]); scorerContext = scorerContext.scoreDocsInOrder(!collector.acceptsDocsOutOfOrder()); - Scorer scorer = weight.scorer(leafContexts[i], scorerContext); + Scorer scorer = weight.scorer(leaves[i], scorerContext); if (scorer != null) { scorer.score(collector); } } } else { - for (int i = 0; i < leafContexts.length; i++) { // search each subreader - collector.setNextReader(leafContexts[i]); - searchWithFilter(leafContexts[i], weight, filter, collector); + for (int i = 0; i < leaves.length; i++) { // search each subreader + collector.setNextReader(leaves[i]); + searchWithFilter(leaves[i], weight, filter, collector); } } } @@ -649,7 +659,7 @@ public class IndexSearcher { * Returns this searchers the top-level {@link ReaderContext}. * @see IndexReader#getTopReaderContext() */ - /* Sugar for .getIndexReader().getTopReaderContext() */ + /* sugar for #getReader().getTopReaderContext() */ public ReaderContext getTopReaderContext() { return readerContext; } @@ -660,24 +670,26 @@ public class IndexSearcher { private static final class SearcherCallableNoSort implements Callable<TopDocs> { private final Lock lock; - private final IndexSearcher searchable; + private final IndexSearcher searcher; private final Weight weight; private final Filter filter; private final int nDocs; private final HitQueue hq; + private final LeafSlice slice; - public SearcherCallableNoSort(Lock lock, IndexSearcher searchable, Weight weight, + public SearcherCallableNoSort(Lock lock, IndexSearcher searcher, LeafSlice slice, Weight weight, Filter filter, int nDocs, HitQueue hq) { this.lock = lock; - this.searchable = searchable; + this.searcher = searcher; this.weight = weight; this.filter = filter; this.nDocs = nDocs; this.hq = hq; + this.slice = slice; } public TopDocs call() throws IOException { - final TopDocs docs = searchable.search (weight, filter, nDocs); + final TopDocs docs = searcher.search (slice.leaves, weight, filter, nDocs); final ScoreDoc[] scoreDocs = docs.scoreDocs; for (int j = 0; j < scoreDocs.length; j++) { // merge scoreDocs into hq final ScoreDoc scoreDoc = scoreDocs[j]; @@ -701,26 +713,28 @@ public class IndexSearcher { private static final class SearcherCallableWithSort implements Callable<TopFieldDocs> { private final Lock lock; - private final IndexSearcher searchable; + private final IndexSearcher searcher; private final Weight weight; private final Filter filter; private final int nDocs; private final FieldDocSortedHitQueue hq; private final Sort sort; + private final LeafSlice slice; - public SearcherCallableWithSort(Lock lock, IndexSearcher searchable, Weight weight, + public SearcherCallableWithSort(Lock lock, IndexSearcher searcher, LeafSlice slice, Weight weight, Filter filter, int nDocs, FieldDocSortedHitQueue hq, Sort sort) { this.lock = lock; - this.searchable = searchable; + this.searcher = searcher; this.weight = weight; this.filter = filter; this.nDocs = nDocs; this.hq = hq; this.sort = sort; + this.slice = slice; } public TopFieldDocs call() throws IOException { - final TopFieldDocs docs = searchable.search (weight, filter, nDocs, sort); + final TopFieldDocs docs = searcher.search (slice.leaves, weight, filter, nDocs, sort, true); lock.lock(); try { hq.setFields(docs.fields); @@ -791,4 +805,18 @@ public class IndexSearcher { return this; } } + + /** + * A class holding a subset of the {@link IndexSearcher}s leaf contexts to be + * executed within a single thread. + * + * @lucene.experimental + */ + public static class LeafSlice { + final AtomicReaderContext[] leaves; + + public LeafSlice(AtomicReaderContext...leaves) { + this.leaves = leaves; + } + } } Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/QueryValueSource.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/QueryValueSource.java?rev=1066669&r1=1066668&r2=1066669&view=diff ============================================================================== --- lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/QueryValueSource.java (original) +++ lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/QueryValueSource.java Wed Feb 2 22:34:15 2011 @@ -100,11 +100,11 @@ class QueryDocValues extends DocValues { if (w == null) { IndexSearcher weightSearcher; if(fcontext == null) { - weightSearcher = new IndexSearcher(ReaderUtil.getTopLevelContext(readerContext), readerContext); + weightSearcher = new IndexSearcher(ReaderUtil.getTopLevelContext(readerContext)); } else { weightSearcher = (IndexSearcher)fcontext.get("searcher"); if (weightSearcher == null) { - weightSearcher = new IndexSearcher(ReaderUtil.getTopLevelContext(readerContext), readerContext); + weightSearcher = new IndexSearcher(ReaderUtil.getTopLevelContext(readerContext)); } } w = q.weight(weightSearcher); From chelsea50@example.com Wed Feb 02 23:27:56 2011 Return-Path: <chelsea50@example.com> Delivered-To: chelsea50@example.com Received: (qmail 86145 invoked from network); 2 Feb 2011 23:27:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Feb 2011 23:27:56 -0000 Received: (qmail 60385 invoked by uid 500); 2 Feb 2011 23:27:55 -0000 Mailing-List: contact chelsea50@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:chelsea50@example.com> List-Unsubscribe: <mailto:chelsea50@example.com> List-Post: <mailto:chelsea50@example.com> List-Id: <commits.lucene.apache.org> Reply-To: chelsea50@example.com Delivered-To: mailing list chelsea50@example.com Received: (qmail 60373 invoked by uid 99); 2 Feb 2011 23:27:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Feb 2011 23:27:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Feb 2011 23:27:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 19B3723889E9; Wed, 2 Feb 2011 23:27:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1066691 [2/2] - in /lucene/dev/trunk: lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/ lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/ lucene/contrib/queries/src/test/org/apache/lucene/sear... Date: Wed, 02 Feb 2011 23:27:29 -0000 To: chelsea50@example.com From: chelsea50@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <chelsea50@example.com> Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java?rev=1066691&r1=1066690&r2=1066691&view=diff ============================================================================== --- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java (original) +++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java Wed Feb 2 23:27:25 2011 @@ -53,7 +53,7 @@ public class TestMultiPhraseQuery extend add("piccadilly circus", writer); IndexReader reader = writer.getReader(); - IndexSearcher searcher = new IndexSearcher(reader); + IndexSearcher searcher = newSearcher(reader); // search for "blueberry pi*": MultiPhraseQuery query1 = new MultiPhraseQuery(); @@ -142,12 +142,13 @@ public class TestMultiPhraseQuery extend IndexReader r = writer.getReader(); writer.close(); - IndexSearcher searcher = new IndexSearcher(r); + IndexSearcher searcher = newSearcher(r); MultiPhraseQuery q = new MultiPhraseQuery(); q.add(new Term("body", "blueberry")); q.add(new Term("body", "chocolate")); q.add(new Term[] {new Term("body", "pie"), new Term("body", "tart")}); assertEquals(2, searcher.search(q, 1).totalHits); + searcher.close(); r.close(); indexStore.close(); } @@ -171,7 +172,7 @@ public class TestMultiPhraseQuery extend add("blue raspberry pie", writer); IndexReader reader = writer.getReader(); - IndexSearcher searcher = new IndexSearcher(reader); + IndexSearcher searcher = newSearcher(reader); // This query will be equivalent to +body:pie +body:"blue*" BooleanQuery q = new BooleanQuery(); q.add(new TermQuery(new Term("body", "pie")), BooleanClause.Occur.MUST); @@ -202,7 +203,7 @@ public class TestMultiPhraseQuery extend add("a note", "note", writer); IndexReader reader = writer.getReader(); - IndexSearcher searcher = new IndexSearcher(reader); + IndexSearcher searcher = newSearcher(reader); // This query will be equivalent to +type:note +body:"a t*" BooleanQuery q = new BooleanQuery(); @@ -229,7 +230,7 @@ public class TestMultiPhraseQuery extend add("a note", "note", writer); IndexReader reader = writer.getReader(); - IndexSearcher searcher = new IndexSearcher(reader); + IndexSearcher searcher = newSearcher(reader); MultiPhraseQuery q = new MultiPhraseQuery(); q.add(new Term("body", "a")); @@ -294,7 +295,7 @@ public class TestMultiPhraseQuery extend add("a note", "note", writer); IndexReader reader = writer.getReader(); - IndexSearcher searcher = new IndexSearcher(reader); + IndexSearcher searcher = newSearcher(reader); searcher.setSimilarityProvider(new DefaultSimilarity() { @Override Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java?rev=1066691&r1=1066690&r2=1066691&view=diff ============================================================================== --- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java (original) +++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java Wed Feb 2 23:27:25 2011 @@ -151,7 +151,7 @@ public class TestMultiTermConstantScore public void testEqualScores() throws IOException { // NOTE: uses index build in *this* setUp - IndexSearcher search = new IndexSearcher(reader); + IndexSearcher search = newSearcher(reader); ScoreDoc[] result; @@ -174,13 +174,14 @@ public class TestMultiTermConstantScore result[i].score); } + search.close(); } @Test public void testBoost() throws IOException { // NOTE: uses index build in *this* setUp - IndexSearcher search = new IndexSearcher(reader); + IndexSearcher search = newSearcher(reader); // test for correct application of query normalization // must use a non score normalizing method for this. @@ -246,13 +247,14 @@ public class TestMultiTermConstantScore Assert.assertEquals(0, hits[0].doc); Assert.assertEquals(1, hits[1].doc); assertTrue(hits[0].score > hits[1].score); + search.close(); } @Test public void testBooleanOrderUnAffected() throws IOException { // NOTE: uses index build in *this* setUp - IndexSearcher search = new IndexSearcher(reader); + IndexSearcher search = newSearcher(reader); // first do a regular TermRangeQuery which uses term expansion so // docs with more terms in range get higher scores @@ -277,6 +279,7 @@ public class TestMultiTermConstantScore actual[i].doc); } + search.close(); } @Test @@ -284,7 +287,7 @@ public class TestMultiTermConstantScore // NOTE: uses index build in *super* setUp IndexReader reader = signedIndexReader; - IndexSearcher search = new IndexSearcher(reader); + IndexSearcher search = newSearcher(reader); int medId = ((maxId - minId) / 2); @@ -405,6 +408,8 @@ public class TestMultiTermConstantScore result = search.search(csrq("id", medIP, medIP, T, T, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, numDocs).scoreDocs; assertEquals("med,med,T,T", 1, result.length); + + search.close(); } @Test @@ -412,7 +417,7 @@ public class TestMultiTermConstantScore // NOTE: uses index build in *super* setUp IndexReader reader = signedIndexReader; - IndexSearcher search = new IndexSearcher(reader); + IndexSearcher search = newSearcher(reader); int medId = ((maxId - minId) / 2); @@ -489,6 +494,8 @@ public class TestMultiTermConstantScore result = search.search(csrq("id", medIP, medIP, T, T, c), null, numDocs).scoreDocs; assertEquals("med,med,T,T,c", 1, result.length); + + search.close(); } @Test @@ -496,7 +503,7 @@ public class TestMultiTermConstantScore // NOTE: uses index build in *super* setUp IndexReader reader = signedIndexReader; - IndexSearcher search = new IndexSearcher(reader); + IndexSearcher search = newSearcher(reader); String minRP = pad(signedIndexDir.minR); String maxRP = pad(signedIndexDir.maxR); @@ -552,6 +559,7 @@ public class TestMultiTermConstantScore result = search.search(csrq("rand", maxRP, null, T, F), null, numDocs).scoreDocs; assertEquals("max,nul,T,T", 1, result.length); + search.close(); } @Test @@ -560,7 +568,7 @@ public class TestMultiTermConstantScore // using the unsigned index because collation seems to ignore hyphens IndexReader reader = unsignedIndexReader; - IndexSearcher search = new IndexSearcher(reader); + IndexSearcher search = newSearcher(reader); String minRP = pad(unsignedIndexDir.minR); String maxRP = pad(unsignedIndexDir.maxR); @@ -617,6 +625,8 @@ public class TestMultiTermConstantScore assertEquals("max,max,T,T,c", 1, result.length); result = search.search(csrq("rand", maxRP, null, T, F, c), null, numDocs).scoreDocs; assertEquals("max,nul,T,T,c", 1, result.length); + + search.close(); } @Test @@ -636,7 +646,7 @@ public class TestMultiTermConstantScore IndexReader reader = writer.getReader(); writer.close(); - IndexSearcher search = new IndexSearcher(reader); + IndexSearcher search = newSearcher(reader); // Neither Java 1.4.2 nor 1.5.0 has Farsi Locale collation available in // RuleBasedCollator. However, the Arabic Locale seems to order the Farsi @@ -681,7 +691,7 @@ public class TestMultiTermConstantScore IndexReader reader = writer.getReader(); writer.close(); - IndexSearcher search = new IndexSearcher(reader); + IndexSearcher search = newSearcher(reader); Collator c = Collator.getInstance(new Locale("da", "dk")); Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java?rev=1066691&r1=1066690&r2=1066691&view=diff ============================================================================== --- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java (original) +++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java Wed Feb 2 23:27:25 2011 @@ -61,17 +61,17 @@ public class TestMultiTermQueryRewrites writer.close(); swriter1.close(); swriter2.close(); reader = IndexReader.open(dir, true); - searcher = new IndexSearcher(reader); + searcher = newSearcher(reader); multiReader = new MultiReader(new IndexReader[] { IndexReader.open(sdir1, true), IndexReader.open(sdir2, true) }, true); - multiSearcher = new IndexSearcher(multiReader); + multiSearcher = newSearcher(multiReader); multiReaderDupls = new MultiReader(new IndexReader[] { IndexReader.open(sdir1, true), IndexReader.open(dir, true) }, true); - multiSearcherDupls = new IndexSearcher(multiReaderDupls); + multiSearcherDupls = newSearcher(multiReaderDupls); } @AfterClass Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java?rev=1066691&r1=1066690&r2=1066691&view=diff ============================================================================== --- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java (original) +++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java Wed Feb 2 23:27:25 2011 @@ -59,7 +59,7 @@ public class TestMultiValuedNumericRange IndexReader reader = writer.getReader(); writer.close(); - IndexSearcher searcher=new IndexSearcher(reader); + IndexSearcher searcher=newSearcher(reader); num = 50 * RANDOM_MULTIPLIER; for (int i = 0; i < num; i++) { int lower=random.nextInt(Integer.MAX_VALUE); Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNot.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNot.java?rev=1066691&r1=1066690&r2=1066691&view=diff ============================================================================== --- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNot.java (original) +++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNot.java Wed Feb 2 23:27:25 2011 @@ -44,7 +44,7 @@ public class TestNot extends LuceneTestC writer.addDocument(d1); IndexReader reader = writer.getReader(); - IndexSearcher searcher = new IndexSearcher(reader); + IndexSearcher searcher = newSearcher(reader); QueryParser parser = new QueryParser(TEST_VERSION_CURRENT, "field", new MockAnalyzer()); Query query = parser.parse("a NOT b"); //System.out.println(query); Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java?rev=1066691&r1=1066690&r2=1066691&view=diff ============================================================================== --- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java (original) +++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java Wed Feb 2 23:27:25 2011 @@ -89,7 +89,7 @@ public class TestNumericRangeQuery32 ext } reader = writer.getReader(); - searcher=new IndexSearcher(reader); + searcher=newSearcher(reader); writer.close(); } Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java?rev=1066691&r1=1066690&r2=1066691&view=diff ============================================================================== --- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java (original) +++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java Wed Feb 2 23:27:25 2011 @@ -89,7 +89,7 @@ public class TestNumericRangeQuery64 ext writer.addDocument(doc); } reader = writer.getReader(); - searcher=new IndexSearcher(reader); + searcher=newSearcher(reader); writer.close(); } Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java?rev=1066691&r1=1066690&r2=1066691&view=diff ============================================================================== --- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java (original) +++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java Wed Feb 2 23:27:25 2011 @@ -65,7 +65,7 @@ public class TestPhrasePrefixQuery exten IndexReader reader = writer.getReader(); writer.close(); - IndexSearcher searcher = new IndexSearcher(reader); + IndexSearcher searcher = newSearcher(reader); // PhrasePrefixQuery query1 = new PhrasePrefixQuery(); MultiPhraseQuery query1 = new MultiPhraseQuery(); Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java?rev=1066691&r1=1066690&r2=1066691&view=diff ============================================================================== --- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java (original) +++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java Wed Feb 2 23:27:25 2011 @@ -86,7 +86,7 @@ public class TestPhraseQuery extends Luc reader = writer.getReader(); writer.close(); - searcher = new IndexSearcher(reader); + searcher = newSearcher(reader); query = new PhraseQuery(); } @@ -221,7 +221,7 @@ public class TestPhraseQuery extends Luc IndexReader
{'source': 'Apache Software Foundation Public Mail Archives'}