ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [20/22] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-49
Date Thu, 22 Jan 2015 13:20:29 GMT
Merge branch 'sprint-1' into ignite-49


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/37ed9c18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/37ed9c18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/37ed9c18

Branch: refs/heads/ignite-49
Commit: 37ed9c1821bf720331a3d93c44fd1a138bfa9447
Parents: e2a599e 92e5d5a
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Thu Jan 22 15:57:37 2015 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Thu Jan 22 15:57:37 2015 +0300

----------------------------------------------------------------------
 .../examples/datagrid/CacheApiExample.java      |  10 --
 .../java/org/apache/ignite/IgniteCache.java     | 173 +------------------
 .../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, 219 insertions(+), 399 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37ed9c18/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index edebee9,ba33aa5..5514a97
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@@ -502,26 -355,4 +355,12 @@@ public interface IgniteCache<K, V> exte
       * @return Projection for portable objects.
       */
      public <K1, V1> IgniteCache<K1, V1> keepPortable();
 +
 +    /**
-      * Gets cache projection base on this one, but with the specified flags turned on.
-      * <h1 class="header">Cache Flags</h1>
-      * The resulting projection will inherit all the flags from this projection.
-      *
-      * @param flags Flags to turn on (if empty, then no-op).
-      * @return New projection based on this one, but with the specified flags turned on.
-      */
-     public IgniteCache<K, V> flagsOn(@Nullable GridCacheFlag... flags);
- 
-     /**
-      * @return Ignite instance.
-      */
-     public Ignite ignite();
- 
-     /**
 +     * Gets metrics (statistics) for this cache.
 +     *
 +     * @return Cache metrics.
 +     */
 +    public CacheMetricsMxBean metrics();
++    
  }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37ed9c18/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 4ae79b3,df98fc8..86a0cab
--- 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,26 -89,7 +89,19 @@@ public class IgniteCacheProxy<K, V> ext
          return ctx;
      }
  
-     /**
-      * @return Ignite instance.
-      */
-     @Override public GridEx ignite() {
-         return ctx.grid();
-     }
- 
      /** {@inheritDoc} */
 +    @Override public CacheMetricsMxBean metrics() {
 +        GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
 +
 +        try {
 +            return ctx.cache().metrics();
 +        }
 +        finally {
 +            gate.leave(prev);
 +        }
 +    }
 +
 +    /** {@inheritDoc} */
      @Override public <C extends Configuration<K, V>> C getConfiguration(Class<C>
clazz) {
          GridCacheConfiguration cfg = ctx.config();
  


Mime
View raw message