ignite-656: reverted
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/81a009e4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/81a009e4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/81a009e4 Branch: refs/heads/ignite-sprint-4 Commit: 81a009e42dc21142bfc4e24b9be5c56474eb4b5d Parents: 410256d Author: Denis Magda <dma...@gridgain.com> Authored: Mon Apr 13 11:38:14 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Mon Apr 13 11:38:14 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheAdapter.java | 2 -- .../internal/processors/cache/GridCacheProjectionImpl.java | 1 - .../ignite/internal/processors/cache/IgniteCacheProxy.java | 1 - .../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 2 -- .../processors/cache/GridCacheAbstractFullApiSelfTest.java | 6 ++---- .../processors/query/h2/twostep/GridReduceQueryExecutor.java | 2 +- 6 files changed, 3 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81a009e4/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 1006e23..30e3bc7 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 @@ -2402,8 +2402,6 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, @Nullable final CacheEntryPredicate... filter) { A.notNull(key, "key", val, "val"); - System.out.println("---------- GridCacheAdapter.putxAsync"); - if (keyCheck) validateCacheKey(key); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81a009e4/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 a24c4fc..77240e4 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 @@ -383,7 +383,6 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public boolean putx(K key, V val, @Nullable CacheEntryPredicate[] filter) throws IgniteCheckedException { - System.out.println("---------- GridCacheProjectionImpl.putx(): cache " + cache.getClass()); return putxAsync(key, val, filter).get(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81a009e4/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 cebf4d2..dda1c7b 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 @@ -774,7 +774,6 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V try { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - System.out.println("------- CACHE PROJECTION " + prj.getClass() + " DELEGATE " + delegate.getClass()); try { if (isAsync()) setFuture(delegate.putxAsync(key, val)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81a009e4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index 2e2e710..026d2c5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -341,8 +341,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { @Nullable CacheEntryPredicate... filter) { A.notNull(key, "key"); - System.out.println("---------- GridDhtAtomicCache.putxAsync"); - return updateAllAsync0(F0.asMap(key, val), null, null, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81a009e4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index c47ee2e..30c2515 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -4267,15 +4267,13 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testWithSkipStore() throws Exception { - //if (gridCount() > 1) // TODO IGNITE-656 (test primary/backup/near keys with multiple nodes). - // return; + if (gridCount() > 1) // TODO IGNITE-656 (test primary/backup/near keys with multiple nodes). + return; IgniteCache<String, Integer> cache = grid(0).cache(null); IgniteCache<String, Integer> cacheSkipStore = cache.withSkipStore(); - System.out.println("------ CACHE CLASS " + cacheSkipStore.getClass()); - List<String> keys = primaryKeysForCache(cache, 10); for (int i = 0; i < keys.size(); ++i) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81a009e4/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java index b7edd27..02c7c55 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java @@ -484,7 +484,7 @@ public class GridReduceQueryExecutor implements GridMessageListener { Query prepare = (Query)ses.prepare(qry.query(), false); - List<org.h2.expression.Parameter> parsedParams = prepare.getParameters(); + List<Parameter> parsedParams = prepare.getParameters(); for (int i = Math.min(parsedParams.size(), qry.parameters().length); --i >= 0; ) { Object val = qry.parameters()[i];
