IGNITE-28621 SQL: Add H2 map query details to system view and logs by chesnokoff · Pull Request #13091 · apache/ignite

chesnokoff · 2026-04-29T15:57:54Z

Thank you for submitting the pull request to the Apache Ignite.

In order to streamline the review of the contribution
we ask you to ensure the following steps have been taken:

The Contribution Checklist

There is a single JIRA ticket related to the pull request.
The web-link to the pull request is attached to the JIRA ticket.
The JIRA ticket has the Patch Available state.
The pull request body describes changes that have been made.
The description explains WHAT and WHY was made instead of HOW.
The pull request title is treated as the final commit message.
The following pattern must be used: IGNITE-XXXX Change summary where XXXX - number of JIRA issue.
A reviewer has been mentioned through the JIRA comments
(see the Maintainers list)
The pull request has been checked by the Teamcity Bot and
the green visa attached to the JIRA ticket (see tab PR Check at TC.Bot - Instance 1 or TC.Bot - Instance 2)

Notes

If you need any help, please email dev@ignite.apache.org or ask anу advice on http://asf.slack.com #ignite channel.

chesnokoff · 2026-05-03T18:27:50Z

+            cursor.iterator().next();
+
+            for (int i = 0; i < 2; i++) {
+                int nodeIdx = i;


effective final variable

chesnokoff · 2026-05-04T05:47:20Z

-    /** Test map query flag in running queries system view. */
-    @Test
-    public void testMapQueryRunningQueriesView() throws Exception {
-        IgniteEx ignite = startGrids(2);
-
-        IgniteCache<Integer, String> cache = ignite.createCache(
-            new CacheConfiguration<Integer, String>(DEFAULT_CACHE_NAME)
-                .setCacheMode(CacheMode.PARTITIONED)
-                .setIndexedTypes(Integer.class, String.class)
-        );
-
-        for (int i = 0; i < 10; i++)
-            cache.put(i, Integer.toString(i));
-
-        awaitPartitionMapExchange();
-
-        String initiatorId = UUID.randomUUID().toString();
-
-        try (FieldsQueryCursor<List<?>> cursor = cache.query(new SqlFieldsQuery("SELECT * FROM String")
-            .setQueryInitiatorId(initiatorId)
-            .setPageSize(1))) {
-            cursor.iterator().next();
-
-            for (int i = 0; i < 2; i++) {
-                int nodeIdx = i;
-                UUID nodeId = grid(nodeIdx).localNode().id();
-
-                assertTrue(waitForCondition(() -> {
-                    SystemView<SqlQueryView> view = grid(nodeIdx).context().systemView().view(SQL_QRY_VIEW);
-
-                    for (SqlQueryView qry : view) {
-                        if (qry.mapQuery()
-                            && nodeId.equals(qry.nodeId())
-                            && ignite.localNode().id().equals(qry.originNodeId())
-                            && initiatorId.equals(qry.initiatorId()))
-                            return true;
-                    }
-
-                    return false;
-                }, 5_000));
-            }
-        }
-    }


Initially, created this test to check map queries but now I think the test may be flaky so I decided to rollback it (the test passed for visa)

To make it non flaky you can use some user-defined function with latch or sleep.

alex-plekhanov · 2026-05-05T15:52:16Z

Any test for SqlQueryView?
Any test for query leakage (register - success - check that unregistered, register - throw an error on init of map phase - check that unregistered, register - throw an error on next page request - chech that unregistered)?
Any test for DML queries?

alex-plekhanov · 2026-05-05T14:56:33Z

                qry.runningFuture().onDone();

-                qryHistTracker.collectHistory(qry, failed);
+                // We need to collect query history and metrics only for external SQL queries.


External is not a good definition here. I think something like Initiated by user is better.

alex-plekhanov · 2026-05-05T15:10:15Z


            List<List<?>> res = node.context().query().querySqlFields(
-                new SqlFieldsQuery("SELECT sql, initiator_id FROM SYS.SQL_QUERIES"), false).getAll();
+                new SqlFieldsQuery("SELECT sql, initiator_id FROM SYS.SQL_QUERIES WHERE MAP_QUERY = FALSE"), false).getAll();


Looks like an issue. Users use initiatorId like label. Maybe it's worth to pass it together with map query request (maybe by another ticket)

alex-plekhanov · 2026-05-05T15:19:48Z

    private final int segment;

+    /** Running query id. */
+    private final long runningQryId;


Maybe "local query id"?

alex-plekhanov · 2026-05-05T15:53:25Z

-    /** Test map query flag in running queries system view. */
-    @Test
-    public void testMapQueryRunningQueriesView() throws Exception {
-        IgniteEx ignite = startGrids(2);
-
-        IgniteCache<Integer, String> cache = ignite.createCache(
-            new CacheConfiguration<Integer, String>(DEFAULT_CACHE_NAME)
-                .setCacheMode(CacheMode.PARTITIONED)
-                .setIndexedTypes(Integer.class, String.class)
-        );
-
-        for (int i = 0; i < 10; i++)
-            cache.put(i, Integer.toString(i));
-
-        awaitPartitionMapExchange();
-
-        String initiatorId = UUID.randomUUID().toString();
-
-        try (FieldsQueryCursor<List<?>> cursor = cache.query(new SqlFieldsQuery("SELECT * FROM String")
-            .setQueryInitiatorId(initiatorId)
-            .setPageSize(1))) {
-            cursor.iterator().next();
-
-            for (int i = 0; i < 2; i++) {
-                int nodeIdx = i;
-                UUID nodeId = grid(nodeIdx).localNode().id();
-
-                assertTrue(waitForCondition(() -> {
-                    SystemView<SqlQueryView> view = grid(nodeIdx).context().systemView().view(SQL_QRY_VIEW);
-
-                    for (SqlQueryView qry : view) {
-                        if (qry.mapQuery()
-                            && nodeId.equals(qry.nodeId())
-                            && ignite.localNode().id().equals(qry.originNodeId())
-                            && initiatorId.equals(qry.initiatorId()))
-                            return true;
-                    }
-
-                    return false;
-                }, 5_000));
-            }
-        }
-    }


To make it non flaky you can use some user-defined function with latch or sleep.

…View

…gQueriesView" This reverts commit b3768f8.

alex-plekhanov · 2026-05-14T12:44:44Z

+        String initiatorId = UUID.randomUUID().toString();
+
+        IgniteInternalFuture<?> fut = GridTestUtils.runAsync(() ->
+            cache.query(new SqlFieldsQuery(sql).setQueryInitiatorId(initiatorId).setArgs(5_000)).getAll()


5 seconds sleep for each query delay test for 10 seconds. I think 1 second here is enough.

github-actions · 2026-05-14T12:49:57Z

Possible compatibility issues. Please, check rolling upgrade cases

This PR modifies protected classes (with Order annotation).
Changes to these classes can break rolling upgrade compatibility.

Affected files:

modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlRequest.java

sonarqubecloud · 2026-05-15T06:37:16Z

Quality Gate failed

Failed conditions
2 New Code Smells (required ≤ 1)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

chesnokoff force-pushed the ignite-28621-sql-map branch from 849559a to 83b64fc Compare April 30, 2026 12:22

chesnokoff commented May 3, 2026

View reviewed changes

chesnokoff commented May 4, 2026

View reviewed changes

alex-plekhanov reviewed May 5, 2026

View reviewed changes

chesnokoff added 8 commits May 12, 2026 00:31

IGNITE-28621 SQL: Add H2 map query details to system view and logs

03333f3

IGNITE-28621 Remove SqlSystemViewsSelfTest#testMapQueryRunningQueries…

a72aafd

…View

Revert "IGNITE-28621 Remove SqlSystemViewsSelfTest#testMapQueryRunnin…

0424cfe

…gQueriesView" This reverts commit b3768f8.

IGNITE-28621 Stabilize map query system view test

0a5c1ba

IGNITE-28621 Simplify map query unregister flow

e9ad40e

IGNITE-28621 Rename map query local id field

14da7fa

IGNITE-28621 Expose origin node in SQL query view

3dc723b

IGNITE-28621 Simplify map query view tests

c12268a

chesnokoff force-pushed the ignite-28621-sql-map branch from b3768f8 to c12268a Compare May 11, 2026 22:06

github-actions Bot added the compatibility label May 11, 2026

IGNITE-28621 Iterate running grids in map query view test

0943652

alex-plekhanov reviewed May 14, 2026

View reviewed changes

IGNITE-28621 Update timeout

a34dfa9

alex-plekhanov approved these changes May 14, 2026

View reviewed changes

asf-gitbox-commits closed this in 4bccc3d May 15, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

IGNITE-28621 SQL: Add H2 map query details to system view and logs#13091

IGNITE-28621 SQL: Add H2 map query details to system view and logs#13091
chesnokoff wants to merge 10 commits into
apache:masterfrom
chesnokoff:ignite-28621-sql-map

chesnokoff commented Apr 29, 2026

Uh oh!

chesnokoff May 3, 2026

Uh oh!

chesnokoff May 4, 2026 •

edited

Loading

Uh oh!

alex-plekhanov May 5, 2026

Uh oh!

alex-plekhanov commented May 5, 2026

Uh oh!

Uh oh!

alex-plekhanov May 5, 2026

Uh oh!

alex-plekhanov May 5, 2026

Uh oh!

Uh oh!

alex-plekhanov May 5, 2026

Uh oh!

Uh oh!

alex-plekhanov May 5, 2026

Uh oh!

alex-plekhanov May 14, 2026

Uh oh!

github-actions Bot commented May 14, 2026

Uh oh!

sonarqubecloud Bot commented May 15, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

chesnokoff commented Apr 29, 2026

The Contribution Checklist

Notes

Uh oh!

chesnokoff May 3, 2026

Choose a reason for hiding this comment

Uh oh!

chesnokoff May 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

alex-plekhanov May 5, 2026

Choose a reason for hiding this comment

Uh oh!

alex-plekhanov commented May 5, 2026

Uh oh!

Uh oh!

alex-plekhanov May 5, 2026

Choose a reason for hiding this comment

Uh oh!

alex-plekhanov May 5, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

alex-plekhanov May 5, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

alex-plekhanov May 5, 2026

Choose a reason for hiding this comment

Uh oh!

alex-plekhanov May 14, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented May 14, 2026

Possible compatibility issues. Please, check rolling upgrade cases

Uh oh!

sonarqubecloud Bot commented May 15, 2026

Quality Gate failed

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

chesnokoff May 4, 2026 •

edited

Loading