You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2017/01/30 14:28:43 UTC
ignite git commit: IGNITE-4436 Minor refactoring.
Repository: ignite
Updated Branches:
refs/heads/ignite-4436-2 fd94b0ac9 -> 3ae41394c
IGNITE-4436 Minor refactoring.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3ae41394
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3ae41394
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3ae41394
Branch: refs/heads/ignite-4436-2
Commit: 3ae41394c359e946079ea0caedce4dcaadea7c87
Parents: fd94b0a
Author: AKuznetsov <ak...@gridgain.com>
Authored: Mon Jan 30 21:28:33 2017 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Mon Jan 30 21:28:33 2017 +0700
----------------------------------------------------------------------
.../processors/query/GridQueryProcessor.java | 28 +++++++++-----------
.../visor/query/VisorCancelQueriesTask.java | 2 +-
.../query/VisorCollectCurrentQueriesTask.java | 2 +-
.../cache/GridCacheCrossCacheQuerySelfTest.java | 16 +++++------
4 files changed, 23 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ae41394/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 fa7f517..1e5c5d8 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
@@ -659,13 +659,6 @@ public class GridQueryProcessor extends GridProcessorAdapter {
}
/**
- * @return Indexing.
- */
- public GridQueryIndexing indexing() {
- return idx;
- }
-
- /**
* @param space Space name.
* @return Cache object context.
*/
@@ -949,16 +942,21 @@ public class GridQueryProcessor extends GridProcessorAdapter {
* @param duration Duration to check.
* @return Collection of long running queries.
*/
- public Collection<String> longRunningQueries(long duration) {
- Collection<String> res = new ArrayList<>();
-
- if (moduleEnabled()) {
- idx.runningQueries(duration);
+ public Collection<GridQuery> runningQueries(long duration) {
+ if (moduleEnabled())
+ return idx.runningQueries(duration);
- res.add("Query");
- }
+ return Collections.emptyList();
+ }
- return res;
+ /**
+ * Cancel specified queries.
+ *
+ * @param queries Queries ID's to cancel.
+ */
+ public void cancelQueries(Set<UUID> queries) {
+ if (moduleEnabled())
+ idx.cancelQueries(queries);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ae41394/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCancelQueriesTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCancelQueriesTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCancelQueriesTask.java
index ddb4731..88d7eec 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCancelQueriesTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCancelQueriesTask.java
@@ -61,7 +61,7 @@ public class VisorCancelQueriesTask extends VisorMultiNodeTask<Set<UUID>, Void,
/** {@inheritDoc} */
@Override protected Void run(@Nullable Set<UUID> queries) throws IgniteException {
- ignite.context().query().indexing().cancelQueries(queries);
+ ignite.context().query().cancelQueries(queries);
return null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ae41394/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCollectCurrentQueriesTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCollectCurrentQueriesTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCollectCurrentQueriesTask.java
index 52ed50e..1638da3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCollectCurrentQueriesTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorCollectCurrentQueriesTask.java
@@ -74,7 +74,7 @@ public class VisorCollectCurrentQueriesTask extends VisorMultiNodeTask<Long, Map
/** {@inheritDoc} */
@Override protected Collection<VisorQuery> run(@Nullable Long duration) throws IgniteException {
- Collection<GridQuery> queries = ignite.context().query().indexing().runningQueries(duration);
+ Collection<GridQuery> queries = ignite.context().query().runningQueries(duration);
Collection<VisorQuery> res = new ArrayList<>(queries.size());
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ae41394/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
index a28e670..98376d7 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
@@ -270,15 +270,15 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest {
Thread.sleep(1000);
- GridQueryIndexing idx = ((IgniteKernal)ignite).context().query().indexing();
+ GridQueryProcessor qryProc = ((IgniteKernal)ignite).context().query();
- Collection<GridQuery> queries = idx.runningQueries(500);
+ Collection<GridQuery> queries = qryProc.runningQueries(500);
assertEquals(1, queries.size());
fut.get();
- queries = idx.runningQueries(500);
+ queries = qryProc.runningQueries(500);
assertEquals(0, queries.size());
}
@@ -304,24 +304,24 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest {
Thread.sleep(1000);
- GridQueryIndexing idx = ((IgniteKernal)ignite).context().query().indexing();
+ GridQueryProcessor queryProc = ((IgniteKernal)ignite).context().query();
- Collection<GridQuery> queries = idx.runningQueries(500);
+ Collection<GridQuery> queries = queryProc.runningQueries(500);
assertEquals(1, queries.size());
for (GridQuery query : queries)
- idx.cancelQueries(Collections.singleton(query.id()));
+ queryProc.cancelQueries(Collections.singleton(query.id()));
Thread.sleep(2000); // Give cluster some time to cancel query and cleanup resources.
- queries = idx.runningQueries(500);
+ queries = queryProc.runningQueries(500);
assertEquals(0, queries.size());
fut.get();
- queries = idx.runningQueries(500);
+ queries = queryProc.runningQueries(500);
assertEquals(0, queries.size());
}