ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [12/22] ignite git commit: Merge branch 'ignite-2925' into novarargs
Date Fri, 01 Apr 2016 08:24:57 GMT
Merge branch 'ignite-2925' into novarargs

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java


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

Branch: refs/heads/ignite-2931
Commit: ad523c98260c2221d15576340c16e736d48f1274
Parents: 0fbb6aa 1432652
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Fri Apr 1 09:57:25 2016 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Fri Apr 1 09:57:25 2016 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheAdapter.java      | 117 ----------
 .../processors/cache/GridCacheProxyImpl.java    |  48 ----
 .../processors/cache/IgniteInternalCache.java   |  79 -------
 .../dht/atomic/GridDhtAtomicCache.java          | 229 +++++++++++++------
 .../distributed/near/GridNearAtomicCache.java   |  22 --
 .../local/atomic/GridLocalAtomicCache.java      |  57 -----
 .../processors/service/GridServiceProxy.java    |   8 +-
 modules/flink/README.txt                        |  33 +++
 modules/flink/licenses/apache-2.0.txt           | 202 ++++++++++++++++
 modules/flink/pom.xml                           | 167 ++++++++++++++
 .../apache/ignite/sink/flink/IgniteSink.java    | 204 +++++++++++++++++
 .../apache/ignite/sink/flink/package-info.java  |  22 ++
 .../sink/flink/FlinkIgniteSinkSelfTest.java     | 188 +++++++++++++++
 .../flink/FlinkIgniteSinkSelfTestSuite.java     |  38 +++
 .../flink/src/test/resources/example-ignite.xml |  70 ++++++
 modules/kafka/README.txt                        |  10 +-
 .../stream/kafka/connect/IgniteSourceTask.java  |  15 +-
 .../Cache/Query/CacheLinqTest.cs                |   2 +-
 .../Impl/Services/ServiceProxyInvoker.cs        |   4 +-
 modules/platforms/dotnet/Apache.Ignite.FxCop    |   4 +-
 .../Impl/CacheQueryModelVisitor.cs              |   3 +-
 .../Apache.Ignite.Linq/Impl/MethodVisitor.cs    |   9 +-
 modules/platforms/dotnet/Apache.Ignite.sln      |   3 +-
 parent/pom.xml                                  |   4 +
 pom.xml                                         |   1 +
 25 files changed, 1125 insertions(+), 414 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/ad523c98/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/ad523c98/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index f3085d1,f85862d..ed5edd3
--- 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
@@@ -451,10 -450,8 +450,8 @@@ public class GridDhtAtomicCache<K, V> e
              null,
              null,
              true,
-             false,
 -            filter,
 +            filter != null ? new CacheEntryPredicate[] { filter } : null,
-             true,
-             UPDATE);
+             true);
      }
  
      /** {@inheritDoc} */
@@@ -468,10 -465,8 +465,8 @@@
              null,
              null,
              false,
-             false,
 -            filter,
 +            filter != null ? new CacheEntryPredicate[] { filter } : null,
-             true,
-             UPDATE);
+             true);
      }
  
      /** {@inheritDoc} */
@@@ -484,10 -479,8 +479,8 @@@
              null,
              null,
              true,
-             false,
 -            ctx.noValArray(),
 +            new CacheEntryPredicate[] { ctx.noVal() },
-             false,
-             UPDATE).get();
+             false).get();
      }
  
      /** {@inheritDoc} */
@@@ -656,11 -616,10 +616,10 @@@
  
      /** {@inheritDoc} */
      @SuppressWarnings("unchecked")
 -    @Override public IgniteInternalFuture<Boolean> removeAsync(K key, @Nullable CacheEntryPredicate...
filter) {
 +    @Override public IgniteInternalFuture<Boolean> removeAsync(K key, @Nullable CacheEntryPredicate
filter) {
          A.notNull(key, "key");
  
-         return removeAllAsync0(Collections.singletonList(key), null, false, false,
-             filter != null ? new CacheEntryPredicate[] { filter } : null);
 -        return removeAsync0(key, false, filter);
++        return removeAsync0(key, false, filter != null ? new CacheEntryPredicate[] { filter
} : null);
      }
  
      /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/ad523c98/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/ad523c98/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
----------------------------------------------------------------------


Mime
View raw message