Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SOLR-16360: Atomic update on boolean fields doesn't reflect when value starts with "1", "t" or "T" #1816

Merged
merged 11 commits into from
Aug 9, 2023
Merged

SOLR-16360: Atomic update on boolean fields doesn't reflect when value starts with "1", "t" or "T" #1816

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
da0c729
Fix for SOLR-16360
rgoswami-cv Jul 30, 2023
ed3f8be
Ran ./gradlew tidy to correct formatting
rgoswami-cv Aug 3, 2023
2d17b34
Merge branch 'apache:main' into SOLR-16360
rahulgoswami Aug 3, 2023
479810e
PR review comments + added tests
rahulgoswami Aug 4, 2023
6871f5e
Merge branch 'apache:main' into SOLR-16360
rahulgoswami Aug 4, 2023
0e51a20
PR comment to use solrconfog-tlog.xml instead of solrconfig-basic.xml…
rahulgoswami Aug 4, 2023
6d6e14e
Change toInternal() in BoolField to also use StrUtils.parseBoolean() …
rahulgoswami Aug 7, 2023
a7c964c
Avoid calling val.toString() when passing to StrUtils.parseBoolean()
rahulgoswami Aug 7, 2023
459ccb6
changes.txt
rahulgoswami Aug 8, 2023
73333bd
Update changes.txt
rahulgoswami Aug 8, 2023
95ed2c8
Merge branch 'main' into SOLR-16360
dsmiley Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion solr/core/src/java/org/apache/solr/schema/BoolField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.apache.lucene.util.mutable.MutableValue;
import org.apache.lucene.util.mutable.MutableValueBool;
import org.apache.solr.analysis.SolrAnalyzer;
import org.apache.solr.common.util.StrUtils;
import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.search.QParser;
import org.apache.solr.search.function.OrdFieldSource;
Expand Down Expand Up @@ -211,7 +212,7 @@ public List<IndexableField> createFields(SchemaField field, Object value) {
@Override
public Object toNativeType(Object val) {
if (val instanceof CharSequence) {
return Boolean.valueOf(val.toString());
return Boolean.valueOf(StrUtils.parseBoolean(val.toString()));
rahulgoswami marked this conversation as resolved.
Show resolved Hide resolved
}
return super.toNativeType(val);
}
Expand Down
5 changes: 5 additions & 0 deletions solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@
DO NOT ADD THINGS TO THIS CONFIG! -->
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<updateHandler class="solr.DirectUpdateHandler2">
<updateLog enable="${enable.update.log:true}">
<str name="dir">${solr.ulog.dir:}</str>
</updateLog>
</updateHandler>
<dataDir>${solr.data.dir:}</dataDir>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
Expand Down
12 changes: 12 additions & 0 deletions solr/core/src/test/org/apache/solr/schema/BooleanFieldTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.apache.solr.schema;

import java.util.Map;
import org.apache.solr.SolrTestCaseJ4;
import org.junit.BeforeClass;
import org.junit.Test;
rahulgoswami marked this conversation as resolved.
Show resolved Hide resolved
Expand Down Expand Up @@ -108,5 +109,16 @@ public void testBoolField() {
"//lst[@name='bindsto']/int[@name='true'][.='2']",
"//lst[@name='bindstom']/int[@name='false'][.='2']",
"//lst[@name='bindstom']/int[@name='true'][.='3']");

// SOLR-16360
assertU(adoc("id", "7", "bindsto", "false"));
assertU(commit());
// do atomic update
assertU(adoc(sdoc("id", "7", "bindsto", Map.of("set", "1"))));
assertQ(
req("qt", "/get", "id", "7"),
"count(//doc)=1",
"//doc/str[@name='id'][.='7']",
"//doc/bool[@name='bindsto'][.='true']");
}
}