You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2018/11/20 18:04:28 UTC
[35/50] [abbrv] ignite git commit: IGNITE-8765: SQL: Fixed event type
when SQL or SQL_FIELDS query is executed. This closes #5421.
IGNITE-8765: SQL: Fixed event type when SQL or SQL_FIELDS query is executed. This closes #5421.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ae7a1d0b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ae7a1d0b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ae7a1d0b
Branch: refs/heads/ignite-9720
Commit: ae7a1d0b8cf51f6ccd13fc5d945c37a0d019e11b
Parents: 2c23d68
Author: Pavel Kuznetsov <pa...@gmail.com>
Authored: Tue Nov 20 12:15:38 2018 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Tue Nov 20 12:15:38 2018 +0300
----------------------------------------------------------------------
.../processors/query/GridQueryProcessor.java | 18 ++++++++++++------
.../IgniteCacheReplicatedQuerySelfTest.java | 9 ---------
2 files changed, 12 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ae7a1d0b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 3842d77..82fd51b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -2175,7 +2175,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
idx.querySqlFields(schemaName, qry, cliCtx, keepBinary, failOnMultipleStmts, null, cancel);
if (cctx != null)
- sendQueryExecutedEvent(qry.getSql(), qry.getArgs(), cctx);
+ sendQueryExecutedEvent(qry.getSql(), qry.getArgs(), cctx, qryType);
return res;
}
@@ -2454,15 +2454,21 @@ public class GridQueryProcessor extends GridProcessorAdapter {
/**
* @param sqlQry Sql query.
- * @param params Params.
- */
- private void sendQueryExecutedEvent(String sqlQry, Object[] params, GridCacheContext<?, ?> cctx) {
+ * @param params Params of the query.
+ * @param cctx cache context.
+ * @param qryType actual query type, usually either SQL or SQL_FIELDS.
+ */
+ private void sendQueryExecutedEvent(
+ String sqlQry,
+ Object[] params,
+ GridCacheContext<?, ?> cctx,
+ GridCacheQueryType qryType) {
if (cctx.events().isRecordable(EVT_CACHE_QUERY_EXECUTED)) {
ctx.event().record(new CacheQueryExecutedEvent<>(
ctx.discovery().localNode(),
- "SQL query executed.",
+ qryType.name() + " query executed.",
EVT_CACHE_QUERY_EXECUTED,
- CacheQueryType.SQL.name(),
+ qryType.name(),
cctx.name(),
null,
sqlQry,
http://git-wip-us.apache.org/repos/asf/ignite/blob/ae7a1d0b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java
index 8635416..f741ef2 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java
@@ -422,15 +422,6 @@ public class IgniteCacheReplicatedQuerySelfTest extends IgniteCacheAbstractQuery
}
/**
- * @throws Exception If failed.
- */
- @Override public void testSqlQueryEvents() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-8765");
-
- super.testSqlQueryEvents();
- }
-
- /**
* Cache key.
*/
public static class CacheKey implements Externalizable {