Merge branch 'ignite-2.0' into ignite-5033
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/86cb61c8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/86cb61c8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/86cb61c8 Branch: refs/heads/ignite-5033 Commit: 86cb61c87fd151b508c0df5f7edbf6a9af943a13 Parents: 35e9bbd 1cd3cac Author: devozerov <[email protected]> Authored: Wed Apr 19 19:45:19 2017 +0300 Committer: devozerov <[email protected]> Committed: Wed Apr 19 19:45:19 2017 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 17 ++-- .../processors/cache/GridCacheAdapter.java | 5 +- .../dht/atomic/GridDhtAtomicCache.java | 38 ++------ .../local/atomic/GridLocalAtomicCache.java | 35 ++------ .../processors/query/GridQueryProcessor.java | 10 +-- .../query/h2/H2IndexingAbstractGeoSelfTest.java | 8 +- .../IgniteCacheAbstractFieldsQuerySelfTest.java | 10 ++- .../index/DuplicateKeyValueClassesSelfTest.java | 94 ++++++++++++++++++++ .../IgniteCacheQuerySelfTestSuite.java | 4 + 9 files changed, 143 insertions(+), 78 deletions(-) ----------------------------------------------------------------------
