ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [14/50] incubator-ignite git commit: # ignite-758 minor
Date Tue, 21 Apr 2015 13:35:03 GMT
# ignite-758 minor


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

Branch: refs/heads/ignite-646
Commit: e99216fd431ce4cbcb21a1893475509e564e7222
Parents: a64810a
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Apr 17 16:34:09 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Apr 17 16:34:09 2015 +0300

----------------------------------------------------------------------
 .../internal/processors/cache/GridCacheAdapter.java      |  4 +++-
 .../internal/processors/cache/GridCacheContext.java      |  2 +-
 .../internal/processors/cache/GridCacheProcessor.java    |  6 +++---
 .../internal/processors/cache/GridCacheProxyImpl.java    |  4 +++-
 .../internal/processors/cache/IgniteCacheProxy.java      | 11 +++++------
 .../datastreamer/DataStreamerCacheUpdaters.java          |  5 ++---
 6 files changed, 17 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e99216fd/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 694f3d8..4379e3f 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
@@ -3545,7 +3545,9 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K,
V
             nodes.nodes());
     }
 
-    /** {@inheritDoc} */
+    /**
+     * @return Random cache entry.
+     */
     @Nullable public Cache.Entry<K, V> randomEntry() {
         GridCacheMapEntry e = map.randomEntry();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e99216fd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 2e62290..48dcee7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -156,7 +156,7 @@ public class GridCacheContext<K, V> implements Externalizable {
 
     /**
      * Thread local operation context. If it's set it means that method call was initiated
-     * by child internal cache of initial cache.
+     * by child cache of initial cache.
      */
     private ThreadLocal<CacheOperationContext> opCtxPerCall = new ThreadLocal<>();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e99216fd/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 c270078..83f1fed 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
@@ -2444,7 +2444,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
 
         IgniteCacheProxy<K, V> jcache = (IgniteCacheProxy<K, V>)jCacheProxies.get(maskNull(name));
 
-        return jcache == null ? null : jcache.legacyProxy();
+        return jcache == null ? null : jcache.internalProxy();
     }
 
     /**
@@ -2454,7 +2454,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
         return F.viewReadOnly(jCacheProxies.values(), new IgniteClosure<IgniteCacheProxy<?,
?>,
             IgniteInternalCache<?, ?>>() {
             @Override public IgniteInternalCache<?, ?> apply(IgniteCacheProxy<?,
?> entries) {
-                return entries.legacyProxy();
+                return entries.internalProxy();
             }
         });
     }
@@ -2515,7 +2515,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
         if (jcache == null)
             throw new IllegalArgumentException("Cache is not started: " + name);
 
-        return jcache.legacyProxy();
+        return jcache.internalProxy();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e99216fd/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 babb3ac..22c730b 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
@@ -220,7 +220,9 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K,
V>, Exte
         if (opCtx.isKeepPortable())
             return (GridCacheProxyImpl<K1, V1>)this;
         
-        return new GridCacheProxyImpl<>((GridCacheContext<K1, V1>)ctx, (GridCacheAdapter<K1,
V1>)delegate, opCtx.keepPortable());
+        return new GridCacheProxyImpl<>((GridCacheContext<K1, V1>)ctx,
+            (GridCacheAdapter<K1, V1>)delegate,
+            opCtx.keepPortable());
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e99216fd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
diff --git 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
index 128091f..c17156b 100644
--- 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
@@ -76,7 +76,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K,
V
 
     /** */
     @GridToStringExclude
-    private GridCacheProxyImpl<K, V> legacyProxy;
+    private GridCacheProxyImpl<K, V> internalProxy;
 
     /** */
     @GridToStringExclude
@@ -133,7 +133,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K,
V
 
         gate = ctx.gate();
 
-        legacyProxy = new GridCacheProxyImpl<>(ctx, delegate, opCtx);
+        internalProxy = new GridCacheProxyImpl<>(ctx, delegate, opCtx);
 
         this.lock = lock;
     }
@@ -1497,11 +1497,10 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K,
V
     }
 
     /**
-     * @return Legacy proxy.
+     * @return Internal proxy.
      */
-    @NotNull
-    public GridCacheProxyImpl<K, V> legacyProxy() {
-        return legacyProxy;
+    public GridCacheProxyImpl<K, V> internalProxy() {
+        return internalProxy;
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e99216fd/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
index d712ba1..50e9ab9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.internal.processors.datastreamer;
 
 import org.apache.ignite.*;
-import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.stream.*;
 import org.jetbrains.annotations.*;
@@ -39,8 +38,8 @@ public class DataStreamerCacheUpdaters {
     private static final StreamReceiver BATCHED_SORTED = new BatchedSorted();
 
     /**
-     * Updates cache using independent {@link IgniteCache#getAndPut(Object, Object)}and
-     * {@link IgniteCache#getAndRemove(Object)} operations. Thus it is safe from deadlocks
but performance
+     * Updates cache using independent {@link IgniteCache#put(Object, Object)}and
+     * {@link IgniteCache#remove(Object)} operations. Thus it is safe from deadlocks but
performance
      * is not the best.
      *
      * @return Single updater.


Mime
View raw message