Merge branch ignite-gg-11044 into ignite-db-x
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6d68db94 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6d68db94 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6d68db94 Branch: refs/heads/ignite-db-x-10884 Commit: 6d68db94fe9b6a36a082c7f350adf2e2da2732c9 Parents: a358116 2da9ee3 Author: Alexey Goncharuk <[email protected]> Authored: Tue Apr 26 11:10:11 2016 -0700 Committer: Alexey Goncharuk <[email protected]> Committed: Tue Apr 26 11:10:11 2016 -0700 ---------------------------------------------------------------------- .../internal/pagemem/DirectMemoryUtils.java | 10 + .../ignite/internal/pagemem/PageMemory.java | 3 +- .../internal/pagemem/impl/FullPageIdTable.java | 90 +++++++- .../ignite/internal/pagemem/impl/PageImpl.java | 9 + .../internal/pagemem/impl/PageMemoryImpl.java | 225 ++++++++++++++++++- 5 files changed, 316 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6d68db94/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/FullPageIdTable.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/FullPageIdTable.java index 9c4ce66,c6529f4..2aa53c6 --- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/FullPageIdTable.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/FullPageIdTable.java @@@ -175,8 -223,8 +220,8 @@@ public class FullPageIdTable do { int res = testKeyAt(index, key); - if (res == EMPTY) { + if (res == EMPTY || res == REMOVED) { - setKeyAt(index, key); + setKeyAt(index, key.pageId(), key.cacheId()); incrementSize();
