ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [01/10] incubator-ignite git commit: ignite-656: trying to fix for atomic cache
Date Wed, 15 Apr 2015 08:06:34 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-656 [created] 8d18956fd


ignite-656: trying to fix for atomic cache


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

Branch: refs/heads/ignite-656
Commit: 410256dfb504d3bb4c55ed359b1664cd6001d2d8
Parents: 9d92bc7
Author: Denis Magda <dmagda@gridgain.com>
Authored: Fri Apr 10 17:30:54 2015 +0300
Committer: Denis Magda <dmagda@gridgain.com>
Committed: Fri Apr 10 17:30:54 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, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/410256df/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 30e3bc7..1006e23 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,6 +2402,8 @@ 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/410256df/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 77240e4..a24c4fc 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,6 +383,7 @@ 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/410256df/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 dda1c7b..cebf4d2 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,6 +774,7 @@ 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/410256df/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 026d2c5..2e2e710 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,6 +341,8 @@ 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/410256df/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 30c2515..c47ee2e 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,13 +4267,15 @@ 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/410256df/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 02c7c55..b7edd27 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<Parameter> parsedParams = prepare.getParameters();
+            List<org.h2.expression.Parameter> parsedParams = prepare.getParameters();
 
             for (int i = Math.min(parsedParams.size(), qry.parameters().length); --i >=
0; ) {
                 Object val = qry.parameters()[i];


Mime
View raw message