GitHub user glukos opened a pull request:
https://github.com/apache/ignite/pull/1758
IGNITE-4534: Implement offheap eviction policies based on page memory
Postreview.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/gridgain/apache-ignite
ignite-4534-from-3477-master
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/ignite/pull/1758.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 #1758
----
commit 98d92d89d69497172a6d33d88c17c1b05396ae04
Author: Ivan Rakov <[email protected]>
Date: 2017-04-04T18:53:35Z
IGNITE-4534: Implement offheap eviction policies based on page memory
commit 2235c7df11042b7c5920889c59ded17bab7bafff
Author: sboikov <[email protected]>
Date: 2017-04-05T11:14:36Z
ignite-4534 review
commit a2cead5342971771f63e91d4564ea738c73bd5fe
Author: Ivan Rakov <[email protected]>
Date: 2017-04-06T10:24:42Z
IGNITE-4534: Postreview.
commit 9cdf332a4931a94602d7ef723def6e338d7a73d0
Author: Ivan Rakov <[email protected]>
Date: 2017-04-06T14:00:09Z
IGNITE-4534: Postreview
commit c824b35293a9e131aec4848323bca94acbc7c2da
Author: Dmitriy Govorukhin <[email protected]>
Date: 2017-04-07T12:44:54Z
ignite-3477-master mute test
commit 3cd21e38b39ebe3966b601a1ab7d0f8a5af30cb6
Author: Ivan Rakov <[email protected]>
Date: 2017-04-07T13:44:08Z
IGNITE-4534: Postreview
commit 0a65588275e27d8a159f114adb44cf00c8df85ae
Author: Ivan Rakov <[email protected]>
Date: 2017-04-07T13:55:34Z
Merge branch 'ignite-3477-master' into ignite-4534-from-3477-master
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/pagemem/Page.java
#
modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageNoStoreImpl.java
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOffheapEvictionManager.java
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/freelist/FreeListImpl.java
commit aa66de672fde2ea5b615400132a71248c240bca9
Author: Konstantin Dudkov <[email protected]>
Date: 2017-04-07T14:18:53Z
remove GridCache(Atomic|Dht|Near)ExpiredEntriesPreloadSelfTest
commit f684af89fa83c07f2264523915d6f0e42fe1fad2
Author: Ivan Rakov <[email protected]>
Date: 2017-04-07T16:19:21Z
IGNITE-4534: Fixing issues after merge with Page deletion
commit e09e0f52d72325c0a4b6e4c95b577284cf5dc15d
Author: Ivan Rakov <[email protected]>
Date: 2017-04-08T12:34:03Z
Merge branch 'ignite-3477-master' into ignite-4534-from-3477-master
commit 83b4fff81797dcca27ea2a7dba80cc475f3d7838
Author: Ivan Rakov <[email protected]>
Date: 2017-04-08T12:36:17Z
IGNITE-4534: Method for acquiring force read lock is moved to interface
commit 48a891de3b907f018ec0c6c3c3a9e7f03c4e88c0
Author: Ivan Rakov <[email protected]>
Date: 2017-04-08T13:57:38Z
Merge branch 'ignite-3477-master-apache' into ignite-4534-from-3477-master
# Conflicts:
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/MemoryPolicy.java
#
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/freelist/FreeListImpl.java
#
modules/core/src/test/java/org/apache/ignite/internal/processors/database/FreeListImplSelfTest.java
commit 9693545615679687f99651c552ffb8d391d6d203
Author: Ivan Rakov <[email protected]>
Date: 2017-04-08T14:21:19Z
IGNITE-4534: Fixing minors after merge.
----
---
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 [email protected] or file a JIRA ticket
with INFRA.
---
