svn commit: r1774618 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query: QueryEngineSettings.java QueryEngineSettingsService.java

[th...@apache.org]

Author: thomasm
Date: Fri Dec 16 15:14:34 2016
New Revision: 1774618

URL: http://svn.apache.org/viewvc?rev=1774618&view=rev
Log:
OAK-5327 Change default query limit configuration, take 2

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineSettings.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineSettingsService.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineSettings.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineSettings.java?rev=1774618&r1=1774617&r2=1774618&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineSettings.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineSettings.java Fri Dec 16 15:14:34 2016
@@ -38,10 +38,13 @@ public class QueryEngineSettings impleme
 
     static final String OAK_QUERY_LIMIT_IN_MEMORY = "oak.queryLimitInMemory";
 
+    // should be the same as QueryEngineSettingsService.DEFAULT_QUERY_LIMIT_IN_MEMORY
     static final int DEFAULT_QUERY_LIMIT_IN_MEMORY =
             Integer.getInteger(OAK_QUERY_LIMIT_IN_MEMORY, 500000);
 
     static final String OAK_QUERY_LIMIT_READS = "oak.queryLimitReads";
+
+    // should be the same as QueryEngineSettingsService.DEFAULT_QUERY_LIMIT_READS
     static final int DEFAULT_QUERY_LIMIT_READS =
             Integer.getInteger(OAK_QUERY_LIMIT_READS, 100000);
 

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineSettingsService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineSettingsService.java?rev=1774618&r1=1774617&r2=1774618&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineSettingsService.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineSettingsService.java Fri Dec 16 15:14:34 2016
@@ -40,20 +40,25 @@ import org.slf4j.LoggerFactory;
                 "supersedes the one defined via OSGi config"
 )
 public class QueryEngineSettingsService {
-    private static final int DEFAULT_QUERY_LIMIT_IN_MEMORY = Integer.MAX_VALUE;
+
+    // should be the same as QueryEngineSettings.DEFAULT_QUERY_LIMIT_IN_MEMORY
+    private static final int DEFAULT_QUERY_LIMIT_IN_MEMORY = 500000;
     @Property(
             intValue = DEFAULT_QUERY_LIMIT_IN_MEMORY,
             label = "In memory limit",
             description = "Maximum number of entries that can be held in memory while evaluating any query"
     )
     static final String QUERY_LIMIT_IN_MEMORY = "queryLimitInMemory";
-    private static final int DEFAULT_QUERY_LIMIT_READS = Integer.MAX_VALUE;
+
+    // should be the same as QueryEngineSettings.DEFAULT_QUERY_LIMIT_READS
+    private static final int DEFAULT_QUERY_LIMIT_READS = 100000;
     @Property(
             intValue = DEFAULT_QUERY_LIMIT_READS,
             label = "In memory read limit",
             description = "Maximum number of results which can be read by any query"
     )
     static final String QUERY_LIMIT_READS = "queryLimitReads";
+
     private static final boolean DEFAULT_QUERY_FAIL_TRAVERSAL = false;
     @Property(
             boolValue = DEFAULT_QUERY_FAIL_TRAVERSAL,
@@ -112,4 +117,5 @@ public class QueryEngineSettingsService
         log.info("For {} using value {} defined via system property {}", key,
                 System.getProperty(sysPropKey), sysPropKey);
     }
+
 }