Author: catholicon
Date: Tue Dec 19 10:00:43 2017
New Revision: 1818645
URL: http://svn.apache.org/viewvc?rev=1818645&view=rev
Log:
OAK-7070: rep:excerpt selector broken as regression of OAK-6750
Thanks for the patch Dirk Rudolph ([~diru]). Applying Dirk's patch to fix the
regression.
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java?rev=1818645&r1=1818644&r2=1818645&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
Tue Dec 19 10:00:43 2017
@@ -673,7 +673,7 @@ public class SelectorImpl extends Source
result = PropertyValues.newString(local);
} else if (oakPropertyName.equals(QueryConstants.JCR_SCORE)) {
result = currentRow.getValue(QueryConstants.JCR_SCORE);
- } else if (oakPropertyName.equals(QueryConstants.REP_EXCERPT + "(")) {
+ } else if (oakPropertyName.equals(QueryConstants.REP_EXCERPT)) {
result = currentRow.getValue(QueryConstants.REP_EXCERPT);
} else if
(oakPropertyName.equals(QueryConstants.OAK_SCORE_EXPLANATION)) {
result = currentRow.getValue(QueryConstants.OAK_SCORE_EXPLANATION);
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java?rev=1818645&r1=1818644&r2=1818645&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
Tue Dec 19 10:00:43 2017
@@ -31,6 +31,7 @@ import static org.apache.jackrabbit.JcrC
import static org.apache.jackrabbit.oak.api.QueryEngine.NO_BINDINGS;
import static org.apache.jackrabbit.oak.api.QueryEngine.NO_MAPPINGS;
import static org.apache.jackrabbit.oak.api.Type.NAMES;
+import static org.apache.jackrabbit.oak.api.Type.STRING;
import static org.apache.jackrabbit.oak.api.Type.STRINGS;
import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.ASYNC_PROPERTY_NAME;
import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.DECLARING_NODE_TYPES;
@@ -77,6 +78,7 @@ import java.io.InputStream;
import java.text.ParseException;
import java.util.Calendar;
import java.util.Collections;
+import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -2418,6 +2420,40 @@ public class LucenePropertyIndexTest ext
query = "SELECT [jcr:path],[rep:excerpt] from [nt:base] WHERE
CONTAINS([text], 'foo')";
assertQuery(query, SQL2, names);
+ // execute the query again to assert the excerpts value of the first
row
+ Result result = executeQuery(query, SQL2, NO_BINDINGS);
+ Iterator<? extends ResultRow> rowsIt = result.getRows().iterator();
+ while (rowsIt.hasNext()) {
+ ResultRow row = rowsIt.next();
+ PropertyValue excerptValue = row.getValue("rep:excerpt");
+ assertFalse("There is an excerpt expected for each result row for
term 'foo'", excerptValue == null || "".equals(excerptValue.getValue(STRING)));
+ }
+ }
+
+ @Test
+ public void simpleRepExcerpt() throws Exception {
+ createFullTextIndex(root.getTree("/"), "lucene");
+
+ root.commit();
+
+ Tree content = root.getTree("/").addChild("content");
+ content.setProperty("foo", "Lorem ipsum, dolor sit", STRING);
+ content.setProperty("bar", "dolor sit, luctus leo, ipsum", STRING);
+
+ root.commit();
+
+ String query = "SELECT [jcr:path],[rep:excerpt] from [nt:base] WHERE
CONTAINS(*, 'ipsum')";
+
+ Result result = executeQuery(query, SQL2, NO_BINDINGS);
+ Iterator<? extends ResultRow> resultRows = result.getRows().iterator();
+ assertTrue(resultRows.hasNext());
+ ResultRow firstRow = result.getRows().iterator().next();
+ PropertyValue excerptValue = firstRow.getValue("rep:excerpt");
+ assertTrue("There is an excerpt expected for rep:excerpt",excerptValue
!= null && !"".equals(excerptValue.getValue(STRING)));
+ excerptValue = firstRow.getValue("rep:excerpt(.)");
+ assertTrue("There is an excerpt expected for
rep:excerpt(.)",excerptValue != null &&
!"".equals(excerptValue.getValue(STRING)));
+ excerptValue = firstRow.getValue("rep:excerpt(bar)");
+ assertTrue("There is an excerpt expected for rep:excerpt(bar)
",excerptValue != null && !"".equals(excerptValue.getValue(STRING)));
}
@Test
