You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-dev@jackrabbit.apache.org by Marcel Reutegger <mr...@adobe.com> on 2016/11/02 15:00:33 UTC
Re: svn commit: r1767688 - in /jackrabbit/oak/trunk/oak-core/src:
main/java/org/apache/jackrabbit/oak/query/QueryEngineSettings.java
test/java/org/apache/jackrabbit/oak/query/QueryEngineSettingsServiceTest.java
Hi Chetan,
this commit causes a test failure. Seen on travis:
https://travis-ci.org/apache/jackrabbit-oak/builds/172613752
but also on my local machine.
Regards
marcel
On 02/11/16 15:26, chetanm@apache.org wrote:
> Author: chetanm
> Date: Wed Nov 2 14:26:36 2016
> New Revision: 1767688
>
> URL: http://svn.apache.org/viewvc?rev=1767688&view=rev
> Log:
> OAK-4974 - Enable configuring QueryEngineSettings via OSGi config
>
> Fix testcase
>
> Modified:
> jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineSettings.java
> jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/QueryEngineSettingsServiceTest.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=1767688&r1=1767687&r2=1767688&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 Wed Nov 2 14:26:36 2016
> @@ -38,11 +38,11 @@ public class QueryEngineSettings impleme
>
> static final String OAK_QUERY_LIMIT_IN_MEMORY = "oak.queryLimitInMemory";
>
> - private static final int DEFAULT_QUERY_LIMIT_IN_MEMORY =
> + static final int DEFAULT_QUERY_LIMIT_IN_MEMORY =
> Integer.getInteger(OAK_QUERY_LIMIT_IN_MEMORY, Integer.MAX_VALUE);
>
> static final String OAK_QUERY_LIMIT_READS = "oak.queryLimitReads";
> - private static final int DEFAULT_QUERY_LIMIT_READS =
> + static final int DEFAULT_QUERY_LIMIT_READS =
> Integer.getInteger(OAK_QUERY_LIMIT_READS, Integer.MAX_VALUE);
>
> static final String OAK_QUERY_FAIL_TRAVERSAL = "oak.queryFailTraversal";
>
> Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/QueryEngineSettingsServiceTest.java
> URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/QueryEngineSettingsServiceTest.java?rev=1767688&r1=1767687&r2=1767688&view=diff
> ==============================================================================
> --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/QueryEngineSettingsServiceTest.java (original)
> +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/QueryEngineSettingsServiceTest.java Wed Nov 2 14:26:36 2016
> @@ -82,8 +82,10 @@ public class QueryEngineSettingsServiceT
>
> @Test
> public void sysPropSupercedes() throws Exception{
> - System.setProperty(QueryEngineSettings.OAK_QUERY_LIMIT_IN_MEMORY, "10");
> - System.setProperty(QueryEngineSettings.OAK_QUERY_LIMIT_READS, "11");
> + System.setProperty(QueryEngineSettings.OAK_QUERY_LIMIT_IN_MEMORY, String.valueOf(QueryEngineSettings
> + .DEFAULT_QUERY_LIMIT_IN_MEMORY));
> + System.setProperty(QueryEngineSettings.OAK_QUERY_LIMIT_READS, String.valueOf(QueryEngineSettings
> + .DEFAULT_QUERY_LIMIT_READS));
> System.setProperty(QueryEngineSettings.OAK_QUERY_FAIL_TRAVERSAL, "false");
>
> QueryEngineSettings settings = new QueryEngineSettings();
> @@ -95,8 +97,10 @@ public class QueryEngineSettingsServiceT
> config.put(QueryEngineSettingsService.QUERY_FAIL_TRAVERSAL, true);
>
> context.registerInjectActivateService(settingsService, config);
> - assertEquals(11, settings.getLimitReads());
> - assertEquals(10, settings.getLimitInMemory());
> + assertEquals(QueryEngineSettings
> + .DEFAULT_QUERY_LIMIT_READS, settings.getLimitReads());
> + assertEquals(QueryEngineSettings
> + .DEFAULT_QUERY_LIMIT_IN_MEMORY, settings.getLimitInMemory());
> assertFalse(settings.getFailTraversal());
> }
>
>
>
Re: svn commit: r1767688 - in /jackrabbit/oak/trunk/oak-core/src:
main/java/org/apache/jackrabbit/oak/query/QueryEngineSettings.java test/java/org/apache/jackrabbit/oak/query/QueryEngineSettingsServiceTest.java
Posted by Chetan Mehrotra <ch...@gmail.com>.
Hi Marcel,
That was due to previous commit 1767677. This change was meant to fix
that. Would watch the build result
Chetan Mehrotra
On Wed, Nov 2, 2016 at 8:30 PM, Marcel Reutegger <mr...@adobe.com> wrote:
> Hi Chetan,
>
> this commit causes a test failure. Seen on travis:
> https://travis-ci.org/apache/jackrabbit-oak/builds/172613752
>
> but also on my local machine.
>
> Regards
> marcel
>
>
> On 02/11/16 15:26, chetanm@apache.org wrote:
>>
>> Author: chetanm
>> Date: Wed Nov 2 14:26:36 2016
>> New Revision: 1767688
>>
>> URL: http://svn.apache.org/viewvc?rev=1767688&view=rev
>> Log:
>> OAK-4974 - Enable configuring QueryEngineSettings via OSGi config
>>
>> Fix testcase
>>
>> Modified:
>>
>> jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineSettings.java
>>
>> jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/QueryEngineSettingsServiceTest.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=1767688&r1=1767687&r2=1767688&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
>> Wed Nov 2 14:26:36 2016
>> @@ -38,11 +38,11 @@ public class QueryEngineSettings impleme
>>
>> static final String OAK_QUERY_LIMIT_IN_MEMORY =
>> "oak.queryLimitInMemory";
>>
>> - private static final int DEFAULT_QUERY_LIMIT_IN_MEMORY =
>> + static final int DEFAULT_QUERY_LIMIT_IN_MEMORY =
>> Integer.getInteger(OAK_QUERY_LIMIT_IN_MEMORY,
>> Integer.MAX_VALUE);
>>
>> static final String OAK_QUERY_LIMIT_READS = "oak.queryLimitReads";
>> - private static final int DEFAULT_QUERY_LIMIT_READS =
>> + static final int DEFAULT_QUERY_LIMIT_READS =
>> Integer.getInteger(OAK_QUERY_LIMIT_READS, Integer.MAX_VALUE);
>>
>> static final String OAK_QUERY_FAIL_TRAVERSAL =
>> "oak.queryFailTraversal";
>>
>> Modified:
>> jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/QueryEngineSettingsServiceTest.java
>> URL:
>> http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/QueryEngineSettingsServiceTest.java?rev=1767688&r1=1767687&r2=1767688&view=diff
>>
>> ==============================================================================
>> ---
>> jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/QueryEngineSettingsServiceTest.java
>> (original)
>> +++
>> jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/QueryEngineSettingsServiceTest.java
>> Wed Nov 2 14:26:36 2016
>> @@ -82,8 +82,10 @@ public class QueryEngineSettingsServiceT
>>
>> @Test
>> public void sysPropSupercedes() throws Exception{
>> - System.setProperty(QueryEngineSettings.OAK_QUERY_LIMIT_IN_MEMORY,
>> "10");
>> - System.setProperty(QueryEngineSettings.OAK_QUERY_LIMIT_READS,
>> "11");
>> + System.setProperty(QueryEngineSettings.OAK_QUERY_LIMIT_IN_MEMORY,
>> String.valueOf(QueryEngineSettings
>> + .DEFAULT_QUERY_LIMIT_IN_MEMORY));
>> + System.setProperty(QueryEngineSettings.OAK_QUERY_LIMIT_READS,
>> String.valueOf(QueryEngineSettings
>> + .DEFAULT_QUERY_LIMIT_READS));
>> System.setProperty(QueryEngineSettings.OAK_QUERY_FAIL_TRAVERSAL,
>> "false");
>>
>> QueryEngineSettings settings = new QueryEngineSettings();
>> @@ -95,8 +97,10 @@ public class QueryEngineSettingsServiceT
>> config.put(QueryEngineSettingsService.QUERY_FAIL_TRAVERSAL,
>> true);
>>
>> context.registerInjectActivateService(settingsService, config);
>> - assertEquals(11, settings.getLimitReads());
>> - assertEquals(10, settings.getLimitInMemory());
>> + assertEquals(QueryEngineSettings
>> + .DEFAULT_QUERY_LIMIT_READS, settings.getLimitReads());
>> + assertEquals(QueryEngineSettings
>> + .DEFAULT_QUERY_LIMIT_IN_MEMORY,
>> settings.getLimitInMemory());
>> assertFalse(settings.getFailTraversal());
>> }
>>
>>
>>
>