ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [34/49] incubator-ignite git commit: # ignite-629-1
Date Wed, 01 Apr 2015 08:38:20 GMT
# ignite-629-1


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

Branch: refs/heads/ignite-645
Commit: a9996d8fdb2ae5ecbf1a56b88a4161f5d8bcf5de
Parents: 1617648
Author: sboikov <sboikov@gridgain.com>
Authored: Tue Mar 31 11:01:37 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Tue Mar 31 11:01:37 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/client/impl/ClientCacheFlagsCodecTest.java  | 1 +
 .../ignite/internal/processors/cache/CacheProjection.java       | 4 ++--
 .../ignite/internal/processors/cache/GridCacheContext.java      | 2 +-
 .../internal/processors/cache/GridCacheProjectionImpl.java      | 5 ++++-
 .../processors/cache/local/atomic/GridLocalAtomicCache.java     | 1 +
 .../java/org/apache/ignite/IgniteCacheAffinitySelfTest.java     | 1 -
 .../processors/cache/IgniteCacheInvokeAbstractTest.java         | 4 ----
 7 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9996d8f/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
index 973a0a3..9f177d7 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
@@ -44,6 +44,7 @@ public class ClientCacheFlagsCodecTest extends TestCase {
             assertTrue(bits != 0);
 
             boolean out = GridCacheCommandHandler.parseCacheFlags(bits);
+
             assertEquals(out, true);
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9996d8f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
index 6189d6b..d4f1ec0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
@@ -241,8 +241,8 @@ public interface CacheProjection<K, V> extends Iterable<Cache.Entry<K,
V>> {
     public CacheProjection<K, V> projection(@Nullable CacheEntryPredicate filter);
 
     /**
-     * @param skipStore Skip store.
-     * @return New projection based on this one, but with skip store.
+     * @param skipStore Skip store flag.
+     * @return New projection based on this one, but with skip store flag enabled.
      */
     public CacheProjection<K, V> setSkipStore(boolean skipStore);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9996d8f/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 bec175a..7fae62f 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
@@ -1225,7 +1225,7 @@ public class GridCacheContext<K, V> implements Externalizable
{
     }
 
     /**
-     * @return {@code true} if the skip store is set.
+     * @return {@code true} if the skip store flag is set.
      */
     public boolean skipStore() {
         if (nearContext())

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9996d8f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
index 3517b42..eea665a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
@@ -89,7 +89,10 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K,
V
      * @param parent Parent projection.
      * @param cctx Cache context.
      * @param entryFilter Entry filter.
-     * @param skipStore Skip store.
+     * @param skipStore Skip store flag.
+     * @param subjId Subject ID.
+     * @param keepPortable Keep portable flag.
+     * @param expiryPlc Expiry policy.
      */
     @SuppressWarnings({"unchecked", "TypeMayBeWeakened"})
     public GridCacheProjectionImpl(

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9996d8f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
index 80ef55c..a9a6f23 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
@@ -508,6 +508,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K,
V> {
      * @param storeEnabled Store enabled flag.
      * @param taskName Task name.
      * @param deserializePortable Deserialize portable .
+     * @param skipVals Skip value flag.
      * @return Key-value map.
      * @throws IgniteCheckedException If failed.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9996d8f/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
index 8d4a350..c4683fd 100644
--- a/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
@@ -96,7 +96,6 @@ public class IgniteCacheAffinitySelfTest extends IgniteCacheAbstractTest
{
 
         startGrid(gridCount() - 1);
         startGrid(gridCount());
-        awaitPartitionMapExchange();
 
         GRID_CNT += 1;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9996d8f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java
index a91aca7..102604e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java
@@ -55,8 +55,6 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT
 
             invoke(cache, OPTIMISTIC);
         }
-        else if (gridCount() > 1)
-            invoke(cache, null);
     }
 
     /**
@@ -181,8 +179,6 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT
 
             invokeAll(cache, OPTIMISTIC);
         }
-        else if (gridCount() > 1)
-            invokeAll(cache, null);
     }
 
     /**


Mime
View raw message