Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

common typo for defined fixed

This commit is contained in:
epugh@opensourceconnections.com 2021-02-12 10:11:09 -05:00
parent 3ea64b39cb
commit f95c150da2
6 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
solr/core/src/test-files/solr/collection1/conf/solrconfig-cache-enable-disable.xml
View File

@ -54,12 +54,12 @@
autowarmCount="0"/>
<cache
name="user_definied_cache_XXX"
enabled="${user_definied_cache_XXX.enabled:false}"
name="user_defined_cache_XXX"
enabled="${user_defined_cache_XXX.enabled:false}"
/>
<cache
name="user_definied_cache_ZZZ"
enabled="${user_definied_cache_ZZZ.enabled:false}"
name="user_defined_cache_ZZZ"
enabled="${user_defined_cache_ZZZ.enabled:false}"
/>
@ -85,6 +85,3 @@
</initParams>
</config>

8
solr/core/src/test-files/solr/collection1/conf/solrconfig-memory-circuitbreaker.xml
View File

@ -54,12 +54,12 @@
autowarmCount="0"/>
<cache
name="user_definied_cache_XXX"
enabled="${user_definied_cache_XXX.enabled:false}"
name="user_defined_cache_XXX"
enabled="${user_defined_cache_XXX.enabled:false}"
/>
<cache
name="user_definied_cache_ZZZ"
enabled="${user_definied_cache_ZZZ.enabled:false}"
name="user_defined_cache_ZZZ"
enabled="${user_defined_cache_ZZZ.enabled:false}"
/>

4
solr/core/src/test/org/apache/solr/core/DirectoryFactoriesTest.java
View File

@ -75,14 +75,14 @@ public class DirectoryFactoriesTest extends SolrTestCaseJ4 {
file.writeInt(42);
// TODO: even StandardDirectoryFactory & NRTCachingDirectoryFactory can't agree on this...
// ... should we consider this explicitly undefinied?
// ... should we consider this explicitly undefined?
// ... or should *all* Caching DirFactories consult the cache as well as the disk itself?
// assertFalse(path + " should still not exist until file is closed", dirFac.exists(path));
} // implicitly close file...
// TODO: even StandardDirectoryFactory & NRTCachingDirectoryFactory can't agree on this...
// ... should we consider this explicitly undefinied?
// ... should we consider this explicitly undefined?
// ... or should *all* Caching DirFactories consult the cache as well as the disk itself?
// assertTrue(path + " should exist once file is closed", dirFac.exists(path));

18
solr/core/src/test/org/apache/solr/core/TestConfig.java
View File

@ -124,8 +124,8 @@ public class TestConfig extends SolrTestCaseJ4 {
System.setProperty("filterCache.enabled", "true");
System.setProperty("queryResultCache.enabled", "true");
System.setProperty("documentCache.enabled", "true");
System.setProperty("user_definied_cache_XXX.enabled","true");
// user_definied_cache_ZZZ.enabled defaults to false in config
System.setProperty("user_defined_cache_XXX.enabled","true");
// user_defined_cache_ZZZ.enabled defaults to false in config
sc = new SolrConfig(TEST_PATH().resolve("collection1"), "solrconfig-cache-enable-disable.xml");
assertNotNull(sc.filterCacheConfig);
@ -134,14 +134,14 @@ public class TestConfig extends SolrTestCaseJ4 {
//
assertNotNull(sc.userCacheConfigs);
assertEquals(1, sc.userCacheConfigs.size());
assertNotNull(sc.userCacheConfigs.get("user_definied_cache_XXX"));
assertNotNull(sc.userCacheConfigs.get("user_defined_cache_XXX"));
// disable all the core caches (and enable both user caches) via system properties and verify
System.setProperty("filterCache.enabled", "false");
System.setProperty("queryResultCache.enabled", "false");
System.setProperty("documentCache.enabled", "false");
System.setProperty("user_definied_cache_XXX.enabled","true");
System.setProperty("user_definied_cache_ZZZ.enabled","true");
System.setProperty("user_defined_cache_XXX.enabled","true");
System.setProperty("user_defined_cache_ZZZ.enabled","true");
sc = new SolrConfig(TEST_PATH().resolve("collection1"), "solrconfig-cache-enable-disable.xml");
assertNull(sc.filterCacheConfig);
@ -150,11 +150,11 @@ public class TestConfig extends SolrTestCaseJ4 {
//
assertNotNull(sc.userCacheConfigs);
assertEquals(2, sc.userCacheConfigs.size());
assertNotNull(sc.userCacheConfigs.get("user_definied_cache_XXX"));
assertNotNull(sc.userCacheConfigs.get("user_definied_cache_ZZZ"));
assertNotNull(sc.userCacheConfigs.get("user_defined_cache_XXX"));
assertNotNull(sc.userCacheConfigs.get("user_defined_cache_ZZZ"));
System.clearProperty("user_definied_cache_XXX.enabled");
System.clearProperty("user_definied_cache_ZZZ.enabled");
System.clearProperty("user_defined_cache_XXX.enabled");
System.clearProperty("user_defined_cache_ZZZ.enabled");
System.clearProperty("filterCache.enabled");
System.clearProperty("queryResultCache.enabled");
System.clearProperty("documentCache.enabled");

2
solr/solr-ref-guide/src/_layouts/default.html
View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
{% comment %}NOTE: page_id is also definied in page.html{% endcomment %}
{% comment %}NOTE: page_id is also defined in page.html{% endcomment %}
{% assign page_id = page.url | split: '/' | last | remove: '.html' %}
<head>
{% include head.html %}

2
solr/solr-ref-guide/src/_layouts/home.html
View File

@ -7,7 +7,7 @@ layout: default
Its main difference is that it uses a different class for the content
container in order to have freedom to customize it as needed. -->
{% comment %}NOTE: page_id is also definied in default.html{% endcomment %}
{% comment %}NOTE: page_id is also defined in default.html{% endcomment %}
{% assign page_id = page.url | split: '/' | last | remove: '.html' %}
<div class="homepage container">