GitHub user ilantukh opened a pull request: https://github.com/apache/ignite/pull/1737
IGNITE-4535 You can merge this pull request into a Git repository by running: $ git pull https://github.com/gridgain/apache-ignite ignite-4535-master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/ignite/pull/1737.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1737 ---- commit 59c302c1b707c29a681fca398671863e69d22171 Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-03-14T13:29:15Z ignite-4535 : WIP. (cherry picked from commit 4dc8376) commit abfbaf801f8a4de747e463a2ac7bcdb5cea61061 Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-03-16T11:44:24Z ignite-4535 : fixed tests to distinguish onheap and offheap peeks. (cherry picked from commit 925c7e4) commit 51d27eb772a227ecbfd6a394c16bea89d945f94e Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-03-16T12:55:22Z ignite-4535 : Fixed test failures. (cherry picked from commit 678bd1b) commit 82fe3bfc3ac5a3997ea2c650cf6ee40753325a10 Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-03-16T14:53:30Z ignite-4535 : Analyzed failing tests. (cherry picked from commit 7c483a3) commit 5ce33f3334c1692eed93a07af3eb962b44f7b8cb Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-03-16T15:34:15Z ignite-4535 : Fixed and uncommented eviction tests. (cherry picked from commit ff4ec5e) commit 8c60243aac12164918aedc829936a61db4e44d31 Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-03-20T12:49:27Z ignite-4535 : Removed SWAP PeekMode, adjusted tests. (cherry picked from commit 5ac245e) commit edc8b7fb51786a405f5a26fe6b6b059ac7e3ed10 Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-03-20T13:49:41Z ignite-4535 : Fixed calculation of entries count in heap. (cherry picked from commit 9826ce4) commit 51eee72c8fb594005a517c8db30578e84728e099 Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-03-20T15:15:42Z ignite-4535 : Removing CacheMemoryMode - WIP. (cherry picked from commit 149b974) commit b55640aafb8e4e9d701e606239a31384e133ea35 Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-03-20T15:29:57Z ignite-4535 : Removing CacheMemoryMode - WIP. (cherry picked from commit 250597e) commit 3e71edae117c435ee406c4fda6526c27d805db99 Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-03-20T16:12:36Z ignite-4535 : Removing CacheMemoryMode - WIP. (cherry picked from commit 5e90523) commit 5ec807a53a812c47a5a8b22f98d57b25cccf0240 Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-03-21T13:27:18Z ignite-4535 : Removing CacheMemoryMode - WIP. (cherry picked from commit b3e1bc3) commit 7a49fa5d4be9970af93ef662abc84d0538638717 Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-03-30T13:10:26Z ignite-4535 : Conflicts. commit 4ea0316e7a2e04389e57efbfbbeaad77fa5bcb45 Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-03-21T13:48:51Z ignite-4535 : Removing CacheMemoryMode - done. (cherry picked from commit 6b7472c) commit c89c563b573d57f5138ab61bd9a161a2d8c8866b Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-03-21T13:52:43Z ignite-4535 : Removed redundant test. (cherry picked from commit 3cfea91) commit 141064ed9e0c392ca0c5bb51bf848945bec1c1d1 Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-03-21T14:29:05Z ignite-4535 : Fixed size calculation. (cherry picked from commit 531a449) commit b5ccfe365ff1a1f1ef949b7505f6058b772671c7 Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-03-21T14:42:06Z ignite-4535 : Redesigned semantics of GridDhtLocalPartitions#size() and #publicSize() methods. (cherry picked from commit dd3884d) commit 0756bb890c26d74a51e72268811048c485502aee Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-03-22T12:15:02Z ignite-4535 : Fixed test. (cherry picked from commit 1475ee3) commit 952c0efd12d2b90b3b519a999ae0fd6935b84274 Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-03-24T11:30:00Z ignite-4535 : Fixed DHT cache size calculation. (cherry picked from commit 06c845c) commit 06d853d124c9cfc1cea5e13867edfa78c89a3d74 Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-03-30T13:21:52Z ignite-4535 : conflicts commit 4ad8974c9f741ea33379ad4e323db9873cfda328 Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-03-30T13:31:03Z ignite-4535 : Conflicts. commit ecfc45e23bcbc5e440a74c594c21455bdd8b935e Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-03-31T13:14:42Z Removed properties specific for old OFFHEAP modes: offheapMaxMemory and sqlOnheapRowCacheSize. commit 7d7b28377c0f53037e5207a18a109ad22c8954aa Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-03-31T13:41:15Z Removed getOrCreateEntry(...). commit f2df0a7c7c11426bc83839cc903f10da18a0d677 Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-03-31T13:50:06Z ignite-4535 : GridDhtLocalPartition - replaced delegation to map with inheritance. commit 65d816f39a6985c2cc2104960ec1f41574e4e3a6 Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-03-31T14:20:27Z ignite-4535 : Removed sync evicts. commit 51b0d0079bab80fc78115d0db40c8569f41894de Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-03-31T15:15:57Z ignite-4535 : Adjusted tests for eviction. commit 48a8c40cabb955749a261c412862a7fb67f44a8d Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-03-31T15:20:36Z ignite-4535 : Merge with ignite-3477-master. commit be28dbf72c931ed52b04450dcc46141ed9dcb425 Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-04-03T12:08:39Z ignite-4535 : Fixed ignite-indexing. commit 55b13c6be2c8d31c1800931417e900dd4079f9a4 Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-04-03T12:09:06Z Merge branches 'ignite-3477-master' and 'ignite-4535-master' of https://github.com/gridgain/apache-ignite into ignite-4535-master commit 2fb75c41eda348ac9c7de770638d4810d394ae5e Author: Ilya Lantukh <ilant...@gridgain.com> Date: 2017-04-03T12:10:59Z ignite-4535 : Merge with ignite-3477-master. commit 6dd29eef599a95d0e3e905dba3aa9500ef994237 Author: Pavel Tupitsyn <ptupit...@apache.org> Date: 2017-04-03T14:20:44Z .NET: Remove CacheConfiguration.OffheapMaxMemory, CacheConfiguration.SqlOnheapRowCacheSize ---- --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---