(jackrabbit-oak) branch OAK-10527 updated: OAK-10527 Improve readability of the explain query output

[thomasm]

This is an automated email from the ASF dual-hosted git repository.

thomasm pushed a commit to branch OAK-10527
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/OAK-10527 by this push:
     new ae90b67fc3 OAK-10527 Improve readability of the explain query output
ae90b67fc3 is described below

commit ae90b67fc32537f5afc28db096353bf90882b1d5
Author: Thomas Mueller <thom...@apache.org>
AuthorDate: Fri Nov 3 12:11:14 2023 +0100

    OAK-10527 Improve readability of the explain query output
---
 .../apache/jackrabbit/oak/run/JsonIndexTest.java   | 23 +++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git 
a/oak-run/src/test/java/org/apache/jackrabbit/oak/run/JsonIndexTest.java 
b/oak-run/src/test/java/org/apache/jackrabbit/oak/run/JsonIndexTest.java
index a07d05a800..3569882393 100644
--- a/oak-run/src/test/java/org/apache/jackrabbit/oak/run/JsonIndexTest.java
+++ b/oak-run/src/test/java/org/apache/jackrabbit/oak/run/JsonIndexTest.java
@@ -131,8 +131,11 @@ public class JsonIndexTest {
                     "{'xpath':'/jcr:root//element(*, 
oak:QueryIndexDefinition)[@type=`counter`] " +
                         "order by @jcr:path'}");
             assertCommand(index,
-                    combineLines("[nt:unstructured] as [a] /* property test = 
1 " +
-                            "where ([a].[x] = 1) and (isdescendantnode([a], 
[/])) */"),
+                    combineLines("[nt:unstructured] as [a] /* property test\n"
+                            + "    indexDefinition: /oak:index/test\n"
+                            + "    values: '1'\n"
+                            + "    estimatedCost: 4.0\n"
+                            + " */"),
                     "{'addNode':'/oak:index/test', 'node':{ " +
                         "'jcr:primaryType':'oak:QueryIndexDefinition', " +
                         "'type':'property', " +
@@ -162,18 +165,20 @@ public class JsonIndexTest {
                     "{'print': '$y'}"
                     );
             assertCommand(index,
-                    combineLines("[nt:unstructured] as [a] /* nodeType 
Filter(query=" +
-                            "explain select [jcr:path], [jcr:score], * from 
[nt:unstructured] as a " +
-                            "where [x] = 1 and isdescendantnode(a, '/') /* 
xpath: " +
-                            "/jcr:root//element(*, nt:unstructured)[@x=1] */, 
path=//*, " +
-                            "property=[x=[1]]) where ([a].[x] = 1) and 
(isdescendantnode([a], [/])) */"),
+                    combineLines("[nt:unstructured] as [a] /* nodeType\n"
+                            + "    path: /\n"
+                            + "    primaryTypes: [nt:unstructured, rep:root]\n"
+                            + "    mixinTypes: []\n"
+                            + " */"),
                     "{'setProperty': '/oak:index/test/type', 'value': 
'disabled'}",
                     "{'session':'save'}",
                     "{'xpath':'explain /jcr:root//element(*, 
nt:unstructured)[@x=1]'}"
                     );
             assertCommand(index,
-                    combineLines("[nt:unstructured] as [a] /* traverse '*' " +
-                            "where [a].[x] = 1 */"),
+                    combineLines("[nt:unstructured] as [a] /* traverse\n"
+                            + "    allNodes (warning: slow)\n"
+                            + "    estimatedEntries: 1.0E8\n"
+                            + " */"),
                     "{'removeNode': '/oak:index/nodetype'}",
                     "{'session':'save'}",
                     "{'sql':'explain select * from [nt:unstructured] as [a] 
where [x]=1'}"