Skip to content

OAK-12045: strip leading and trailing whitespaces (including newlines) from :fulltext #2670

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

Open
fabriziofortino wants to merge 1 commit into
base: trunk
Choose a base branch
from
+49 −1
Open

OAK-12045: strip leading and trailing whitespaces (including newlines) from :fulltext #2670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion .../src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticDocument.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,12 @@ public class ElasticDocument {
}

void addFulltext(String value) {
fulltext.add(value);
if (value != null) {
String cleaned = value.strip();
if (!cleaned.isEmpty()) {
fulltext.add(cleaned);
}
}
}

void addFulltextRelative(String path, String value) {
Expand Down
43 changes: 43 additions & 0 deletions ...tic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticContentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@
*/
package org.apache.jackrabbit.oak.plugins.index.elastic;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.plugins.index.elastic.util.ElasticIndexUtils;
import org.apache.jackrabbit.oak.plugins.index.search.FieldNames;
import org.apache.jackrabbit.oak.plugins.index.search.util.IndexDefinitionBuilder;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
import org.junit.Ignore;
Expand All @@ -32,13 +34,15 @@
import java.util.function.BiConsumer;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.StreamSupport;

import static org.apache.jackrabbit.oak.plugins.index.elastic.ElasticTestUtils.randomString;
import static org.hamcrest.CoreMatchers.endsWith;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.hasItem;
import static org.junit.Assert.assertTrue;
import static org.mockito.AdditionalMatchers.geq;
import static org.mockito.ArgumentMatchers.anyBoolean;
Expand Down Expand Up @@ -329,4 +333,43 @@ public void indexAliasContainsMappingVersionWhenGreatestThanOne() throws Excepti
assertThat(indexAlias, not(endsWith("_v" + ElasticIndexDefinition.MAPPING_VERSION)));
}
}

@Test
public void fulltextFieldValuesCleanup() throws Exception {
IndexDefinitionBuilder builder = createIndex("a").noAsync();
builder.includedPaths("/content");
builder.indexRule("nt:base").property("a").nodeScopeIndex();
Tree index = setIndex(UUID.randomUUID().toString(), builder);
root.commit();

Tree content = root.getTree("/").addChild("content");
content.addChild("indexed1").setProperty("a", "foo bar baz");
content.addChild("indexed2").setProperty("a", "\nfoo foo baz\n");
content.addChild("indexed3").setProperty("a", "\n\n\n foo foo baz \n\n\n");
root.commit();

assertEventually(() -> {
ObjectNode indexed1 = getDocument(index, "/content/indexed1");
List<String> values1 = StreamSupport.stream(
indexed1.get(ElasticIndexUtils.fieldName(FieldNames.FULLTEXT)).spliterator(), false)
.map(JsonNode::asText)
.collect(Collectors.toList());
assertThat(values1, hasItem("foo bar baz"));

ObjectNode indexed2 = getDocument(index, "/content/indexed2");
List<String> values2 = StreamSupport.stream(
indexed2.get(ElasticIndexUtils.fieldName(FieldNames.FULLTEXT)).spliterator(), false)
.map(JsonNode::asText)
.collect(Collectors.toList());
assertThat(values2, hasItem("foo foo baz"));

ObjectNode indexed3 = getDocument(index, "/content/indexed3");
List<String> values3 = StreamSupport.stream(
indexed3.get(ElasticIndexUtils.fieldName(FieldNames.FULLTEXT)).spliterator(), false)
.map(JsonNode::asText)
.collect(Collectors.toList());
assertThat(values3, hasItem("foo foo baz"));
});
}

}
Loading