You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dm...@apache.org on 2016/02/19 08:22:59 UTC

[2/2] ignite git commit: Merge branch 'ignite-1.5.7' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5.7

Merge branch 'ignite-1.5.7' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5.7


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

Branch: refs/heads/ignite-1.5.7
Commit: 0bdd56f9764a18b3b9988e7e7681ade122055f6f
Parents: 2622793 51efdfa
Author: Denis Magda <dm...@gridgain.com>
Authored: Fri Feb 19 10:22:35 2016 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Fri Feb 19 10:22:35 2016 +0300

----------------------------------------------------------------------
 .../ignite/internal/binary/BinaryContext.java   |   1 +
 .../ignite/internal/binary/BinaryUtils.java     |   4 +-
 .../binary/builder/BinaryBuilderSerializer.java |  16 +-
 .../binary/builder/BinaryObjectBuilderImpl.java |  12 +-
 .../binary/builder/BinaryValueWithType.java     |   3 +-
 .../processors/cache/GridCacheEntryEx.java      |   2 +-
 .../cache/GridCacheEvictionManager.java         |   6 +-
 .../processors/cache/GridCacheMapEntry.java     | 105 ++---
 .../processors/cache/GridCacheTtlManager.java   |  75 +++-
 .../distributed/dht/GridDhtCacheAdapter.java    |  29 +-
 .../distributed/dht/GridDhtCacheEntry.java      |   2 +-
 .../distributed/near/GridNearCacheEntry.java    |   4 +-
 .../cache/query/GridCacheQueryManager.java      | 424 +++++++++++++------
 .../BinaryObjectBuilderAdditionalSelfTest.java  |  91 +++-
 ...naryObjectBuilderDefaultMappersSelfTest.java |  30 +-
 ...CacheAtomicLocalOffheapExpiryPolicyTest.java |  30 ++
 ...gniteCacheAtomicOffheapExpiryPolicyTest.java |  30 ++
 ...rimaryWriteOrderOffheapExpiryPolicyTest.java |  31 ++
 ...teOrderWithStoreOffheapExpiryPolicyTest.java |  31 ++
 ...AtomicReplicatedOffheapExpiryPolicyTest.java |  30 ++
 ...eAtomicWithStoreOffheapExpiryPolicyTest.java |  30 ++
 .../IgniteCacheExpiryPolicyAbstractTest.java    | 169 ++++++--
 .../IgniteCacheExpiryPolicyTestSuite.java       |  13 +
 ...niteCacheTxLocalOffheapExpiryPolicyTest.java |  30 ++
 .../IgniteCacheTxOffheapExpiryPolicyTest.java   |  30 ++
 ...acheTxReplicatedOffheapExpiryPolicyTest.java |  30 ++
 ...CacheTxWithStoreOffheapExpiryPolicyTest.java |  30 ++
 .../testsuites/IgniteBinaryCacheTestSuite.java  |   2 +
 .../processors/query/h2/IgniteH2Indexing.java   |  95 +++--
 .../cache/IgniteClientReconnectQueriesTest.java |   9 +-
 .../h2/GridIndexingSpiAbstractSelfTest.java     |  38 +-
 31 files changed, 1128 insertions(+), 304 deletions(-)
----------------------------------------------------------------------