You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ep...@apache.org on 2021/02/12 15:12:04 UTC
[lucene-solr] branch branch_8x updated: common typo for defined
fixed
This is an automated email from the ASF dual-hosted git repository.
epugh pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8x by this push:
new a4a8e45 common typo for defined fixed
a4a8e45 is described below
commit a4a8e45463902814da4e317466acb6d9252bb26a
Author: epugh@opensourceconnections.com <>
AuthorDate: Fri Feb 12 10:11:09 2021 -0500
common typo for defined fixed
---
.../conf/solrconfig-cache-enable-disable.xml | 12 ++++++------
.../conf/solrconfig-memory-circuitbreaker.xml | 8 ++++----
.../org/apache/solr/core/DirectoryFactoriesTest.java | 4 ++--
.../core/src/test/org/apache/solr/core/TestConfig.java | 18 +++++++++---------
solr/solr-ref-guide/src/_layouts/default.html | 2 +-
solr/solr-ref-guide/src/_layouts/home.html | 2 +-
6 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-cache-enable-disable.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-cache-enable-disable.xml
index a83ccb0..d51f805 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-cache-enable-disable.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-cache-enable-disable.xml
@@ -24,7 +24,7 @@
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/>
<requestHandler name="/select" class="solr.SearchHandler" />
-
+
<query>
<!-- Maximum number of clauses in a boolean query... can affect
range or wildcard queries that expand to big boolean
@@ -54,16 +54,16 @@
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}"
/>
-
+
<!-- If true, stored fields that are not requested will be loaded lazily.
-->
<enableLazyFieldLoading>true</enableLazyFieldLoading>
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-memory-circuitbreaker.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-memory-circuitbreaker.xml
index 699a7bd..6ab9f89 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-memory-circuitbreaker.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-memory-circuitbreaker.xml
@@ -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}"
/>
diff --git a/solr/core/src/test/org/apache/solr/core/DirectoryFactoriesTest.java b/solr/core/src/test/org/apache/solr/core/DirectoryFactoriesTest.java
index c06dabd..ce30231 100644
--- a/solr/core/src/test/org/apache/solr/core/DirectoryFactoriesTest.java
+++ b/solr/core/src/test/org/apache/solr/core/DirectoryFactoriesTest.java
@@ -76,14 +76,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));
diff --git a/solr/core/src/test/org/apache/solr/core/TestConfig.java b/solr/core/src/test/org/apache/solr/core/TestConfig.java
index a1404e1..ccf3114 100644
--- a/solr/core/src/test/org/apache/solr/core/TestConfig.java
+++ b/solr/core/src/test/org/apache/solr/core/TestConfig.java
@@ -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");
diff --git a/solr/solr-ref-guide/src/_layouts/default.html b/solr/solr-ref-guide/src/_layouts/default.html
index 5b929bc..75b66b2 100755
--- a/solr/solr-ref-guide/src/_layouts/default.html
+++ b/solr/solr-ref-guide/src/_layouts/default.html
@@ -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 %}
diff --git a/solr/solr-ref-guide/src/_layouts/home.html b/solr/solr-ref-guide/src/_layouts/home.html
index e5b7119..c1d9cb6 100644
--- a/solr/solr-ref-guide/src/_layouts/home.html
+++ b/solr/solr-ref-guide/src/_layouts/home.html
@@ -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">