ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [09/11] incubator-ignite git commit: Merge branch 'ignite-sprint-3-p1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4
Date Fri, 17 Apr 2015 22:45:15 GMT
Merge branch 'ignite-sprint-3-p1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-sprint-4


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

Branch: refs/heads/ignite-218
Commit: 5049704da5742ab7e4215f66a699dce62df357db
Parents: 11baaa8 9934af1
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Fri Apr 17 22:24:38 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Fri Apr 17 22:24:38 2015 +0700

----------------------------------------------------------------------
 .../discovery/GridDiscoveryManager.java         |  18 ++-
 .../processors/cache/CacheEntryImpl.java        |  29 +++-
 .../cache/CacheVersionedEntryImpl.java          |  29 +++-
 .../processors/cache/GridCacheAdapter.java      |  43 +++---
 .../GridCacheQuerySerializationSelfTest.java    | 144 +++++++++++++++++++
 .../IgniteCacheQuerySelfTestSuite.java          |   2 +
 6 files changed, 234 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5049704d/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5049704d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 71d3c0d,62dae3c..81cdf02
--- 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
@@@ -2020,9 -2102,9 +2020,9 @@@ public abstract class GridCacheAdapter<
  
          validateCacheValue(val);
  
-         return asyncOp(new AsyncOp<V>(key) {
+         return asyncOp(new AsyncOp<V>() {
              @Override public IgniteInternalFuture<V> op(IgniteTxLocalAdapter tx) {
 -                return tx.putAllAsync(ctx, F.t(key, val), true, entry, ttl, filter)
 +                return tx.putAllAsync(ctx, F.t(key, val), true, null, -1, filter)
                      .chain((IgniteClosure<IgniteInternalFuture<GridCacheReturn>,
V>)RET2VAL);
              }
  
@@@ -2352,9 -2407,9 +2352,9 @@@
  
          validateCacheValue(val);
  
-         return asyncOp(new AsyncOp<Boolean>(key) {
+         return asyncOp(new AsyncOp<Boolean>() {
              @Override public IgniteInternalFuture<Boolean> op(IgniteTxLocalAdapter
tx) {
 -                return tx.putAllAsync(ctx, F.t(key, val), false, entry, ttl, filter).chain(
 +                return tx.putAllAsync(ctx, F.t(key, val), false, null, -1, filter).chain(
                      (IgniteClosure<IgniteInternalFuture<GridCacheReturn>, Boolean>)
RET2FLAG);
              }
  
@@@ -2739,10 -2818,10 +2739,10 @@@
          if (keyCheck)
              validateCacheKey(key);
  
-         IgniteInternalFuture<V> fut = asyncOp(new AsyncOp<V>(key) {
+         IgniteInternalFuture<V> fut = asyncOp(new AsyncOp<V>() {
              @Override public IgniteInternalFuture<V> op(IgniteTxLocalAdapter tx) {
                  // TODO should we invoke interceptor here?
 -                return tx.removeAllAsync(ctx, Collections.singletonList(key), null, true,
filter)
 +                return tx.removeAllAsync(ctx, Collections.singletonList(key), null, true,
CU.empty0())
                      .chain((IgniteClosure<IgniteInternalFuture<GridCacheReturn>,
V>) RET2VAL);
              }
  
@@@ -2862,9 -2956,9 +2862,9 @@@
          if (keyCheck)
              validateCacheKey(key);
  
-         IgniteInternalFuture<Boolean> fut = asyncOp(new AsyncOp<Boolean>(key)
{
+         IgniteInternalFuture<Boolean> fut = asyncOp(new AsyncOp<Boolean>() {
              @Override public IgniteInternalFuture<Boolean> op(IgniteTxLocalAdapter
tx) {
 -                return tx.removeAllAsync(ctx, Collections.singletonList(key), entry, false,
filter).chain(
 +                return tx.removeAllAsync(ctx, Collections.singletonList(key), null, false,
filter).chain(
                      (IgniteClosure<IgniteInternalFuture<GridCacheReturn>, Boolean>)RET2FLAG);
              }
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5049704d/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
----------------------------------------------------------------------


Mime
View raw message