Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f2258cc8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f2258cc8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f2258cc8 Branch: refs/heads/ignite-1.5-cache-get-opts Commit: f2258cc805fa25a37802bad4defe529eff3021be Parents: 3289cc1 97270bf Author: Yakov Zhdanov <[email protected]> Authored: Wed Nov 25 23:53:58 2015 +0300 Committer: Yakov Zhdanov <[email protected]> Committed: Wed Nov 25 23:53:58 2015 +0300 ---------------------------------------------------------------------- examples/pom.xml | 2 +- .../client/router/RouterFactorySelfTest.java | 2 + .../java/org/apache/ignite/IgniteCache.java | 23 +++ .../org/apache/ignite/internal/IgnitionEx.java | 9 +- .../internal/portable/BinaryReaderExImpl.java | 18 ++- .../processors/cache/CacheLockImpl.java | 18 ++- .../processors/cache/GridCacheAdapter.java | 156 ++++++++++++++++++- .../processors/cache/GridCacheProxyImpl.java | 61 ++++++++ .../processors/cache/IgniteCacheProxy.java | 42 +++++ .../processors/cache/IgniteInternalCache.java | 47 +++++- .../distributed/dht/GridDhtCacheAdapter.java | 7 +- .../colocated/GridDhtColocatedLockFuture.java | 8 +- .../distributed/near/GridNearCacheAdapter.java | 10 ++ .../platform/PlatformContextImpl.java | 2 +- .../ignite/resources/MBeanServerResource.java | 69 -------- .../CacheDeferredDeleteSanitySelfTest.java | 98 ++++++++++++ .../cache/CacheStopAndDestroySelfTest.java | 8 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 42 ++++- .../multijvm/IgniteCacheProcessProxy.java | 38 +++++ .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + ...niteCacheP2pUnmarshallingQueryErrorTest.java | 7 +- .../Services/ServicesExample.cs | 4 + modules/scalar/pom.xml | 4 +- modules/spark/pom.xml | 4 +- modules/visor-console/pom.xml | 2 +- .../ignite-int-max-values-offheap-config.xml | 89 +++++++++++ .../ignite-int-max-values-onheap-config.xml | 84 ++++++++++ .../ignite-int-max-values-swap-config.xml | 93 +++++++++++ .../test-max-int-values-offheap.properties | 70 +++++++++ .../test-max-int-values-onheap.properties | 70 +++++++++ .../config/test-max-int-values-swap.properties | 69 ++++++++ .../yardstick/cache/IntMaxValueEntriesTest.java | 135 ++++++++++++++++ parent/pom.xml | 2 +- 33 files changed, 1194 insertions(+), 101 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f2258cc8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f2258cc8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java ----------------------------------------------------------------------
