You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/03/20 10:37:33 UTC
[7/7] ignite git commit: Removed onUndeploy() traits.
Removed onUndeploy() traits.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c5dc4075
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c5dc4075
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c5dc4075
Branch: refs/heads/ignite-4565-ddl
Commit: c5dc407541e305d8dee63bc23e8d619712fff409
Parents: b8d815f
Author: devozerov <vo...@gridgain.com>
Authored: Mon Mar 20 13:37:05 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Mon Mar 20 13:37:05 2017 +0300
----------------------------------------------------------------------
.../processors/cache/query/GridCacheQueryManager.java | 1 -
.../internal/processors/query/GridQueryProcessor.java | 10 +++-------
.../internal/processors/query/QueryIndexClientFuture.java | 7 -------
3 files changed, 3 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c5dc4075/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
index 87454f4..da43cbc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
@@ -86,7 +86,6 @@ import org.apache.ignite.internal.processors.query.GridQueryIndexDescriptor;
import org.apache.ignite.internal.processors.query.GridQueryProcessor;
import org.apache.ignite.internal.processors.query.GridQueryTypeDescriptor;
import org.apache.ignite.internal.processors.query.QueryUtils;
-import org.apache.ignite.internal.processors.query.ddl.IndexProposeDiscoveryMessage;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.util.GridBoundedPriorityQueue;
import org.apache.ignite.internal.util.GridCloseableIteratorAdapter;
http://git-wip-us.apache.org/repos/asf/ignite/blob/c5dc4075/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 80ae032..490d872 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
@@ -575,9 +575,8 @@ public class GridQueryProcessor extends GridProcessorAdapter {
* Complete index client futures in case of cache stop or type unregistration.
*
* @param space Space.
- * @param cacheStop {@code True} if completion caused by cache stop.
*/
- private void completeIndexClientFuturesOnSpaceUnregister(String space, boolean cacheStop) {
+ private void completeIndexClientFuturesOnSpaceUnregister(String space) {
Iterator<Map.Entry<UUID, QueryIndexClientFuture>> idxCliFutIt = idxCliFuts.entrySet().iterator();
while (idxCliFutIt.hasNext()) {
@@ -586,10 +585,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
QueryIndexClientFuture idxCliFut = idxCliFutEntry.getValue();
if (F.eq(space, idxCliFut.key().space())) {
- if (cacheStop)
- idxCliFut.onCacheStopped();
- else
- idxCliFut.onTypeUnregistered();
+ idxCliFut.onCacheStopped();
idxCliFutIt.remove();
}
@@ -1321,7 +1317,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
// TODO: Correct implementation.
removeIndexesOnSpaceUnregister(task.space());
- completeIndexClientFuturesOnSpaceUnregister(task.space(), true);
+ completeIndexClientFuturesOnSpaceUnregister(task.space());
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/c5dc4075/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryIndexClientFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryIndexClientFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryIndexClientFuture.java
index 58f4121..9de63bb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryIndexClientFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryIndexClientFuture.java
@@ -65,13 +65,6 @@ public class QueryIndexClientFuture extends GridFutureAdapter<Object> {
onDone(new IgniteException("Operation failed because cache was stopped."));
}
- /**
- * Handle type undeploy.
- */
- public void onTypeUnregistered() {
- onDone(new IgniteException("Operation failed because type was undeployed."));
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(QueryIndexClientFuture.class, this);