You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2025/02/08 05:31:03 UTC
(jackrabbit-oak) branch trunk updated: Revert "OAK-11454 Explain query output: fix synchronousPropertyCondition (#2052)"
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new eb56c9ba11 Revert "OAK-11454 Explain query output: fix synchronousPropertyCondition (#2052)"
eb56c9ba11 is described below
commit eb56c9ba110d31921537eb70ebc7f79f8536512d
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Sat Feb 8 06:30:51 2025 +0100
Revert "OAK-11454 Explain query output: fix synchronousPropertyCondition (#2052)"
This reverts commit 7d241126ee60c937b814c61fb9ccf869192478d3.
---
.../plugins/index/lucene/property/SynchronousPropertyIndexTest.java | 4 ++--
.../jackrabbit/oak/plugins/index/search/spi/query/FulltextIndex.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/SynchronousPropertyIndexTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/SynchronousPropertyIndexTest.java
index 89bbe7f96f..9694d43925 100644
--- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/SynchronousPropertyIndexTest.java
+++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/SynchronousPropertyIndexTest.java
@@ -331,9 +331,9 @@ public class SynchronousPropertyIndexTest extends AbstractQueryTest {
runAsyncIndex();
assertThat(explain("select * from [nt:base] where [jcr:content/foo] = 'bar'"),
- containsString("propertyCondition: foo[jcr:content/foo] bar"));
+ containsString("synchronousPropertyCondition: foo[jcr:content/foo] bar"));
assertThat(explain("select * from [nt:base] where [foo] = 'bar'"),
- containsString("propertyCondition: foo bar"));
+ containsString("synchronousPropertyCondition: foo bar"));
}
@Test
diff --git a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndex.java b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndex.java
index d0c1f67d0a..9581e87be5 100644
--- a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndex.java
+++ b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndex.java
@@ -184,7 +184,7 @@ public abstract class FulltextIndex implements AdvancedQueryIndex, QueryIndex, N
PlanResult pr = getPlanResult(plan);
if (pr.hasPropertyIndexResult()) {
FulltextIndexPlanner.PropertyIndexResult pres = pr.getPropertyIndexResult();
- sb.append(" propertyCondition: ").append(pres.propertyName);
+ sb.append(" synchronousPropertyCondition: ").append(pres.propertyName);
if (!pres.propertyName.equals(pres.pr.propertyName)) {
sb.append("[").append(pres.pr.propertyName).append("]");
}