Merge branch sprint-1 into ignite-tx-rename
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c554af3b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c554af3b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c554af3b Branch: refs/heads/sprint-1 Commit: c554af3b1f9fc48afa61fa9be1f0431bc6ffccba Parents: 0e91e57 2d20498 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Sun Feb 15 20:27:22 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Sun Feb 15 20:27:22 2015 -0800 ---------------------------------------------------------------------- .../datastructures/IgniteQueueExample.java | 2 +- .../ignite/cache/store/CacheStoreSession.java | 19 +++-- .../processors/cache/GridCacheAdapter.java | 7 +- .../processors/cache/GridCacheMapEntry.java | 15 ++-- .../processors/cache/IgniteCacheProxy.java | 6 +- .../CacheDataStructuresManager.java | 3 +- .../continuous/CacheContinuousQueryHandler.java | 12 +++ .../CacheContinuousQueryListener.java | 2 + .../continuous/CacheContinuousQueryManager.java | 88 ++++++++++++++++++-- .../service/GridServiceProcessor.java | 6 +- .../internal/util/nio/GridDirectParser.java | 7 +- .../apache/ignite/lang/IgniteAsyncSupport.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 7 +- .../hadoop/jobtracker/GridHadoopJobTracker.java | 1 + 14 files changed, 130 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c554af3b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java index ce63c6a,3f62443..2fdd68f --- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java @@@ -27,11 -26,17 +26,17 @@@ import java.util.* */ public interface CacheStoreSession { /** + * Gets transaction spanning multiple store operations, or {@code null} if + * there is no transaction. + * * @return Transaction belonging to current session. */ - @Nullable public Transaction transaction(); - public IgniteTx transaction(); ++ public Transaction transaction(); /** + * Gets current session properties. You can add properties directly to the + * returned map. + * * @return Current session properties. */ public <K, V> Map<K, V> properties(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c554af3b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c554af3b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c554af3b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java ----------------------------------------------------------------------
