jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r708611 - in /jackrabbit/branches/1.5: ./ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/TextExtractorJob.java
Date Tue, 28 Oct 2008 17:11:55 GMT
Author: jukka
Date: Tue Oct 28 10:11:55 2008
New Revision: 708611

URL: http://svn.apache.org/viewvc?rev=708611&view=rev
Log:
1.5: Merged revisions 706562 and 706606 (JCR-1824 and JCR-1826). Ignored revision 706649.

Modified:
    jackrabbit/branches/1.5/   (props changed)
    jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java
    jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/TextExtractorJob.java

Propchange: jackrabbit/branches/1.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 28 10:11:55 2008
@@ -1,2 +1,2 @@
 /jackrabbit/branches/1.3:631261
-/jackrabbit/trunk:703899-704158,704165,704167,704324,704358,704361,704864,704933,704939,705010,705033,705243,705496,705522,705579,705925,705932,705934,705937-705938,705961,706242,706273,706285-706286
+/jackrabbit/trunk:703899-704158,704165,704167,704324,704358,704361,704864,704933,704939,705010,705033,705243,705496,705522,705579,705925,705932,705934,705937-705938,705961,706242,706273,706285-706286,706562,706606,706649

Modified: jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java?rev=708611&r1=708610&r2=708611&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java
(original)
+++ jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java
Tue Oct 28 10:11:55 2008
@@ -135,6 +135,8 @@
 
     /**
      * The default value for property {@link #extractorPoolSize}.
+     * @deprecated this value is not used anymore. Instead the default value
+     * is calculated as follows: 2 * Runtime.getRuntime().availableProcessors().
      */
     public static final int DEFAULT_EXTRACTOR_POOL_SIZE = 0;
 
@@ -239,7 +241,7 @@
     /**
      * extractorPoolSize config parameter
      */
-    private int extractorPoolSize = DEFAULT_EXTRACTOR_POOL_SIZE;
+    private int extractorPoolSize = 2 * Runtime.getRuntime().availableProcessors();
 
     /**
      * extractorBackLog config parameter

Modified: jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/TextExtractorJob.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/TextExtractorJob.java?rev=708611&r1=708610&r2=708611&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/TextExtractorJob.java
(original)
+++ jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/TextExtractorJob.java
Tue Oct 28 10:11:55 2008
@@ -123,7 +123,7 @@
             // also covers TimeoutException
             // text not extracted within timeout or interrupted
             if (timeout > 0) {
-                log.info("Text extraction for {} timed out (>{}ms).",
+                log.debug("Text extraction for {} timed out (>{}ms).",
                         type, new Long(timeout));
                 timedOut = true;
             }



Mime
View raw message