You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/11/25 19:40:10 UTC

[7/8] ignite git commit: Merge branches 'ignite-1.5' and 'ignite-sql-opt-2' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-sql-opt-2

Merge branches 'ignite-1.5' and 'ignite-sql-opt-2' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-sql-opt-2


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

Branch: refs/heads/ignite-sql-opt-2
Commit: 91e1960643dea9d7bdca1ce2a317fd14be130740
Parents: f7e0199 97270bf
Author: S.Vladykin <sv...@gridgain.com>
Authored: Wed Nov 25 20:23:35 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Wed Nov 25 20:23:35 2015 +0300

----------------------------------------------------------------------
 .../client/router/RouterFactorySelfTest.java    |   2 +
 .../java/org/apache/ignite/IgniteCache.java     |  23 +++
 .../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 +-
 .../distributed/near/GridNearCacheAdapter.java  |  10 ++
 .../ignite/resources/MBeanServerResource.java   |  69 --------
 .../CacheDeferredDeleteSanitySelfTest.java      |  98 ++++++++++++
 .../cache/CacheStopAndDestroySelfTest.java      |   8 +-
 .../multijvm/IgniteCacheProcessProxy.java       |  38 +++++
 .../ignite/testsuites/IgniteCacheTestSuite.java |   2 +
 ...niteCacheP2pUnmarshallingQueryErrorTest.java |   7 +-
 .../Services/ServicesExample.cs                 |   4 +
 .../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 ++++++++++++++++
 22 files changed, 1105 insertions(+), 79 deletions(-)
----------------------------------------------------------------------