lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rm...@apache.org
Subject svn commit: r1143906 - in /lucene/dev/branches/flexscoring: ./ lucene/ lucene/contrib/queries/src/test/org/apache/lucene/search/regex/ lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/builders/ lucene/src/java/org/apache/lucene/inde...
Date Thu, 07 Jul 2011 16:18:47 GMT
Author: rmuir
Date: Thu Jul  7 16:18:46 2011
New Revision: 1143906

URL: http://svn.apache.org/viewvc?rev=1143906&view=rev
Log:
merge trunk (1143843:1143905)

Modified:
    lucene/dev/branches/flexscoring/   (props changed)
    lucene/dev/branches/flexscoring/lucene/   (props changed)
    lucene/dev/branches/flexscoring/lucene/common-build.xml
    lucene/dev/branches/flexscoring/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java
  (props changed)
    lucene/dev/branches/flexscoring/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/builders/TestNumericRangeFilterBuilder.java
  (props changed)
    lucene/dev/branches/flexscoring/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
    lucene/dev/branches/flexscoring/solr/   (props changed)
    lucene/dev/branches/flexscoring/solr/CHANGES.txt   (props changed)
    lucene/dev/branches/flexscoring/solr/LICENSE.txt   (props changed)
    lucene/dev/branches/flexscoring/solr/NOTICE.txt   (props changed)
    lucene/dev/branches/flexscoring/solr/README.txt   (props changed)
    lucene/dev/branches/flexscoring/solr/build.xml   (props changed)
    lucene/dev/branches/flexscoring/solr/client/   (props changed)
    lucene/dev/branches/flexscoring/solr/common-build.xml   (contents, props changed)
    lucene/dev/branches/flexscoring/solr/contrib/   (props changed)
    lucene/dev/branches/flexscoring/solr/example/   (props changed)
    lucene/dev/branches/flexscoring/solr/lib/   (props changed)
    lucene/dev/branches/flexscoring/solr/site/   (props changed)
    lucene/dev/branches/flexscoring/solr/src/   (props changed)
    lucene/dev/branches/flexscoring/solr/testlogging.properties   (props changed)

Modified: lucene/dev/branches/flexscoring/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/lucene/common-build.xml?rev=1143906&r1=1143905&r2=1143906&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/lucene/common-build.xml (original)
+++ lucene/dev/branches/flexscoring/lucene/common-build.xml Thu Jul  7 16:18:46 2011
@@ -331,7 +331,7 @@
       <artifact:deploy file="${build.dir}/${maven.project.build.finalName}.jar">
         <artifact-attachments/>
       	<remoteRepository url="${m2.repository.url}">
-          <authentication username="${m2.repository.username}" privateKey="${m2.repository.private.key}"/>
+          <authentication username="${m2.repository.username}" privateKey="${m2.repository.private.key}"
password="${m2.repository.password}"/>
         </remoteRepository>
         <pom refid="maven.project"/>
       </artifact:deploy>
@@ -351,7 +351,7 @@
       <artifact:pom id="maven.project" file="${maven.build.dir}/@{pom.xml}" />
       <artifact:deploy file="@{jar.file}">
         <remoteRepository url="${m2.repository.url}">
-          <authentication username="${m2.repository.username}" privateKey="${m2.repository.private.key}"/>
+          <authentication username="${m2.repository.username}" privateKey="${m2.repository.private.key}"
password="${m2.repository.password}"/>
         </remoteRepository>
         <pom refid="maven.project"/>
       </artifact:deploy>

Modified: lucene/dev/branches/flexscoring/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/lucene/src/java/org/apache/lucene/index/SegmentMerger.java?rev=1143906&r1=1143905&r2=1143906&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
(original)
+++ lucene/dev/branches/flexscoring/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
Thu Jul  7 16:18:46 2011
@@ -574,37 +574,37 @@ final class SegmentMerger {
     final List<Bits> perDocBits = new ArrayList<Bits>();
     final List<Integer> perDocBitsStarts = new ArrayList<Integer>();
     int docBase = 0;
-    try {
-      for(IndexReader r : readers) {
-        final int maxDoc = r.maxDoc();
-        final PerDocValues producer = r.perDocValues();
-        if (producer != null) {
-          perDocSlices.add(new ReaderUtil.Slice(docBase, maxDoc, perDocProducers.size()));
-          perDocProducers.add(producer);
-          perDocBits.add(r.getLiveDocs());
-          perDocBitsStarts.add(docBase);
-        }
-        docBase += maxDoc;
+    for (IndexReader r : readers) {
+      final int maxDoc = r.maxDoc();
+      final PerDocValues producer = r.perDocValues();
+      if (producer != null) {
+        perDocSlices.add(new ReaderUtil.Slice(docBase, maxDoc, perDocProducers
+            .size()));
+        perDocProducers.add(producer);
+        perDocBits.add(r.getLiveDocs());
+        perDocBitsStarts.add(docBase);
       }
-      perDocBitsStarts.add(docBase);
-      if (!perDocSlices.isEmpty()) {
-        mergeState.multiLiveDocs = new MultiBits(perDocBits, perDocBitsStarts, true);
-        final PerDocConsumer docsConsumer = codec
-            .docsConsumer(new PerDocWriteState(segmentWriteState));
-        boolean success = false;
-        try {
-          final MultiPerDocValues multiPerDocValues = new MultiPerDocValues(perDocProducers
-              .toArray(PerDocValues.EMPTY_ARRAY), perDocSlices
-              .toArray(ReaderUtil.Slice.EMPTY_ARRAY));
-          docsConsumer.merge(mergeState, multiPerDocValues);
-          success = true;
-        } finally {
-          IOUtils.closeSafely(!success, docsConsumer);
-        }
+      docBase += maxDoc;
+    }
+    perDocBitsStarts.add(docBase);
+    if (!perDocSlices.isEmpty()) {
+      mergeState.multiLiveDocs = new MultiBits(perDocBits, perDocBitsStarts,
+          true);
+      final PerDocConsumer docsConsumer = codec
+          .docsConsumer(new PerDocWriteState(segmentWriteState));
+      boolean success = false;
+      try {
+        final MultiPerDocValues multiPerDocValues = new MultiPerDocValues(
+            perDocProducers.toArray(PerDocValues.EMPTY_ARRAY),
+            perDocSlices.toArray(ReaderUtil.Slice.EMPTY_ARRAY));
+        docsConsumer.merge(mergeState, multiPerDocValues);
+        success = true;
+      } finally {
+        IOUtils.closeSafely(!success, docsConsumer);
       }
-    } finally {
-      IOUtils.closeSafely(false, perDocProducers);
     }
+    /* don't close the perDocProducers here since they are private segment producers
+     * and will be closed once the SegmentReader goes out of scope */ 
   }
 
   private MergeState mergeState;

Modified: lucene/dev/branches/flexscoring/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/solr/common-build.xml?rev=1143906&r1=1143905&r2=1143906&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/solr/common-build.xml (original)
+++ lucene/dev/branches/flexscoring/solr/common-build.xml Thu Jul  7 16:18:46 2011
@@ -162,8 +162,9 @@
        into your local repository).  If you wish to deploy to a remote
        repository, set this property to the URL of that repository.  In
        addition, if the repository requires authentication, you can set
-       properties "m2.repository.username" and "m2.repository.private.key"
-       to define your credentials.
+       properties "m2.repository.username" and either
+       "m2.repository.private.key" or "m2.repository.password" to define
+       your credentials.
   -->
   <property name="m2.repository.url" value="file://${maven.dist.dir}"/>
   <property name="m2.repository.private.key" value="${user.home}/.ssh/id_dsa"/>
@@ -423,7 +424,7 @@
       <artifact:deploy file="@{jar.file}">
         <artifact-attachments/>
         <remoteRepository url="${m2.repository.url}">
-          <authentication username="${m2.repository.username}" privateKey="${m2.repository.private.key}"/>
+          <authentication username="${m2.repository.username}" privateKey="${m2.repository.private.key}"
password="${m2.repository.password}"/>
         </remoteRepository>
         <pom refid="maven.project"/>
       </artifact:deploy>
@@ -443,7 +444,7 @@
       <artifact:pom id="maven.project" file="${maven.build.dir}/@{pom.xml}" />
       <artifact:deploy file="@{jar.file}">
         <remoteRepository url="${m2.repository.url}">
-          <authentication username="${m2.repository.username}" privateKey="${m2.repository.private.key}"/>
+          <authentication username="${m2.repository.username}" privateKey="${m2.repository.private.key}"
password="${m2.repository.password}"/>
         </remoteRepository>
         <pom refid="maven.project"/>
       </artifact:deploy>



Mime
View raw message