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 2017/11/01 09:55:49 UTC
[19/19] ignite git commit: IGNITE-6778 Fixing tests
IGNITE-6778 Fixing tests
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/98ca614b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/98ca614b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/98ca614b
Branch: refs/heads/ignite-6778
Commit: 98ca614b47ed114f9041d1c39e0572833683cc47
Parents: 54ccc9f
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Wed Nov 1 12:55:14 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Wed Nov 1 12:55:14 2017 +0300
----------------------------------------------------------------------
.../internal/processors/cache/CacheGroupContext.java | 4 +++-
.../internal/processors/cache/GridCacheProcessor.java | 6 ++++--
.../internal/processors/query/GridQueryIndexing.java | 4 ++--
.../internal/processors/query/GridQueryProcessor.java | 12 ++++++------
.../cache/IgniteClientCacheInitializationFailTest.java | 2 +-
.../internal/processors/query/h2/IgniteH2Indexing.java | 9 ++-------
6 files changed, 18 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/98ca614b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
index 19ca9c8..d9523e3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
@@ -342,7 +342,9 @@ public class CacheGroupContext {
public GridCacheContext singleCacheContext() {
List<GridCacheContext> caches = this.caches;
- assert !sharedGroup() && caches.size() == 1 : ctx.kernalContext().isStopping();
+ assert !sharedGroup() && caches.size() == 1 :
+ "stopping=" + ctx.kernalContext().isStopping() + ", groupName=" + ccfg.getGroupName() +
+ ", caches=" + caches;
return caches.get(0);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/98ca614b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 021807a..01d0d41 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -1026,7 +1026,9 @@ public class GridCacheProcessor extends GridProcessorAdapter {
assert desc != null : cctx.name();
- ctx.query().onCacheStop0(cctx.name(), false);
+ boolean rmvIdx = !cache.context().group().persistenceEnabled();
+
+ ctx.query().onCacheStop0(cctx.name(), rmvIdx);
ctx.query().onCacheStart0(cctx, desc.schema());
}
}
@@ -1150,7 +1152,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
cache.stop();
- ctx.kernalContext().query().onCacheStop(ctx, destroy);
+ ctx.kernalContext().query().onCacheStop(ctx, !cache.context().group().persistenceEnabled() || destroy);
if (isNearEnabled(ctx)) {
GridDhtCacheAdapter dht = ctx.near().dht();
http://git-wip-us.apache.org/repos/asf/ignite/blob/98ca614b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
index b0a3831..7a5cbc7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
@@ -195,10 +195,10 @@ public interface GridQueryIndexing {
* Unregisters cache.
*
* @param cacheName Cache name.
- * @param destroy Destroy flag.
+ * @param rmvIdx If {@code true}, will remove index.
* @throws IgniteCheckedException If failed to drop cache schema.
*/
- public void unregisterCache(String cacheName, boolean destroy) throws IgniteCheckedException;
+ public void unregisterCache(String cacheName, boolean rmvIdx) throws IgniteCheckedException;
/**
* Registers type if it was not known before or updates it otherwise.
http://git-wip-us.apache.org/repos/asf/ignite/blob/98ca614b/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 9327cfe..aa947ff 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
@@ -846,9 +846,9 @@ public class GridQueryProcessor extends GridProcessorAdapter {
/**
* @param cctx Cache context.
- * @param destroy Destroy flag.
+ * @param removeIdx If {@code true}, will remove index.
*/
- public void onCacheStop(GridCacheContext cctx, boolean destroy) {
+ public void onCacheStop(GridCacheContext cctx, boolean removeIdx) {
if (idx == null)
return;
@@ -856,7 +856,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
return;
try {
- onCacheStop0(cctx.name(), destroy);
+ onCacheStop0(cctx.name(), removeIdx);
}
finally {
busyLock.leaveBusy();
@@ -1527,9 +1527,9 @@ public class GridQueryProcessor extends GridProcessorAdapter {
* Use with {@link #busyLock} where appropriate.
*
* @param cacheName Cache name.
- * @param destroy Destroy flag.
+ * @param rmvIdx If {@code true}, will remove index.
*/
- public void onCacheStop0(String cacheName, boolean destroy) {
+ public void onCacheStop0(String cacheName, boolean rmvIdx) {
if (idx == null)
return;
@@ -1567,7 +1567,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
// Notify indexing.
try {
- idx.unregisterCache(cacheName, destroy);
+ idx.unregisterCache(cacheName, rmvIdx);
}
catch (Exception e) {
U.error(log, "Failed to clear indexing on cache unregister (will ignore): " + cacheName, e);
http://git-wip-us.apache.org/repos/asf/ignite/blob/98ca614b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientCacheInitializationFailTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientCacheInitializationFailTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientCacheInitializationFailTest.java
index b0b758a..9126e96 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientCacheInitializationFailTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientCacheInitializationFailTest.java
@@ -299,7 +299,7 @@ public class IgniteClientCacheInitializationFailTest extends GridCommonAbstractT
}
/** {@inheritDoc} */
- @Override public void unregisterCache(String spaceName, boolean destroy) throws IgniteCheckedException {
+ @Override public void unregisterCache(String spaceName, boolean rmvIdx) throws IgniteCheckedException {
// No-op
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/98ca614b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index dd7308a..4a9faa1 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -61,7 +61,6 @@ import org.apache.ignite.internal.GridTopic;
import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.CacheEntryImpl;
-import org.apache.ignite.internal.processors.cache.CacheGroupContext;
import org.apache.ignite.internal.processors.cache.CacheObjectUtils;
import org.apache.ignite.internal.processors.cache.CacheObjectValueContext;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
@@ -2330,7 +2329,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
}
/** {@inheritDoc} */
- @Override public void unregisterCache(String cacheName, boolean destroy) {
+ @Override public void unregisterCache(String cacheName, boolean rmvIdx) {
String schemaName = schema(cacheName);
H2Schema schema = schemas.get(schemaName);
@@ -2345,14 +2344,10 @@ public class IgniteH2Indexing implements GridQueryIndexing {
// Drop tables.
Collection<H2TableDescriptor> rmvTbls = new HashSet<>();
- CacheGroupContext grpCtx = ctx.cache().cache(cacheName).context().group();
-
for (H2TableDescriptor tbl : schema.tables()) {
if (F.eq(tbl.cache().name(), cacheName)) {
try {
- boolean removeIdx = !grpCtx.persistenceEnabled() || destroy;
-
- tbl.table().setRemoveIndexOnDestroy(removeIdx);
+ tbl.table().setRemoveIndexOnDestroy(rmvIdx);
dropTable(tbl);
}