Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A629917EBD for ; Wed, 1 Apr 2015 09:13:05 +0000 (UTC) Received: (qmail 8215 invoked by uid 500); 1 Apr 2015 09:12:49 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 8181 invoked by uid 500); 1 Apr 2015 09:12:49 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 8169 invoked by uid 99); 1 Apr 2015 09:12:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2015 09:12:49 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 01 Apr 2015 09:12:11 +0000 Received: (qmail 4387 invoked by uid 99); 1 Apr 2015 09:12:08 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2015 09:12:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 892F5E2F30; Wed, 1 Apr 2015 09:12:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 01 Apr 2015 09:12:33 -0000 Message-Id: <3ba5e5931a4d419f9454a0b788dcf035@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [26/50] incubator-ignite git commit: # ignite-629-1 X-Virus-Checked: Checked by ClamAV on apache.org # 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-gg-9950 Commit: a9996d8fdb2ae5ecbf1a56b88a4161f5d8bcf5de Parents: 1617648 Author: sboikov Authored: Tue Mar 31 11:01:37 2015 +0300 Committer: sboikov 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 extends Iterable> { public CacheProjection 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 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 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 implements GridCacheProjectionEx extends GridCacheAdapter { * @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); } /**