# ignite-42
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/55b5a6d2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/55b5a6d2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/55b5a6d2 Branch: refs/heads/ignite-32 Commit: 55b5a6d221ba000d0f6c25beb63c099b217a326c Parents: 5e01feb 92e5d5a Author: sboikov <sboi...@gridgain.com> Authored: Thu Jan 22 14:19:39 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Jan 22 14:19:39 2015 +0300 ---------------------------------------------------------------------- .../examples/datagrid/CacheApiExample.java | 10 -- .../java/org/apache/ignite/IgniteCache.java | 172 +------------------ .../apache/ignite/IgniteCachingProvider.java | 2 +- .../org/apache/ignite/IgniteDataLoader.java | 20 ++- .../java/org/apache/ignite/cache/CacheFlag.java | 74 -------- .../processors/cache/IgniteCacheProxy.java | 95 ++-------- .../dataload/GridDataLoadCacheUpdaters.java | 6 +- .../dataload/GridDataLoadRequest.java | 36 +++- .../dataload/GridDataLoadUpdateJob.java | 12 +- .../dataload/GridDataLoaderProcessor.java | 13 +- .../dataload/IgniteDataLoaderImpl.java | 18 +- .../dr/GridDrDataLoadCacheUpdater.java | 2 +- .../cache/IgniteCacheInvokeAbstractTest.java | 4 +- .../tcp/GridCacheDhtLockBackupSelfTest.java | 2 +- .../GridCacheAbstractProjectionSelfTest.java | 4 +- .../GridCacheInterceptorAbstractSelfTest.java | 42 +---- .../GridCacheReturnValueTransferSelfTest.java | 3 +- .../distributed/GridCacheLockAbstractTest.java | 4 +- ...GridCacheValueConsistencyAtomicSelfTest.java | 4 +- .../GridDataLoaderProcessorSelfTest.java | 94 ++++++++++ 20 files changed, 218 insertions(+), 399 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55b5a6d2/modules/core/src/main/java/org/apache/ignite/IgniteCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55b5a6d2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index 054bd93,df98fc8..44486d6 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@@ -89,16 -89,9 +89,9 @@@ public class IgniteCacheProxy<K, V> ext return ctx; } - /** - * @return Ignite instance. - */ - @Override public GridEx ignite() { - return ctx.grid(); - } - /** {@inheritDoc} */ @Override public <C extends Configuration<K, V>> C getConfiguration(Class<C> clazz) { - GridCacheConfiguration cfg = ctx.config(); + CacheConfiguration cfg = ctx.config(); if (!clazz.isAssignableFrom(cfg.getClass())) throw new IllegalArgumentException(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55b5a6d2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadCacheUpdaters.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55b5a6d2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridDrDataLoadCacheUpdater.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridDrDataLoadCacheUpdater.java index e792e6d,686814f..a5a0bb1 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridDrDataLoadCacheUpdater.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridDrDataLoadCacheUpdater.java @@@ -38,9 -39,9 +38,9 @@@ public class GridDrDataLoadCacheUpdater /** {@inheritDoc} */ @Override public void update(IgniteCache<K, V> cache0, Collection<Map.Entry<K, V>> col) throws IgniteCheckedException { - String cacheName = cache0.getConfiguration(GridCacheConfiguration.class).getName(); + String cacheName = cache0.getConfiguration(CacheConfiguration.class).getName(); - GridKernalContext ctx = ((GridKernal)cache0.ignite()).context(); + GridKernalContext ctx = ((GridKernal)cache0.unwrap(Ignite.class)).context(); IgniteLogger log = ctx.log(GridDrDataLoadCacheUpdater.class); GridCacheAdapter<K, V> cache = ctx.cache().internalCache(cacheName); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55b5a6d2/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55b5a6d2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractProjectionSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55b5a6d2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAbstractSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55b5a6d2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReturnValueTransferSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReturnValueTransferSelfTest.java index 5ec15d7,68d4e62..9a03fe3 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReturnValueTransferSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReturnValueTransferSelfTest.java @@@ -18,8 -18,8 +18,9 @@@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; + import org.apache.ignite.internal.processors.cache.*; import org.gridgain.grid.cache.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55b5a6d2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55b5a6d2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java ----------------------------------------------------------------------
