Repository: ignite Updated Branches: refs/heads/master 6e7b86e8e -> de30a86e7
IGNITE-9361 Remove IgniteInternalCache.isMongo*Cache() and other remnants. - Fixes #4678. Signed-off-by: Dmitriy Govorukhin <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/de30a86e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/de30a86e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/de30a86e Branch: refs/heads/master Commit: de30a86e740067ed239602fb5dc28396144fd446 Parents: 6e7b86e Author: Ilya Kasnacheev <[email protected]> Authored: Tue Sep 4 13:27:28 2018 +0300 Committer: Dmitriy Govorukhin <[email protected]> Committed: Tue Sep 4 13:27:28 2018 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/GridTopic.java | 3 --- .../ignite/internal/IgniteNodeAttributes.java | 3 --- .../processors/cache/GridCacheAdapter.java | 18 --------------- .../processors/cache/GridCacheProxyImpl.java | 24 -------------------- .../processors/cache/IgniteInternalCache.java | 14 ------------ .../distributed/near/GridNearCacheAdapter.java | 10 -------- modules/core/src/test/config/tests.properties | 5 ---- .../cache/hibernate/HibernateCacheProxy.java | 10 -------- 8 files changed, 87 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/de30a86e/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java index 68cea4f..5610b2a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java @@ -82,9 +82,6 @@ public enum GridTopic { TOPIC_CONTINUOUS, /** */ - TOPIC_MONGO, - - /** */ TOPIC_TIME_SYNC, /** */ http://git-wip-us.apache.org/repos/asf/ignite/blob/de30a86e/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java index 61a98a1..539727d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java @@ -82,9 +82,6 @@ public final class IgniteNodeAttributes { public static final String ATTR_IGFS = ATTR_PREFIX + ".igfs"; /** Internal attribute name constant. */ - public static final String ATTR_MONGO = ATTR_PREFIX + ".mongo"; - - /** Internal attribute name constant. */ public static final String ATTR_DAEMON = ATTR_PREFIX + ".daemon"; /** Internal attribute name constant. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/de30a86e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 159d681..4481e4d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -276,14 +276,6 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V /** Whether this cache is IGFS data cache. */ private boolean igfsDataCache; - /** Whether this cache is Mongo data cache. */ - @SuppressWarnings("UnusedDeclaration") - private boolean mongoDataCache; - - /** Whether this cache is Mongo meta cache. */ - @SuppressWarnings("UnusedDeclaration") - private boolean mongoMetaCache; - /** Current IGFS data cache size. */ private LongAdder igfsDataCacheSize; @@ -4572,16 +4564,6 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V return igfsDataCacheSize.longValue(); } - /** {@inheritDoc} */ - @Override public boolean isMongoDataCache() { - return mongoDataCache; - } - - /** {@inheritDoc} */ - @Override public boolean isMongoMetaCache() { - return mongoMetaCache; - } - /** * Callback invoked when data is added to IGFS cache. * http://git-wip-us.apache.org/repos/asf/ignite/blob/de30a86e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java index fb0a556..a9ce448 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java @@ -445,30 +445,6 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte } /** {@inheritDoc} */ - @Override public boolean isMongoDataCache() { - CacheOperationContext prev = gate.enter(opCtx); - - try { - return delegate.isMongoDataCache(); - } - finally { - gate.leave(prev); - } - } - - /** {@inheritDoc} */ - @Override public boolean isMongoMetaCache() { - CacheOperationContext prev = gate.enter(opCtx); - - try { - return delegate.isMongoMetaCache(); - } - finally { - gate.leave(prev); - } - } - - /** {@inheritDoc} */ @Override public Map<K, V> getAll(@Nullable Collection<? extends K> keys) throws IgniteCheckedException { CacheOperationContext prev = gate.enter(opCtx); http://git-wip-us.apache.org/repos/asf/ignite/blob/de30a86e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java index bbedef8..cba2228 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java @@ -1658,20 +1658,6 @@ public interface IgniteInternalCache<K, V> extends Iterable<Cache.Entry<K, V>> { public long igfsDataSpaceUsed(); /** - * Checks whether this cache is Mongo data cache. - * - * @return {@code True} if this cache is mongo data cache. - */ - public boolean isMongoDataCache(); - - /** - * Checks whether this cache is Mongo meta cache. - * - * @return {@code True} if this cache is mongo meta cache. - */ - public boolean isMongoMetaCache(); - - /** * @param keepBinary Keep binary flag. * @param p Optional key/value predicate. * @return Scan query iterator. http://git-wip-us.apache.org/repos/asf/ignite/blob/de30a86e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java index 672693c..3904781 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java @@ -396,16 +396,6 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda } /** {@inheritDoc} */ - @Override public boolean isMongoDataCache() { - return dht().isMongoDataCache(); - } - - /** {@inheritDoc} */ - @Override public boolean isMongoMetaCache() { - return dht().isMongoMetaCache(); - } - - /** {@inheritDoc} */ @Override public List<GridCacheClearAllRunnable<K, V>> splitClearLocally(boolean srv, boolean near, boolean readers) { assert configuration().getNearConfiguration() != null; http://git-wip-us.apache.org/repos/asf/ignite/blob/de30a86e/modules/core/src/test/config/tests.properties ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/tests.properties b/modules/core/src/test/config/tests.properties index 718d661..b39e3ca 100644 --- a/modules/core/src/test/config/tests.properties +++ b/modules/core/src/test/config/tests.properties @@ -146,8 +146,3 @@ ssl.keystore.trustboth.path=@{IGNITE_HOME}/modules/clients/src/test/keystore/ca/ # Hadoop home directory. hadoop.home=@{HADOOP_HOME} - -# Sharded mongo properties -mongos.host=192.168.2.10 -mongos.port=27017 -sharded.db.name=gg-test-db http://git-wip-us.apache.org/repos/asf/ignite/blob/de30a86e/modules/hibernate-core/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java ---------------------------------------------------------------------- diff --git a/modules/hibernate-core/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java b/modules/hibernate-core/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java index 70e55de..fdb87f0 100644 --- a/modules/hibernate-core/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java +++ b/modules/hibernate-core/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java @@ -602,16 +602,6 @@ public class HibernateCacheProxy implements IgniteInternalCache<Object, Object> } /** {@inheritDoc} */ - @Override public boolean isMongoDataCache() { - return delegate.isMongoDataCache(); - } - - /** {@inheritDoc} */ - @Override public boolean isMongoMetaCache() { - return delegate.isMongoMetaCache(); - } - - /** {@inheritDoc} */ @Nullable @Override public ExpiryPolicy expiry() { return delegate.expiry(); }
