Merge remote-tracking branch 'professional/ignite-2.1.5' into ignite-2.1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e82f077d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e82f077d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e82f077d Branch: refs/heads/ignite-gg-12822 Commit: e82f077df78972a58fdd06917839445711432705 Parents: aeb4aea 21d7fed Author: Dmitriy Govorukhin <[email protected]> Authored: Thu Sep 21 18:56:40 2017 +0300 Committer: Dmitriy Govorukhin <[email protected]> Committed: Thu Sep 21 18:56:40 2017 +0300 ---------------------------------------------------------------------- .../pagemem/store/IgnitePageStoreManager.java | 4 +- .../cache/CacheAffinitySharedManager.java | 4 +- .../persistence/file/FilePageStoreManager.java | 7 +- .../processors/query/GridQueryProcessor.java | 30 ++- .../pagemem/NoOpPageStoreManager.java | 2 +- .../IgnitePersistentStoreSchemaLoadTest.java | 237 ++++++++++++------- 6 files changed, 184 insertions(+), 100 deletions(-) ----------------------------------------------------------------------
